diff --git a/CHANGES b/CHANGES index a1edfdac527..054e7b06615 100644 --- a/CHANGES +++ b/CHANGES @@ -1,7 +1,387 @@ -Apache CloudStack (Incubating) CHANGES +Apache CloudStack CHANGES ====================================== -Full release notes for each release are located in the project's documentation website: http://cloudstack.apache.org/docs +Full release notes for each release are located in the project's documentation website: +http://cloudstack.apache.org/docs + +Version 4.2.0 +------------------------ + +In progress + + + + +Version 4.1.0 +------------------------ + +This is the second major release of CloudStack from within the Apache Software Foundation, and the +first major release as a Top-Level Project (TLP). + +Build Tool Changes: + + * The project now uses Maven 3 exclusively to build. + +New Features: +* CLOUDSTACK-101: OVS support in KVM +* CLOUDSTACK-132: Mash up marvin into an interactive auto-completing API shell for CloudStack +* CLOUDSTACK-241: AWS Style Regions +* CLOUDSTACK-297: Reset SSH Key to access VM (similar to reset password) +* CLOUDSTACK-299: Egress firewall rules for guest network +* CLOUDSTACK-306: Support SRX & F5 inline mode +* CLOUDSTACK-618: API request throttling to avoid malicious attacks on MS per account through frequent API request. +* CLOUDSTACK-637: AutoScale +* CLOUDSTACK-644: Resize volumes feature +* CLOUDSTACK-706: Persistent Networks without running a VM +* CLOUDSTACK-726: Implement L3 Router functionality in Nicira Nvp Plugin +* CLOUDSTACK-780: Additional VMX Settings +* CLOUDSTACK-926: ApiDiscoverService: Implement a plugin mechanism that exposes the list of APIs through a discovery service on the management server + +Bug Fixes: + +* CLOUDSTACK-1600 Typo in dpkg-buildpackage command +* CLOUDSTACK-1574 updateResourceCount API is failed saying to specify valida resource type even after parsing the valid resource type +* CLOUDSTACK-1562 Replace the short-cut solution of supportting @DB with the formal one +* CLOUDSTACK-1541 NPE while deleting snapshot :Unexpected exception while executing org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd +* CLOUDSTACK-1521 Redundant router: Services are not stopped when switch to BACKUP state +* CLOUDSTACK-1509 Failed to implement network elements and resources while provisioning for persistent network(createVlanIpRange to an account] +* CLOUDSTACK-1496 List API Performance: listAccounts failing with OOME for high values of pagesize (>1000 ) +* CLOUDSTACK-1487 cloudstack-setup-agent fails to set private.network.device on KVM host add +* CLOUDSTACK-1485 Add Baremetal Provider back to 4.1 branch +* CLOUDSTACK-1484 "API Throttling : api.throttling.enabled, Global setting missing" +* CLOUDSTACK-1473 deleteDomain is failing with NPE +* CLOUDSTACK-1470 unhandled exception executing api command: deployVirtualMachine +* CLOUDSTACK-1469 kvm agent: agent service fails to start up +* CLOUDSTACK-1465 List Zones returns null under create instance when logged is as user +* CLOUDSTACK-1449 listAccounts and listProjectAccounts API lists all the users not account-specific users for each account returned +* CLOUDSTACK-1447 [UI]Persistent Status is not displayed for VPC Tiers +* CLOUDSTACK-1436 4.1 management server fails to start from RPM build artifacts +* CLOUDSTACK-1429 single account is unable to use same vnet across multiple physical networks +* CLOUDSTACK-1425 unhandled exception executing api command: migrateVirtualMachine & recoverVirtualMachine +* CLOUDSTACK-1420 Ensure trademarks are properly attributed in publican brand. +* CLOUDSTACK-1419 Apache-ify and apply trademark logos in the UI +* CLOUDSTACK-1418 "As regular user , we are not allowed to deploy VM on a shared network." +* CLOUDSTACK-1417 "When invalid values are passed to createNetwork() , error message does not indicate the parameter name that has invalid values." +* CLOUDSTACK-1414 Redundant router: BACKUP switch cancelled due to lock timeout after a glitch in network +* CLOUDSTACK-1403 Storage and console-proxy related error +* CLOUDSTACK-1402 listRouters API response doesn't return linklocal IP and public IP details +* CLOUDSTACK-1399 Unhandled exception executing api command: stopVirtualMachine +* CLOUDSTACK-1397 Static Nat configuration is failing with NPE +* CLOUDSTACK-1391 EventBus is not getting injected after javelin merge +* CLOUDSTACK-1383 Deploying basic zone on 4.1 fails in NPE +* CLOUDSTACK-1382 "vm deploy fails with Error ""cannot find DeployPlannerSelector for vm""" +* CLOUDSTACK-1375 deploydb failing with acs master +* CLOUDSTACK-1369 "Ipv6 - In dual Stack network , guest VM does not have the Ipv6 address of the router programmed in /etc/resolv.conf for DNS resolution." +* CLOUDSTACK-1367 NPE noticed in logs while AgentMonitor is monitoring the host ping interval +* CLOUDSTACK-1357 "Autoscale: Provisioned VMs from Netscaler not being added to lb vserver, provserver fails with provserver_err_asynctaskpoll" +* CLOUDSTACK-1350 Management server Stop and start causes previously downloaded ISOs and templates to redownload & reinstall +* CLOUDSTACK-1347 "Not able to delete network. Error - ""Unable to insert queue item into database, DB is full?""" +* CLOUDSTACK-1346 "Check to see if external devices are used in the network, is hardcoded for specific devices" +* CLOUDSTACK-1345 BigSwitch plugin introduces 'VNS' isolation in UI without backend implementation +* CLOUDSTACK-1344 Typo in use.external.dns setting description +* CLOUDSTACK-1343 Porting Baremetal related UI changes to ACS +* CLOUDSTACK-1341 URL for the KEYs file is wrong in the installation guide +* CLOUDSTACK-1339 ASF 4.1: Management server becomes unresponsive +* CLOUDSTACK-1338 Deploy VM failed using ISO +* CLOUDSTACK-1334 vmware.root.disk.controller doesn't work. +* CLOUDSTACK-1332 IPV6 - Router and guest Vms should be able to use an IPV6 address for external DNS entry. +* CLOUDSTACK-1331 Upgrade fails for a 2.2.14 Zone having multiple guest networks using network_tags and Public Vlan +* CLOUDSTACK-1330 ec2-run-instances - When -n option is used to deploy multiple Vms API returns error even though few of the Vms have been deployed successfully. +* CLOUDSTACK-1320 Routers naming convention is changed to hostname +* CLOUDSTACK-1319 createCustomerVpnGateway response gives TypeError: json.createvpncustomergatewayresponse is undefined +* CLOUDSTACK-1315 [F5-SRX-InlineMode] Network implement failed with Run time Exception during network upgrade from VR to SRX-F5 +* CLOUDSTACK-1313 Working with Volumes Section Is Missing +* CLOUDSTACK-1312 "Fix rolling upgrades from 4.0 to 4.1 in 4.1 release, fix db schemas to be same as 4.0" +* CLOUDSTACK-1307 Noticed NPE when we put host in maintenance mode in clustered management setup +* CLOUDSTACK-1303 Ipv6 - java.lang.NullPointerException when executing listnetworks() and deployVirtualMachine() after extending the Ipv4 range of a dual stack network. +* CLOUDSTACK-1300 section in wrong order in installation guide +* CLOUDSTACK-1299 Errors in 4.5.5 section of installation guide +* CLOUDSTACK-1295 NPE in usage parsers due to missing @Component inject +* CLOUDSTACK-1289 [F5-SRX-InlineMode] Usage stats are not generated for Juniper SRX Firewall in inlinemode +* CLOUDSTACK-1288 [F5-SRX-InlineMode] classCastException during network restart with cleanup option true +* CLOUDSTACK-1277 ApiResponseHelper.createUserVmResponse failed to populate password field set from UserVm object +* CLOUDSTACK-1272 Autoscale: createAutoScaleVmProfile fails due to unable to retrieve Service Offering id +* CLOUDSTACK-1267 KVM's cloudstack-agent service doesn't log (log4j) +* CLOUDSTACK-1265 logrotate dnsmasq configuration is wrong +* CLOUDSTACK-1262 "Failed to Prepare Secondary Storage in VMware," +* CLOUDSTACK-1251 Baremetal zone doesn't need primary/secondary storage in UI wizard +* CLOUDSTACK-1243 Failed to cleanup account :java.lang.NullPointerException +* CLOUDSTACK-1242 [F5-SRX-InlineMode] Failed to create LB rule with F5-SRX inlinemode deployement +* CLOUDSTACK-1241 Network apply rules logic is broken +* CLOUDSTACK-1237 "Register Template fails with ""Cannot find template adapter for XenServer""" +* CLOUDSTACK-1234 Unable to start KVM agent with 4.1 build +* CLOUDSTACK-1233 Veewee configuration files are inappropriately identified as ASLv2 licensed files +* CLOUDSTACK-1232 "Ipv6 - Guest Vms are not able to get Ipaddress when executing dhclient command when using ""/96"" network." +* CLOUDSTACK-1226 Error while running Cloudstack-setup-databases +* CLOUDSTACK-1223 Exception while starting jetty server: org.springframework.beans.factory.BeanCreationException Error creating bean with name 'apiServer': +* CLOUDSTACK-1222 API rate limit configs: removed double quote in upgrade script +* CLOUDSTACK-1220 Ipv6 - Better error message when deploy Vm fails to get a free Ip address. +* CLOUDSTACK-1219 Ipv6 - Provide better error messages when deploying a Vm with Ip an address that is outside the network's ip range / if the ip address already is assigned to another Vm. +* CLOUDSTACK-1216 UUID is null for admin and failed to register user key with 4.1 +* CLOUDSTACK-1210 Make all pluggable services return list of api cmd classes +* CLOUDSTACK-1206 Failure in Copy of System templates +* CLOUDSTACK-1205 Ipv6 - Ubuntu 12.10 guest Vms looses default route (after it expiration time ~ 30 mts) when ipv6.autoconfig parameters are disabled except for net.ipv6.conf.lo.autoconf which is enabled. +* CLOUDSTACK-1204 Fail to create advance zone due to fail to add host +* CLOUDSTACK-1201 "Failed to create ssh key for user ""cloud"" /var/lib/cloud/management/.ssh/id_rsa and failed to start management server" +* CLOUDSTACK-1190 Make APIChecker interface throw a single sensible exception +* CLOUDSTACK-1181 mvn deploy db failing with NPE +* CLOUDSTACK-1176 Issue with snapshots(create/list) +* CLOUDSTACK-1174 Snapshots related SQL error +* CLOUDSTACK-1173 ConsoleProxyResource instantiation exception +* CLOUDSTACK-1168 Create firewall rule broken +* CLOUDSTACK-1163 Failed with NPE while creating firewall rule +* CLOUDSTACK-1161 Differences between 4.1 and master in ongoing-config-of-external-firewalls-lb.xml +* CLOUDSTACK-1154 Account/Users related API failed due to RegionService inject exception +* CLOUDSTACK-1153 "Ipv6 - Vm deployment fails with ""n must be positive"" error." +* CLOUDSTACK-1152 Missing tag in host-add.xml +* CLOUDSTACK-1141 "Ipv6 - After network restart (and reboot router) , we do not see the existing vms dnsentries not being programmed in the router." +* CLOUDSTACK-1138 "Providing invalid values for gateway, netmask etc in the zoneWizard blocks the VLAN container to load , throwing an error" +* CLOUDSTACK-1123 ListStoragePools API broken by refactor +* CLOUDSTACK-1113 "Ipv6 - Not able to deploy a new VM in this network because of ""Unable to allocate Unique Ipv6 address""" +* CLOUDSTACK-1112 "Errors in ""Prepare the System VM Template""" +* CLOUDSTACK-1111 Ipv6 - listRouters() does not return guestipaddress/ +* CLOUDSTACK-1109 "Ipv6 - Unable to expunge User Vms that are ""Destroyed""." +* CLOUDSTACK-1108 Ipv6 - Not able to restart Networks. +* CLOUDSTACK-1107 Ipv6 - Unable to extend Ip range for a Ipv6 network using craeteVlanIpRange() command - Error code 530 returned. +* CLOUDSTACK-1105 "IpV6 - listVirtualMachines() does not return netmask ,gateway,ipaddress." +* CLOUDSTACK-1104 Ipv6 - listVlanIpRanges() returns error 530. +* CLOUDSTACK-1103 "IpV6 - listNetwork() command does not retrun gateway,netmask,cidr" +* CLOUDSTACK-1095 Ipv6 - dhclient command needs to be run manually on the Vms to get the Ipv6 address. +* CLOUDSTACK-1088 EnableStaticNat error will clear the data in database +* CLOUDSTACK-1087 Update the Developer Guide for ASFCS 4.1 Release +* CLOUDSTACK-1083 listUsageRecords api: removed project results in NPE +* CLOUDSTACK-1082 UI doesn't throw any error message when trying to delete ip range from a network that is in use +* CLOUDSTACK-1079 Deploying AWSAPI with mvn -pl :cloud-awsapi jetty:run fails +* CLOUDSTACK-1070 javelin: NPE on executing registerIso API +* CLOUDSTACK-1064 A type error occurs when trying to add account/register template.... +* CLOUDSTACK-1063 "SG Enabled Advanced Zone - ""Add Guest Networks"" - When user tries to add a guest Network with scope as ""Account"" , he should NOT be presented with ""Offering for shared security group enabled""" +* CLOUDSTACK-1057 regression of changeServiceForVirtualMachine API - fails to find service offering by serviceOfferingId parameter +* CLOUDSTACK-1056 S3 secondary storage fails to upload systemvm template due to KVMHA directory +* CLOUDSTACK-1055 "The overlay still exists when the ""Recurring Snapshots"" dialog is canceled by pressing esc key." +* CLOUDSTACK-1051 API dispatcher unable to find objectVO corresponding to DeleteTemplatecmd +* CLOUDSTACK-1050 No Documentation on Adding a Load Balancer Rule +* CLOUDSTACK-1037 "Make cloudmonkey awesome-er: Online help docs and api discovery, better colored output, parameter value autocompletion" +* CLOUDSTACK-1029 Enter the token to specified project is malfunctioned +* CLOUDSTACK-1027 """Update SSL certificate"" button should properly reflect it's functionality" +* CLOUDSTACK-1024 Regression: Unable to add Xenserver host with latest build +* CLOUDSTACK-1021 the vlan is not creat to right nic. when i creat multi guest network. +* CLOUDSTACK-1016 Not able to deploy VM. +* CLOUDSTACK-1014 Merge ManagementServer and ManagementServerExt +* CLOUDSTACK-1013 running cloudstack overwrites default public/private ssh keys +* CLOUDSTACK-1011 KVM host getting disconnected in cluster environment +* CLOUDSTACK-1010 Host count and Secondary storage count always shows 1 in UI +* CLOUDSTACK-1002 Not able to start VM. +* CLOUDSTACK-995 Not able to add the KVM host. +* CLOUDSTACK-993 """admin"" user is not getting created when management server is started." +* CLOUDSTACK-987 Sections missing in Working With Snapshots +* CLOUDSTACK-985 Different MAC address for RvR caused issue in short term network outrage +* CLOUDSTACK-978 TypeError: instance.displayname is undefined while adding VM's to the LB rule. +* CLOUDSTACK-968 marvin: vlan should be an attribute of the physical_network and not the zone +* CLOUDSTACK-959 Missing sub-sections in document section System Service Offerings +* CLOUDSTACK-938 s2s VPN trouble +* CLOUDSTACK-928 [Simulator] Latency for Agent Commands - change unit of wait from seconds to milliseconds +* CLOUDSTACK-863 Non-printable characters (ASCII control character) such as %00 or %0025 are getting stored in raw/non encoded form in the database. +* CLOUDSTACK-819 Create Account/User API logging password in access logs +* CLOUDSTACK-799 [Load Test] Check router statistics falls behind in gathering stats by more than 2 times the set value +* CLOUDSTACK-798 Move usage related cmd classes from cloud-server to cloud-api +* CLOUDSTACK-736 Integration smoke tests: Fix check for vm name for the deployvm smoke test +* CLOUDSTACK-734 api_refactoring: CreateAccountCmd fails to send response due to NPE in service layer +* CLOUDSTACK-725 UI: Error when the Egress rules tab is selected for a network +* CLOUDSTACK-721 Bytes sent/received in user statistics is empty (CloudStack 4.0) +* CLOUDSTACK-720 Fail to load a png image when accessing the web console +* CLOUDSTACK-717 cloudmonkey fails to parse/print response +* CLOUDSTACK-693 Adding a VPC virtual router to a NiciraNVP enabled network fails +* CLOUDSTACK-691 A warning dialog box shows after reloading the welcome page +* CLOUDSTACK-689 RVR: Stop pending flag is not cleared when user start the disconnected router from another host +* CLOUDSTACK-683 Image Is Missing in the Accessing VM Section +* CLOUDSTACK-660 Network Traffic Labels are not functional in Marvin +* CLOUDSTACK-648 The normal users could change their own login password +* CLOUDSTACK-639 API Refactoring: Adapters for ACL +* CLOUDSTACK-617 Unable to edit a Sub domain +* CLOUDSTACK-614 "ListTemplates API is not returning ""Enable SSH Key"" attribute for any given template" +* CLOUDSTACK-606 Starting VM fails with 'ConcurrentOperationException' in a clustered MS scenario +* CLOUDSTACK-605 Host physical CPU is incorrectly calculated for Vmware hosts +* CLOUDSTACK-599 DhcpEntryCommand fails on Router VM on CS4.0 and vSphere5 with Advanced Network Zone +* CLOUDSTACK-596 DeployVM command takes a lot of time to return job id +* CLOUDSTACK-584 "typos in ""Apache_CloudStack-4.0.0-incubating-CloudStack_Nicira_NVP_Guide-en-US""" +* CLOUDSTACK-573 "NPE at ""com.cloud.network.NetworkManagerImpl.networkOfferingIsConfiguredForExternalNetworking(NetworkManagerImpl.java:4345)"" when create network from the network offering having NULL provider for the service" +* CLOUDSTACK-572 SG Enabled Advanced Zone - Not able to deploy a VM in an account specific shared network. +* CLOUDSTACK-560 Usage server doesn't work in 4.0.0 due to missing db changes +* CLOUDSTACK-556 Erratic window behavior in Quick View tooltip +* CLOUDSTACK-553 "SRX - When adding SRX device make ""Public Network"" - default to ""untrusted"" and ""Private Network"" - default to ""trusted"" as un-editable fields." +* CLOUDSTACK-552 ]Quick view details for a volume displays scroll bar in place of name of the volume when the name of the volume has more no of characters +* CLOUDSTACK-539 Cropped Text in UI under Quick View +* CLOUDSTACK-536 remove citrix cloudpatform from 4.0 build - CloudStack is ASF project +* CLOUDSTACK-527 List API performance optimization by using DB views and removing UUID conversion. +* CLOUDSTACK-522 Log requests in cloudmonkey's log file +* CLOUDSTACK-520 Dependency jar names mismatch with install-non-oss.sh +* CLOUDSTACK-518 API refactoring -- change @Parameter annotation and remove the @IdentityMapper annotation +* CLOUDSTACK-514 Marvin and Cloudmonkey don't work when an API target uses https or an alternate path +* CLOUDSTACK-510 Add button not visible when adding public IPs to physical network +* CLOUDSTACK-508 CLVM copies template to primary storage unnecessarily +* CLOUDSTACK-507 fix api docs for listSSHKeyPairs +* CLOUDSTACK-504 Duplicate guest password scripts in codebase +* CLOUDSTACK-501 Apidocs and marvin does not know how to handle Autoscaling docs +* CLOUDSTACK-500 Passwd-server iptables rules are dropped on domr on fresh start or on reboot +* CLOUDSTACK-499 cloudmonkey CLI can't accept complex parameters +* CLOUDSTACK-493 2.2.x-3.0 DB upgrade support for Advance SG enabled networks +* CLOUDSTACK-481 Installation Guide Doc Error +* CLOUDSTACK-467 Developer's Guide points to cloud.com for API reference +* CLOUDSTACK-465 French language file quotes are dropping javascript syntax errors +* CLOUDSTACK-464 "Regression in AWSAPI docs, entire sections removed" +* CLOUDSTACK-462 A few corrections to make to the 4.0.0 installation guide +* CLOUDSTACK-459 [Optional Public IP assignment for EIP with Basic Zone] Associate IP Checkbox in Create Network Offering Dialog is Displayed When Elastic LB is Selected +* CLOUDSTACK-456 License tag in SPEC isn't what RPM is expecting +* CLOUDSTACK-448 SSVM bootstrap failure on XenServer hosts with E3 CPU +* CLOUDSTACK-446 "Host going to alert state, if you are adding already added host" +* CLOUDSTACK-441 Running mgmt server using jetty fails to start api server +* CLOUDSTACK-435 Vmware network labels are ignored when creating a Zone using basic networking +* CLOUDSTACK-427 Change hardcoded step number references to dynamic links +* CLOUDSTACK-424 Updated userdata not propagating to the VR. +* CLOUDSTACK-417 Handle password server securely to run on port 8080 on VR +* CLOUDSTACK-416 XCP 1.6beta2 (61002c) - can't add a host +* CLOUDSTACK-404 Update docs on the usage of cloud-setup-databases +* CLOUDSTACK-398 Install Guide: Section 11.17.3 (Using VPN with Mac OSX): Not complete? +* CLOUDSTACK-397 Install Guide: Section 11.1 (Guest Traffic): Diagram is the wrong diagram +* CLOUDSTACK-390 Install Guide: Section 4.5.7 (Prepare the System VM Template): Links go to cloud.com +* CLOUDSTACK-378 mavenize marvin on master +* CLOUDSTACK-377 provide deployment config access to marvin's testcase +* CLOUDSTACK-373 "static NAT and Firewall is not working on external firewall device SRX, it needs to be implemented" +* CLOUDSTACK-369 ASF 4.0 - unable to support XenServer 6.1 host +* CLOUDSTACK-364 Docs point to download.cloud.com for AWS API script +* CLOUDSTACK-361 Wrong creation of guest networks on a KVM host in Multiple Physical Networks with guest traffic +* CLOUDSTACK-359 PropagateResourceEventCommand failes in cluster configuration +* CLOUDSTACK-357 "ISOs can be deleted while still attached to a running VM, and they subsequently cannot be detached from a running VM" +* CLOUDSTACK-355 "Fix ""count"" in a bunch of API commands" +* CLOUDSTACK-348 deleteNetwork does not clean up network resource count correctly +* CLOUDSTACK-347 listNetworks API: return vlan information only when the caller is ROOT admin +* CLOUDSTACK-346 Cannot add Vmware cluster with class loader conflict exception +* CLOUDSTACK-335 KVM VPC load balancer not working +* CLOUDSTACK-333 When Datacenter name in VCenter has spaces Primary Storage (VMFS) discovery will fail +* CLOUDSTACK-332 """count"" property in list* API response should be equal to how many entries in database, not how many objects in API response" +* CLOUDSTACK-318 Adding XenServer Host Fails - 6.0.2 fails with 4.0.0 +* CLOUDSTACK-304 Add synchronization for createSnapshot command per host basis +* CLOUDSTACK-293 "We do awful, hacky things in our spec file for client" +* CLOUDSTACK-290 3.0.0 template also needed for 2.2.14 to 3.0.5 direct upgrade. +* CLOUDSTACK-284 listVirtualMachines does not return deleted machines when zone is specified +* CLOUDSTACK-279 deleteProject fails when executed by the regular user (works fine for root/domain admin) +* CLOUDSTACK-274 Two error codes mapped to same value in API +* CLOUDSTACK-271 updatePhysicalNetwork dies with an NPE when the vlan range is empty +* CLOUDSTACK-256 "vpn:As an admin user , not able to delete VPN user which is present in a regular user's network." +* CLOUDSTACK-250 Incorrect description of maintenance mode in admin guide +* CLOUDSTACK-249 Add host id to failed VM deploy alerts +* CLOUDSTACK-235 Network rate can be set in 2 places. Clarify docs on how this works. +* CLOUDSTACK-232 Zone infrastructure chart -- disable resource total display +* CLOUDSTACK-228 UI provides an option to reconnect a disconnected host - ServerApiException is thrown on an attempt +* CLOUDSTACK-227 ReconnectHostCmd: NullPointerException: Unable to get host Information for XenServer 6.0.2 host - on intentionally changing the traffic labels on the physical network +* CLOUDSTACK-226 UpdatePhysicalNetworkcommand failed due to java.sql.BatchUpdateException ; Tried to extend the existing Guest VLAN Range of one physical network into the Guest VLAN range of the other physical network +* CLOUDSTACK-225 API Docs: Request params repeated with different descriptions +* CLOUDSTACK-222 Admin UI prompts to restart Management server with cancel edit operation +* CLOUDSTACK-178 Expose name parameter of VM in list Vm view. +* CLOUDSTACK-130 Clarify docs on tags parameter in API reference +* CLOUDSTACK-119 Move Agent-Simulator in to the hypervisor plugin model +* CLOUDSTACK-118 "Status of host resorce stuck in ""ErrorInMaintenance""" +* CLOUDSTACK-95 IP address allocation not working when a user tries to allocate IP addresses in a Project. +* CLOUDSTACK-70 Improve Network Restart Behaviour for Basic Zone: Restarting Network Fails +* CLOUDSTACK-46 Remnants of mycloud remain + +Security Fixes: + + * CVE-2012-4501: Apache CloudStack configuration vulnerability + + +Version 4.0.2 +------------------------ + +This is a maintenance release for the Apache CloudStack 4.0.x series, with no new features. + +Issues fixed in this release: + +* CLOUDSTACK-354: Display of storage statistics is wrong. +* CLOUDSTACK-397: Install Guide: Section 11.1 (Guest Traffic): Diagram is the wrong diagram +* CLOUDSTACK-398: Install Guide: Section 11.17.3 (Using VPN with Mac OSX): Not complete? +* CLOUDSTACK-462: A few corrections to make to the 4.0.0 installation guide +* CLOUDSTACK-524: http proxy used by ssvm (secstorage.proxy) NOT working +* CLOUDSTACK-587: MEMORY_CONSTRAINT_VIOLATIONMemory limits must satisfy: +* CLOUDSTACK-803: HA gets triggered even when the host investigator is unable to determine the state of the host +* CLOUDSTACK-810: Make DirectAgent thread pool size configurable +* CLOUDSTACK-976: unable to start cloudstack (error: "java.lang.NoSuchMethodError: org.apache.commons.codec.binary.Base64.encodeBase64URLSafeString([B)Ljava/lang/String;") +* CLOUDSTACK-988: HV version must be updated in hypervisor_version column of host table +* CLOUDSTACK-990: Documentation issue with libvirtd.conf tcp_port configuration +* CLOUDSTACK-1088: EnableStaticNat error will clear the data in database +* CLOUDSTACK-1106: Missing documentation for cloud-setup-databases +* CLOUDSTACK-1110: Documentation missing "Management Server Load Balancing" +* CLOUDSTACK-1112: Errors in "Prepare the System VM Template" +* CLOUDSTACK-1137: Force reconnect of a disconnected state complains about the state of the host. +* CLOUDSTACK-1150: Documentation for libvirt on Ubuntu 12.04 +* CLOUDSTACK-1151: vmware systemVm template upgrade is missing in 4.0 upgrade +* CLOUDSTACK-1211: Network operations are Blocked for the Read-only file system of Virtual Router +* CLOUDSTACK-1265: logrotate dnsmasq configuration is wrong +* CLOUDSTACK-1291: duplicate arguments in commands.xml prevents cloudapis.py to run to completion +* CLOUDSTACK-1298: typo in deb package setup +* CLOUDSTACK-1299: Errors in 4.5.5 section of installation guide +* CLOUDSTACK-1300: section in wrong order in installation guide +* CLOUDSTACK-1341: URL for the KEYs file is wrong in the installation guide +* CLOUDSTACK-1419: Apache-ify and apply trademark logos in the UI +* CLOUDSTACK-1420: Ensure trademarks are properly attributed in publican brand. +* CLOUDSTACK-1589: Ubuntu 4.0 packages depend on non-existent chkconfig +* CLOUDSTACK-1629: Need to move location or conflict with antlr +* CLOUDSTACK-1642: Add support CentOS 6.4 +* CLOUDSTACK-1648: Unable to add KVM host +* CLOUDSTACK-1652: /etc/hosts error in virtual router when deploy instance with the name same to previous instances +* CLOUDSTACK-1666: KVM VPC NetworkUsage doesnot work +* CLOUDSTACK-1668: IP conflict in VPC tier +* CLOUDSTACK-1761: Available local storage disk capacity incorrectly reported in KVM to manager. +* CLOUDSTACK-1845: KVM - storage migration often fails +* CLOUDSTACK-1846: KVM - storage pools can silently fail to be unregistered, leading to failure to register later +* CLOUDSTACK-2003: Deleting domain while deleted account is cleaning up leaves VMs expunging forever due to 'Failed to update resource count' +* CLOUDSTACK-2090: Upgrade from version 4.0.1 to version 4.0.2 triggers the 4.0.0 to 4.0.1. +* CLOUDSTACK-2091: Error in API documentation for 4.0.x. + + +Version 4.0.1-incubating +------------------------ + +This is a bugfix release for Apache CloudStack 4.0.0-incubating, with no new features. + +Security Fixes: + +* CVE-2012-5616: Local Information Disclosure Vulnerability (See CLOUDSTACK-505) + +Bugs fixed in this release: + +* CLOUDSTACK-359: PropagateResourceEventCommand fails in cluster configuration +* CLOUDSTACK-374: When running cloud-setup-databases, it auto chooses the highest priority nic (lowest number ie: eth0) +* CLOUDSTACK-389: Install Guide: Section 4.5.5 (Prepare NFS Shares): Confusing statement about iSCSI +* CLOUDSTACK-395: Primary Storage and Secondary Storage sections missing sub-sections +* CLOUDSTACK-411: Add another step during kvm agent installation on Ubuntu machine +* CLOUDSTACK-415: restartNetwork call causes VM to be unreachable when Nicira based SDN is used. +* CLOUDSTACK-422: XSL files missing license header. +* CLOUDSTACK-426: SetVPCStaticNatRules unimplemented for KVM. +* CLOUDSTACK-448: SSVM bootstrap failure on XenServer hosts with E3 CPU. +* CLOUDSTACK-465: French language file quotes are dropping javascript syntax errors. +* CLOUDSTACK-473: API Doc for uploadCustomCertificate doesn't explain how to use the optional parameters well. +* CLOUDSTACK-480: Installation Documentation error: Section 4.5.5.2 needs to mention nfs-kernel-server. +* CLOUDSTACK-481: Installation Guide Doc Error +* CLOUDSTACK-498: Missing dependency in RPM of KVM Agent. +* CLOUDSTACK-502: VPC router needs to resolve its hostname. +* CLOUDSTACK-505: cloudstack logs the private key in plaintext. +* CLOUDSTACK-507: fix api docs for listSSHKeyPairs. +* CLOUDSTACK-515: NVP installation. +* CLOUDSTACK-536: remove citrix cloudpatform from 4.0 build - CloudStack is ASF project. +* CLOUDSTACK-560: Usage server doesn't work in 4.0.0 due to missing db changes. +* CLOUDSTACK-580: Packages are named with 4.0 with 4.0.1 build. +* CLOUDSTACK-591: Wrong vnet in iptables on KVM hypervisors after VM reboot. +* CLOUDSTACK-595: Recreate root volume scenarios doesn't work in VMware +* CLOUDSTACK-603: Upgrade from 4.0 to 4.0.1 is not enabled. +* CLOUDSTACK-605: Host physical CPU is incorrectly calculated for VMware host +* CLOUDSTACK-622: In the add primary storage dialog in the ui the RBD fields don't disappear when changing from RBD to another protocol. +* CLOUDSTACK-683: Image is missing in the Accessing VM Section +* CLOUDSTACK-685: CloudStack 4.0 Network Usage is ZERO +* CLOUDSTACK-938: s2s VPN trouble +* CLOUDSTACK-961: Installation docs don't detail dependencies for building RPMs +* CLOUDSTACK-995: Not able to add the KVM host + Version 4.0.0-incubating ------------------------ @@ -34,4 +414,3 @@ New Features: Security Fixes: * CVE-2012-4501: Apache CloudStack configuration vulnerability - diff --git a/DISCLAIMER b/DISCLAIMER deleted file mode 100644 index fa1e9261a36..00000000000 --- a/DISCLAIMER +++ /dev/null @@ -1,7 +0,0 @@ -Apache CloudStack is an effort undergoing incubation at The Apache Software Foundation (ASF), -sponsored by the Apache Incubator. Incubation is required of all newly accepted -projects until a further review indicates that the infrastructure, communications, and -decision making process have stabilized in a manner consistent with other successful ASF -projects. While incubation status is not necessarily a reflection of the completeness or -stability of the code, it does indicate that the project has yet to be fully endorsed by -the ASF. diff --git a/LICENSE b/LICENSE index 6b81a9140e9..2094d029e90 100644 --- a/LICENSE +++ b/LICENSE @@ -180,70 +180,6 @@ Copyright (c) 2013 The Apache Software Foundation This distribution contains third party resources. -Within the . directory - licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - - Copyright (c) 2005-2010 Thomas Nagy - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - THE POSSIBILITY OF SUCH DAMAGE. - - from Thomas Nagy http://code.google.com/p/waf/ - waf - -Within the awsapi directory - licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - - Copyright (c) 2005-2010 Thomas Nagy - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - THE POSSIBILITY OF SUCH DAMAGE. - - from Thomas Nagy http://code.google.com/p/waf/ - waf - Within the console-proxy/js directory licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) diff --git a/README.md b/README.md index 7fb9b57c53f..fda0b894e35 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,8 @@ -Apache CloudStack (Incubating) Version 4.0.0 +Apache CloudStack Version 4.2.0 -# About Apache CloudStack (Incubating) +# About Apache CloudStack -Apache CloudStack (Incubating) is software designed to deploy +Apache CloudStack is software designed to deploy and manage large networks of virtual machines, as a highly available, highly scalable Infrastructure as a Service (IaaS) cloud computing platform. CloudStack is used by a number of diff --git a/agent/src/com/cloud/agent/AgentShell.java b/agent/src/com/cloud/agent/AgentShell.java index 2af08e9bf21..73b3950e7e4 100644 --- a/agent/src/com/cloud/agent/AgentShell.java +++ b/agent/src/com/cloud/agent/AgentShell.java @@ -38,12 +38,10 @@ import java.util.UUID; import javax.naming.ConfigurationException; -import org.apache.commons.beanutils.PropertyUtils; import org.apache.commons.httpclient.HttpClient; import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager; import org.apache.commons.httpclient.methods.GetMethod; import org.apache.log4j.Logger; -import org.apache.log4j.PropertyConfigurator; import org.apache.log4j.xml.DOMConfigurator; import com.cloud.agent.Agent.ExitStatus; @@ -373,6 +371,7 @@ public class AgentShell implements IAgentShell { throw new ConfigurationException("Unable to find the guid"); } _guid = UUID.randomUUID().toString(); + _properties.setProperty("guid", _guid); } return true; diff --git a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java index 516430b2fed..991764c53f8 100644 --- a/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java +++ b/agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java @@ -235,14 +235,14 @@ public class ConsoleProxyResource extends ServerResourceBase implements if (_eth1ip != null) { params.put("private.network.device", "eth1"); } else { - s_logger.warn("WARNING: eth1ip parameter is not found!"); + s_logger.info("eth1ip parameter has not been configured, assuming that we are not inside a system vm"); } String eth2ip = (String) params.get("eth2ip"); if (eth2ip != null) { params.put("public.network.device", "eth2"); } else { - s_logger.warn("WARNING: eth2ip parameter is not found!"); + s_logger.info("eth2ip parameter is not found, assuming that we are not inside a system vm"); } super.configure(name, params); diff --git a/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java b/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java index 6114148954f..128df84c729 100644 --- a/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java +++ b/api/src/com/cloud/agent/api/DeleteSnapshotBackupCommand.java @@ -19,6 +19,7 @@ package com.cloud.agent.api; import com.cloud.agent.api.LogLevel.Log4jLevel; import com.cloud.agent.api.to.S3TO; import com.cloud.agent.api.to.SwiftTO; +import com.cloud.storage.StoragePool; /** * This command encapsulates a primitive operation which enables coalescing the backed up VHD snapshots on the secondary server @@ -78,7 +79,8 @@ public class DeleteSnapshotBackupCommand extends SnapshotCommand { * @param backupUUID The VHD which has to be deleted * @param childUUID The child VHD file of the backup whose parent is reset to its grandparent. */ - public DeleteSnapshotBackupCommand(SwiftTO swift, + public DeleteSnapshotBackupCommand(StoragePool pool, + SwiftTO swift, S3TO s3, String secondaryStoragePoolURL, Long dcId, @@ -86,7 +88,7 @@ public class DeleteSnapshotBackupCommand extends SnapshotCommand { Long volumeId, String backupUUID, Boolean all) { - super(null, secondaryStoragePoolURL, backupUUID, null, dcId, accountId, volumeId); + super(pool, secondaryStoragePoolURL, backupUUID, null, dcId, accountId, volumeId); setSwift(swift); this.s3 = s3; setAll(all); diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageAnswer.java b/api/src/com/cloud/agent/api/MigrateWithStorageAnswer.java new file mode 100644 index 00000000000..06aff323bdc --- /dev/null +++ b/api/src/com/cloud/agent/api/MigrateWithStorageAnswer.java @@ -0,0 +1,39 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +import java.util.List; +import com.cloud.agent.api.to.VolumeTO; + +public class MigrateWithStorageAnswer extends Answer { + + List volumeTos; + + public MigrateWithStorageAnswer(MigrateWithStorageCommand cmd, Exception ex) { + super(cmd, ex); + volumeTos = null; + } + + public MigrateWithStorageAnswer(MigrateWithStorageCommand cmd, List volumeTos) { + super(cmd, true, null); + this.volumeTos = volumeTos; + } + + public List getVolumeTos() { + return volumeTos; + } +} diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageCommand.java b/api/src/com/cloud/agent/api/MigrateWithStorageCommand.java new file mode 100644 index 00000000000..058aa15338e --- /dev/null +++ b/api/src/com/cloud/agent/api/MigrateWithStorageCommand.java @@ -0,0 +1,45 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +import java.util.Map; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.agent.api.to.VolumeTO; +import com.cloud.agent.api.to.StorageFilerTO; + +public class MigrateWithStorageCommand extends Command { + VirtualMachineTO vm; + Map volumeToFiler; + + public MigrateWithStorageCommand(VirtualMachineTO vm, Map volumeToFiler) { + this.vm = vm; + this.volumeToFiler = volumeToFiler; + } + + public VirtualMachineTO getVirtualMachine() { + return vm; + } + + public Map getVolumeToFiler() { + return volumeToFiler; + } + + @Override + public boolean executeInSequence() { + return true; + } +} diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java b/api/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java new file mode 100644 index 00000000000..920cf48ca49 --- /dev/null +++ b/api/src/com/cloud/agent/api/MigrateWithStorageCompleteAnswer.java @@ -0,0 +1,38 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +import java.util.List; +import com.cloud.agent.api.to.VolumeTO; + +public class MigrateWithStorageCompleteAnswer extends Answer { + List volumeTos; + + public MigrateWithStorageCompleteAnswer(MigrateWithStorageCompleteCommand cmd, Exception ex) { + super(cmd, ex); + volumeTos = null; + } + + public MigrateWithStorageCompleteAnswer(MigrateWithStorageCompleteCommand cmd, List volumeTos) { + super(cmd, true, null); + this.volumeTos = volumeTos; + } + + public List getVolumeTos() { + return volumeTos; + } +} diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java b/api/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java new file mode 100644 index 00000000000..1303c07c56f --- /dev/null +++ b/api/src/com/cloud/agent/api/MigrateWithStorageCompleteCommand.java @@ -0,0 +1,36 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +import com.cloud.agent.api.to.VirtualMachineTO; + +public class MigrateWithStorageCompleteCommand extends Command { + VirtualMachineTO vm; + + public MigrateWithStorageCompleteCommand(VirtualMachineTO vm) { + this.vm = vm; + } + + public VirtualMachineTO getVirtualMachine() { + return vm; + } + + @Override + public boolean executeInSequence() { + return false; + } +} diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java b/api/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java new file mode 100644 index 00000000000..3bf521ce535 --- /dev/null +++ b/api/src/com/cloud/agent/api/MigrateWithStorageReceiveAnswer.java @@ -0,0 +1,55 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +import java.util.Map; +import com.cloud.agent.api.to.VolumeTO; +import com.cloud.agent.api.to.NicTO; + +public class MigrateWithStorageReceiveAnswer extends Answer { + + Map volumeToSr; + Map nicToNetwork; + Map token; + + public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Exception ex) { + super(cmd, ex); + volumeToSr = null; + nicToNetwork = null; + token = null; + } + + public MigrateWithStorageReceiveAnswer(MigrateWithStorageReceiveCommand cmd, Map volumeToSr, + Map nicToNetwork, Map token) { + super(cmd, true, null); + this.volumeToSr = volumeToSr; + this.nicToNetwork = nicToNetwork; + this.token = token; + } + + public Map getVolumeToSr() { + return volumeToSr; + } + + public Map getNicToNetwork() { + return nicToNetwork; + } + + public Map getToken() { + return token; + } +} diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java b/api/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java new file mode 100644 index 00000000000..df6740574a7 --- /dev/null +++ b/api/src/com/cloud/agent/api/MigrateWithStorageReceiveCommand.java @@ -0,0 +1,45 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +import java.util.Map; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.agent.api.to.VolumeTO; +import com.cloud.agent.api.to.StorageFilerTO; + +public class MigrateWithStorageReceiveCommand extends Command { + VirtualMachineTO vm; + Map volumeToFiler; + + public MigrateWithStorageReceiveCommand(VirtualMachineTO vm, Map volumeToFiler) { + this.vm = vm; + this.volumeToFiler = volumeToFiler; + } + + public VirtualMachineTO getVirtualMachine() { + return vm; + } + + public Map getVolumeToFiler() { + return volumeToFiler; + } + + @Override + public boolean executeInSequence() { + return true; + } +} diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java b/api/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java new file mode 100644 index 00000000000..7cf641f7845 --- /dev/null +++ b/api/src/com/cloud/agent/api/MigrateWithStorageSendAnswer.java @@ -0,0 +1,39 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +import java.util.Set; +import com.cloud.agent.api.to.VolumeTO; + +public class MigrateWithStorageSendAnswer extends Answer { + + Set volumeToSet; + + public MigrateWithStorageSendAnswer(MigrateWithStorageSendCommand cmd, Exception ex) { + super(cmd, ex); + volumeToSet = null; + } + + public MigrateWithStorageSendAnswer(MigrateWithStorageSendCommand cmd, Set volumeToSet) { + super(cmd, true, null); + this.volumeToSet = volumeToSet; + } + + public Set getVolumeToSet() { + return volumeToSet; + } +} diff --git a/api/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java b/api/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java new file mode 100644 index 00000000000..d10db30effa --- /dev/null +++ b/api/src/com/cloud/agent/api/MigrateWithStorageSendCommand.java @@ -0,0 +1,58 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +import java.util.Map; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.agent.api.to.VolumeTO; +import com.cloud.agent.api.to.NicTO; + +public class MigrateWithStorageSendCommand extends Command { + VirtualMachineTO vm; + Map volumeToSr; + Map nicToNetwork; + Map token; + + public MigrateWithStorageSendCommand(VirtualMachineTO vm, Map volumeToSr, + Map nicToNetwork, Map token) { + this.vm = vm; + this.volumeToSr = volumeToSr; + this.nicToNetwork = nicToNetwork; + this.token = token; + } + + public VirtualMachineTO getVirtualMachine() { + return vm; + } + + public Map getVolumeToSr() { + return volumeToSr; + } + + public Map getNicToNetwork() { + return nicToNetwork; + } + + public Map getToken() { + return token; + } + + @Override + public boolean executeInSequence() { + return true; + } +} diff --git a/api/src/com/cloud/agent/api/UnregisterVMCommand.java b/api/src/com/cloud/agent/api/UnregisterVMCommand.java new file mode 100644 index 00000000000..428ffea1600 --- /dev/null +++ b/api/src/com/cloud/agent/api/UnregisterVMCommand.java @@ -0,0 +1,34 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +public class UnregisterVMCommand extends Command { + String vmName; + + public UnregisterVMCommand(String vmName){ + this.vmName = vmName; + } + + @Override + public boolean executeInSequence() { + return false; + } + + public String getVmName() { + return vmName; + } +} diff --git a/api/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java b/api/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java new file mode 100644 index 00000000000..d5efa9527b5 --- /dev/null +++ b/api/src/com/cloud/agent/api/storage/MigrateVolumeAnswer.java @@ -0,0 +1,38 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api.storage; + +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.Command; + +public class MigrateVolumeAnswer extends Answer { + private String volumePath; + + public MigrateVolumeAnswer(Command command, boolean success, String details, String volumePath) { + super(command, success, details); + this.volumePath = volumePath; + } + + public MigrateVolumeAnswer(Command command) { + super(command); + this.volumePath = null; + } + + public String getVolumePath() { + return volumePath; + } +} \ No newline at end of file diff --git a/api/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java b/api/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java new file mode 100644 index 00000000000..b82d8481f2c --- /dev/null +++ b/api/src/com/cloud/agent/api/storage/MigrateVolumeCommand.java @@ -0,0 +1,51 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api.storage; + +import com.cloud.agent.api.Command; +import com.cloud.agent.api.to.StorageFilerTO; +import com.cloud.storage.StoragePool; + +public class MigrateVolumeCommand extends Command { + + long volumeId; + String volumePath; + StorageFilerTO pool; + + public MigrateVolumeCommand(long volumeId, String volumePath, StoragePool pool) { + this.volumeId = volumeId; + this.volumePath = volumePath; + this.pool = new StorageFilerTO(pool); + } + + @Override + public boolean executeInSequence() { + return true; + } + + public String getVolumePath() { + return volumePath; + } + + public long getVolumeId() { + return volumeId; + } + + public StorageFilerTO getPool() { + return pool; + } +} \ No newline at end of file diff --git a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java index 7f779365c9e..f296aa4d1f9 100644 --- a/api/src/com/cloud/agent/api/to/FirewallRuleTO.java +++ b/api/src/com/cloud/agent/api/to/FirewallRuleTO.java @@ -23,6 +23,7 @@ import org.apache.cloudstack.api.InternalIdentity; import com.cloud.network.rules.FirewallRule; import com.cloud.network.rules.FirewallRule.State; +import com.cloud.network.rules.FirewallRule.TrafficType; import com.cloud.utils.net.NetUtils; /** @@ -109,6 +110,11 @@ public class FirewallRuleTO implements InternalIdentity { this(rule.getId(),srcVlanTag, srcIp, rule.getProtocol(), rule.getSourcePortStart(), rule.getSourcePortEnd(), revokeState, alreadyAdded, purpose,rule.getSourceCidrList(),rule.getIcmpType(),rule.getIcmpCode()); } + public FirewallRuleTO(FirewallRule rule, String guestVlanTag, FirewallRule.TrafficType trafficType) { + this(rule.getId(), guestVlanTag, null, rule.getProtocol(), rule.getSourcePortStart(), rule.getSourcePortEnd(), rule.getState()==State.Revoke, rule.getState()==State.Active, rule.getPurpose(), rule.getSourceCidrList(), rule.getIcmpType(), rule.getIcmpCode()); + this.trafficType = trafficType; + } + public FirewallRule.TrafficType getTrafficType(){ return trafficType; } diff --git a/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java b/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java deleted file mode 100644 index 2b63c64425d..00000000000 --- a/api/src/com/cloud/api/commands/CreatePrivateNetworkCmd.java +++ /dev/null @@ -1,197 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.api.commands; - -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseAsyncCreateCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.DomainResponse; -import org.apache.cloudstack.api.response.NetworkResponse; -import org.apache.cloudstack.api.response.PhysicalNetworkResponse; -import org.apache.cloudstack.api.response.ProjectResponse; -import org.apache.log4j.Logger; - -import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.network.Network; -import com.cloud.user.UserContext; - -//@APICommand(description="Creates a private network", responseObject=NetworkResponse.class) -public class CreatePrivateNetworkCmd extends BaseAsyncCreateCmd { - public static final Logger s_logger = Logger.getLogger(CreatePrivateNetworkCmd.class.getName()); - - private static final String s_name = "createnetworkresponse"; - - ///////////////////////////////////////////////////// - //////////////// API parameters ///////////////////// - ///////////////////////////////////////////////////// - - @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, required=true, description="the name of the network") - private String name; - - @Parameter(name=ApiConstants.DISPLAY_TEXT, type=CommandType.STRING, required=true, description="the display text of the network") - private String displayText; - - @Parameter(name=ApiConstants.PHYSICAL_NETWORK_ID, type=CommandType.UUID, entityType = PhysicalNetworkResponse.class, - required=true, description="the Physical Network ID the network belongs to") - private Long physicalNetworkId; - - @Parameter(name=ApiConstants.GATEWAY, type=CommandType.STRING, required=true, description="the gateway of the network") - private String gateway; - - @Parameter(name=ApiConstants.NETMASK, type=CommandType.STRING, required=true, description="the netmask of the network") - private String netmask; - - @Parameter(name=ApiConstants.START_IP, type=CommandType.STRING, required=true, description="the beginning IP address in the network IP range") - private String startIp; - - @Parameter(name=ApiConstants.END_IP, type=CommandType.STRING, description="the ending IP address in the network IP" + - " range. If not specified, will be defaulted to startIP") - private String endIp; - - @Parameter(name=ApiConstants.VLAN, type=CommandType.STRING, required=true, description="the ID or VID of the network") - private String vlan; - - @Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING, description="account who will own the network") - private String accountName; - - @Parameter(name=ApiConstants.PROJECT_ID, type=CommandType.UUID, entityType = ProjectResponse.class, - description="an optional project for the ssh key") - private Long projectId; - - @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.UUID, entityType = DomainResponse.class, - description="domain ID of the account owning a network") - private Long domainId; - - - ///////////////////////////////////////////////////// - /////////////////// Accessors /////////////////////// - ///////////////////////////////////////////////////// - - public String getGateway() { - return gateway; - } - - public String getVlan() { - return vlan; - } - - public String getAccountName() { - return accountName; - } - - public Long getDomainId() { - return domainId; - } - - public String getNetmask() { - return netmask; - } - - public String getStartIp() { - return startIp; - } - - public String getNetworkName() { - return name; - } - - public String getDisplayText() { - return displayText; - } - - public Long getProjectId() { - return projectId; - } - - public long getPhysicalNetworkId() { - return physicalNetworkId; - } - - public String getEndIp() { - return endIp; - } - - ///////////////////////////////////////////////////// - /////////////// API Implementation/////////////////// - ///////////////////////////////////////////////////// - @Override - public String getCommandName() { - return s_name; - } - - - @Override - public void create() throws ResourceAllocationException { - Network result = null; - try { - result = _networkService.createPrivateNetwork(getNetworkName(), getDisplayText(), getPhysicalNetworkId(), getVlan(), - getStartIp(), getEndIp(), getGateway(), getNetmask(), getEntityOwnerId(), null); - } catch (InsufficientCapacityException ex){ - s_logger.info(ex); - s_logger.trace(ex); - throw new ServerApiException(ApiErrorCode.INSUFFICIENT_CAPACITY_ERROR, ex.getMessage()); - } catch (ConcurrentOperationException ex) { - s_logger.warn("Exception: ", ex); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, ex.getMessage()); - } - - if (result != null) { - this.setEntityId(result.getId()); - this.setEntityUuid(result.getUuid()); - } else { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create a Private network"); - } - } - - @Override - public void execute() throws InsufficientCapacityException, ConcurrentOperationException, ResourceAllocationException{ - Network result = _networkService.getNetwork(getEntityId()); - if (result != null) { - NetworkResponse response = _responseGenerator.createNetworkResponse(result); - response.setResponseName(getCommandName()); - this.setResponseObject(response); - } else { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create private network"); - } - } - - @Override - public long getEntityOwnerId() { - Long accountId = finalyzeAccountId(accountName, domainId, projectId, true); - if (accountId == null) { - return UserContext.current().getCaller().getId(); - } - return accountId; - } - - @Override - public String getEventType() { - return EventTypes.EVENT_NETWORK_CREATE; - } - - @Override - public String getEventDescription() { - return "creating private network"; - - } - -} diff --git a/api/src/com/cloud/async/AsyncJob.java b/api/src/com/cloud/async/AsyncJob.java index 8e4aec0739a..866429b6547 100644 --- a/api/src/com/cloud/async/AsyncJob.java +++ b/api/src/com/cloud/async/AsyncJob.java @@ -49,7 +49,8 @@ public interface AsyncJob extends Identity, InternalIdentity { AutoScalePolicy, AutoScaleVmProfile, AutoScaleVmGroup, - GlobalLoadBalancerRule + GlobalLoadBalancerRule, + AffinityGroup } long getUserId(); diff --git a/api/src/com/cloud/configuration/ConfigurationService.java b/api/src/com/cloud/configuration/ConfigurationService.java index e63fcece525..6937d0b64de 100644 --- a/api/src/com/cloud/configuration/ConfigurationService.java +++ b/api/src/com/cloud/configuration/ConfigurationService.java @@ -35,7 +35,9 @@ import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd; import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd; import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd; import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd; import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd; import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd; import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd; @@ -234,6 +236,10 @@ public interface ConfigurationService { boolean deleteVlanIpRange(DeleteVlanIpRangeCmd cmd); + Vlan dedicatePublicIpRange(DedicatePublicIpRangeCmd cmd) throws ResourceAllocationException; + + boolean releasePublicIpRange(ReleasePublicIpRangeCmd cmd); + NetworkOffering createNetworkOffering(CreateNetworkOfferingCmd cmd); NetworkOffering updateNetworkOffering(UpdateNetworkOfferingCmd cmd); diff --git a/api/src/com/cloud/event/EventTypes.java b/api/src/com/cloud/event/EventTypes.java index 704a1bfc02c..0ee7f402fd7 100755 --- a/api/src/com/cloud/event/EventTypes.java +++ b/api/src/com/cloud/event/EventTypes.java @@ -142,6 +142,9 @@ public class EventTypes { //registering SSH keypair events public static final String EVENT_REGISTER_SSH_KEYPAIR = "REGISTER.SSH.KEYPAIR"; + //register for user API and secret keys + public static final String EVENT_REGISTER_FOR_SECRET_API_KEY = "REGISTER.USER.KEY"; + // Template Events public static final String EVENT_TEMPLATE_CREATE = "TEMPLATE.CREATE"; public static final String EVENT_TEMPLATE_DELETE = "TEMPLATE.DELETE"; @@ -223,6 +226,8 @@ public class EventTypes { // VLANs/IP ranges public static final String EVENT_VLAN_IP_RANGE_CREATE = "VLAN.IP.RANGE.CREATE"; public static final String EVENT_VLAN_IP_RANGE_DELETE = "VLAN.IP.RANGE.DELETE"; + public static final String EVENT_VLAN_IP_RANGE_DEDICATE = "VLAN.IP.RANGE.DEDICATE"; + public static final String EVENT_VLAN_IP_RANGE_RELEASE = "VLAN.IP.RANGE.RELEASE"; public static final String EVENT_STORAGE_IP_RANGE_CREATE = "STORAGE.IP.RANGE.CREATE"; public static final String EVENT_STORAGE_IP_RANGE_DELETE = "STORAGE.IP.RANGE.DELETE"; @@ -345,7 +350,7 @@ public class EventTypes { // tag related events public static final String EVENT_TAGS_CREATE = "CREATE_TAGS"; public static final String EVENT_TAGS_DELETE = "DELETE_TAGS"; - + // vm snapshot events public static final String EVENT_VM_SNAPSHOT_CREATE = "VMSNAPSHOT.CREATE"; public static final String EVENT_VM_SNAPSHOT_DELETE = "VMSNAPSHOT.DELETE"; @@ -379,6 +384,12 @@ public class EventTypes { public static final String EVENT_BAREMETAL_PXE_SERVER_ADD = "PHYSICAL.PXE.ADD"; public static final String EVENT_BAREMETAL_PXE_SERVER_DELETE = "PHYSICAL.PXE.DELETE"; + public static final String EVENT_AFFINITY_GROUP_CREATE = "AG.CREATE"; + public static final String EVENT_AFFINITY_GROUP_DELETE = "AG.DELETE"; + public static final String EVENT_AFFINITY_GROUP_ASSIGN = "AG.ASSIGN"; + public static final String EVENT_AFFINITY_GROUP_REMOVE = "AG.REMOVE"; + public static final String EVENT_VM_AFFINITY_GROUP_UPDATE = "VM.AG.UPDATE"; + static { // TODO: need a way to force author adding event types to declare the entity details as well, with out braking @@ -536,6 +547,8 @@ public class EventTypes { // VLANs/IP ranges entityEventDetails.put(EVENT_VLAN_IP_RANGE_CREATE, Vlan.class.getName()); entityEventDetails.put(EVENT_VLAN_IP_RANGE_DELETE,Vlan.class.getName()); + entityEventDetails.put(EVENT_VLAN_IP_RANGE_DEDICATE, Vlan.class.getName()); + entityEventDetails.put(EVENT_VLAN_IP_RANGE_RELEASE,Vlan.class.getName()); entityEventDetails.put(EVENT_STORAGE_IP_RANGE_CREATE, StorageNetworkIpRange.class.getName()); entityEventDetails.put(EVENT_STORAGE_IP_RANGE_DELETE, StorageNetworkIpRange.class.getName()); diff --git a/api/src/com/cloud/exception/AffinityConflictException.java b/api/src/com/cloud/exception/AffinityConflictException.java new file mode 100644 index 00000000000..8b187783f24 --- /dev/null +++ b/api/src/com/cloud/exception/AffinityConflictException.java @@ -0,0 +1,34 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.exception; + +import com.cloud.utils.SerialVersionUID; +import com.cloud.utils.exception.CloudRuntimeException; + +public class AffinityConflictException extends CloudRuntimeException { + + private static final long serialVersionUID = SerialVersionUID.AffinityConflictException; + + public AffinityConflictException(String message) { + super(message); + } + + public AffinityConflictException(String message, Throwable th) { + super(message, th); + } + +} diff --git a/api/src/com/cloud/hypervisor/HypervisorCapabilities.java b/api/src/com/cloud/hypervisor/HypervisorCapabilities.java index aff81b0018d..c954750a12a 100644 --- a/api/src/com/cloud/hypervisor/HypervisorCapabilities.java +++ b/api/src/com/cloud/hypervisor/HypervisorCapabilities.java @@ -52,4 +52,6 @@ public interface HypervisorCapabilities extends Identity, InternalIdentity{ */ Integer getMaxHostsPerCluster(); + boolean isStorageMotionSupported(); + } diff --git a/api/src/com/cloud/hypervisor/HypervisorGuru.java b/api/src/com/cloud/hypervisor/HypervisorGuru.java index b4a0b06a7af..eab4e4e4ebd 100644 --- a/api/src/com/cloud/hypervisor/HypervisorGuru.java +++ b/api/src/com/cloud/hypervisor/HypervisorGuru.java @@ -16,6 +16,8 @@ // under the License. package com.cloud.hypervisor; +import java.util.List; + import com.cloud.agent.api.Command; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; @@ -57,4 +59,11 @@ public interface HypervisorGuru extends Adapter { * @return */ NicTO toNicTO(NicProfile profile); + + /** + * Give hypervisor guru opportunity to decide if certain command needs to be done after expunge VM from DB + * @param vm + * @return a list of Commands + */ + List finalizeExpunge(VirtualMachine vm); } diff --git a/api/src/com/cloud/network/IpAddress.java b/api/src/com/cloud/network/IpAddress.java index fce8f38c2f2..71c9b4e0bf3 100644 --- a/api/src/com/cloud/network/IpAddress.java +++ b/api/src/com/cloud/network/IpAddress.java @@ -78,16 +78,7 @@ public interface IpAddress extends ControlledEntity, Identity, InternalIdentity boolean getSystem(); - /** - * @return - */ Long getVpcId(); - /** - * @param vpcId - */ - void setVpcId(Long vpcId); String getVmIp(); - void setVmIp(String vmIp); - } diff --git a/api/src/com/cloud/network/Network.java b/api/src/com/cloud/network/Network.java index c0b0117fc7e..4472dbacc53 100644 --- a/api/src/com/cloud/network/Network.java +++ b/api/src/com/cloud/network/Network.java @@ -16,24 +16,11 @@ // under the License. package com.cloud.network; -import java.net.URI; -import java.util.ArrayList; -import java.util.List; -import java.util.Set; - -import org.apache.cloudstack.acl.ControlledEntity; -import org.apache.cloudstack.api.Identity; -import org.apache.cloudstack.api.InternalIdentity; - -import com.cloud.network.Networks.BroadcastDomainType; -import com.cloud.network.Networks.Mode; -import com.cloud.network.Networks.TrafficType; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.Mode; import com.cloud.network.Networks.TrafficType; import com.cloud.utils.fsm.StateMachine2; import com.cloud.utils.fsm.StateObject; - import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; @@ -137,6 +124,7 @@ public interface Network extends ControlledEntity, StateObject, I public static final Provider None = new Provider("None", false); // NiciraNvp is not an "External" provider, otherwise we get in trouble with NetworkServiceImpl.providersConfiguredForExternalNetworking public static final Provider NiciraNvp = new Provider("NiciraNvp", false); + public static final Provider CiscoVnmc = new Provider("CiscoVnmc", true); private String name; private boolean isExternal; @@ -182,6 +170,7 @@ public interface Network extends ControlledEntity, StateObject, I public static final Capability AllowDnsSuffixModification = new Capability("AllowDnsSuffixModification"); public static final Capability RedundantRouter = new Capability("RedundantRouter"); public static final Capability ElasticIp = new Capability("ElasticIp"); + public static final Capability AssociatePublicIP = new Capability("AssociatePublicIP"); public static final Capability ElasticLb = new Capability("ElasticLb"); public static final Capability AutoScaleCounters = new Capability("AutoScaleCounters"); public static final Capability InlineMode = new Capability("InlineMode"); diff --git a/api/src/com/cloud/network/NetworkModel.java b/api/src/com/cloud/network/NetworkModel.java index c1f1674bad7..4d7d714a7ae 100644 --- a/api/src/com/cloud/network/NetworkModel.java +++ b/api/src/com/cloud/network/NetworkModel.java @@ -260,7 +260,7 @@ public interface NetworkModel { String getStartIpv6Address(long id); - Nic getPlaceholderNic(Network network, Long podId); - boolean isProviderEnabledInZone(long zoneId, String provider); + + Nic getPlaceholderNicForRouter(Network network, Long podId); } \ No newline at end of file diff --git a/api/src/com/cloud/network/NetworkService.java b/api/src/com/cloud/network/NetworkService.java index ab6d7bfd882..6c9bebc1c15 100755 --- a/api/src/com/cloud/network/NetworkService.java +++ b/api/src/com/cloud/network/NetworkService.java @@ -46,7 +46,7 @@ public interface NetworkService { List getIsolatedNetworksOwnedByAccountInZone(long zoneId, Account owner); - IpAddress allocateIP(Account ipOwner, boolean isSystem, long zoneId) throws ResourceAllocationException, + IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) throws ResourceAllocationException, InsufficientAddressCapacityException, ConcurrentOperationException; boolean releaseIpAddress(long ipAddressId) throws InsufficientAddressCapacityException; @@ -79,7 +79,7 @@ public interface NetworkService { Long startIndex, Long pageSize, String name); PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List tags, - String newVnetRangeString, String state); + String newVnetRangeString, String state, String removeVlan); boolean deletePhysicalNetwork(Long id); @@ -158,7 +158,7 @@ public interface NetworkService { throws ResourceAllocationException, ConcurrentOperationException, InsufficientCapacityException; /* Requests an IP address for the guest nic */ - String allocateSecondaryGuestIP(Account account, long zoneId, Long nicId, + NicSecondaryIp allocateSecondaryGuestIP(Account account, long zoneId, Long nicId, Long networkId, String ipaddress) throws InsufficientAddressCapacityException; boolean releaseSecondaryIpFromNic(long ipAddressId); diff --git a/api/src/com/cloud/network/PhysicalNetwork.java b/api/src/com/cloud/network/PhysicalNetwork.java index a2044a61047..c521dc4f888 100644 --- a/api/src/com/cloud/network/PhysicalNetwork.java +++ b/api/src/com/cloud/network/PhysicalNetwork.java @@ -18,6 +18,7 @@ package com.cloud.network; import java.util.List; +import com.cloud.utils.Pair; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; @@ -59,7 +60,9 @@ public interface PhysicalNetwork extends Identity, InternalIdentity { Long getDomainId(); - String getVnet(); + List> getVnet(); + + String getVnetString(); String getSpeed(); diff --git a/api/src/com/cloud/network/PublicIpAddress.java b/api/src/com/cloud/network/PublicIpAddress.java index d81e9c1ee6c..916d43428e9 100644 --- a/api/src/com/cloud/network/PublicIpAddress.java +++ b/api/src/com/cloud/network/PublicIpAddress.java @@ -30,7 +30,4 @@ public interface PublicIpAddress extends ControlledEntity, IpAddress, Vlan, Inte public String getNetmask(); public String getGateway(); - - @Override - public String getVlanTag(); } diff --git a/api/src/com/cloud/network/element/IpDeployer.java b/api/src/com/cloud/network/element/IpDeployer.java index c92d3e3cf2d..d356c3b7d01 100644 --- a/api/src/com/cloud/network/element/IpDeployer.java +++ b/api/src/com/cloud/network/element/IpDeployer.java @@ -28,7 +28,11 @@ import com.cloud.utils.component.Adapter; public interface IpDeployer extends Adapter{ /** - * Apply ip addresses to this network + * Modify ip addresses on this network + * Depending on the State of the ip addresses the element should take + * appropriate action. + * If state is Releasing the ip address should be de-allocated + * If state is Allocating or Allocated the ip address should be provisioned * @param network * @param ipAddress * @return diff --git a/api/src/com/cloud/offering/NetworkOffering.java b/api/src/com/cloud/offering/NetworkOffering.java index 8cb82996036..6f0b9937854 100644 --- a/api/src/com/cloud/offering/NetworkOffering.java +++ b/api/src/com/cloud/offering/NetworkOffering.java @@ -46,6 +46,7 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity, public final static String SystemPrivateGatewayNetworkOffering = "System-Private-Gateway-Network-Offering"; public final static String DefaultSharedNetworkOfferingWithSGService = "DefaultSharedNetworkOfferingWithSGService"; + public final static String QuickCloudNoServices = "QuickCloudNoServices"; public final static String DefaultIsolatedNetworkOfferingWithSourceNatService = "DefaultIsolatedNetworkOfferingWithSourceNatService"; public final static String OvsIsolatedNetworkOfferingWithSourceNatService = "OvsIsolatedNetworkOfferingWithSourceNatService"; public final static String DefaultSharedNetworkOffering = "DefaultSharedNetworkOffering"; @@ -106,6 +107,8 @@ public interface NetworkOffering extends InfrastructureEntity, InternalIdentity, boolean getElasticIp(); + boolean getAssociatePublicIP(); + boolean getElasticLb(); boolean getSpecifyIpRanges(); diff --git a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java index e2f097e29a3..186faf75f78 100644 --- a/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java +++ b/api/src/com/cloud/region/ha/GlobalLoadBalancingRulesService.java @@ -17,6 +17,7 @@ package com.cloud.region.ha; +import com.cloud.network.rules.LoadBalancer; import org.apache.cloudstack.api.command.user.region.ha.gslb.*; import java.util.List; @@ -44,4 +45,6 @@ public interface GlobalLoadBalancingRulesService { List listGlobalLoadBalancerRule(ListGlobalLoadBalancerRuleCmd listGslbCmd); + List listSiteLoadBalancers(long gslbRuleId); + } diff --git a/api/src/com/cloud/server/ManagementService.java b/api/src/com/cloud/server/ManagementService.java index 1e6ca8d0b67..22494072648 100755 --- a/api/src/com/cloud/server/ManagementService.java +++ b/api/src/com/cloud/server/ManagementService.java @@ -75,9 +75,11 @@ import com.cloud.network.IpAddress; import com.cloud.org.Cluster; import com.cloud.storage.GuestOS; import com.cloud.storage.GuestOsCategory; +import com.cloud.storage.StoragePool; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.SSHKeyPair; import com.cloud.utils.Pair; +import com.cloud.utils.Ternary; import com.cloud.vm.InstanceGroup; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.Type; @@ -123,7 +125,7 @@ public interface ManagementService { /** * Searches for servers by the specified search criteria Can search by: "name", "type", "state", "dataCenterId", * "podId" - * + * * @param cmd * @return List of Hosts */ @@ -388,10 +390,21 @@ public interface ManagementService { * @param Long * vmId * Id of The VM to migrate - * @return Pair, List> List of all Hosts in VM's cluster and list of Hosts with - * enough capacity + * @return Ternary, List, Map> List of all Hosts to which a VM + * can be migrated, list of Hosts with enough capacity and hosts requiring storage motion for migration. */ - Pair, Integer>, List> listHostsForMigrationOfVM(Long vmId, Long startIndex, Long pageSize); + Ternary, Integer>, List, Map> listHostsForMigrationOfVM( + Long vmId, Long startIndex, Long pageSize); + + /** + * List storage pools for live migrating of a volume. The API returns list of all pools in the cluster to which the + * volume can be migrated. Current pool is not included in the list. + * + * @param Long volumeId + * @return Pair, List> List of storage pools in cluster and list + * of pools with enough capacity. + */ + Pair, List> listStoragePoolsForMigrationOfVolume(Long volumeId); String[] listEventTypes(); diff --git a/api/src/com/cloud/user/Account.java b/api/src/com/cloud/user/Account.java index 5d32fb23253..940a0eb2667 100755 --- a/api/src/com/cloud/user/Account.java +++ b/api/src/com/cloud/user/Account.java @@ -22,6 +22,7 @@ import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; + public interface Account extends ControlledEntity, InternalIdentity, Identity { public enum Type { Normal, @@ -64,4 +65,7 @@ public interface Account extends ControlledEntity, InternalIdentity, Identity { public Long getDefaultZoneId(); public String getUuid(); + + boolean isDefault(); + } diff --git a/api/src/com/cloud/user/User.java b/api/src/com/cloud/user/User.java index 3742c7bf3e2..dcf27a0de69 100644 --- a/api/src/com/cloud/user/User.java +++ b/api/src/com/cloud/user/User.java @@ -72,5 +72,7 @@ public interface User extends OwnedBy, InternalIdentity { String getRegistrationToken(); boolean isRegistered(); + + boolean isDefault(); } diff --git a/api/src/com/cloud/vm/DiskProfile.java b/api/src/com/cloud/vm/DiskProfile.java index e34a3340e9e..e3a3386d1e5 100644 --- a/api/src/com/cloud/vm/DiskProfile.java +++ b/api/src/com/cloud/vm/DiskProfile.java @@ -139,7 +139,7 @@ public class DiskProfile { this.hyperType = hyperType; } - public HypervisorType getHypersorType() { + public HypervisorType getHypervisorType() { return this.hyperType; } diff --git a/api/src/com/cloud/vm/UserVmService.java b/api/src/com/cloud/vm/UserVmService.java index 2c33d41cd35..7e89cd3e618 100755 --- a/api/src/com/cloud/vm/UserVmService.java +++ b/api/src/com/cloud/vm/UserVmService.java @@ -21,14 +21,24 @@ import java.util.Map; import javax.naming.InsufficientResourcesException; +import org.apache.cloudstack.api.BaseCmd.HTTPMethod; import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd; import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd; -import org.apache.cloudstack.api.command.user.vm.*; +import org.apache.cloudstack.api.command.user.vm.AddNicToVMCmd; +import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; +import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd; +import org.apache.cloudstack.api.command.user.vm.RebootVMCmd; +import org.apache.cloudstack.api.command.user.vm.RemoveNicFromVMCmd; +import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd; +import org.apache.cloudstack.api.command.user.vm.ResetVMSSHKeyCmd; +import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd; +import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd; +import org.apache.cloudstack.api.command.user.vm.StartVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpdateDefaultNicForVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd; import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd; import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd; -import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd; -import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd; - import com.cloud.dc.DataCenter; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -42,7 +52,6 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.Network.IpAddresses; import com.cloud.offering.ServiceOffering; import com.cloud.storage.StoragePool; -import com.cloud.storage.Volume; import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; import com.cloud.uservm.UserVm; @@ -104,14 +113,14 @@ public interface UserVmService { * @return the vm object if successful, null otherwise */ UserVm addNicToVirtualMachine(AddNicToVMCmd cmd); - + /** * Removes a NIC on the given network from the virtual machine * @param cmd the command object that defines the vm and the given network * @return the vm object if successful, null otherwise */ UserVm removeNicFromVirtualMachine(RemoveNicFromVMCmd cmd); - + /** * Updates default Nic to the given network for given virtual machine * @param cmd the command object that defines the vm and the given network @@ -123,7 +132,8 @@ public interface UserVmService { /** - * Creates a Basic Zone User VM in the database and returns the VM to the caller. + * Creates a Basic Zone User VM in the database and returns the VM to the + * caller. * * @param zone * - availability zone for the virtual machine @@ -132,61 +142,69 @@ public interface UserVmService { * @param template * - the template for the virtual machine * @param securityGroupIdList - * - comma separated list of security groups id that going to be applied to the virtual machine + * - comma separated list of security groups id that going to be + * applied to the virtual machine * @param hostName * - host name for the virtual machine * @param displayName * - an optional user generated name for the virtual machine * @param diskOfferingId - * - the ID of the disk offering for the virtual machine. If the template is of ISO format, the - * diskOfferingId is - * for the root disk volume. Otherwise this parameter is used to indicate the offering for the data disk - * volume. - * If the templateId parameter passed is from a Template object, the diskOfferingId refers to a DATA Disk - * Volume - * created. If the templateId parameter passed is from an ISO object, the diskOfferingId refers to a ROOT - * Disk - * Volume created + * - the ID of the disk offering for the virtual machine. If the + * template is of ISO format, the diskOfferingId is for the root + * disk volume. Otherwise this parameter is used to indicate the + * offering for the data disk volume. If the templateId parameter + * passed is from a Template object, the diskOfferingId refers to + * a DATA Disk Volume created. If the templateId parameter passed + * is from an ISO object, the diskOfferingId refers to a ROOT + * Disk Volume created * @param diskSize - * - the arbitrary size for the DATADISK volume. Mutually exclusive with diskOfferingId + * - the arbitrary size for the DATADISK volume. Mutually + * exclusive with diskOfferingId * @param group * - an optional group for the virtual machine * @param hypervisor * - the hypervisor on which to deploy the virtual machine * @param userData - * - an optional binary data that can be sent to the virtual machine upon a successful deployment. This - * binary - * data must be base64 encoded before adding it to the request. Currently only HTTP GET is supported. - * Using HTTP - * GET (via querystring), you can send up to 2KB of data after base64 encoding + * - an optional binary data that can be sent to the virtual + * machine upon a successful deployment. This binary data must be + * base64 encoded before adding it to the request. Currently only + * HTTP GET is supported. Using HTTP GET (via querystring), you + * can send up to 2KB of data after base64 encoding * @param sshKeyPair - * - name of the ssh key pair used to login to the virtual machine + * - name of the ssh key pair used to login to the virtual + * machine * @param requestedIps * TODO * @param defaultIp * TODO + * @param affinityGroupIdList * @param accountName - * - an optional account for the virtual machine. Must be used with domainId + * - an optional account for the virtual machine. Must be used + * with domainId * @param domainId - * - an optional domainId for the virtual machine. If the account parameter is used, domainId must also - * be used + * - an optional domainId for the virtual machine. If the account + * parameter is used, domainId must also be used * @return UserVm object if successful. * * @throws InsufficientCapacityException * if there is insufficient capacity to deploy the VM. * @throws ConcurrentOperationException - * if there are multiple users working on the same VM or in the same environment. + * if there are multiple users working on the same VM or in the + * same environment. * @throws ResourceUnavailableException - * if the resources required to deploy the VM is not currently available. + * if the resources required to deploy the VM is not currently + * available. * @throws InsufficientResourcesException */ UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List securityGroupIdList, Account owner, String hostName, - String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, String userData, String sshKeyPair, Map requestedIps, IpAddresses defaultIp, String keyboard) + String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, + HTTPMethod httpmethod, String userData, String sshKeyPair, Map requestedIps, + IpAddresses defaultIp, String keyboard, List affinityGroupIdList) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException; /** - * Creates a User VM in Advanced Zone (Security Group feature is enabled) in the database and returns the VM to the - * caller. + * Creates a User VM in Advanced Zone (Security Group feature is enabled) in + * the database and returns the VM to the caller. * * @param zone * - availability zone for the virtual machine @@ -197,63 +215,69 @@ public interface UserVmService { * @param networkIdList * - list of network ids used by virtual machine * @param securityGroupIdList - * - comma separated list of security groups id that going to be applied to the virtual machine + * - comma separated list of security groups id that going to be + * applied to the virtual machine * @param hostName * - host name for the virtual machine * @param displayName * - an optional user generated name for the virtual machine * @param diskOfferingId - * - the ID of the disk offering for the virtual machine. If the template is of ISO format, the - * diskOfferingId is - * for the root disk volume. Otherwise this parameter is used to indicate the offering for the data disk - * volume. - * If the templateId parameter passed is from a Template object, the diskOfferingId refers to a DATA Disk - * Volume - * created. If the templateId parameter passed is from an ISO object, the diskOfferingId refers to a ROOT - * Disk - * Volume created + * - the ID of the disk offering for the virtual machine. If the + * template is of ISO format, the diskOfferingId is for the root + * disk volume. Otherwise this parameter is used to indicate the + * offering for the data disk volume. If the templateId parameter + * passed is from a Template object, the diskOfferingId refers to + * a DATA Disk Volume created. If the templateId parameter passed + * is from an ISO object, the diskOfferingId refers to a ROOT + * Disk Volume created * @param diskSize - * - the arbitrary size for the DATADISK volume. Mutually exclusive with diskOfferingId + * - the arbitrary size for the DATADISK volume. Mutually + * exclusive with diskOfferingId * @param group * - an optional group for the virtual machine * @param hypervisor * - the hypervisor on which to deploy the virtual machine * @param userData - * - an optional binary data that can be sent to the virtual machine upon a successful deployment. This - * binary - * data must be base64 encoded before adding it to the request. Currently only HTTP GET is supported. - * Using HTTP - * GET (via querystring), you can send up to 2KB of data after base64 encoding + * - an optional binary data that can be sent to the virtual + * machine upon a successful deployment. This binary data must be + * base64 encoded before adding it to the request. Currently only + * HTTP GET is supported. Using HTTP GET (via querystring), you + * can send up to 2KB of data after base64 encoding * @param sshKeyPair - * - name of the ssh key pair used to login to the virtual machine + * - name of the ssh key pair used to login to the virtual + * machine * @param requestedIps * TODO * @param defaultIps * TODO + * @param affinityGroupIdList * @param accountName - * - an optional account for the virtual machine. Must be used with domainId + * - an optional account for the virtual machine. Must be used + * with domainId * @param domainId - * - an optional domainId for the virtual machine. If the account parameter is used, domainId must also - * be used + * - an optional domainId for the virtual machine. If the account + * parameter is used, domainId must also be used * @return UserVm object if successful. * * @throws InsufficientCapacityException * if there is insufficient capacity to deploy the VM. * @throws ConcurrentOperationException - * if there are multiple users working on the same VM or in the same environment. + * if there are multiple users working on the same VM or in the + * same environment. * @throws ResourceUnavailableException - * if the resources required to deploy the VM is not currently available. + * if the resources required to deploy the VM is not currently + * available. * @throws InsufficientResourcesException */ UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, List securityGroupIdList, - Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, String userData, String sshKeyPair, Map requestedIps, - IpAddresses defaultIps, String keyboard) + Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData, String sshKeyPair, + Map requestedIps, IpAddresses defaultIps, String keyboard, List affinityGroupIdList) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException; /** - * Creates a User VM in Advanced Zone (Security Group feature is disabled) in the database and returns the VM to the - * caller. - * + * Creates a User VM in Advanced Zone (Security Group feature is disabled) + * in the database and returns the VM to the caller. + * * @param zone * - availability zone for the virtual machine * @param serviceOffering @@ -267,49 +291,57 @@ public interface UserVmService { * @param displayName * - an optional user generated name for the virtual machine * @param diskOfferingId - * - the ID of the disk offering for the virtual machine. If the template is of ISO format, the - * diskOfferingId is - * for the root disk volume. Otherwise this parameter is used to indicate the offering for the data disk - * volume. - * If the templateId parameter passed is from a Template object, the diskOfferingId refers to a DATA Disk - * Volume - * created. If the templateId parameter passed is from an ISO object, the diskOfferingId refers to a ROOT - * Disk - * Volume created + * - the ID of the disk offering for the virtual machine. If the + * template is of ISO format, the diskOfferingId is for the root + * disk volume. Otherwise this parameter is used to indicate the + * offering for the data disk volume. If the templateId parameter + * passed is from a Template object, the diskOfferingId refers to + * a DATA Disk Volume created. If the templateId parameter passed + * is from an ISO object, the diskOfferingId refers to a ROOT + * Disk Volume created * @param diskSize - * - the arbitrary size for the DATADISK volume. Mutually exclusive with diskOfferingId + * - the arbitrary size for the DATADISK volume. Mutually + * exclusive with diskOfferingId * @param group * - an optional group for the virtual machine * @param hypervisor * - the hypervisor on which to deploy the virtual machine * @param userData - * - an optional binary data that can be sent to the virtual machine upon a successful deployment. This - * binary - * data must be base64 encoded before adding it to the request. Currently only HTTP GET is supported. - * Using HTTP - * GET (via querystring), you can send up to 2KB of data after base64 encoding + * - an optional binary data that can be sent to the virtual + * machine upon a successful deployment. This binary data must be + * base64 encoded before adding it to the request. Currently only + * HTTP GET is supported. Using HTTP GET (via querystring), you + * can send up to 2KB of data after base64 encoding * @param sshKeyPair - * - name of the ssh key pair used to login to the virtual machine + * - name of the ssh key pair used to login to the virtual + * machine * @param requestedIps * TODO - * @param defaultIps TODO + * @param defaultIps + * TODO + * @param affinityGroupIdList * @param accountName - * - an optional account for the virtual machine. Must be used with domainId + * - an optional account for the virtual machine. Must be used + * with domainId * @param domainId - * - an optional domainId for the virtual machine. If the account parameter is used, domainId must also - * be used + * - an optional domainId for the virtual machine. If the account + * parameter is used, domainId must also be used * @return UserVm object if successful. - * + * * @throws InsufficientCapacityException * if there is insufficient capacity to deploy the VM. * @throws ConcurrentOperationException - * if there are multiple users working on the same VM or in the same environment. + * if there are multiple users working on the same VM or in the + * same environment. * @throws ResourceUnavailableException - * if the resources required to deploy the VM is not currently available. + * if the resources required to deploy the VM is not currently + * available. * @throws InsufficientResourcesException */ UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, Account owner, String hostName, - String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, String userData, String sshKeyPair, Map requestedIps, IpAddresses defaultIps, String keyboard) + String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, + HTTPMethod httpmethod, String userData, String sshKeyPair, Map requestedIps, + IpAddresses defaultIps, String keyboard, List affinityGroupIdList) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException; /** @@ -386,6 +418,33 @@ public interface UserVmService { */ VirtualMachine migrateVirtualMachine(Long vmId, Host destinationHost) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException; + /** + * Migrate the given VM with its volumes to the destination host. The API returns the migrated VM if it succeeds. + * Only root admin can migrate a VM. + * + * @param destinationStorage + * TODO + * @param Long + * vmId of The VM to migrate + * @param Host + * destinationHost to migrate the VM + * @param Map + * A map of volume to which pool it should be migrated + * + * @return VirtualMachine migrated VM + * @throws ManagementServerException + * in case we get error finding the VM or host or access errors or other internal errors. + * @throws ConcurrentOperationException + * if there are multiple users working on the same VM. + * @throws ResourceUnavailableException + * if the destination host to migrate the VM is not currently available. + * @throws VirtualMachineMigrationException + * if the VM to be migrated is not in Running state + */ + VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinationHost, Map volumeToPool) + throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, + VirtualMachineMigrationException; + UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException; VirtualMachine vmStorageMigration(Long vmId, StoragePool destPool); diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroup.java b/api/src/org/apache/cloudstack/affinity/AffinityGroup.java new file mode 100644 index 00000000000..ac2eb613370 --- /dev/null +++ b/api/src/org/apache/cloudstack/affinity/AffinityGroup.java @@ -0,0 +1,31 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import org.apache.cloudstack.acl.ControlledEntity; +import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; + +public interface AffinityGroup extends ControlledEntity, InternalIdentity, Identity { + + String getName(); + + String getDescription(); + + String getType(); + +} diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java new file mode 100644 index 00000000000..60b8e4c554f --- /dev/null +++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupProcessor.java @@ -0,0 +1,49 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import com.cloud.deploy.DeploymentPlan; +import com.cloud.deploy.DeploymentPlanner.ExcludeList; +import com.cloud.exception.AffinityConflictException; +import com.cloud.utils.component.Adapter; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachineProfile; + +public interface AffinityGroupProcessor extends Adapter { + + /** + * process() is called to apply any user preferences to the deployment plan + * and avoid set for the given VM placement. + * + * @param vm + * virtual machine. + * @param plan + * deployment plan that tells you where it's being deployed to. + * @param avoid + * avoid these data centers, pods, clusters, or hosts. + */ + void process(VirtualMachineProfile vm, DeploymentPlan plan, ExcludeList avoid) + throws AffinityConflictException; + + /** + * getType() should return the affinity/anti-affinity group being + * implemented + * + * @return String Affinity/Anti-affinity type + */ + String getType(); +} \ No newline at end of file diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java new file mode 100644 index 00000000000..b6d4ff64b31 --- /dev/null +++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupResponse.java @@ -0,0 +1,158 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import java.util.ArrayList; +import java.util.HashSet; +import java.util.LinkedHashSet; +import java.util.List; +import java.util.Set; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; +import org.apache.cloudstack.api.response.ControlledEntityResponse; +import org.apache.cloudstack.api.response.ControlledViewEntityResponse; +import org.apache.cloudstack.api.response.UserVmResponse; + +import com.cloud.network.security.SecurityGroup; +import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; + +@SuppressWarnings("unused") +@EntityReference(value = AffinityGroup.class) +public class AffinityGroupResponse extends BaseResponse implements ControlledViewEntityResponse { + + @SerializedName(ApiConstants.ID) @Param(description="the ID of the affinity group") + private String id; + + @SerializedName(ApiConstants.NAME) @Param(description="the name of the affinity group") + private String name; + + @SerializedName(ApiConstants.DESCRIPTION) @Param(description="the description of the affinity group") + private String description; + + @SerializedName(ApiConstants.ACCOUNT) @Param(description="the account owning the affinity group") + private String accountName; + + @SerializedName(ApiConstants.DOMAIN_ID) @Param(description="the domain ID of the affinity group") + private String domainId; + + @SerializedName(ApiConstants.DOMAIN) @Param(description="the domain name of the affinity group") + private String domainName; + + @SerializedName(ApiConstants.TYPE) + @Param(description = "the type of the affinity group") + private String type; + + @SerializedName("virtualmachineIds") + @Param(description = "virtual machine Ids associated with this affinity group ") + private List vmIdList; + + public AffinityGroupResponse() { + } + + @Override + public String getObjectId() { + return this.getId(); + } + + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + + public void setName(String name) { + this.name = name; + } + + public void setDescription(String description) { + this.description = description; + } + + public void setAccountName(String accountName) { + this.accountName = accountName; + } + + public void setType(String type) { + this.type = type; + } + + @Override + public void setDomainId(String domainId) { + this.domainId = domainId; + } + + public void setDomainName(String domainName) { + this.domainName = domainName; + } + + @Override + public int hashCode() { + final int prime = 31; + int result = 1; + result = prime * result + ((id == null) ? 0 : id.hashCode()); + return result; + } + + @Override + public boolean equals(Object obj) { + if (this == obj) + return true; + if (obj == null) + return false; + if (getClass() != obj.getClass()) + return false; + AffinityGroupResponse other = (AffinityGroupResponse) obj; + if (id == null) { + if (other.id != null) + return false; + } else if (!id.equals(other.id)) + return false; + return true; + } + + @Override + public void setProjectId(String projectId) { + // TODO Auto-generated method stub + + } + + @Override + public void setProjectName(String projectName) { + // TODO Auto-generated method stub + + } + + public void setVMIdList(List vmIdList) { + this.vmIdList = vmIdList; + } + + public void addVMId(String vmId) { + if (this.vmIdList == null) { + this.vmIdList = new ArrayList(); + } + + this.vmIdList.add(vmId); + } + +} diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupService.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupService.java new file mode 100644 index 00000000000..26c32c89c1f --- /dev/null +++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupService.java @@ -0,0 +1,79 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import java.util.List; + +import com.cloud.exception.ResourceInUseException; +import com.cloud.uservm.UserVm; +import com.cloud.utils.Pair; + +public interface AffinityGroupService { + + /** + * Creates an affinity/anti-affinity group for the given account/domain. + * + * @param account + * @param domainId + * @param name + * @param type + * @param description + * @return AffinityGroup + */ + + AffinityGroup createAffinityGroup(String account, Long domainId, String affinityGroupName, + String affinityGroupType, String description); + + /** + * Creates an affinity/anti-affinity group. + * + * @param affinityGroupId + * @param account + * @param domainId + * @param affinityGroupName + * @throws ResourceInUseException + */ + boolean deleteAffinityGroup(Long affinityGroupId, String account, Long domainId, String affinityGroupName) + throws ResourceInUseException; + + /** Lists Affinity Groups in your account + * @param account + * @param domainId + * @param affinityGroupId + * @param affinityGroupName + * @param affinityGroupType + * @param vmId + * @param startIndex + * @param pageSize + * @return + */ + Pair, Integer> listAffinityGroups(Long affinityGroupId, String affinityGroupName, + String affinityGroupType, Long vmId, Long startIndex, Long pageSize); + + + /** + * List group types available in deployment + * + * @return + */ + List listAffinityGroupTypes(); + + AffinityGroup getAffinityGroup(Long groupId); + + UserVm updateVMAffinityGroups(Long vmId, List affinityGroupIds); + +} diff --git a/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java b/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java new file mode 100644 index 00000000000..2d1cd25edda --- /dev/null +++ b/api/src/org/apache/cloudstack/affinity/AffinityGroupTypeResponse.java @@ -0,0 +1,48 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import java.util.HashSet; +import java.util.Set; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; +import org.apache.cloudstack.api.response.ControlledEntityResponse; +import org.apache.cloudstack.api.response.ControlledViewEntityResponse; + +import com.cloud.network.security.SecurityGroup; +import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; + +@SuppressWarnings("unused") +@EntityReference(value = AffinityGroup.class) +public class AffinityGroupTypeResponse extends BaseResponse { + + @SerializedName(ApiConstants.TYPE) + @Param(description = "the type of the affinity group") + private String type; + + + public AffinityGroupTypeResponse() { + } + + public void setType(String type) { + this.type = type; + } + +} diff --git a/api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java b/api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java new file mode 100644 index 00000000000..70ecd08350f --- /dev/null +++ b/api/src/org/apache/cloudstack/affinity/AffinityProcessorBase.java @@ -0,0 +1,44 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import com.cloud.deploy.DeploymentPlan; +import com.cloud.deploy.DeploymentPlanner.ExcludeList; +import com.cloud.exception.AffinityConflictException; +import com.cloud.utils.component.AdapterBase; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachineProfile; + +public class AffinityProcessorBase extends AdapterBase implements AffinityGroupProcessor { + + protected String _type; + + @Override + public void process(VirtualMachineProfile vm, DeploymentPlan plan, ExcludeList avoid) + throws AffinityConflictException { + + } + + @Override + public String getType() { + return _type; + } + + public void setType(String type) { + _type = type; + } +} diff --git a/api/src/org/apache/cloudstack/api/ApiConstants.java b/api/src/org/apache/cloudstack/api/ApiConstants.java index c518830c92c..1165c7b34f6 100755 --- a/api/src/org/apache/cloudstack/api/ApiConstants.java +++ b/api/src/org/apache/cloudstack/api/ApiConstants.java @@ -221,6 +221,7 @@ public class ApiConstants { public static final String VIRTUAL_MACHINE_ID = "virtualmachineid"; public static final String VIRTUAL_MACHINE_IDS = "virtualmachineids"; public static final String VLAN = "vlan"; + public static final String REMOVE_VLAN="removevlan"; public static final String VLAN_ID = "vlanid"; public static final String VM_AVAILABLE = "vmavailable"; public static final String VM_LIMIT = "vmlimit"; @@ -230,6 +231,7 @@ public class ApiConstants { public static final String VOLUME_ID = "volumeid"; public static final String ZONE_ID = "zoneid"; public static final String ZONE_NAME = "zonename"; + public static final String ZONE_TYPE = "zonetype"; public static final String NETWORK_TYPE = "networktype"; public static final String PAGE = "page"; public static final String PAGE_SIZE = "pagesize"; @@ -333,6 +335,7 @@ public class ApiConstants { public static final String LOAD_BALANCER_DEVICE_STATE = "lbdevicestate"; public static final String LOAD_BALANCER_DEVICE_CAPACITY = "lbdevicecapacity"; public static final String LOAD_BALANCER_DEVICE_DEDICATED = "lbdevicededicated"; + public static final String LOAD_BALANCER_RULE = "loadbalancerrule"; public static final String LOAD_BALANCER_RULE_LIST = "loadbalancerrulelist"; public static final String FIREWALL_DEVICE_ID = "fwdeviceid"; public static final String FIREWALL_DEVICE_NAME = "fwdevicename"; @@ -364,6 +367,8 @@ public class ApiConstants { public static final String HA_HOST = "hahost"; public static final String CUSTOM_DISK_OFF_MAX_SIZE = "customdiskofferingmaxsize"; public static final String DEFAULT_ZONE_ID = "defaultzoneid"; + public static final String LIVE_MIGRATE = "livemigrate"; + public static final String MIGRATE_TO = "migrateto"; public static final String GUID = "guid"; public static final String VSWITCH_TYPE_GUEST_TRAFFIC = "guestvswitchtype"; public static final String VSWITCH_TYPE_PUBLIC_TRAFFIC = "publicvswitchtype"; @@ -473,13 +478,17 @@ public class ApiConstants { public static final String HEALTHCHECK_HEALTHY_THRESHOLD = "healthythreshold"; public static final String HEALTHCHECK_UNHEALTHY_THRESHOLD = "unhealthythreshold"; public static final String HEALTHCHECK_PINGPATH = "pingpath"; + public static final String AFFINITY_GROUP_IDS = "affinitygroupids"; + public static final String AFFINITY_GROUP_NAMES = "affinitygroupnames"; + public static final String ASA_INSIDE_PORT_PROFILE = "insideportprofile"; + public static final String AFFINITY_GROUP_ID = "affinitygroupid"; public enum HostDetails { all, capacity, events, stats, min; } public enum VMDetails { - all, group, nics, stats, secgrp, tmpl, servoff, iso, volume, min; + all, group, nics, stats, secgrp, tmpl, servoff, iso, volume, min, affgrp; } public enum LDAPParams { diff --git a/api/src/org/apache/cloudstack/api/BaseCmd.java b/api/src/org/apache/cloudstack/api/BaseCmd.java index 78a2af36aa2..200675ddaca 100644 --- a/api/src/org/apache/cloudstack/api/BaseCmd.java +++ b/api/src/org/apache/cloudstack/api/BaseCmd.java @@ -27,12 +27,12 @@ import java.util.regex.Pattern; import javax.inject.Inject; +import org.apache.cloudstack.affinity.AffinityGroupService; import org.apache.cloudstack.query.QueryService; import org.apache.cloudstack.usage.UsageService; import org.apache.log4j.Logger; import com.cloud.configuration.ConfigurationService; -import com.cloud.consoleproxy.ConsoleProxyService; import com.cloud.dao.EntityManager; import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; @@ -95,6 +95,11 @@ public abstract class BaseCmd { private Object _responseObject = null; private Map fullUrlParams; + public enum HTTPMethod { + GET, POST, PUT, DELETE + } + private HTTPMethod httpMethod; + @Parameter(name = "response", type = CommandType.STRING) private String responseType; @@ -109,7 +114,6 @@ public abstract class BaseCmd { @Inject public TemplateService _templateService; @Inject public SecurityGroupService _securityGroupService; @Inject public SnapshotService _snapshotService; - @Inject public ConsoleProxyService _consoleProxyService; @Inject public VpcVirtualNetworkApplianceService _routerService; @Inject public ResponseGenerator _responseGenerator; @Inject public EntityManager _entityMgr; @@ -134,12 +138,32 @@ public abstract class BaseCmd { @Inject public VMSnapshotService _vmSnapshotService; @Inject public DataStoreProviderApiService dataStoreProviderApiService; @Inject public VpcProvisioningService _vpcProvSvc; + @Inject public AffinityGroupService _affinityGroupService; public abstract void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException; public void configure() { } + public HTTPMethod getHttpMethod() { + return httpMethod; + } + + public void setHttpMethod(String method) { + if (method != null) { + if (method.equalsIgnoreCase("GET")) + httpMethod = HTTPMethod.GET; + else if (method.equalsIgnoreCase("PUT")) + httpMethod = HTTPMethod.PUT; + else if (method.equalsIgnoreCase("POST")) + httpMethod = HTTPMethod.POST; + else if (method.equalsIgnoreCase("DELETE")) + httpMethod = HTTPMethod.DELETE; + } else { + httpMethod = HTTPMethod.GET; + } + } + public String getResponseType() { if (responseType == null) { return RESPONSE_TYPE_XML; @@ -156,7 +180,7 @@ public abstract class BaseCmd { /** * For commands the API framework needs to know the owner of the object being acted upon. This method is * used to determine that information. - * + * * @return the id of the account that owns the object being acted upon */ public abstract long getEntityOwnerId(); @@ -469,7 +493,7 @@ public abstract class BaseCmd { if (!enabledOnly || account.getState() == Account.State.enabled) { return account.getId(); } else { - throw new PermissionDeniedException("Can't add resources to the account id=" + account.getId() + " in state=" + account.getState() + " as it's no longer active"); + throw new PermissionDeniedException("Can't add resources to the account id=" + account.getId() + " in state=" + account.getState() + " as it's no longer active"); } } else { // idList is not used anywhere, so removed it now @@ -486,7 +510,7 @@ public abstract class BaseCmd { return project.getProjectAccountId(); } else { PermissionDeniedException ex = new PermissionDeniedException("Can't add resources to the project with specified projectId in state=" + project.getState() + " as it's no longer active"); - ex.addProxyObject(project, projectId, "projectId"); + ex.addProxyObject(project, projectId, "projectId"); throw ex; } } else { diff --git a/api/src/org/apache/cloudstack/api/ResponseGenerator.java b/api/src/org/apache/cloudstack/api/ResponseGenerator.java index d1e13023117..cbf8bb27b90 100644 --- a/api/src/org/apache/cloudstack/api/ResponseGenerator.java +++ b/api/src/org/apache/cloudstack/api/ResponseGenerator.java @@ -20,6 +20,9 @@ import java.text.DecimalFormat; import java.util.EnumSet; import java.util.List; +import com.cloud.vm.NicSecondaryIp; +import org.apache.cloudstack.affinity.AffinityGroup; +import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ApiConstants.HostDetails; import org.apache.cloudstack.api.ApiConstants.VMDetails; import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd; @@ -150,18 +153,9 @@ import com.cloud.user.UserAccount; import com.cloud.uservm.UserVm; import com.cloud.vm.InstanceGroup; import com.cloud.vm.Nic; -import com.cloud.vm.NicSecondaryIp; import com.cloud.vm.snapshot.VMSnapshot; import com.cloud.vm.VirtualMachine; -import org.apache.cloudstack.api.ApiConstants.HostDetails; -import org.apache.cloudstack.api.ApiConstants.VMDetails; -import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd; import org.apache.cloudstack.api.response.*; -import org.apache.cloudstack.region.Region; - -import java.text.DecimalFormat; -import java.util.EnumSet; -import java.util.List; public interface ResponseGenerator { UserResponse createUserResponse(UserAccount user); @@ -196,6 +190,10 @@ public interface ResponseGenerator { HostResponse createHostResponse(Host host); + HostForMigrationResponse createHostForMigrationResponse(Host host); + + HostForMigrationResponse createHostForMigrationResponse(Host host, EnumSet details); + VlanIpRangeResponse createVlanIpRangeResponse(Vlan vlan); IPAddressResponse createIPAddressResponse(IpAddress ipAddress); @@ -223,6 +221,8 @@ public interface ResponseGenerator { StoragePoolResponse createStoragePoolResponse(StoragePool pool); + StoragePoolForMigrationResponse createStoragePoolForMigrationResponse(StoragePool pool); + ClusterResponse createClusterResponse(Cluster cluster, Boolean showCapacities); FirewallRuleResponse createPortForwardingRuleResponse(PortForwardingRule fwRule); @@ -384,12 +384,16 @@ public interface ResponseGenerator { GuestOSResponse createGuestOSResponse(GuestOS os); SnapshotScheduleResponse createSnapshotScheduleResponse(SnapshotSchedule sched); - + UsageRecordResponse createUsageResponse(Usage usageRecord); TrafficMonitorResponse createTrafficMonitorResponse(Host trafficMonitor); VMSnapshotResponse createVMSnapshotResponse(VMSnapshot vmSnapshot); - NicSecondaryIpResponse createSecondaryIPToNicResponse(String ip, - Long nicId, Long networkId); + + NicSecondaryIpResponse createSecondaryIPToNicResponse(NicSecondaryIp result); public NicResponse createNicResponse(Nic result); + + AffinityGroupResponse createAffinityGroupResponse(AffinityGroup group); + + Long getAffinityGroupId(String name, long entityOwnerId); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java index 95d0d07d9ce..cc74eb2007e 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/account/CreateAccountCmd.java @@ -16,9 +16,9 @@ // under the License. package org.apache.cloudstack.api.command.admin.account; -import java.util.Collection; -import java.util.Map; - +import com.cloud.user.Account; +import com.cloud.user.UserAccount; +import com.cloud.user.UserContext; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; @@ -27,14 +27,12 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.AccountResponse; import org.apache.cloudstack.api.response.DomainResponse; -import org.apache.cloudstack.api.response.UserResponse; import org.apache.log4j.Logger; -import com.cloud.user.Account; -import com.cloud.user.UserAccount; -import com.cloud.user.UserContext; +import java.util.Collection; +import java.util.Map; -@APICommand(name = "createAccount", description="Creates an account", responseObject=UserResponse.class) +@APICommand(name = "createAccount", description="Creates an account", responseObject=AccountResponse.class) public class CreateAccountCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(CreateAccountCmd.class.getName()); diff --git a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java index 95728dd184d..c5130587ec5 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/cluster/UpdateClusterCmd.java @@ -111,14 +111,14 @@ public class UpdateClusterCmd extends BaseCmd { if(cpuovercommitratio != null){ return Float.parseFloat(cpuovercommitratio); } - return 1.0f; + return null; } public Float getMemoryOvercommitRaito (){ if (memoryovercommitratio != null){ return Float.parseFloat(memoryovercommitratio); } - return 1.0f; + return null; } @Override @@ -127,9 +127,16 @@ public class UpdateClusterCmd extends BaseCmd { if (cluster == null) { throw new InvalidParameterValueException("Unable to find the cluster by id=" + getId()); } + if (getMemoryOvercommitRaito() !=null){ + if ((getMemoryOvercommitRaito().compareTo(1f) < 0)) { + throw new InvalidParameterValueException("Memory overcommit ratio should be greater than or equal to one"); + } + } - if ((getMemoryOvercommitRaito().compareTo(1f) < 0) | (getCpuOvercommitRatio().compareTo(1f) < 0)) { - throw new InvalidParameterValueException("Cpu and ram overcommit ratios should be greater than one"); + if (getCpuOvercommitRatio() !=null){ + if (getCpuOvercommitRatio().compareTo(1f) < 0) { + throw new InvalidParameterValueException("Cpu overcommit ratio should be greater than or equal to one"); + } } Cluster result = _resourceService.updateCluster(cluster, getClusterType(), getHypervisor(), getAllocationState(), getManagedstate(), getMemoryOvercommitRaito(), getCpuOvercommitRatio()); diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java index aabfd4a620d..9f34405ffbd 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/ListCfgsByCmd.java @@ -23,8 +23,7 @@ import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseListCmd; import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.response.ConfigurationResponse; -import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.*; import org.apache.log4j.Logger; import com.cloud.configuration.Configuration; @@ -46,6 +45,13 @@ public class ListCfgsByCmd extends BaseListCmd { @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "lists configuration by name") private String configName; + @Parameter(name=ApiConstants.SCOPE, type = CommandType.STRING, description = "scope(zone/cluster/pool/account) of the parameter that needs to be updated") + private String scope; + + @Parameter(name=ApiConstants.ID, type = CommandType.UUID, entityType = {ZoneResponse.class, ClusterResponse.class, StoragePoolResponse.class, AccountResponse.class}, description = "corresponding ID of the scope") + private Long id; + + // /////////////////////////////////////////////////// // ///////////////// Accessors /////////////////////// // /////////////////////////////////////////////////// @@ -58,6 +64,15 @@ public class ListCfgsByCmd extends BaseListCmd { return configName; } + public String getScope() { + return scope; + } + + public Long getId() { + return id; + } + + @Override public Long getPageSizeVal() { Long pageSizeVal = 500L; @@ -85,6 +100,11 @@ public class ListCfgsByCmd extends BaseListCmd { for (Configuration cfg : result.first()) { ConfigurationResponse cfgResponse = _responseGenerator.createConfigurationResponse(cfg); cfgResponse.setObjectName("configuration"); + if (scope != null) { + cfgResponse.setScope(scope); + } else { + cfgResponse.setScope("global"); + } configResponses.add(cfgResponse); } diff --git a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java index ffeb58621b9..074c5a3b028 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/config/UpdateCfgCmd.java @@ -22,7 +22,7 @@ import org.apache.cloudstack.api.ApiErrorCode; import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.ConfigurationResponse; +import org.apache.cloudstack.api.response.*; import org.apache.log4j.Logger; import com.cloud.configuration.Configuration; @@ -43,6 +43,12 @@ public class UpdateCfgCmd extends BaseCmd { @Parameter(name=ApiConstants.VALUE, type=CommandType.STRING, description="the value of the configuration", length=4095) private String value; + @Parameter(name=ApiConstants.SCOPE, type = CommandType.STRING, description = "scope(zone/cluster/pool/account) of the parameter that needs to be updated") + private String scope; + + @Parameter(name=ApiConstants.ID, type = CommandType.UUID, entityType = {ZoneResponse.class, ClusterResponse.class, StoragePoolResponse.class, AccountResponse.class}, description = "corresponding ID of the scope") + private Long id; + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// @@ -55,6 +61,14 @@ public class UpdateCfgCmd extends BaseCmd { return value; } + public String getScope() { + return scope; + } + + public Long getId() { + return id; + } + ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// @@ -75,6 +89,12 @@ public class UpdateCfgCmd extends BaseCmd { if (cfg != null) { ConfigurationResponse response = _responseGenerator.createConfigurationResponse(cfg); response.setResponseName(getCommandName()); + if (scope != null) { + response.setScope(scope); + response.setValue(value); + } else { + response.setScope("global"); + } this.setResponseObject(response); } else { throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update config"); diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java new file mode 100644 index 00000000000..e6e45cc7246 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/command/admin/host/FindHostsForMigrationCmd.java @@ -0,0 +1,107 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.admin.host; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import org.apache.cloudstack.api.APICommand; +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.HostForMigrationResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import com.cloud.host.Host; +import com.cloud.utils.Pair; +import com.cloud.utils.Ternary; + +@APICommand(name = "findHostsForMigration", description="Find hosts suitable for migrating a virtual machine.", + responseObject=HostForMigrationResponse.class) +public class FindHostsForMigrationCmd extends BaseListCmd { + public static final Logger s_logger = Logger.getLogger(FindHostsForMigrationCmd.class.getName()); + + private static final String s_name = "findhostsformigrationresponse"; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.VIRTUAL_MACHINE_ID, type=CommandType.UUID, entityType = UserVmResponse.class, + required=false, description="find hosts to which this VM can be migrated and flag the hosts with enough " + + "CPU/RAM to host the VM") + private Long virtualMachineId; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getVirtualMachineId() { + return virtualMachineId; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public void execute() { + ListResponse response = null; + Pair,Integer> result; + List hostsWithCapacity = new ArrayList(); + Map hostsRequiringStorageMotion; + + Ternary,Integer>, List, Map> hostsForMigration = + _mgr.listHostsForMigrationOfVM(getVirtualMachineId(), this.getStartIndex(), this.getPageSizeVal()); + result = hostsForMigration.first(); + hostsWithCapacity = hostsForMigration.second(); + hostsRequiringStorageMotion = hostsForMigration.third(); + + response = new ListResponse(); + List hostResponses = new ArrayList(); + for (Host host : result.first()) { + HostForMigrationResponse hostResponse = _responseGenerator.createHostForMigrationResponse(host); + Boolean suitableForMigration = false; + if (hostsWithCapacity.contains(host)) { + suitableForMigration = true; + } + hostResponse.setSuitableForMigration(suitableForMigration); + + Boolean requiresStorageMotion = hostsRequiringStorageMotion.get(host); + if (requiresStorageMotion != null && requiresStorageMotion) { + hostResponse.setRequiresStorageMotion(true); + } else { + hostResponse.setRequiresStorageMotion(false); + } + + hostResponse.setObjectName("host"); + hostResponses.add(hostResponse); + } + + response.setResponses(hostResponses, result.second()); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } +} diff --git a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java index 29844c31113..69c69802bfe 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/host/ListHostsCmd.java @@ -19,6 +19,7 @@ package org.apache.cloudstack.api.command.admin.host; import java.util.ArrayList; import java.util.EnumSet; import java.util.List; +import java.util.Map; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -37,6 +38,7 @@ import com.cloud.async.AsyncJob; import com.cloud.exception.InvalidParameterValueException; import com.cloud.host.Host; import com.cloud.utils.Pair; +import com.cloud.utils.Ternary; @APICommand(name = "listHosts", description="Lists hosts.", responseObject=HostResponse.class) public class ListHostsCmd extends BaseListCmd { @@ -73,6 +75,9 @@ public class ListHostsCmd extends BaseListCmd { description="the Zone ID for the host") private Long zoneId; + @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to") + private String zoneType; + @Parameter(name=ApiConstants.VIRTUAL_MACHINE_ID, type=CommandType.UUID, entityType = UserVmResponse.class, required=false, description="lists hosts in the same cluster as this VM and flag hosts with enough CPU/RAm to host this VM") private Long virtualMachineId; @@ -122,6 +127,10 @@ public class ListHostsCmd extends BaseListCmd { return zoneId; } + public String getZoneType() { + return zoneType; + } + public Long getVirtualMachineId() { return virtualMachineId; } @@ -170,8 +179,8 @@ public class ListHostsCmd extends BaseListCmd { } else { Pair,Integer> result; List hostsWithCapacity = new ArrayList(); - - Pair,Integer>, List> hostsForMigration = _mgr.listHostsForMigrationOfVM(getVirtualMachineId(), this.getStartIndex(), this.getPageSizeVal()); + Ternary,Integer>, List, Map> hostsForMigration = + _mgr.listHostsForMigrationOfVM(getVirtualMachineId(), this.getStartIndex(), this.getPageSizeVal()); result = hostsForMigration.first(); hostsWithCapacity = hostsForMigration.second(); @@ -192,6 +201,5 @@ public class ListHostsCmd extends BaseListCmd { } response.setResponseName(getCommandName()); this.setResponseObject(response); - } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java index 06cf38dba3f..6d37dd8a49b 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/network/UpdatePhysicalNetworkCmd.java @@ -54,6 +54,8 @@ public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd { @Parameter(name=ApiConstants.VLAN, type=CommandType.STRING, description="the VLAN for the physical network") private String vlan; + @Parameter(name=ApiConstants.REMOVE_VLAN, type = CommandType.STRING, description ="The vlan range we want to remove") + private String removevlan; ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// @@ -79,6 +81,10 @@ public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd { return vlan; } + public String getRemoveVlan(){ + return removevlan; + } + ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// @@ -95,7 +101,7 @@ public class UpdatePhysicalNetworkCmd extends BaseAsyncCmd { @Override public void execute(){ - PhysicalNetwork result = _networkService.updatePhysicalNetwork(getId(),getNetworkSpeed(), getTags(), getVlan(), getState()); + PhysicalNetwork result = _networkService.updatePhysicalNetwork(getId(),getNetworkSpeed(), getTags(), getVlan(), getState(), getRemoveVlan()); PhysicalNetworkResponse response = _responseGenerator.createPhysicalNetworkResponse(result); response.setResponseName(getCommandName()); this.setResponseObject(response); diff --git a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java index e915c48e9b6..0e35276d914 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/offering/CreateServiceOfferingCmd.java @@ -148,6 +148,7 @@ public class CreateServiceOfferingCmd extends BaseCmd { return networkRate; } + ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java new file mode 100644 index 00000000000..37d007c0376 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/FindStoragePoolsForMigrationCmd.java @@ -0,0 +1,98 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.admin.storage; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.cloudstack.api.APICommand; +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.StoragePoolForMigrationResponse; +import org.apache.cloudstack.api.response.VolumeResponse; +import com.cloud.async.AsyncJob; +import com.cloud.storage.StoragePool; +import com.cloud.utils.Pair; + +@APICommand(name = "findStoragePoolsForMigration", description="Lists storage pools available for migration of a volume.", + responseObject=StoragePoolForMigrationResponse.class) +public class FindStoragePoolsForMigrationCmd extends BaseListCmd { + public static final Logger s_logger = Logger.getLogger(FindStoragePoolsForMigrationCmd.class.getName()); + + private static final String s_name = "findstoragepoolsformigrationresponse"; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = VolumeResponse.class, required=true, + description="the ID of the volume") + private Long id; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getId() { + return id; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public String getCommandName() { + return s_name; + } + + public AsyncJob.Type getInstanceType() { + return AsyncJob.Type.StoragePool; + } + + @Override + public void execute() { + Pair, List> pools = + _mgr.listStoragePoolsForMigrationOfVolume(getId()); + ListResponse response = new ListResponse(); + List poolResponses = new ArrayList(); + + List allPools = pools.first(); + List suitablePoolList = pools.second(); + for (StoragePool pool : allPools) { + StoragePoolForMigrationResponse poolResponse = _responseGenerator.createStoragePoolForMigrationResponse(pool); + Boolean suitableForMigration = false; + for (StoragePool suitablePool : suitablePoolList) { + if (suitablePool.getId() == pool.getId()) { + suitableForMigration = true; + break; + } + } + poolResponse.setSuitableForMigration(suitableForMigration); + poolResponse.setObjectName("storagepool"); + poolResponses.add(poolResponse); + } + + response.setResponses(poolResponses); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } +} diff --git a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java index 02b98037b2e..17adb18ecc8 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/storage/ListStoragePoolsCmd.java @@ -60,6 +60,9 @@ public class ListStoragePoolsCmd extends BaseListCmd { description="the Zone ID for the storage pool") private Long zoneId; + @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to") + private String zoneType; + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = StoragePoolResponse.class, description="the ID of the storage pool") private Long id; @@ -92,6 +95,10 @@ public class ListStoragePoolsCmd extends BaseListCmd { return zoneId; } + public String getZoneType() { + return zoneType; + } + public Long getId() { return id; } diff --git a/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java new file mode 100755 index 00000000000..e7b1105af94 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/DedicatePublicIpRangeCmd.java @@ -0,0 +1,108 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.admin.vlan; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.ProjectResponse; +import org.apache.cloudstack.api.response.VlanIpRangeResponse; +import org.apache.cloudstack.api.response.ZoneResponse; +import org.apache.log4j.Logger; + +import com.cloud.dc.Vlan; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; + +@APICommand(name = "dedicatePublicIpRange", description="Dedicates a Public IP range to an account", responseObject=VlanIpRangeResponse.class) +public class DedicatePublicIpRangeCmd extends BaseCmd { + public static final Logger s_logger = Logger.getLogger(DedicatePublicIpRangeCmd.class.getName()); + + private static final String s_name = "dedicatepubliciprangeresponse"; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = VlanIpRangeResponse.class, + required=true, description="the id of the VLAN IP range") + private Long id; + + @Parameter(name=ApiConstants.ACCOUNT, type=CommandType.STRING, required=true, + description="account who will own the VLAN") + private String accountName; + + @Parameter(name=ApiConstants.PROJECT_ID, type=CommandType.UUID, entityType = ProjectResponse.class, + description="project who will own the VLAN") + private Long projectId; + + @Parameter(name=ApiConstants.DOMAIN_ID, type=CommandType.UUID, entityType = DomainResponse.class, + required=true, description="domain ID of the account owning a VLAN") + private Long domainId; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getId() { + return id; + } + + public String getAccountName() { + return accountName; + } + + public Long getDomainId() { + return domainId; + } + + public Long getProjectId() { + return projectId; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + return Account.ACCOUNT_ID_SYSTEM; + } + + @Override + public void execute() throws ResourceUnavailableException, ResourceAllocationException { + Vlan result = _configService.dedicatePublicIpRange(this); + if (result != null) { + VlanIpRangeResponse response = _responseGenerator.createVlanIpRangeResponse(result); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to dedicate vlan ip range"); + } + } + +} diff --git a/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java similarity index 64% rename from api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java rename to api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java index 829283e8b9f..91cc7d33da9 100644 --- a/api/src/com/cloud/api/commands/DestroyConsoleProxyCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vlan/ReleasePublicIpRangeCmd.java @@ -14,34 +14,34 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.api.commands; +package org.apache.cloudstack.api.command.admin.vlan; +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.cloudstack.api.response.VlanIpRangeResponse; import org.apache.log4j.Logger; -import com.cloud.event.EventTypes; import com.cloud.user.Account; -import com.cloud.user.UserContext; -//@APICommand(description="Destroys console proxy", responseObject=SuccessResponse.class) -public class DestroyConsoleProxyCmd extends BaseAsyncCmd { - public static final Logger s_logger = Logger.getLogger(DestroyConsoleProxyCmd.class.getName()); +@APICommand(name = "releasePublicIpRange", description="Releases a Public IP range back to the system pool", responseObject=SuccessResponse.class) +public class ReleasePublicIpRangeCmd extends BaseCmd { + public static final Logger s_logger = Logger.getLogger(ReleasePublicIpRangeCmd.class.getName()); - private static final String s_name = "destroyconsoleproxyresponse"; + private static final String s_name = "releasepubliciprangeresponse"; ///////////////////////////////////////////////////// //////////////// API parameters ///////////////////// ///////////////////////////////////////////////////// - @Parameter(name=ApiConstants.ID, type=CommandType.LONG, required=true, description="console proxy ID") + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType = VlanIpRangeResponse.class, + required=true, description="the id of the Public IP range") private Long id; - ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// @@ -50,7 +50,6 @@ public class DestroyConsoleProxyCmd extends BaseAsyncCmd { return id; } - ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// @@ -62,32 +61,17 @@ public class DestroyConsoleProxyCmd extends BaseAsyncCmd { @Override public long getEntityOwnerId() { - Account account = (Account)UserContext.current().getCaller(); - if (account != null) { - return account.getId(); - } - - return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked - } - - @Override - public String getEventType() { - return EventTypes.EVENT_PROXY_DESTROY; - } - - @Override - public String getEventDescription() { - return "destroying console proxy: " + getId(); + return Account.ACCOUNT_ID_SYSTEM; } @Override public void execute(){ - boolean result = _consoleProxyService.destroyConsoleProxy(this); + boolean result = _configService.releasePublicIpRange(this); if (result) { SuccessResponse response = new SuccessResponse(getCommandName()); this.setResponseObject(response); } else { - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to destroy console proxy"); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to release public ip range"); } } } diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java index ddba78ea083..e9779ce6135 100644 --- a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVMCmd.java @@ -58,7 +58,7 @@ public class MigrateVMCmd extends BaseAsyncCmd { required=true, description="the ID of the virtual machine") private Long virtualMachineId; - @Parameter(name=ApiConstants.STORAGE_ID, type=CommandType.LONG, entityType=StoragePoolResponse.class, + @Parameter(name=ApiConstants.STORAGE_ID, type=CommandType.UUID, entityType=StoragePoolResponse.class, required=false, description="Destination storage pool ID to migrate VM volumes to. Required for migrating the root disk volume") private Long storageId; diff --git a/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java new file mode 100644 index 00000000000..b1eaf11a251 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/command/admin/vm/MigrateVirtualMachineWithVolumeCmd.java @@ -0,0 +1,160 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.admin.vm; + +import java.util.Collection; +import java.util.HashMap; +import java.util.Iterator; +import java.util.Map; + +import org.apache.cloudstack.api.*; +import org.apache.log4j.Logger; + +import org.apache.cloudstack.api.APICommand; + +import org.apache.cloudstack.api.BaseCmd.CommandType; +import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import com.cloud.event.EventTypes; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ManagementServerException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.exception.VirtualMachineMigrationException; +import com.cloud.host.Host; +import com.cloud.storage.StoragePool; +import com.cloud.user.Account; +import com.cloud.user.UserContext; +import com.cloud.uservm.UserVm; +import com.cloud.vm.VirtualMachine; + +@APICommand(name = "migrateVirtualMachineWithVolume", description="Attempts Migration of a VM with its volumes to a different host", responseObject=UserVmResponse.class) +public class MigrateVirtualMachineWithVolumeCmd extends BaseAsyncCmd { + public static final Logger s_logger = Logger.getLogger(MigrateVMCmd.class.getName()); + + private static final String s_name = "migratevirtualmachinewithvolumeresponse"; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.HOST_ID, type=CommandType.UUID, entityType=HostResponse.class, + required=true, description="Destination Host ID to migrate VM to.") + private Long hostId; + + @Parameter(name=ApiConstants.VIRTUAL_MACHINE_ID, type=CommandType.UUID, entityType=UserVmResponse.class, + required=true, description="the ID of the virtual machine") + private Long virtualMachineId; + + @Parameter(name = ApiConstants.MIGRATE_TO, type = CommandType.MAP, required=false, + description = "Map of pool to which each volume should be migrated (volume/pool pair)") + private Map migrateVolumeTo; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getHostId() { + return hostId; + } + + public Long getVirtualMachineId() { + return virtualMachineId; + } + + public Map getVolumeToPool() { + Map volumeToPoolMap = new HashMap(); + if (migrateVolumeTo != null && !migrateVolumeTo.isEmpty()) { + Collection allValues = migrateVolumeTo.values(); + Iterator iter = allValues.iterator(); + while (iter.hasNext()) { + HashMap volumeToPool = (HashMap) iter.next(); + String volume = volumeToPool.get("volume"); + String pool = volumeToPool.get("pool"); + volumeToPoolMap.put(volume, pool); + } + } + return volumeToPoolMap; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + UserVm userVm = _entityMgr.findById(UserVm.class, getVirtualMachineId()); + if (userVm != null) { + return userVm.getAccountId(); + } + + return Account.ACCOUNT_ID_SYSTEM; + } + + @Override + public String getEventType() { + return EventTypes.EVENT_VM_MIGRATE; + } + + @Override + public String getEventDescription() { + return "Attempting to migrate VM Id: " + getVirtualMachineId() + " to host Id: "+ getHostId(); + } + + @Override + public void execute(){ + UserVm userVm = _userVmService.getUserVm(getVirtualMachineId()); + if (userVm == null) { + throw new InvalidParameterValueException("Unable to find the VM by id=" + getVirtualMachineId()); + } + + Host destinationHost = _resourceService.getHost(getHostId()); + if (destinationHost == null) { + throw new InvalidParameterValueException("Unable to find the host to migrate the VM, host id =" + getHostId()); + } + + try{ + VirtualMachine migratedVm = _userVmService.migrateVirtualMachineWithVolume(getVirtualMachineId(), + destinationHost, getVolumeToPool()); + if (migratedVm != null) { + UserVmResponse response = _responseGenerator.createUserVmResponse("virtualmachine", (UserVm)migratedVm).get(0); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to migrate vm"); + } + } catch (ResourceUnavailableException ex) { + s_logger.warn("Exception: ", ex); + throw new ServerApiException(ApiErrorCode.RESOURCE_UNAVAILABLE_ERROR, ex.getMessage()); + } catch (ConcurrentOperationException e) { + s_logger.warn("Exception: ", e); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } catch (ManagementServerException e) { + s_logger.warn("Exception: ", e); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } catch (VirtualMachineMigrationException e) { + s_logger.warn("Exception: ", e); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } + } +} diff --git a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java index 406f782da51..28fbae4437a 100644 --- a/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/address/AssociateIPAddrCmd.java @@ -16,38 +16,21 @@ // under the License. package org.apache.cloudstack.api.command.user.address; -import java.util.List; - -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseAsyncCmd; -import org.apache.cloudstack.api.BaseAsyncCreateCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.DomainResponse; -import org.apache.cloudstack.api.response.IPAddressResponse; -import org.apache.cloudstack.api.response.NetworkResponse; -import org.apache.cloudstack.api.response.ProjectResponse; -import org.apache.cloudstack.api.response.VpcResponse; -import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; - import com.cloud.async.AsyncJob; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenter.NetworkType; import com.cloud.event.EventTypes; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientAddressCapacityException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; +import com.cloud.exception.*; import com.cloud.network.IpAddress; import com.cloud.network.Network; import com.cloud.network.vpc.Vpc; import com.cloud.user.Account; import com.cloud.user.UserContext; +import org.apache.cloudstack.api.*; +import org.apache.cloudstack.api.response.*; +import org.apache.log4j.Logger; + +import java.util.List; @APICommand(name = "associateIpAddress", description="Acquires and associates a public IP to an account.", responseObject=IPAddressResponse.class) public class AssociateIPAddrCmd extends BaseAsyncCreateCmd { @@ -213,7 +196,7 @@ public class AssociateIPAddrCmd extends BaseAsyncCreateCmd { @Override public void create() throws ResourceAllocationException{ try { - IpAddress ip = _networkService.allocateIP(_accountService.getAccount(getEntityOwnerId()), false, getZoneId()); + IpAddress ip = _networkService.allocateIP(_accountService.getAccount(getEntityOwnerId()), getZoneId(), getNetworkId()); if (ip != null) { this.setEntityId(ip.getId()); diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java new file mode 100644 index 00000000000..96de4aa13c0 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/CreateAffinityGroupCmd.java @@ -0,0 +1,167 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.user.affinitygroup; + +import org.apache.cloudstack.affinity.AffinityGroup; +import org.apache.cloudstack.affinity.AffinityGroupResponse; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCreateCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.log4j.Logger; + +import com.cloud.async.AsyncJob; +import com.cloud.event.EventTypes; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.user.Account; +import com.cloud.user.UserContext; + +@APICommand(name = "createAffinityGroup", responseObject = AffinityGroupResponse.class, description = "Creates an affinity/anti-affinity group") +public class CreateAffinityGroupCmd extends BaseAsyncCreateCmd { + public static final Logger s_logger = Logger.getLogger(CreateAffinityGroupCmd.class.getName()); + + private static final String s_name = "createaffinitygroupresponse"; + + // /////////////////////////////////////////////////// + // ////////////// API parameters ///////////////////// + // /////////////////////////////////////////////////// + + @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "an account for the affinity group. Must be used with domainId.") + private String accountName; + + @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, description = "domainId of the account owning the affinity group", entityType = DomainResponse.class) + private Long domainId; + + @Parameter(name = ApiConstants.DESCRIPTION, type = CommandType.STRING, description = "optional description of the affinity group") + private String description; + + @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, required = true, description = "name of the affinity group") + private String affinityGroupName; + + @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, required = true, description = "Type of the affinity group from the available affinity/anti-affinity group types") + private String affinityGroupType; + + + // /////////////////////////////////////////////////// + // ///////////////// Accessors /////////////////////// + // /////////////////////////////////////////////////// + + public String getAccountName() { + return accountName; + } + + public String getDescription() { + return description; + } + + public Long getDomainId() { + return domainId; + } + + public String getAffinityGroupName() { + return affinityGroupName; + } + + public String getAffinityGroupType() { + return affinityGroupType; + } + + // /////////////////////////////////////////////////// + // ///////////// API Implementation/////////////////// + // /////////////////////////////////////////////////// + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + Account account = UserContext.current().getCaller(); + if ((account == null) || isAdmin(account.getType())) { + if ((domainId != null) && (accountName != null)) { + Account userAccount = _responseGenerator.findAccountByNameDomain(accountName, domainId); + if (userAccount != null) { + return userAccount.getId(); + } + } + } + + if (account != null) { + return account.getId(); + } + + return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this + // command to SYSTEM so ERROR events + // are tracked + } + + @Override + public void execute() { + AffinityGroup group = _affinityGroupService.getAffinityGroup(getEntityId()); + if (group != null) { + AffinityGroupResponse response = _responseGenerator.createAffinityGroupResponse(group); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create affinity group:" + + affinityGroupName); + } + } + + @Override + public void create() throws ResourceAllocationException { + AffinityGroup result = _affinityGroupService.createAffinityGroup(accountName, domainId, affinityGroupName, + affinityGroupType, description); + if (result != null) { + setEntityId(result.getId()); + setEntityUuid(result.getUuid()); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to create affinity group entity" + affinityGroupName); + } + + } + + @Override + public String getEventType() { + return EventTypes.EVENT_AFFINITY_GROUP_CREATE; + } + + @Override + public String getEventDescription() { + return "creating Affinity Group"; + } + + @Override + public String getCreateEventType() { + return EventTypes.EVENT_AFFINITY_GROUP_CREATE; + } + + @Override + public String getCreateEventDescription() { + return "creating Affinity Group"; + } + + @Override + public AsyncJob.Type getInstanceType() { + return AsyncJob.Type.AffinityGroup; + } + +} diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java new file mode 100644 index 00000000000..ea4a010ab93 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/DeleteAffinityGroupCmd.java @@ -0,0 +1,154 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.user.affinitygroup; + +import org.apache.cloudstack.affinity.AffinityGroupResponse; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.DomainResponse; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.log4j.Logger; + +import com.cloud.async.AsyncJob; +import com.cloud.event.EventTypes; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceInUseException; +import com.cloud.user.Account; +import com.cloud.user.UserContext; + +@APICommand(name = "deleteAffinityGroup", description = "Deletes affinity group", responseObject = SuccessResponse.class) +public class DeleteAffinityGroupCmd extends BaseAsyncCmd { + public static final Logger s_logger = Logger.getLogger(DeleteAffinityGroupCmd.class.getName()); + private static final String s_name = "deleteaffinitygroupresponse"; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name = ApiConstants.ACCOUNT, type = CommandType.STRING, description = "the account of the affinity group. Must be specified with domain ID") + private String accountName; + + @Parameter(name = ApiConstants.DOMAIN_ID, type = CommandType.UUID, description = "the domain ID of account owning the affinity group", entityType = DomainResponse.class) + private Long domainId; + + @Parameter(name = ApiConstants.ID, type = CommandType.UUID, description = "The ID of the affinity group. Mutually exclusive with name parameter", entityType = AffinityGroupResponse.class) + private Long id; + + @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "The name of the affinity group. Mutually exclusive with id parameter") + private String name; + + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public String getAccountName() { + return accountName; + } + + public Long getDomainId() { + return domainId; + } + + + public Long getId() { + if (id != null && name != null) { + throw new InvalidParameterValueException("name and id parameters are mutually exclusive"); + } + + if (name != null) { + id = _responseGenerator.getAffinityGroupId(name, getEntityOwnerId()); + if (id == null) { + throw new InvalidParameterValueException("Unable to find affinity group by name " + name + + " for the account id=" + getEntityOwnerId()); + } + } + + if (id == null) { + throw new InvalidParameterValueException( + "Either id or name parameter is requred by deleteAffinityGroup command"); + } + + return id; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + Account account = UserContext.current().getCaller(); + if ((account == null) || isAdmin(account.getType())) { + if ((domainId != null) && (accountName != null)) { + Account userAccount = _responseGenerator.findAccountByNameDomain(accountName, domainId); + if (userAccount != null) { + return userAccount.getId(); + } + } + } + + if (account != null) { + return account.getId(); + } + + return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this + // command to SYSTEM so ERROR events + // are tracked + + } + + @Override + public void execute(){ + try{ + boolean result = _affinityGroupService.deleteAffinityGroup(id, accountName, domainId, name); + if (result) { + SuccessResponse response = new SuccessResponse(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete affinity group"); + } + } catch (ResourceInUseException ex) { + s_logger.warn("Exception: ", ex); + throw new ServerApiException(ApiErrorCode.RESOURCE_IN_USE_ERROR, ex.getMessage()); + } + } + + @Override + public String getEventType() { + return EventTypes.EVENT_AFFINITY_GROUP_DELETE; + } + + @Override + public String getEventDescription() { + return "Deleting Affinity Group"; + } + + @Override + public AsyncJob.Type getInstanceType() { + return AsyncJob.Type.AffinityGroup; + } +} diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java new file mode 100644 index 00000000000..ce6e89a078c --- /dev/null +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupTypesCmd.java @@ -0,0 +1,67 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.user.affinitygroup; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.cloudstack.affinity.AffinityGroupTypeResponse; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.log4j.Logger; + +import com.cloud.user.Account; + +@APICommand(name = "listAffinityGroupTypes", description = "Lists affinity group types available", responseObject = AffinityGroupTypeResponse.class) +public class ListAffinityGroupTypesCmd extends BaseListCmd { + public static final Logger s_logger = Logger.getLogger(ListAffinityGroupTypesCmd.class.getName()); + + private static final String s_name = "listaffinitygrouptypesresponse"; + + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public String getCommandName() { + return s_name; + } + + public long getEntityOwnerId() { + return Account.ACCOUNT_ID_SYSTEM; + } + + @Override + public void execute() { + List result = _affinityGroupService.listAffinityGroupTypes(); + ListResponse response = new ListResponse(); + ArrayList responses = new ArrayList(); + if (result != null) { + for (String type : result) { + AffinityGroupTypeResponse affinityTypeResponse = new AffinityGroupTypeResponse(); + affinityTypeResponse.setType(type); + affinityTypeResponse.setObjectName("affinityGroupType"); + responses.add(affinityTypeResponse); + } + } + response.setResponses(responses); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } +} diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java new file mode 100644 index 00000000000..9310fb91016 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/ListAffinityGroupsCmd.java @@ -0,0 +1,90 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.user.affinitygroup; + +import org.apache.cloudstack.affinity.AffinityGroupResponse; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.log4j.Logger; + +import com.cloud.async.AsyncJob; + +@APICommand(name = "listAffinityGroups", description = "Lists affinity groups", responseObject = AffinityGroupResponse.class) +public class ListAffinityGroupsCmd extends BaseListCmd { + public static final Logger s_logger = Logger.getLogger(ListAffinityGroupsCmd.class.getName()); + + private static final String s_name = "listaffinitygroupsresponse"; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name = ApiConstants.NAME, type = CommandType.STRING, description = "lists affinity groups by name") + private String affinityGroupName; + + @Parameter(name = ApiConstants.VIRTUAL_MACHINE_ID, type = CommandType.UUID, description = "lists affinity groups by virtual machine id", entityType = UserVmResponse.class) + private Long virtualMachineId; + + @Parameter(name = ApiConstants.ID, type = CommandType.UUID, description = "list the affinity group by the id provided", entityType = AffinityGroupResponse.class) + private Long id; + + @Parameter(name = ApiConstants.TYPE, type = CommandType.STRING, description = "lists affinity groups by type") + private String affinityGroupType; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + public String getAffinityGroupName() { + return affinityGroupName; + } + + public Long getVirtualMachineId() { + return virtualMachineId; + } + + public Long getId(){ + return id; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public void execute(){ + + ListResponse response = _queryService.listAffinityGroups(id, affinityGroupName, + affinityGroupType, virtualMachineId, this.getStartIndex(), this.getPageSizeVal()); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + + } + + @Override + public AsyncJob.Type getInstanceType() { + return AsyncJob.Type.AffinityGroup; + } +} diff --git a/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java new file mode 100644 index 00000000000..44d017b7d8b --- /dev/null +++ b/api/src/org/apache/cloudstack/api/command/user/affinitygroup/UpdateVMAffinityGroupCmd.java @@ -0,0 +1,164 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.user.affinitygroup; + +import java.util.ArrayList; +import java.util.EnumSet; +import java.util.List; + +import org.apache.cloudstack.affinity.AffinityGroupResponse; +import org.apache.cloudstack.api.ACL; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.ApiConstants.VMDetails; +import org.apache.cloudstack.api.response.UserVmResponse; +import org.apache.log4j.Logger; + +import com.cloud.async.AsyncJob; +import com.cloud.event.EventTypes; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; +import com.cloud.user.UserContext; +import com.cloud.uservm.UserVm; + + +@APICommand(name = "updateVMAffinityGroup", description = "Updates the affinity/anti-affinity group associations of a virtual machine. The VM has to be stopped and restarted for the " + + "new properties to take effect.", responseObject = UserVmResponse.class) +public class UpdateVMAffinityGroupCmd extends BaseAsyncCmd { + public static final Logger s_logger = Logger.getLogger(UpdateVMAffinityGroupCmd.class.getName()); + private static final String s_name = "updatevirtualmachineresponse"; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + + @ACL + @Parameter(name=ApiConstants.ID, type=CommandType.UUID, entityType=UserVmResponse.class, + required=true, description="The ID of the virtual machine") + private Long id; + + @ACL + @Parameter(name = ApiConstants.AFFINITY_GROUP_IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups id that are going to be applied to the virtual machine. " + + "Should be passed only when vm is created from a zone with Basic Network support." + + " Mutually exclusive with securitygroupnames parameter") + private List affinityGroupIdList; + + @ACL + @Parameter(name = ApiConstants.AFFINITY_GROUP_NAMES, type = CommandType.LIST, collectionType = CommandType.STRING, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups names that are going to be applied to the virtual machine." + + " Should be passed only when vm is created from a zone with Basic Network support. " + + "Mutually exclusive with securitygroupids parameter") + private List affinityGroupNameList; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + + public Long getId() { + return id; + } + + + public List getAffinityGroupIdList() { + if (affinityGroupNameList != null && affinityGroupIdList != null) { + throw new InvalidParameterValueException( + "affinitygroupids parameter is mutually exclusive with affinitygroupnames parameter"); + } + + // transform group names to ids here + if (affinityGroupNameList != null) { + List affinityGroupIds = new ArrayList(); + for (String groupName : affinityGroupNameList) { + Long groupId = _responseGenerator.getAffinityGroupId(groupName, getEntityOwnerId()); + if (groupId == null) { + throw new InvalidParameterValueException("Unable to find group by name " + groupName + + " for account " + getEntityOwnerId()); + } else { + affinityGroupIds.add(groupId); + } + } + return affinityGroupIds; + } else { + return affinityGroupIdList; + } + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + + @Override + public String getCommandName() { + return s_name; + } + + public static String getResultObjectName() { + return "virtualmachine"; + } + + @Override + public long getEntityOwnerId() { + UserVm userVm = _entityMgr.findById(UserVm.class, getId()); + if (userVm != null) { + return userVm.getAccountId(); + } + + return Account.ACCOUNT_ID_SYSTEM; // no account info given, parent this command to SYSTEM so ERROR events are tracked + } + + @Override + public void execute() throws ResourceUnavailableException, + InsufficientCapacityException, ServerApiException { + UserContext.current().setEventDetails("Vm Id: "+getId()); + UserVm result = _affinityGroupService.updateVMAffinityGroups(getId(), getAffinityGroupIdList()); + ArrayList dc = new ArrayList(); + dc.add(VMDetails.valueOf("affgrp")); + EnumSet details = EnumSet.copyOf(dc); + + if (result != null){ + UserVmResponse response = _responseGenerator.createUserVmResponse("virtualmachine", details, result).get(0); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to update vm's affinity groups"); + } + } + + @Override + public String getEventType() { + return EventTypes.EVENT_VM_AFFINITY_GROUP_UPDATE; + } + + @Override + public String getEventDescription() { + return "updating VM Affinity Group"; + } + + @Override + public AsyncJob.Type getInstanceType() { + return AsyncJob.Type.AffinityGroup; + } + +} diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java index cd559d8c470..b08b6aeff17 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/CreateGlobalLoadBalancerRuleCmd.java @@ -93,6 +93,9 @@ public class CreateGlobalLoadBalancerRuleCmd extends BaseAsyncCreateCmd { } public String getStickyMethod() { + if (stickyMethod == null) { + return "sourceip"; + } return stickyMethod; } diff --git a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java index dae861a35b1..d75de57f7d1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/region/ha/gslb/ListGlobalLoadBalancerRuleCmd.java @@ -45,7 +45,7 @@ public class ListGlobalLoadBalancerRuleCmd extends BaseListTaggedResourcesCmd { @Parameter(name = ApiConstants.ID, type = CommandType.UUID, entityType = GlobalLoadBalancerResponse.class, description = "the ID of the global load balancer rule") private Long id; - @Parameter(name = ApiConstants.REGION_ID, type = CommandType.UUID, entityType = RegionResponse.class, description = "region ID") + @Parameter(name = ApiConstants.REGION_ID, type = CommandType.INTEGER, entityType = RegionResponse.class, description = "region ID") private Integer regionId; // /////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java index 63e2788b77c..a01bac39a4b 100644 --- a/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/CreateTagsCmd.java @@ -35,7 +35,7 @@ import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.server.ResourceTag; import com.cloud.server.ResourceTag.TaggedResourceType; -@APICommand(name = "createTags", description = "Creates resource tag(s)", responseObject = SuccessResponse.class, since = "Burbank") +@APICommand(name = "createTags", description = "Creates resource tag(s)", responseObject = SuccessResponse.class, since = "4.0.0") public class CreateTagsCmd extends BaseAsyncCmd{ public static final Logger s_logger = Logger.getLogger(CreateTagsCmd.class.getName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java index 084a5142aa1..a6ba0da82b7 100644 --- a/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/DeleteTagsCmd.java @@ -34,7 +34,7 @@ import org.apache.log4j.Logger; import com.cloud.event.EventTypes; import com.cloud.server.ResourceTag.TaggedResourceType; -@APICommand(name = "deleteTags", description = "Deleting resource tag(s)", responseObject = SuccessResponse.class, since = "Burbank") +@APICommand(name = "deleteTags", description = "Deleting resource tag(s)", responseObject = SuccessResponse.class, since = "4.0.0") public class DeleteTagsCmd extends BaseAsyncCmd{ public static final Logger s_logger = Logger.getLogger(DeleteTagsCmd.class.getName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java b/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java index e3dc108a757..f80da204cce 100644 --- a/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/tag/ListTagsCmd.java @@ -24,7 +24,7 @@ import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.api.response.ResourceTagResponse; -@APICommand(name = "listTags", description = "List resource tag(s)", responseObject = ResourceTagResponse.class, since = "Burbank") +@APICommand(name = "listTags", description = "List resource tag(s)", responseObject = ResourceTagResponse.class, since = "4.0.0") public class ListTagsCmd extends BaseListProjectAndAccountResourcesCmd{ private static final String s_name = "listtagsresponse"; diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java index df6b3999dba..ae5482b22de 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/AddIpToVmNicCmd.java @@ -16,6 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.user.vm; +import com.cloud.vm.NicSecondaryIp; import org.apache.log4j.Logger; import org.apache.cloudstack.api.APICommand; @@ -146,6 +147,7 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd { UserContext.current().setEventDetails("Nic Id: " + getNicId() ); String ip; + NicSecondaryIp result; String secondaryIp = null; if ((ip = getIpaddress()) != null) { if (!NetUtils.isValidIp(ip)) { @@ -154,12 +156,13 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd { } try { - secondaryIp = _networkService.allocateSecondaryGuestIP(_accountService.getAccount(getEntityOwnerId()), getZoneId(), getNicId(), getNetworkId(), getIpaddress()); + result = _networkService.allocateSecondaryGuestIP(_accountService.getAccount(getEntityOwnerId()), getZoneId(), getNicId(), getNetworkId(), getIpaddress()); } catch (InsufficientAddressCapacityException e) { throw new InvalidParameterValueException("Allocating guest ip for nic failed"); } - if (secondaryIp != null) { + if (result != null) { + secondaryIp = result.getIp4Address(); if (getNetworkType() == NetworkType.Basic) { // add security group rules for the secondary ip addresses boolean success = false; @@ -171,7 +174,7 @@ public class AddIpToVmNicCmd extends BaseAsyncCmd { s_logger.info("Associated ip address to NIC : " + secondaryIp); NicSecondaryIpResponse response = new NicSecondaryIpResponse(); - response = _responseGenerator.createSecondaryIPToNicResponse(secondaryIp, getNicId(), getNetworkId()); + response = _responseGenerator.createSecondaryIPToNicResponse(result); response.setResponseName(getCommandName()); this.setResponseObject(response); } else { diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java index 21a45f8cc7f..3ed08d26be0 100755 --- a/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/DeployVMCmd.java @@ -25,6 +25,7 @@ import java.util.List; import java.util.Map; import org.apache.cloudstack.acl.SecurityChecker.AccessType; +import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ACL; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; @@ -127,7 +128,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { @Parameter(name=ApiConstants.HYPERVISOR, type=CommandType.STRING, description="the hypervisor on which to deploy the virtual machine") private String hypervisor; - @Parameter(name=ApiConstants.USER_DATA, type=CommandType.STRING, description="an optional binary data that can be sent to the virtual machine upon a successful deployment. This binary data must be base64 encoded before adding it to the request. Currently only HTTP GET is supported. Using HTTP GET (via querystring), you can send up to 2KB of data after base64 encoding.", length=2048) + @Parameter(name=ApiConstants.USER_DATA, type=CommandType.STRING, description="an optional binary data that can be sent to the virtual machine upon a successful deployment. This binary data must be base64 encoded before adding it to the request. Using HTTP GET (via querystring), you can send up to 2KB of data after base64 encoding. Using HTTP POST(via POST body), you can send up to 32K of data after base64 encoding.", length=32768) private String userData; @Parameter(name=ApiConstants.SSH_KEYPAIR, type=CommandType.STRING, description="name of the ssh key pair used to login to the virtual machine") @@ -172,6 +173,16 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { @Parameter(name=ApiConstants.START_VM, type=CommandType.BOOLEAN, description="true if network offering supports specifying ip ranges; defaulted to true if not specified") private Boolean startVm; + @ACL + @Parameter(name = ApiConstants.AFFINITY_GROUP_IDS, type = CommandType.LIST, collectionType = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups id that are going to be applied to the virtual machine." + + " Mutually exclusive with affinitygroupnames parameter") + private List affinityGroupIdList; + + @ACL + @Parameter(name = ApiConstants.AFFINITY_GROUP_NAMES, type = CommandType.LIST, collectionType = CommandType.STRING, entityType = AffinityGroupResponse.class, description = "comma separated list of affinity groups names that are going to be applied to the virtual machine." + + "Mutually exclusive with affinitygroupids parameter") + private List affinityGroupNameList; + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// @@ -219,7 +230,7 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { for (String groupName : securityGroupNameList) { Long groupId = _responseGenerator.getSecurityGroupId(groupName, getEntityOwnerId()); if (groupId == null) { - throw new InvalidParameterValueException("Unable to find group by name " + groupName + " for account " + getEntityOwnerId()); + throw new InvalidParameterValueException("Unable to find group by name " + groupName); } else { securityGroupIds.add(groupId); } @@ -301,8 +312,8 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { throw new InvalidParameterValueException("Unable to translate and find entity with networkId: " + ips.get("networkid")); } } - String requestedIp = (String) ips.get("ip"); - String requestedIpv6 = (String) ips.get("ipv6"); + String requestedIp = ips.get("ip"); + String requestedIpv6 = ips.get("ipv6"); if (requestedIpv6 != null) { requestedIpv6 = requestedIpv6.toLowerCase(); } @@ -321,6 +332,29 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { return ip6Address.toLowerCase(); } + public List getAffinityGroupIdList() { + if (affinityGroupNameList != null && affinityGroupIdList != null) { + throw new InvalidParameterValueException( + "affinitygroupids parameter is mutually exclusive with affinitygroupnames parameter"); + } + + // transform group names to ids here + if (affinityGroupNameList != null) { + List affinityGroupIds = new ArrayList(); + for (String groupName : affinityGroupNameList) { + Long groupId = _responseGenerator.getAffinityGroupId(groupName, getEntityOwnerId()); + if (groupId == null) { + throw new InvalidParameterValueException("Unable to find affinity group by name " + groupName); + } else { + affinityGroupIds.add(groupId); + } + } + return affinityGroupIds; + } else { + return affinityGroupIdList; + } + } + ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// @@ -447,18 +481,18 @@ public class DeployVMCmd extends BaseAsyncCreateCmd { throw new InvalidParameterValueException("Can't specify network Ids in Basic zone"); } else { vm = _userVmService.createBasicSecurityGroupVirtualMachine(zone, serviceOffering, template, getSecurityGroupIdList(), owner, name, - displayName, diskOfferingId, size, group, getHypervisor(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, keyboard); + displayName, diskOfferingId, size, group, getHypervisor(), this.getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, keyboard, getAffinityGroupIdList()); } } else { if (zone.isSecurityGroupEnabled()) { vm = _userVmService.createAdvancedSecurityGroupVirtualMachine(zone, serviceOffering, template, getNetworkIds(), getSecurityGroupIdList(), - owner, name, displayName, diskOfferingId, size, group, getHypervisor(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, keyboard); + owner, name, displayName, diskOfferingId, size, group, getHypervisor(), this.getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, keyboard, getAffinityGroupIdList()); } else { if (getSecurityGroupIdList() != null && !getSecurityGroupIdList().isEmpty()) { throw new InvalidParameterValueException("Can't create vm with security groups; security group feature is not enabled per zone"); } vm = _userVmService.createAdvancedVirtualMachine(zone, serviceOffering, template, getNetworkIds(), owner, name, displayName, - diskOfferingId, size, group, getHypervisor(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, keyboard); + diskOfferingId, size, group, getHypervisor(), this.getHttpMethod(), userData, sshKeyPairName, getIpToNetworkMap(), addrs, keyboard, getAffinityGroupIdList()); } } diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java index 30f03b88995..b2a2ce071f1 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/ListVMsCmd.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.EnumSet; import java.util.List; +import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.ApiConstants.VMDetails; @@ -74,10 +75,12 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd { @Parameter(name=ApiConstants.STATE, type=CommandType.STRING, description="state of the virtual machine") private String state; - @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class, - description="the availability zone ID") + @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, entityType=ZoneResponse.class, description="the availability zone ID") private Long zoneId; + @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to") + private String zoneType; + @Parameter(name=ApiConstants.FOR_VIRTUAL_NETWORK, type=CommandType.BOOLEAN, description="list by network type; true if need to list vms using Virtual Network, false otherwise") private Boolean forVirtualNetwork; @@ -95,7 +98,7 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd { @Parameter(name=ApiConstants.DETAILS, type=CommandType.LIST, collectionType=CommandType.STRING, description="comma separated list of host details requested, " + - "value can be a list of [all, group, nics, stats, secgrp, tmpl, servoff, iso, volume, min]." + + "value can be a list of [all, group, nics, stats, secgrp, tmpl, servoff, iso, volume, min, affgrp]." + " If no parameter is passed in, the details will be defaulted to all" ) private List viewDetails; @@ -110,6 +113,10 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd { @Parameter(name=ApiConstants.VPC_ID, type=CommandType.UUID, entityType=VpcResponse.class, description="list vms by vpc") private Long vpcId; + + @Parameter(name = ApiConstants.AFFINITY_GROUP_ID, type = CommandType.UUID, entityType = AffinityGroupResponse.class, description = "list vms by affinity group") + private Long affinityGroupId; + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// @@ -142,6 +149,10 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd { return zoneId; } + public String getZoneType() { + return zoneType; + } + public Boolean getForVirtualNetwork() { return forVirtualNetwork; } @@ -174,6 +185,10 @@ public class ListVMsCmd extends BaseListTaggedResourcesCmd { return vpcId; } + public Long getAffinityGroupId() { + return affinityGroupId; + } + public EnumSet getDetails() throws InvalidParameterValueException { EnumSet dv; if (viewDetails==null || viewDetails.size() <=0){ diff --git a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java index ff8fff1c19f..bbf9b259201 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vm/UpdateVMCmd.java @@ -61,7 +61,7 @@ public class UpdateVMCmd extends BaseCmd{ description="the ID of the OS type that best represents this VM.") private Long osTypeId; - @Parameter(name=ApiConstants.USER_DATA, type=CommandType.STRING, description="an optional binary data that can be sent to the virtual machine upon a successful deployment. This binary data must be base64 encoded before adding it to the request. Currently only HTTP GET is supported. Using HTTP GET (via querystring), you can send up to 2KB of data after base64 encoding.", length=2048) + @Parameter(name=ApiConstants.USER_DATA, type=CommandType.STRING, description="an optional binary data that can be sent to the virtual machine upon a successful deployment. This binary data must be base64 encoded before adding it to the request. Using HTTP GET (via querystring), you can send up to 2KB of data after base64 encoding. Using HTTP POST(via POST body), you can send up to 32K of data after base64 encoding.", length=32768) private String userData; diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java index f0dbf16b250..aa9feb8e2a3 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/CreateVMSnapshotCmd.java @@ -34,7 +34,7 @@ import com.cloud.user.UserContext; import com.cloud.uservm.UserVm; import com.cloud.vm.snapshot.VMSnapshot; -@APICommand(name = "createVMSnapshot", description = "Creates snapshot for a vm.", responseObject = VMSnapshotResponse.class) +@APICommand(name = "createVMSnapshot", description = "Creates snapshot for a vm.", responseObject = VMSnapshotResponse.class, since="4.2.0") public class CreateVMSnapshotCmd extends BaseAsyncCreateCmd { public static final Logger s_logger = Logger diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java index a2b2c08b381..bda84c893a5 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/DeleteVMSnapshotCmd.java @@ -32,7 +32,7 @@ import com.cloud.user.Account; import com.cloud.user.UserContext; import com.cloud.vm.snapshot.VMSnapshot; -@APICommand(name="deleteVMSnapshot", description = "Deletes a vmsnapshot.", responseObject = SuccessResponse.class) +@APICommand(name="deleteVMSnapshot", description = "Deletes a vmsnapshot.", responseObject = SuccessResponse.class, since="4.2.0") public class DeleteVMSnapshotCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger .getLogger(DeleteVMSnapshotCmd.class.getName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java index 936d348950d..82fb9e57877 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/ListVMSnapshotCmd.java @@ -30,7 +30,7 @@ import org.apache.cloudstack.api.response.VMSnapshotResponse; import com.cloud.vm.snapshot.VMSnapshot; -@APICommand(name="listVMSnapshot", description = "List virtual machine snapshot by conditions", responseObject = VMSnapshotResponse.class) +@APICommand(name="listVMSnapshot", description = "List virtual machine snapshot by conditions", responseObject = VMSnapshotResponse.class, since="4.2.0") public class ListVMSnapshotCmd extends BaseListTaggedResourcesCmd { private static final String s_name = "listvmsnapshotresponse"; diff --git a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToSnapshotCmd.java b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToSnapshotCmd.java index d7b4599d6c4..ea7bf60d6a3 100644 --- a/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToSnapshotCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/vmsnapshot/RevertToSnapshotCmd.java @@ -37,7 +37,7 @@ import com.cloud.user.UserContext; import com.cloud.uservm.UserVm; import com.cloud.vm.snapshot.VMSnapshot; -@APICommand(name = "revertToSnapshot",description = "Revert VM from a vmsnapshot.", responseObject = UserVmResponse.class) +@APICommand(name = "revertToSnapshot",description = "Revert VM from a vmsnapshot.", responseObject = UserVmResponse.class, since="4.2.0") public class RevertToSnapshotCmd extends BaseAsyncCmd { public static final Logger s_logger = Logger .getLogger(RevertToSnapshotCmd.class.getName()); diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java index 4c78eedeb08..91316b02167 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/ListVolumesCmd.java @@ -67,6 +67,9 @@ public class ListVolumesCmd extends BaseListTaggedResourcesCmd { description="the ID of the availability zone") private Long zoneId; + @Parameter(name=ApiConstants.ZONE_TYPE, type=CommandType.STRING, description="the network type of the zone that the virtual machine belongs to") + private String zoneType; + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// @@ -100,6 +103,10 @@ public class ListVolumesCmd extends BaseListTaggedResourcesCmd { return zoneId; } + public String getZoneType() { + return zoneType; + } + ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java index 287241a8d90..ce40f0d2979 100644 --- a/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/volume/MigrateVolumeCmd.java @@ -47,6 +47,10 @@ public class MigrateVolumeCmd extends BaseAsyncCmd { required=true, description="destination storage pool ID to migrate the volume to") private Long storageId; + @Parameter(name=ApiConstants.LIVE_MIGRATE, type=CommandType.BOOLEAN, required=false, + description="if the volume should be live migrated when it is attached to a running vm") + private Boolean liveMigrate; + ///////////////////////////////////////////////////// /////////////////// Accessors /////////////////////// ///////////////////////////////////////////////////// @@ -58,6 +62,10 @@ public class MigrateVolumeCmd extends BaseAsyncCmd { public Long getStoragePoolId() { return storageId; } + + public boolean isLiveMigrate() { + return (liveMigrate != null) ? liveMigrate : false; + } ///////////////////////////////////////////////////// /////////////// API Implementation/////////////////// ///////////////////////////////////////////////////// diff --git a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java index bbfb598b1db..d0dc736f1a6 100644 --- a/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java +++ b/api/src/org/apache/cloudstack/api/command/user/zone/ListZonesByCmd.java @@ -56,6 +56,9 @@ public class ListZonesByCmd extends BaseListCmd { @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, description="the name of the zone") private String name; + @Parameter(name=ApiConstants.NETWORK_TYPE, type=CommandType.STRING, description="the network type of the zone") + private String networkType; + @Parameter(name=ApiConstants.SHOW_CAPACITIES, type=CommandType.BOOLEAN, description="flag to display the capacity of the zones") private Boolean showCapacities; @@ -79,6 +82,10 @@ public class ListZonesByCmd extends BaseListCmd { return name; } + public String getNetworkType(){ + return networkType; + } + public Boolean getShowCapacities() { return showCapacities; } diff --git a/api/src/org/apache/cloudstack/api/response/AccountResponse.java b/api/src/org/apache/cloudstack/api/response/AccountResponse.java index c109a6325c8..1e59822180f 100644 --- a/api/src/org/apache/cloudstack/api/response/AccountResponse.java +++ b/api/src/org/apache/cloudstack/api/response/AccountResponse.java @@ -183,6 +183,9 @@ public class AccountResponse extends BaseResponse { @SerializedName(ApiConstants.ACCOUNT_DETAILS) @Param(description="details for the account") private Map details; + + @SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if account is default, false otherwise", since="4.2.0") + private Boolean isDefault; @Override @@ -381,4 +384,8 @@ public class AccountResponse extends BaseResponse { public void setDefaultZone(String defaultZoneId) { this.defaultZoneId = defaultZoneId; } + + public void setIsDefault(Boolean isDefault) { + this.isDefault = isDefault; + } } diff --git a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java index a90acde6145..cfd772d7115 100644 --- a/api/src/org/apache/cloudstack/api/response/ClusterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ClusterResponse.java @@ -46,7 +46,10 @@ public class ClusterResponse extends BaseResponse { @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the cluster") private String zoneName; - + + @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") + private String zoneType; + @SerializedName("hypervisortype") @Param(description="the hypervisor type of the cluster") private String hypervisorType; @@ -116,6 +119,10 @@ public class ClusterResponse extends BaseResponse { this.zoneName = zoneName; } + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public String getClusterType() { return clusterType; } diff --git a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java index 95b8af2f4c5..176c47aff8b 100644 --- a/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java +++ b/api/src/org/apache/cloudstack/api/response/ConfigurationResponse.java @@ -32,9 +32,13 @@ public class ConfigurationResponse extends BaseResponse { @SerializedName(ApiConstants.VALUE) @Param(description="the value of the configuration") private String value; + @SerializedName(ApiConstants.SCOPE) @Param(description="scope(zone/cluster/pool/account) of the parameter that needs to be updated") + private String scope; + @SerializedName(ApiConstants.DESCRIPTION) @Param(description="the description of the configuration") private String description; + public String getCategory() { return category; } @@ -66,4 +70,12 @@ public class ConfigurationResponse extends BaseResponse { public void setDescription(String description) { this.description = description; } + + public String getScope() { + return scope; + } + + public void setScope(String scope) { + this.scope = scope; + } } diff --git a/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java b/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java new file mode 100644 index 00000000000..a37800fd650 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/response/DeploymentPlannersResponse.java @@ -0,0 +1,37 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.response; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; + +import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; + +public class DeploymentPlannersResponse extends BaseResponse { + @SerializedName(ApiConstants.NAME) + @Param(description = "Deployment Planner name") + private String name; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java index b2bc02e9b83..79c8596a8d1 100644 --- a/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java +++ b/api/src/org/apache/cloudstack/api/response/DomainRouterResponse.java @@ -42,6 +42,9 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name for the router") private String zoneName; + @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") + private String zoneType; + @SerializedName(ApiConstants.DNS1) @Param(description="the first DNS for the router") private String dns1; @@ -186,6 +189,14 @@ public class DomainRouterResponse extends BaseResponse implements ControlledView this.zoneName = zoneName; } + public String getZoneType() { + return zoneType; + } + + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public void setDns1(String dns1) { this.dns1 = dns1; } diff --git a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java index 08722ae2c6b..787410a24c5 100644 --- a/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java +++ b/api/src/org/apache/cloudstack/api/response/FirewallRuleResponse.java @@ -71,6 +71,18 @@ public class FirewallRuleResponse extends BaseResponse { @SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with the rule", responseObject = ResourceTagResponse.class) private List tags; + @SerializedName(ApiConstants.VM_GUEST_IP) @Param(description="the vm ip address for the port forwarding rule") + private String destNatVmIp; + + + public String getDestNatVmIp() { + return destNatVmIp; + } + + public void setDestNatVmIp(String destNatVmIp) { + this.destNatVmIp = destNatVmIp; + } + @Override public String getObjectId() { diff --git a/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java b/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java index 0fd064f41b5..9f5139db947 100644 --- a/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java +++ b/api/src/org/apache/cloudstack/api/response/GlobalLoadBalancerResponse.java @@ -23,6 +23,8 @@ import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; +import java.util.List; + @EntityReference(value= GlobalLoadBalancerRule.class) public class GlobalLoadBalancerResponse extends BaseResponse implements ControlledEntityResponse { @@ -50,6 +52,10 @@ public class GlobalLoadBalancerResponse extends BaseResponse implements Controll @Param(description = "session persistence method used for the global load balancer") private String stickyMethod; + @SerializedName(ApiConstants.GSLB_SERVICE_TYPE) + @Param(description = "GSLB service type") + private String serviceType; + @SerializedName(ApiConstants.REGION_ID) @Param(description = "Region Id in which global load balancer is created") private Integer regionId; @@ -72,6 +78,10 @@ public class GlobalLoadBalancerResponse extends BaseResponse implements Controll @Param(description = "the domain of the load balancer rule") private String domainName; + @SerializedName(ApiConstants.LOAD_BALANCER_RULE) + @Param(description="List of load balancer rules that are part of GSLB rule", responseObject = LoadBalancerResponse.class) + private List siteLoadBalancers; + public void setRegionIdId(Integer regionId) { this.regionId = regionId; } @@ -96,6 +106,10 @@ public class GlobalLoadBalancerResponse extends BaseResponse implements Controll this.stickyMethod = stickyMethod; } + public void setServiceType(String serviceType) { + this.serviceType = serviceType; + } + public void setServiceDomainName(String domainName) { this.gslbDomainName = domainName; } @@ -122,4 +136,8 @@ public class GlobalLoadBalancerResponse extends BaseResponse implements Controll public void setDomainName(String domainName) { this.domainName = domainName; } + + public void setSiteLoadBalancers(List siteLoadBalancers) { + this.siteLoadBalancers = siteLoadBalancers; + } } diff --git a/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java new file mode 100644 index 00000000000..fde2440a8e2 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/response/HostForMigrationResponse.java @@ -0,0 +1,365 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.response; + +import java.util.Date; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; + +import com.cloud.host.Host; +import com.cloud.host.Status; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; + +@EntityReference(value=Host.class) +public class HostForMigrationResponse extends BaseResponse { + @SerializedName(ApiConstants.ID) @Param(description="the ID of the host") + private String id; + + @SerializedName(ApiConstants.NAME) @Param(description="the name of the host") + private String name; + + @SerializedName(ApiConstants.STATE) @Param(description="the state of the host") + private Status state; + + @SerializedName("disconnected") @Param(description="true if the host is disconnected. False otherwise.") + private Date disconnectedOn; + + @SerializedName(ApiConstants.TYPE) @Param(description="the host type") + private Host.Type hostType; + + @SerializedName("oscategoryid") @Param(description="the OS category ID of the host") + private String osCategoryId; + + @SerializedName("oscategoryname") @Param(description="the OS category name of the host") + private String osCategoryName; + + @SerializedName(ApiConstants.IP_ADDRESS) @Param(description="the IP address of the host") + private String ipAddress; + + @SerializedName(ApiConstants.ZONE_ID) @Param(description="the Zone ID of the host") + private String zoneId; + + @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the host") + private String zoneName; + + @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod ID of the host") + private String podId; + + @SerializedName("podname") @Param(description="the Pod name of the host") + private String podName; + + @SerializedName("version") @Param(description="the host version") + private String version; + + @SerializedName(ApiConstants.HYPERVISOR) @Param(description="the host hypervisor") + private HypervisorType hypervisor; + + @SerializedName("cpunumber") @Param(description="the CPU number of the host") + private Integer cpuNumber; + + @SerializedName("cpuspeed") @Param(description="the CPU speed of the host") + private Long cpuSpeed; + + @SerializedName("cpuallocated") @Param(description="the amount of the host's CPU currently allocated") + private String cpuAllocated; + + @SerializedName("cpuused") @Param(description="the amount of the host's CPU currently used") + private String cpuUsed; + + @SerializedName("cpuwithoverprovisioning") @Param(description="the amount of the host's CPU after applying the cpu.overprovisioning.factor ") + private String cpuWithOverprovisioning; + + @SerializedName("averageload") @Param(description="the cpu average load on the host") + private Long averageLoad; + + @SerializedName("networkkbsread") @Param(description="the incoming network traffic on the host") + private Long networkKbsRead; + + @SerializedName("networkkbswrite") @Param(description="the outgoing network traffic on the host") + private Long networkKbsWrite; + + @SerializedName("memorytotal") @Param(description="the memory total of the host") + private Long memoryTotal; + + @SerializedName("memoryallocated") @Param(description="the amount of the host's memory currently allocated") + private Long memoryAllocated; + + @SerializedName("memoryused") @Param(description="the amount of the host's memory currently used") + private Long memoryUsed; + + @SerializedName("disksizetotal") @Param(description="the total disk size of the host") + private Long diskSizeTotal; + + @SerializedName("disksizeallocated") @Param(description="the host's currently allocated disk size") + private Long diskSizeAllocated; + + @SerializedName("capabilities") @Param(description="capabilities of the host") + private String capabilities; + + @SerializedName("lastpinged") @Param(description="the date and time the host was last pinged") + private Date lastPinged; + + @SerializedName("managementserverid") @Param(description="the management server ID of the host") + private Long managementServerId; + + @SerializedName("clusterid") @Param(description="the cluster ID of the host") + private String clusterId; + + @SerializedName("clustername") @Param(description="the cluster name of the host") + private String clusterName; + + @SerializedName("clustertype") @Param(description="the cluster type of the cluster that host belongs to") + private String clusterType; + + @SerializedName("islocalstorageactive") @Param(description="true if local storage is active, false otherwise") + private Boolean localStorageActive; + + @SerializedName(ApiConstants.CREATED) @Param(description="the date and time the host was created") + private Date created; + + @SerializedName("removed") @Param(description="the date and time the host was removed") + private Date removed; + + @SerializedName("events") @Param(description="events available for the host") + private String events; + + @SerializedName("hosttags") @Param(description="comma-separated list of tags for the host") + private String hostTags; + + @SerializedName("hasenoughcapacity") @Param(description="true if this host has enough CPU and RAM capacity to migrate a VM to it, false otherwise") + private Boolean hasEnoughCapacity; + + @SerializedName("suitableformigration") @Param(description="true if this host is suitable(has enough capacity and satisfies all conditions like hosttags, max guests vm limit etc) to migrate a VM to it , false otherwise") + private Boolean suitableForMigration; + + @SerializedName("requiresStorageMotion") @Param(description="true if migrating a vm to this host requires storage motion, false otherwise") + private Boolean requiresStorageMotion; + + @SerializedName("resourcestate") @Param(description="the resource state of the host") + private String resourceState; + + @SerializedName(ApiConstants.HYPERVISOR_VERSION) @Param(description="the hypervisor version") + private String hypervisorVersion; + + @SerializedName(ApiConstants.HA_HOST) @Param(description="true if the host is Ha host (dedicated to vms started by HA process; false otherwise") + private Boolean haHost; + + @Override + public String getObjectId() { + return this.getId(); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public void setName(String name) { + this.name = name; + } + + public void setState(Status state) { + this.state = state; + } + + public void setDisconnectedOn(Date disconnectedOn) { + this.disconnectedOn = disconnectedOn; + } + + public void setHostType(Host.Type hostType) { + this.hostType = hostType; + } + + public void setOsCategoryId(String osCategoryId) { + this.osCategoryId = osCategoryId; + } + + public void setOsCategoryName(String osCategoryName) { + this.osCategoryName = osCategoryName; + } + + public void setIpAddress(String ipAddress) { + this.ipAddress = ipAddress; + } + + public void setZoneId(String zoneId) { + this.zoneId = zoneId; + } + + public void setZoneName(String zoneName) { + this.zoneName = zoneName; + } + + public void setPodId(String podId) { + this.podId = podId; + } + + public void setPodName(String podName) { + this.podName = podName; + } + + public void setVersion(String version) { + this.version = version; + } + + public void setHypervisor(HypervisorType hypervisor) { + this.hypervisor = hypervisor; + } + + public void setCpuNumber(Integer cpuNumber) { + this.cpuNumber = cpuNumber; + } + + public void setCpuSpeed(Long cpuSpeed) { + this.cpuSpeed = cpuSpeed; + } + + public String getCpuAllocated() { + return cpuAllocated; + } + + public void setCpuAllocated(String cpuAllocated) { + this.cpuAllocated = cpuAllocated; + } + + public void setCpuUsed(String cpuUsed) { + this.cpuUsed = cpuUsed; + } + + public void setAverageLoad(Long averageLoad) { + this.averageLoad = averageLoad; + } + + public void setNetworkKbsRead(Long networkKbsRead) { + this.networkKbsRead = networkKbsRead; + } + + public void setNetworkKbsWrite(Long networkKbsWrite) { + this.networkKbsWrite = networkKbsWrite; + } + + public void setMemoryTotal(Long memoryTotal) { + this.memoryTotal = memoryTotal; + } + + public void setMemoryAllocated(Long memoryAllocated) { + this.memoryAllocated = memoryAllocated; + } + + public void setMemoryUsed(Long memoryUsed) { + this.memoryUsed = memoryUsed; + } + + public void setDiskSizeTotal(Long diskSizeTotal) { + this.diskSizeTotal = diskSizeTotal; + } + + public void setDiskSizeAllocated(Long diskSizeAllocated) { + this.diskSizeAllocated = diskSizeAllocated; + } + + public void setCapabilities(String capabilities) { + this.capabilities = capabilities; + } + + public void setLastPinged(Date lastPinged) { + this.lastPinged = lastPinged; + } + + public void setManagementServerId(Long managementServerId) { + this.managementServerId = managementServerId; + } + + public void setClusterId(String clusterId) { + this.clusterId = clusterId; + } + + public void setClusterName(String clusterName) { + this.clusterName = clusterName; + } + + public void setClusterType(String clusterType) { + this.clusterType = clusterType; + } + + public void setLocalStorageActive(Boolean localStorageActive) { + this.localStorageActive = localStorageActive; + } + + public void setCreated(Date created) { + this.created = created; + } + + public void setRemoved(Date removed) { + this.removed = removed; + } + + public void setEvents(String events) { + this.events = events; + } + + public String getHostTags() { + return hostTags; + } + + public void setHostTags(String hostTags) { + this.hostTags = hostTags; + } + + public void setHasEnoughCapacity(Boolean hasEnoughCapacity) { + this.hasEnoughCapacity = hasEnoughCapacity; + } + + public void setSuitableForMigration(Boolean suitableForMigration) { + this.suitableForMigration = suitableForMigration; + } + + public void setRequiresStorageMotion(Boolean requiresStorageMotion) { + this.requiresStorageMotion = requiresStorageMotion; + } + + public String getResourceState() { + return resourceState; + } + + public void setResourceState(String resourceState) { + this.resourceState = resourceState; + } + + public String getCpuWithOverprovisioning() { + return cpuWithOverprovisioning; + } + + public void setCpuWithOverprovisioning(String cpuWithOverprovisioning) { + this.cpuWithOverprovisioning = cpuWithOverprovisioning; + } + + public void setHypervisorVersion(String hypervisorVersion) { + this.hypervisorVersion = hypervisorVersion; + } + + public void setHaHost(Boolean haHost) { + this.haHost = haHost; + } +} diff --git a/api/src/org/apache/cloudstack/api/response/HostResponse.java b/api/src/org/apache/cloudstack/api/response/HostResponse.java index f5aa8f90a17..be1a4b443be 100644 --- a/api/src/org/apache/cloudstack/api/response/HostResponse.java +++ b/api/src/org/apache/cloudstack/api/response/HostResponse.java @@ -59,7 +59,10 @@ public class HostResponse extends BaseResponse { @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the host") private String zoneName; - + + @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") + private String zoneType; + @SerializedName(ApiConstants.POD_ID) @Param(description="the Pod ID of the host") private String podId; @@ -209,6 +212,10 @@ public class HostResponse extends BaseResponse { this.zoneName = zoneName; } + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public void setPodId(String podId) { this.podId = podId; } @@ -330,7 +337,6 @@ public class HostResponse extends BaseResponse { this.hasEnoughCapacity = hasEnoughCapacity; } - public void setSuitableForMigration(Boolean suitableForMigration) { this.suitableForMigration = suitableForMigration; } diff --git a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java index cd32dede3c8..3f366e2e576 100644 --- a/api/src/org/apache/cloudstack/api/response/NetworkResponse.java +++ b/api/src/org/apache/cloudstack/api/response/NetworkResponse.java @@ -66,6 +66,9 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone the network belongs to") private String zoneName; + + @SerializedName(ApiConstants.ZONE_TYPE) @Param(description="the networktype of the zone the network belongs to") + private String zoneType; @SerializedName("networkofferingid") @Param(description="network offering id the network is created from") private String networkOfferingId; @@ -291,6 +294,10 @@ public class NetworkResponse extends BaseResponse implements ControlledEntityRes this.zoneName = zoneName; } + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public void setCidr(String cidr) { this.cidr = cidr; } diff --git a/api/src/org/apache/cloudstack/api/response/PodResponse.java b/api/src/org/apache/cloudstack/api/response/PodResponse.java index f31c289217e..471cac1aa47 100644 --- a/api/src/org/apache/cloudstack/api/response/PodResponse.java +++ b/api/src/org/apache/cloudstack/api/response/PodResponse.java @@ -36,10 +36,13 @@ public class PodResponse extends BaseResponse { @SerializedName("zoneid") @Param(description="the Zone ID of the Pod") private String zoneId; - + @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the Pod") private String zoneName; + @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") + private String zoneType; + @SerializedName("gateway") @Param(description="the gateway of the Pod") private String gateway; @@ -86,6 +89,10 @@ public class PodResponse extends BaseResponse { return zoneName; } + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public void setZoneName(String zoneName) { this.zoneName = zoneName; } diff --git a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java index 5b77fb2f360..7484ac965fd 100644 --- a/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SnapshotResponse.java @@ -93,6 +93,14 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe @Param(description = "the state of the snapshot. BackedUp means that snapshot is ready to be used; Creating - the snapshot is being allocated on the primary storage; BackingUp - the snapshot is being backed up on secondary storage") private Snapshot.State state; + @SerializedName(ApiConstants.ZONE_NAME) + @Param(description = "name of the availability zone") + private String zoneName; + + @SerializedName(ApiConstants.ZONE_TYPE) + @Param(description = "network type of the availability zone") + private String zoneType; + @SerializedName(ApiConstants.TAGS) @Param(description="the list of resource tags associated with snapshot", responseObject = ResourceTagResponse.class) private List tags; @@ -173,6 +181,14 @@ public class SnapshotResponse extends BaseResponse implements ControlledEntityRe this.projectName = projectName; } + public void setZoneName(String zoneName) { + this.zoneName = zoneName; + } + + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public void setTags(List tags) { this.tags = tags; } diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolForMigrationResponse.java b/api/src/org/apache/cloudstack/api/response/StoragePoolForMigrationResponse.java new file mode 100644 index 00000000000..f0bbcb19136 --- /dev/null +++ b/api/src/org/apache/cloudstack/api/response/StoragePoolForMigrationResponse.java @@ -0,0 +1,248 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.response; + +import java.util.Date; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; + +import com.cloud.serializer.Param; +import com.cloud.storage.StoragePool; +import com.cloud.storage.StoragePoolStatus; +import com.google.gson.annotations.SerializedName; + +@EntityReference(value=StoragePool.class) +public class StoragePoolForMigrationResponse extends BaseResponse { + @SerializedName("id") @Param(description="the ID of the storage pool") + private String id; + + @SerializedName("zoneid") @Param(description="the Zone ID of the storage pool") + private String zoneId; + + @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the storage pool") + private String zoneName; + + @SerializedName("podid") @Param(description="the Pod ID of the storage pool") + private String podId; + + @SerializedName("podname") @Param(description="the Pod name of the storage pool") + private String podName; + + @SerializedName("name") @Param(description="the name of the storage pool") + private String name; + + @SerializedName("ipaddress") @Param(description="the IP address of the storage pool") + private String ipAddress; + + @SerializedName("path") @Param(description="the storage pool path") + private String path; + + @SerializedName("created") @Param(description="the date and time the storage pool was created") + private Date created; + + @SerializedName("type") @Param(description="the storage pool type") + private String type; + + @SerializedName("clusterid") @Param(description="the ID of the cluster for the storage pool") + private String clusterId; + + @SerializedName("clustername") @Param(description="the name of the cluster for the storage pool") + private String clusterName; + + @SerializedName("disksizetotal") @Param(description="the total disk size of the storage pool") + private Long diskSizeTotal; + + @SerializedName("disksizeallocated") @Param(description="the host's currently allocated disk size") + private Long diskSizeAllocated; + + @SerializedName("disksizeused") @Param(description="the host's currently used disk size") + private Long diskSizeUsed; + + @SerializedName("tags") @Param(description="the tags for the storage pool") + private String tags; + + @SerializedName(ApiConstants.STATE) @Param(description="the state of the storage pool") + private StoragePoolStatus state; + + @SerializedName(ApiConstants.SCOPE) @Param(description="the scope of the storage pool") + private String scope; + + @SerializedName("suitableformigration") @Param(description="true if this pool is suitable to migrate a volume," + + " false otherwise") + private Boolean suitableForMigration; + + /** + * @return the scope + */ + public String getScope() { + return scope; + } + + /** + * @param scope the scope to set + */ + public void setScope(String scope) { + this.scope = scope; + } + + @Override + public String getObjectId() { + return this.getId(); + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getZoneId() { + return zoneId; + } + + public void setZoneId(String zoneId) { + this.zoneId = zoneId; + } + + public String getZoneName() { + return zoneName; + } + + public void setZoneName(String zoneName) { + this.zoneName = zoneName; + } + + public String getPodId() { + return podId; + } + + public void setPodId(String podId) { + this.podId = podId; + } + + public String getPodName() { + return podName; + } + + public void setPodName(String podName) { + this.podName = podName; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getIpAddress() { + return ipAddress; + } + + public void setIpAddress(String ipAddress) { + this.ipAddress = ipAddress; + } + + public String getPath() { + return path; + } + + public void setPath(String path) { + this.path = path; + } + + public Date getCreated() { + return created; + } + + public void setCreated(Date created) { + this.created = created; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + public String getClusterId() { + return clusterId; + } + + public void setClusterId(String clusterId) { + this.clusterId = clusterId; + } + + public String getClusterName() { + return clusterName; + } + + public void setClusterName(String clusterName) { + this.clusterName = clusterName; + } + + public Long getDiskSizeTotal() { + return diskSizeTotal; + } + + public void setDiskSizeTotal(Long diskSizeTotal) { + this.diskSizeTotal = diskSizeTotal; + } + + public Long getDiskSizeAllocated() { + return diskSizeAllocated; + } + + public void setDiskSizeAllocated(Long diskSizeAllocated) { + this.diskSizeAllocated = diskSizeAllocated; + } + + public Long getDiskSizeUsed() { + return diskSizeUsed; + } + + public void setDiskSizeUsed(Long diskSizeUsed) { + this.diskSizeUsed = diskSizeUsed; + } + + public String getTags() { + return tags; + } + + public void setTags(String tags) { + this.tags = tags; + } + + public StoragePoolStatus getState() { + return state; + } + + public void setState(StoragePoolStatus state) { + this.state = state; + } + + public void setSuitableForMigration(Boolean suitableForMigration) { + this.suitableForMigration = suitableForMigration; + } +} diff --git a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java index 66dde3655f0..4411ddcb112 100644 --- a/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java +++ b/api/src/org/apache/cloudstack/api/response/StoragePoolResponse.java @@ -38,12 +38,15 @@ public class StoragePoolResponse extends BaseResponse { @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name of the storage pool") private String zoneName; + @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") + private String zoneType; + @SerializedName("podid") @Param(description="the Pod ID of the storage pool") private String podId; @SerializedName("podname") @Param(description="the Pod name of the storage pool") - private String podName; - + private String podName; + @SerializedName("name") @Param(description="the name of the storage pool") private String name; @@ -79,8 +82,23 @@ public class StoragePoolResponse extends BaseResponse { @SerializedName(ApiConstants.STATE) @Param(description="the state of the storage pool") private StoragePoolStatus state; + + @SerializedName(ApiConstants.SCOPE) @Param(description="the scope of the storage pool") + private String scope; + /** + * @return the scope + */ + public String getScope() { + return scope; + } + /** + * @param scope the scope to set + */ + public void setScope(String scope) { + this.scope = scope; + } @Override public String getObjectId() { @@ -111,6 +129,14 @@ public class StoragePoolResponse extends BaseResponse { this.zoneName = zoneName; } + public String getZoneType() { + return zoneType; + } + + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public String getPodId() { return podId; } @@ -222,5 +248,4 @@ public class StoragePoolResponse extends BaseResponse { public void setState(StoragePoolStatus state) { this.state = state; } - } diff --git a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java index 8d2798a9d04..3439dc025e3 100644 --- a/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/SystemVmResponse.java @@ -46,6 +46,9 @@ public class SystemVmResponse extends BaseResponse { @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the Zone name for the system VM") private String zoneName; + @SerializedName(ApiConstants.ZONE_TYPE) @Param(description = "network type of the availability zone") + private String zoneType; + @SerializedName("dns1") @Param(description="the first DNS for the system VM") private String dns1; @@ -150,7 +153,15 @@ public class SystemVmResponse extends BaseResponse { public void setZoneName(String zoneName) { this.zoneName = zoneName; } + + public String getZoneType() { + return zoneType; + } + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public String getDns1() { return dns1; } diff --git a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java index ed933ff18c3..896154aa9e9 100644 --- a/api/src/org/apache/cloudstack/api/response/TemplateResponse.java +++ b/api/src/org/apache/cloudstack/api/response/TemplateResponse.java @@ -87,6 +87,9 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the zone for this template") private String zoneName; + + @SerializedName(ApiConstants.ZONE_TYPE) @Param(description="the networktype of the zone for this template") + private String zoneType; @SerializedName(ApiConstants.STATUS) @Param(description="the status of the template") private String status; @@ -156,6 +159,10 @@ public class TemplateResponse extends BaseResponse implements ControlledEntityRe this.zoneName = zoneName; } + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public void setAccountId(String accountId) { this.accountId = accountId; } diff --git a/api/src/org/apache/cloudstack/api/response/UserResponse.java b/api/src/org/apache/cloudstack/api/response/UserResponse.java index 9cd25cb7ad6..e70a310bf06 100644 --- a/api/src/org/apache/cloudstack/api/response/UserResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UserResponse.java @@ -18,6 +18,7 @@ package org.apache.cloudstack.api.response; import java.util.Date; +import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -74,6 +75,9 @@ public class UserResponse extends BaseResponse { @SerializedName("iscallerchilddomain") @Param(description="the boolean value representing if the updating target is in caller's child domain") private boolean isCallerChildDomain; + + @SerializedName(ApiConstants.IS_DEFAULT) @Param(description="true if user is default, false otherwise", since="4.2.0") + private Boolean isDefault; @Override public String getObjectId() { @@ -206,4 +210,8 @@ public class UserResponse extends BaseResponse { public void setIsCallerChildDomain(boolean isCallerChildDomain) { this.isCallerChildDomain = isCallerChildDomain; } + + public void setIsDefault(Boolean isDefault) { + this.isDefault = isDefault; + } } diff --git a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java index 71d1b823c6a..da08c94074c 100644 --- a/api/src/org/apache/cloudstack/api/response/UserVmResponse.java +++ b/api/src/org/apache/cloudstack/api/response/UserVmResponse.java @@ -21,6 +21,7 @@ import java.util.HashSet; import java.util.LinkedHashSet; import java.util.Set; +import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseResponse; import org.apache.cloudstack.api.EntityReference; @@ -79,6 +80,9 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp @SerializedName(ApiConstants.ZONE_NAME) @Param(description="the name of the availability zone for the virtual machine") private String zoneName; + @SerializedName(ApiConstants.ZONE_TYPE) @Param(description="the network type of the availability zone for the virtual machine") + private String zoneType; + @SerializedName(ApiConstants.HOST_ID) @Param(description="the ID of the host for the virtual machine") private String hostId; @@ -169,10 +173,15 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp @SerializedName(ApiConstants.SSH_KEYPAIR) @Param(description="ssh key-pair") private String keyPairName; + @SerializedName("affinitygroup") + @Param(description = "list of affinity groups associated with the virtual machine", responseObject = AffinityGroupResponse.class) + private Set affinityGroupList; + public UserVmResponse(){ securityGroupList = new LinkedHashSet(); nics = new LinkedHashSet(); tags = new LinkedHashSet(); + affinityGroupList = new LinkedHashSet(); } public void setHypervisor(String hypervisor) { @@ -243,6 +252,10 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp this.zoneName = zoneName; } + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public void setHostId(String hostId) { this.hostId = hostId; } @@ -381,4 +394,12 @@ public class UserVmResponse extends BaseResponse implements ControlledEntityResp this.keyPairName = keyPairName; } + public void setAffinityGroupList(Set affinityGroups) { + this.affinityGroupList = affinityGroups; + } + + public void addAffinityGroup(AffinityGroupResponse affinityGroup) { + this.affinityGroupList.add(affinityGroup); + } + } diff --git a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java index d5054f0bc26..b928fcd90d0 100644 --- a/api/src/org/apache/cloudstack/api/response/VolumeResponse.java +++ b/api/src/org/apache/cloudstack/api/response/VolumeResponse.java @@ -47,6 +47,10 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity @SerializedName(ApiConstants.ZONE_NAME) @Param(description = "name of the availability zone") private String zoneName; + + @SerializedName(ApiConstants.ZONE_TYPE) + @Param(description = "network type of the availability zone") + private String zoneType; @SerializedName(ApiConstants.TYPE) @Param(description = "type of the disk volume (ROOT or DATADISK)") @@ -198,6 +202,10 @@ public class VolumeResponse extends BaseResponse implements ControlledViewEntity this.zoneName = zoneName; } + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public void setVolumeType(String volumeType) { this.volumeType = volumeType; } diff --git a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java index aeed81d2011..29ce2e3971d 100644 --- a/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java +++ b/api/src/org/apache/cloudstack/network/ExternalNetworkDeviceManager.java @@ -43,6 +43,7 @@ public interface ExternalNetworkDeviceManager extends Manager { public static final NetworkDevice F5BigIpLoadBalancer = new NetworkDevice("F5BigIpLoadBalancer", Network.Provider.F5BigIp.getName()); public static final NetworkDevice JuniperSRXFirewall = new NetworkDevice("JuniperSRXFirewall", Network.Provider.JuniperSRX.getName()); public static final NetworkDevice NiciraNvp = new NetworkDevice("NiciraNvp", Network.Provider.NiciraNvp.getName()); + public static final NetworkDevice CiscoVnmc = new NetworkDevice("CiscoVnmc", Network.Provider.CiscoVnmc.getName()); public NetworkDevice(String deviceName, String ntwkServiceprovider) { _name = deviceName; diff --git a/api/src/org/apache/cloudstack/query/QueryService.java b/api/src/org/apache/cloudstack/query/QueryService.java index c3f86aabb7f..443c5df65b5 100644 --- a/api/src/org/apache/cloudstack/query/QueryService.java +++ b/api/src/org/apache/cloudstack/query/QueryService.java @@ -16,6 +16,7 @@ // under the License. package org.apache.cloudstack.query; +import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.command.admin.host.ListHostsCmd; import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd; import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd; @@ -97,4 +98,7 @@ public interface QueryService { public ListResponse searchForServiceOfferings(ListServiceOfferingsCmd cmd); public ListResponse listDataCenters(ListZonesByCmd cmd); + + public ListResponse listAffinityGroups(Long affinityGroupId, String affinityGroupName, + String affinityGroupType, Long vmId, Long startIndex, Long pageSize); } diff --git a/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java b/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java index 106589d10cc..e5015cb3cac 100644 --- a/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java +++ b/api/test/org/apache/cloudstack/api/command/test/AddIpToVmNicTest.java @@ -16,6 +16,7 @@ // under the License. package org.apache.cloudstack.api.command.test; +import com.cloud.vm.NicSecondaryIp; import junit.framework.Assert; import junit.framework.TestCase; @@ -64,15 +65,16 @@ public class AddIpToVmNicTest extends TestCase { NetworkService networkService = Mockito.mock(NetworkService.class); AddIpToVmNicCmd ipTonicCmd = Mockito.mock(AddIpToVmNicCmd.class); + NicSecondaryIp secIp = Mockito.mock(NicSecondaryIp.class); Mockito.when( - networkService.allocateSecondaryGuestIP(Mockito.any(Account.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString())).thenReturn("10.1.1.2"); + networkService.allocateSecondaryGuestIP(Mockito.any(Account.class), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyLong(), Mockito.anyString())).thenReturn(secIp); ipTonicCmd._networkService = networkService; responseGenerator = Mockito.mock(ResponseGenerator.class); NicSecondaryIpResponse ipres = Mockito.mock(NicSecondaryIpResponse.class); - Mockito.when(responseGenerator.createSecondaryIPToNicResponse(Mockito.anyString(), Mockito.anyLong(), Mockito.anyLong())).thenReturn(ipres); + Mockito.when(responseGenerator.createSecondaryIPToNicResponse(secIp)).thenReturn(ipres); ipTonicCmd._responseGenerator = responseGenerator; ipTonicCmd.execute(); diff --git a/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java new file mode 100644 index 00000000000..7c05eaf5a8d --- /dev/null +++ b/api/test/org/apache/cloudstack/api/command/test/ListCfgCmdTest.java @@ -0,0 +1,89 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.test; + +import com.cloud.configuration.Configuration; +import com.cloud.configuration.ConfigurationService; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.resource.ResourceService; +import com.cloud.server.ManagementService; +import com.cloud.utils.Pair; +import junit.framework.Assert; +import junit.framework.TestCase; +import org.apache.cloudstack.api.ResponseGenerator; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd; +import org.apache.cloudstack.api.response.ConfigurationResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.mockito.Mockito; + +import java.util.ArrayList; +import java.util.List; + +public class ListCfgCmdTest extends TestCase{ + + private ListCfgsByCmd listCfgsByCmd; + private ManagementService mgr; + private ResponseGenerator responseGenerator; + + @Rule + public ExpectedException expectedException = ExpectedException.none(); + + @Before + public void setUp() { + responseGenerator = Mockito.mock(ResponseGenerator.class); + mgr = Mockito.mock(ManagementService.class); + listCfgsByCmd = new ListCfgsByCmd(); + } + + @Test + public void testCreateSuccess() { + + Configuration cfg = Mockito.mock(Configuration.class); + listCfgsByCmd._mgr = mgr; + listCfgsByCmd._responseGenerator = responseGenerator; + + + + List configList = new ArrayList(); + configList.add(cfg); + + Pair, Integer> result = new Pair, Integer>(configList, 1); + + try { + Mockito.when( + mgr.searchForConfigurations(listCfgsByCmd)) + .thenReturn(result); + }catch (Exception e){ + Assert.fail("Received exception when success expected " + e.getMessage()); + } + ConfigurationResponse cfgResponse = new ConfigurationResponse(); + cfgResponse.setName("Test case"); + Mockito.when(responseGenerator.createConfigurationResponse(cfg)).thenReturn(cfgResponse); + + listCfgsByCmd.execute(); + Mockito.verify(responseGenerator).createConfigurationResponse(cfg); + + ListResponse actualResponse = (ListResponse) listCfgsByCmd.getResponseObject(); + Assert.assertEquals(cfgResponse, actualResponse.getResponses().get(0)); + } + +} diff --git a/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java new file mode 100644 index 00000000000..27000cf1770 --- /dev/null +++ b/api/test/org/apache/cloudstack/api/command/test/UpdateCfgCmdTest.java @@ -0,0 +1,116 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.api.command.test; + +import com.cloud.configuration.Configuration; +import com.cloud.configuration.ConfigurationService; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.resource.ResourceService; +import junit.framework.Assert; +import junit.framework.TestCase; +import org.apache.cloudstack.api.ResponseGenerator; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd; +import org.apache.cloudstack.api.response.ConfigurationResponse; +import org.junit.Before; +import org.junit.Rule; +import org.junit.Test; +import org.junit.rules.ExpectedException; +import org.mockito.Mockito; + +public class UpdateCfgCmdTest extends TestCase{ + + private UpdateCfgCmd updateCfgCmd; + private ConfigurationService configService; + private ResponseGenerator responseGenerator; + + @Rule + public ExpectedException expectedException = ExpectedException.none(); + + @Before + public void setUp() { + responseGenerator = Mockito.mock(ResponseGenerator.class); + configService = Mockito.mock(ConfigurationService.class); + updateCfgCmd = new UpdateCfgCmd(); + } + + @Test + public void testExecuteForEmptyResult() { + updateCfgCmd._configService = configService; + + try { + updateCfgCmd.execute(); + } catch (ServerApiException exception) { + Assert.assertEquals("Failed to update config", + exception.getDescription()); + } + + } + + @Test + public void testExecuteForNullResult() { + + updateCfgCmd._configService = configService; + + try { + Mockito.when( + configService.updateConfiguration(updateCfgCmd)) + .thenReturn(null); + } catch (InvalidParameterValueException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } catch (IllegalArgumentException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + try { + updateCfgCmd.execute(); + } catch (ServerApiException exception) { + Assert.assertEquals("Failed to update config", + exception.getDescription()); + } + + } + + + @Test + public void testCreateSuccess() { + + Configuration cfg = Mockito.mock(Configuration.class); + updateCfgCmd._configService = configService; + updateCfgCmd._responseGenerator = responseGenerator; + + try { + Mockito.when( + configService.updateConfiguration(updateCfgCmd)) + .thenReturn(cfg); + }catch (Exception e){ + Assert.fail("Received exception when success expected " + e.getMessage()); + } + + ConfigurationResponse response = new ConfigurationResponse(); + response.setName("Test case"); + Mockito.when(responseGenerator.createConfigurationResponse(cfg)).thenReturn(response); + + updateCfgCmd.execute(); + Mockito.verify(responseGenerator).createConfigurationResponse(cfg); + ConfigurationResponse actualResponse = (ConfigurationResponse) updateCfgCmd.getResponseObject(); + Assert.assertEquals(response, actualResponse); + Assert.assertEquals("updateconfigurationresponse", response.getResponseName()); + } + +} diff --git a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java index 29a002cebaf..630e16fb5f3 100644 --- a/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java +++ b/awsapi/src/com/cloud/bridge/service/EC2RestServlet.java @@ -209,7 +209,7 @@ public class EC2RestServlet extends HttpServlet { if (installedPath == null) installedPath = System.getProperty("catalina.home"); String webappPath = config.getServletContext().getRealPath("/"); //pathToKeystore = new String( installedPath + File.separator + "webapps" + File.separator + webappName + File.separator + "WEB-INF" + File.separator + "classes" + File.separator + keystore ); - pathToKeystore = new String( webappPath + File.separator + "\\WEB-INF" + File.separator + "classes" + File.separator + keystore ); + pathToKeystore = new String( webappPath + File.separator + "WEB-INF" + File.separator + "classes" + File.separator + keystore ); } } diff --git a/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java index e1ccd4c4d1f..7beb012d4b7 100644 --- a/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java +++ b/awsapi/src/com/cloud/bridge/service/core/s3/S3Engine.java @@ -1126,7 +1126,7 @@ public class S3Engine { SBucketVO sbucket = bucketDao.getByName( bucketName ); if (sbucket == null) { response.setResultCode(404); - response.setResultDescription("Bucket dosen't existsBucket " + bucketName + " does not exist"); + response.setResultDescription("Bucket doesn't existsBucket " + bucketName + " does not exist"); return response; } diff --git a/build/replace.properties b/build/replace.properties index c9a93c2831c..265f3358724 100644 --- a/build/replace.properties +++ b/build/replace.properties @@ -27,3 +27,4 @@ MSMNTDIR=/mnt COMPONENTS-SPEC=components.xml AWSAPILOG=awsapi.log REMOTEHOST=localhost +COMMONLIBDIR=C:\Users\htrippaers\eclipse_workspace\cloudstack\client\target\cloud-client-ui-4.2.0-SNAPSHOT\WEB-INF\classes diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index d62cbaeb99b..ad8f42b0e78 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -14,905 +14,151 @@ # KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. - - -#new labels (begin) ********************************************************************************************** -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:

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.

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.


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.

You may also drag and drop 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.

The host is the smallest organizational unit within a CloudStack™ 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:
  • Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications
  • ISO images - OS images that can be bootable or non-bootable
  • Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates
-message.installWizard.copy.whatIsPrimaryStorage=A CloudStack™ 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.

Primary storage 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™ deployment. Clusters are contained within pods, and pods are contained within zones.

CloudStack™ 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.

A pod is the second-largest organizational unit within a CloudStack™ 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™ 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™ is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack™ manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack™ to deploy, manage, and configure cloud computing environments.

Extending beyond individual virtual machine images running on commodity hardware, CloudStack™ 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’s add secondary storage -label.installWizard.addPrimaryStorageIntro.subtitle=What is primary storage? -label.installWizard.addPrimaryStorageIntro.title=Let’s add primary storage -label.installWizard.addHostIntro.subtitle=What is a host? -label.installWizard.addHostIntro.title=Let’s add a host -label.installWizard.addClusterIntro.subtitle=What is a cluster? -label.installWizard.addClusterIntro.title=Let’s add a cluster -label.installWizard.addPodIntro.subtitle=What is a pod? -label.installWizard.addPodIntro.title=Let’s add a pod -label.installWizard.addZone.title=Add zone -label.installWizard.addZoneIntro.subtitle=What is a zone? -label.installWizard.addZoneIntro.title=Let’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™ -label.what.is.cloudstack=What is CloudStack™? -label.hints=Hints -label.installWizard.subtitle=This tour will aid you in setting up your CloudStack™ installation -label.continue=Continue -label.installWizard.title=Hello and Welcome to CloudStack™ -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 +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 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.
Please create a new one from the projects section. -message.no.projects.adminOnly=You do not have any projects.
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 +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.

Drag and drop one or more traffic types 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.

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.

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.

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.account.specific=Account-Specific 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.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 label.action.edit.global.setting=Edit Global Setting +label.action.edit.host=Edit Host label.action.edit.instance=Edit Instance +label.action.edit.ISO=Edit ISO +label.action.edit.network=Edit Network label.action.edit.network.offering=Edit Network Offering +label.action.edit.network.processing=Editing Network.... label.action.edit.pod=Edit Pod label.action.edit.primary.storage=Edit Primary Storage label.action.edit.resource.limits=Edit Resource Limits @@ -920,22 +166,37 @@ label.action.edit.service.offering=Edit Service Offering label.action.edit.template=Edit Template label.action.edit.user=Edit User label.action.edit.zone=Edit Zone -label.action.enable.account.processing=Enabling account.... label.action.enable.account=Enable account -label.action.enable.maintenance.mode.processing=Enabling Maintenance Mode.... +label.action.enable.account.processing=Enabling account.... +label.action.enable.cluster=Enable Cluster +label.action.enable.cluster.processing=Enabling Cluster.... label.action.enable.maintenance.mode=Enable Maintenance Mode -label.action.enable.static.NAT.processing=Enabling Static NAT.... +label.action.enable.maintenance.mode.processing=Enabling Maintenance Mode.... +label.action.enable.nexusVswitch=Enable Nexus 1000v +label.action.enable.physical.network=Enable physical network +label.action.enable.pod=Enable Pod +label.action.enable.pod.processing=Enabling Pod.... label.action.enable.static.NAT=Enable Static NAT -label.action.enable.user.processing=Enabling User.... +label.action.enable.static.NAT.processing=Enabling Static NAT.... label.action.enable.user=Enable User -label.action.force.reconnect.processing=Reconnecting.... +label.action.enable.user.processing=Enabling User.... +label.action.enable.zone=Enable Zone +label.action.enable.zone.processing=Enabling Zone.... label.action.force.reconnect=Force Reconnect -label.action.generate.keys.processing=Generate Keys.... +label.action.force.reconnect.processing=Reconnecting.... label.action.generate.keys=Generate Keys -label.action.lock.account.processing=Locking account.... +label.action.generate.keys.processing=Generate Keys.... +label.action.list.nexusVswitch=List Nexus 1000v label.action.lock.account=Lock account +label.action.lock.account.processing=Locking account.... +label.action.manage.cluster=Manage Cluster +label.action.manage.cluster.processing=Managing Cluster.... label.action.migrate.instance=Migrate Instance label.action.migrate.instance.processing=Migrating Instance.... +label.action.migrate.router=Migrate Router +label.action.migrate.router.processing=Migrating Router.... +label.action.migrate.systemvm=Migrate System VM +label.action.migrate.systemvm.processing=Migrating System VM.... label.action.reboot.instance.processing=Rebooting Instance.... label.action.reboot.instance=Reboot Instance label.action.reboot.router.processing=Rebooting Router.... @@ -943,15 +204,20 @@ label.action.reboot.router=Reboot Router label.action.reboot.systemvm.processing=Rebooting System VM.... label.action.reboot.systemvm=Reboot System VM label.action.recurring.snapshot=Recurring Snapshots +label.action.register.iso=Register ISO +label.action.register.template=Register template label.action.release.ip.processing=Releasing IP.... label.action.release.ip=Release IP label.action.remove.host.processing=Removing Host.... label.action.remove.host=Remove Host label.action.reset.password.processing=Resetting Password.... label.action.reset.password=Reset Password +label.action.resize.volume.processing=Resizing Volume.... +label.action.resize.volume=Resize Volume label.action.resource.limits=Resource limits label.action.restore.instance.processing=Restoring Instance.... label.action.restore.instance=Restore Instance +label.actions=Actions label.action.start.instance.processing=Starting Instance.... label.action.start.instance=Start Instance label.action.start.router.processing=Starting Router.... @@ -966,65 +232,124 @@ label.action.stop.systemvm.processing=Stopping System VM.... label.action.stop.systemvm=Stop System VM label.action.take.snapshot.processing=Taking Snapshot.... label.action.take.snapshot=Take Snapshot +label.action.unmanage.cluster.processing=Unmanaging Cluster.... +label.action.unmanage.cluster=Unmanage Cluster label.action.update.OS.preference.processing=Updating OS Preference.... label.action.update.OS.preference=Update OS Preference -label.actions=Actions +label.action.update.resource.count.processing=Updating Resource Count.... +label.action.update.resource.count=Update Resource Count +label.action.vmsnapshot.create=Take VM Snapshot +label.action.vmsnapshot.delete=Delete VM snapshot +label.action.vmsnapshot.revert=Revert to VM snapshot +label.activate.project=Activate Project label.active.sessions=Active Sessions label.add.account=Add Account +label.add.accounts=Add accounts +label.add.accounts.to=Add accounts to +label.add.account.to.project=Add account to project +label.add.ACL=Add ACL +label.add=Add +label.add.BigSwitchVns.device=Add BigSwitch Vns Controller +label.add.by=Add by label.add.by.cidr=Add By CIDR label.add.by.group=Add By Group label.add.cluster=Add Cluster +label.add.compute.offering=Add compute offering label.add.direct.iprange=Add Direct Ip Range label.add.disk.offering=Add Disk Offering label.add.domain=Add Domain +label.add.egress.rule=Add egress rule +label.add.F5.device=Add F5 device label.add.firewall=Add firewall rule +label.add.guest.network=Add guest network label.add.host=Add Host -label.add.ingress.rule=Add Ingress Rule -label.add.ip.range=Add IP Range -label.add.load.balancer=Add Load Balancer -label.add.more=Add More -label.add.network=Add Network -label.add.pod=Add Pod -label.add.primary.storage=Add Primary Storage -label.add.secondary.storage=Add Secondary Storage -label.add.security.group=Add Security Group -label.add.service.offering=Add Service Offering -label.add.template=Add Template -label.add.user=Add User -label.add.vlan=Add VLAN -label.add.volume=Add Volume -label.add.zone=Add Zone -label.add=Add +label.adding=Adding label.adding.cluster=Adding Cluster label.adding.failed=Adding Failed label.adding.pod=Adding Pod label.adding.processing=Adding.... +label.add.ingress.rule=Add Ingress Rule label.adding.succeeded=Adding Succeeded label.adding.user=Adding User label.adding.zone=Adding Zone -label.adding=Adding +label.add.ip.range=Add IP Range label.additional.networks=Additional Networks +label.add.load.balancer=Add Load Balancer +label.add.more=Add More +label.add.netScaler.device=Add Netscaler device +label.add.network.ACL=Add network ACL +label.add.network=Add Network +label.add.network.device=Add Network Device +label.add.network.offering=Add network offering +label.add.new.F5=Add new F5 +label.add.new.gateway=Add new gateway +label.add.new.NetScaler=Add new NetScaler +label.add.new.SRX=Add new SRX +label.add.new.tier=Add new tier +label.add.NiciraNvp.device=Add Nvp Controller +label.add.physical.network=Add physical network +label.add.pod=Add Pod +label.add.port.forwarding.rule=Add port forwarding rule +label.add.primary.storage=Add Primary Storage +label.add.region=Add Region +label.add.resources=Add Resources +label.add.route=Add route +label.add.rule=Add rule +label.add.secondary.storage=Add Secondary Storage +label.add.security.group=Add Security Group +label.add.service.offering=Add Service Offering +label.add.SRX.device=Add SRX device +label.add.static.nat.rule=Add static NAT rule +label.add.static.route=Add static route +label.add.system.service.offering=Add System Service Offering +label.add.template=Add Template +label.add.to.group=Add to group +label.add.user=Add User +label.add.vlan=Add VLAN +label.add.vm=Add VM +label.add.vms=Add VMs +label.add.vms.to.lb=Add VM(s) to load balancer rule +label.add.VM.to.tier=Add VM to tier +label.add.volume=Add Volume +label.add.vpc=Add VPC +label.add.vpn.customer.gateway=Add VPN Customer Gateway +label.add.VPN.gateway=Add VPN Gateway +label.add.vpn.user=Add VPN user +label.add.zone=Add Zone label.admin.accounts=Admin Accounts label.admin=Admin +label.advanced=Advanced label.advanced.mode=Advanced Mode label.advanced.search=Advance Search -label.advanced=Advanced +label.agent.password=Agent Password +label.agent.username=Agent Username +label.agree=Agree label.alert=Alert label.algorithm=Algorithm label.allocated=Allocated +label.allocation.state=Allocation State label.api.key=API Key -label.assign.to.load.balancer=Assigning instance to load balancer +label.apply=Apply label.assign=Assign +label.assign.to.load.balancer=Assigning instance to load balancer +label.associated.network=Associated Network label.associated.network.id=Associated Network ID label.attached.iso=Attached ISO -label.availability.zone=Availability Zone +label.author.email=Author e-mail +label.author.name=Author name label.availability=Availability -label.available.public.ips=Available Public IP Addresses +label.availability.zone=Availability Zone label.available=Available +label.available.public.ips=Available Public IP Addresses label.back=Back +label.bandwidth=Bandwidth +label.basic=Basic label.basic.mode=Basic Mode +label.bigswitch.controller.address=BigSwitch Vns Controller Address label.bootable=Bootable +label.broadcast.domain.range=Broadcast domain range label.broadcast.domain.type=Broadcast Domain Type +label.broadcast.uri=Broadcast URI label.by.account=By Account label.by.availability=By Availability label.by.domain=By Domain @@ -1034,30 +359,64 @@ label.by.pod=By Pod label.by.role=By Role label.by.start.date=By Start Date label.by.state=By State -label.by.traffic.type=By Traffic Type -label.by.type.id=By Type ID -label.by.type=By Type -label.by.zone=By Zone label.bytes.received=Bytes Received label.bytes.sent=Bytes Sent +label.by.traffic.type=By Traffic Type +label.by.type=By Type +label.by.type.id=By Type ID +label.by.zone=By Zone label.cancel=Cancel +label.capacity=Capacity label.certificate=Certificate -label.privatekey=PKCS#8 Private Key -label.domain.suffix=DNS Domain Suffix (i.e., xyz.com) +label.change.service.offering=Change service offering +label.change.value=Change value label.character=Character +label.checksum=MD5 checksum label.cidr.account=CIDR or Account/Security Group +label.cidr=CIDR +label.CIDR.list=CIDR list +label.cidr.list=Source CIDR +label.CIDR.of.destination.network=CIDR of destination network +label.clean.up=Clean up +label.clear.list=Clear list label.close=Close label.cloud.console=Cloud Management Console label.cloud.managed=Cloud.com Managed -label.cluster.type=Cluster Type label.cluster=Cluster +label.cluster.name=Cluster Name +label.clusters=Clusters +label.cluster.type=Cluster Type +label.clvm=CLVM label.code=Code +label.community=Community +label.compute.and.storage=Compute and Storage +label.compute=Compute +label.compute.offering=Compute offering +label.compute.offerings=Compute offerings +label.configuration=Configuration +label.configure=Configure +label.configure.network.ACLs=Configure Network ACLs +label.configure.vpc=Configure VPC label.confirmation=Confirmation -label.cpu.allocated.for.VMs=CPU Allocated for VMs +label.confirm.password=Confirm password +label.congratulations=Congratulations! +label.conserve.mode=Conserve mode +label.console.proxy=Console proxy +label.continue.basic.install=Continue with basic installation +label.continue=Continue +label.corrections.saved=Corrections saved label.cpu.allocated=CPU Allocated -label.cpu.utilized=CPU Utilized +label.cpu.allocated.for.VMs=CPU Allocated for VMs +label.CPU.cap=CPU Cap label.cpu=CPU +label.cpu.limits=CPU limits +label.cpu.mhz=CPU (in MHz) +label.cpu.utilized=CPU Utilized +label.created.by.system=Created by system label.created=Created +label.create.project=Create project +label.create.template=Create template +label.create.VPN.connection=Create VPN Connection label.cross.zones=Cross Zones label.custom.disk.size=Custom Disk Size label.daily=Daily @@ -1065,47 +424,111 @@ label.data.disk.offering=Data Disk Offering label.date=Date label.day.of.month=Day of Month label.day.of.week=Day of Week +label.dead.peer.detection=Dead Peer Detection +label.decline.invitation=Decline invitation +label.dedicated=Dedicated +label.default=Default +label.default.use=Default Use +label.default.view=Default View +label.delete.BigSwitchVns=Remove BigSwitch Vns Controller label.delete=Delete +label.delete.F5=Delete F5 +label.delete.gateway=delete gateway +label.delete.NetScaler=Delete NetScaler +label.delete.NiciraNvp=Remove Nvp Controller +label.delete.project=Delete project +label.delete.SRX=Delete SRX +label.delete.VPN.connection=delete VPN connection +label.delete.VPN.customer.gateway=delete VPN Customer Gateway +label.delete.VPN.gateway=delete VPN Gateway +label.delete.vpn.user=Delete VPN user label.deleting.failed=Deleting Failed label.deleting.processing=Deleting.... label.description=Description +label.destination.physical.network.id=Destination physical network ID +label.destination.zone=Destination Zone +label.destroy=Destroy +label.destroy.router=Destroy router label.detaching.disk=Detaching Disk label.details=Details label.device.id=Device ID +label.devices=Devices +label.dhcp=DHCP +label.DHCP.server.type=DHCP Server Type +label.direct.ips=Shared Network IPs label.disabled=Disabled +label.disable.provider=Disable provider +label.disable.vpn=Disable VPN label.disabling.vpn.access=Disabling VPN Access label.disk.allocated=Disk Allocated label.disk.offering=Disk Offering -label.disk.size.gb=Disk Size (in GB) label.disk.size=Disk Size +label.disk.size.gb=Disk Size (in GB) label.disk.total=Disk Total label.disk.volume=Disk Volume +label.display.name=Display name label.display.text=Display Text label.dns.1=DNS 1 label.dns.2=DNS 2 +label.dns=DNS +label.DNS.domain.for.guest.networks=DNS domain for Guest Networks label.domain.admin=Domain Admin +label.domain=Domain label.domain.id=Domain ID label.domain.name=Domain Name -label.domain=Domain +label.domain.router=Domain router +label.domain.suffix=DNS Domain Suffix (i.e., xyz.com) +label.done=Done label.double.quotes.are.not.allowed=Double quotes are not allowed label.download.progress=Download Progress +label.drag.new.position=Drag to new position label.edit=Edit +label.edit.lb.rule=Edit LB rule +label.edit.network.details=Edit network details +label.edit.project.details=Edit project details +label.edit.tags=Edit tags +label.edit.traffic.type=Edit traffic type +label.edit.vpc=Edit VPC +label.egress.rule=Egress rule +label.egress.rules=Egress rules +label.elastic=Elastic +label.elastic.IP=Elastic IP +label.elastic.LB=Elastic LB label.email=Email +label.enable.provider=Enable provider +label.enable.s3=Enable S3-backed Secondary Storage +label.enable.swift=Enable Swift +label.enable.vpn=Enable VPN label.enabling.vpn.access=Enabling VPN Access label.enabling.vpn=Enabling VPN -label.end.port=End Port +label.end.IP=End IP +label.endpoint=Endpoint label.endpoint.or.operation=Endpoint or Operation +label.end.port=End Port +label.end.reserved.system.IP=End Reserved system IP +label.end.vlan=End Vlan +label.enter.token=Enter token label.error.code=Error Code label.error=Error +label.ESP.encryption=ESP Encryption +label.ESP.hash=ESP Hash +label.ESP.lifetime=ESP Lifetime (second) +label.ESP.lifetime=ESP Lifetime(second) +label.ESP.policy=ESP policy label.esx.host=ESX/ESXi Host label.example=Example +label.external.link=External link +label.f5=F5 label.failed=Failed label.featured=Featured +label.fetch.latest=Fetch latest +label.filterBy=Filter by label.firewall=Firewall label.first.name=First Name label.format=Format label.friday=Friday label.full=Full +label.full.path=Full path label.gateway=Gateway label.general.alerts=General Alerts label.generating.url=Generating URL @@ -1113,75 +536,161 @@ label.go.step.2=Go to Step 2 label.go.step.3=Go to Step 3 label.go.step.4=Go to Step 4 label.go.step.5=Go to Step 5 -label.group.optional=Group (Optional) label.group=Group +label.group.optional=Group (Optional) label.guest.cidr=Guest CIDR +label.guest.end.ip=Guest end IP label.guest.gateway=Guest Gateway -label.guest.ip.range=Guest IP Range +label.guest=Guest label.guest.ip=Guest IP Address +label.guest.ip.range=Guest IP Range label.guest.netmask=Guest Netmask +label.guest.networks=Guest networks +label.guest.start.ip=Guest start IP +label.guest.traffic=Guest Traffic +label.guest.type=Guest Type label.ha.enabled=HA Enabled label.help=Help +label.hide.ingress.rule=Hide Ingress Rule +label.hints=Hints label.host.alerts=Host Alerts -label.host.name=Host Name label.host=Host +label.host.MAC=Host MAC +label.host.name=Host Name label.hosts=Hosts +label.host.tags=Host Tags label.hourly=Hourly -label.hypervisor.type=Hypervisor Type +label.hypervisor.capabilities=Hypervisor capabilities label.hypervisor=Hypervisor +label.hypervisor.type=Hypervisor Type +label.hypervisor.version=Hypervisor version label.id=ID +label.IKE.DH=IKE DH +label.IKE.encryption=IKE Encryption +label.IKE.hash=IKE Hash +label.IKE.lifetime=IKE lifetime (second) +label.IKE.lifetime=IKE Lifetime (second) +label.IKE.policy=IKE policy label.info=Info label.ingress.rule=Ingress Rule label.initiated.by=Initiated By +label.installWizard.addClusterIntro.subtitle=What is a cluster? +label.installWizard.addClusterIntro.title=Let’s add a cluster +label.installWizard.addHostIntro.subtitle=What is a host? +label.installWizard.addHostIntro.title=Let’s add a host +label.installWizard.addPodIntro.subtitle=What is a pod? +label.installWizard.addPodIntro.title=Let’s add a pod +label.installWizard.addPrimaryStorageIntro.subtitle=What is primary storage? +label.installWizard.addPrimaryStorageIntro.title=Let’s add primary storage +label.installWizard.addSecondaryStorageIntro.subtitle=What is secondary storage? +label.installWizard.addSecondaryStorageIntro.title=Let’s add secondary storage +label.installWizard.addZoneIntro.subtitle=What is a zone? +label.installWizard.addZoneIntro.title=Let’s add a zone +label.installWizard.addZone.title=Add zone +label.installWizard.click.launch=Click the launch button. +label.installWizard.subtitle=This tour will aid you in setting up your CloudStack™ installation +label.installWizard.title=Hello and Welcome to CloudStack™ +label.instance=Instance label.instance.limits=Instance Limits label.instance.name=Instance Name -label.instance=Instance label.instances=Instances label.internal.dns.1=Internal DNS 1 label.internal.dns.2=Internal DNS 2 +label.internal.name=Internal name label.interval.type=Interval Type +label.introduction.to.cloudstack=Introduction to CloudStack™ label.invalid.integer=Invalid Integer label.invalid.number=Invalid Number +label.invitations=Invitations +label.invited.accounts=Invited accounts +label.invite=Invite +label.invite.to=Invite to label.ip.address=IP Address +label.ipaddress=IP Address label.ip.allocations=IP Allocations +label.ip=IP label.ip.limits=Public IP Limits label.ip.or.fqdn=IP or FQDN label.ip.range=IP Range -label.ip=IP +label.ip.ranges=IP Ranges +label.IPsec.preshared.key=IPsec Preshared-Key label.ips=IPs -label.is.default=Is Default -label.is.shared=Is Shared -label.is.system=Is System label.iscsi=iSCSI +label.is.default=Is Default label.iso.boot=ISO Boot label.iso=ISO +label.isolated.networks=Isolated networks +label.isolation.method=Isolation method label.isolation.mode=Isolation Mode +label.isolation.uri=Isolation URI +label.is.redundant.router=Redundant +label.is.shared=Is Shared +label.is.system=Is System +label.item.listing=Item listing label.keep=Keep +label.keyboard.type=Keyboard type +label.key=Key +label.kvm.traffic.label=KVM traffic label +label.label=Label +label.lang.brportugese=Brazilian Portugese +label.lang.catalan=Catalan label.lang.chinese=Chinese (Simplified) label.lang.english=English -label.lang.japanese=Japanese -label.lang.spanish=Spanish -label.lang.korean=Korean -label.lang.russian=Russian label.lang.french=French -label.lang.brportugese=Brazilian Portugese +label.lang.german=German +label.lang.italian=Italian +label.lang.japanese=Japanese +label.lang.korean=Korean +label.lang.norwegian=Norwegian +label.lang.russian=Russian +label.lang.spanish=Spanish label.last.disconnected=Last Disconnected label.last.name=Last Name +label.latest.events=Latest events +label.launch=Launch +label.launch.vm=Launch VM +label.launch.zone=Launch zone +label.LB.isolation=LB isolation +label.least.connections=Least connections label.level=Level label.linklocal.ip=Link Local IP Adddress label.load.balancer=Load Balancer +label.load.balancing=Load Balancing +label.load.balancing.policies=Load balancing policies label.loading=Loading label.local=Local +label.local.storage.enabled=Local storage enabled label.local.storage.enabled=Local Storage Enabled +label.local.storage=Local Storage label.login=Login label.logout=Logout label.lun=LUN +label.LUN.number=LUN # +label.make.project.owner=Make account project owner label.manage=Manage +label.management.ips=Management IP Addresses +label.management=Management +label.manage.resources=Manage Resources +label.max.cpus=Max. CPU cores +label.max.guest.limit=Max guest limit label.maximum=Maximum +label.max.memory=Max. memory (MiB) +label.max.networks=Max. networks +label.max.primary.storage=Max. primary (GiB) +label.max.public.ips=Max. public IPs +label.max.secondary.storage=Max. secondary (GiB) +label.max.snapshots=Max. snapshots +label.max.templates=Max. templates +label.max.vms=Max. user VMs +label.max.volumes=Max. volumes +label.max.vpcs=Max. VPCs +label.may.continue=You may now continue. label.memory.allocated=Memory Allocated +label.memory.limits=Memory limits (MiB) +label.memory.mb=Memory (in MB) +label.memory=Memory label.memory.total=Memory Total label.memory.used=Memory Used -label.memory=Memory label.menu.accounts=Accounts label.menu.alerts=Alerts label.menu.all.accounts=All Accounts @@ -1197,6 +706,7 @@ label.menu.events=Events label.menu.featured.isos=Featured ISOs label.menu.featured.templates=Featured Templates label.menu.global.settings=Global Settings +label.menu.infrastructure=Infrastructure label.menu.instances=Instances label.menu.ipaddresses=IP Addresses label.menu.isos=ISOs @@ -1204,65 +714,112 @@ label.menu.my.accounts=My Accounts label.menu.my.instances=My Instances label.menu.my.isos=My ISOs label.menu.my.templates=My Templates -label.menu.network.offerings=Network Offerings label.menu.network=Network +label.menu.network.offerings=Network Offerings label.menu.physical.resources=Physical Resources +label.menu.regions=Regions label.menu.running.instances=Running Instances label.menu.security.groups=Security Groups label.menu.service.offerings=Service Offerings label.menu.snapshots=Snapshots label.menu.stopped.instances=Stopped Instances label.menu.storage=Storage -label.menu.system.vms=System VMs +label.menu.system.service.offerings=System Offerings label.menu.system=System +label.menu.system.vms=System VMs label.menu.templates=Templates label.menu.virtual.appliances=Virtual Appliances label.menu.virtual.resources=Virtual Resources label.menu.volumes=Volumes +label.migrate.instance.to.host=Migrate instance to another host label.migrate.instance.to=Migrate instance to +label.migrate.instance.to.ps=Migrate instance to another primary storage +label.migrate.router.to=Migrate Router to +label.migrate.systemvm.to=Migrate System VM to +label.migrate.to.host=Migrate to host +label.migrate.to.storage=Migrate to storage +label.migrate.volume=Migrate volume to another primary storage label.minimum=Minimum label.minute.past.hour=minute(s) Past the Hour label.monday=Monday label.monthly=Monthly label.more.templates=More Templates +label.move.down.row=Move down one row +label.move.to.bottom=Move to bottom +label.move.to.top=Move to top +label.move.up.row=Move up one row label.my.account=My Account -label.name.optional=Name (Optional) +label.my.network=My network +label.my.templates=My templates label.name=Name +label.name.optional=Name (Optional) +label.nat.port.range=NAT Port Range label.netmask=Netmask +label.netScaler=NetScaler +label.network.ACL=Network ACL +label.network.ACLs=Network ACLs +label.network.ACL.total=Network ACL Total label.network.desc=Network Desc +label.network.device=Network Device +label.network.device.type=Network Device Type label.network.domain=Network Domain +label.network.domain.text=Network domain label.network.id=Network ID +label.networking.and.security=Networking and security +label.network.label.display.for.blank.value=Use default gateway label.network.name=Network Name +label.network=Network label.network.offering.display.text=Network Offering Display Text label.network.offering.id=Network Offering ID label.network.offering.name=Network Offering Name label.network.offering=Network Offering -label.network.rate=Network Rate label.network.rate.megabytes=Network Rate (Mb/s) +label.network.rate=Network Rate label.network.read=Network Read +label.network.service.providers=Network Service Providers +label.networks=Networks label.network.type=Network Type label.network.write=Network Write -label.network=Network +label.new=New label.new.password=New Password +label.new.project=New Project +label.new.vm=New VM label.next=Next +label.nexusVswitch=Nexus 1000v +label.nfs=NFS label.nfs.server=NFS Server label.nfs.storage=NFS Storage -label.nfs=NFS +label.nic.adapter.type=NIC adapter type +label.nicira.controller.address=Controller Address +label.nicira.l3gatewayserviceuuid=L3 Gateway Service Uuid +label.nicira.transportzoneuuid=Transport Zone Uuid label.nics=NICs label.no.actions=No Available Actions label.no.alerts=No Recent Alerts +label.no.data=No data to show label.no.errors=No Recent Errors label.no.isos=No available ISOs label.no.items=No Available Items -label.no.security.groups=No Available Security Groups -label.no.thanks=No Thanks -label.no=No label.none=None +label.no=No +label.no.security.groups=No Available Security Groups label.not.found=Not Found +label.no.thanks=No thanks +label.no.thanks=No Thanks +label.notifications=Notifications +label.number.of.clusters=Number of Clusters +label.number.of.hosts=Number of Hosts +label.number.of.pods=Number of Pods +label.number.of.system.vms=Number of System VMs +label.number.of.virtual.routers=Number of Virtual Routers +label.number.of.zones=Number of Zones label.num.cpu.cores=# of CPU Cores label.numretries=Number of Retries +label.ocfs2=OCFS2 label.offer.ha=Offer HA +label.ok=OK label.optional=Optional +label.order=Order label.os.preference=OS Preference label.os.type=OS Type label.owned.public.ips=Owned Public IP Addresses @@ -1272,110 +829,259 @@ label.parent.domain=Parent Domain label.password.enabled=Password Enabled label.password=Password label.path=Path +label.perfect.forward.secrecy=Perfect Forward Secrecy +label.physical.network.ID=Physical network ID +label.physical.network=Physical Network +label.PING.CIFS.password=PING CIFS password +label.PING.CIFS.username=PING CIFS username +label.PING.dir=PING Directory +label.PING.storage.IP=PING storage IP +label.please.specify.netscaler.info=Please specify Netscaler info label.please.wait=Please Wait +label.plugin.details=Plugin details +label.plugins=Plugins +label.pod.name=Pod name label.pod=Pod +label.pods=Pods +label.port.forwarding.policies=Port forwarding policies label.port.forwarding=Port Forwarding label.port.range=Port Range +label.PreSetup=PreSetup +label.previous=Previous label.prev=Prev label.primary.allocated=Primary Storage Allocated label.primary.network=Primary Network +label.primary.storage.count=Primary Storage Pools +label.primary.storage.limits=Primary Storage limits (GiB) label.primary.storage=Primary Storage label.primary.used=Primary Storage Used +label.private.Gateway=Private Gateway label.private.interface=Private Interface -label.private.ip.range=Private IP Range label.private.ip=Private IP Address +label.private.ip.range=Private IP Range label.private.ips=Private IP Addresses +label.privatekey=PKCS#8 Private Key +label.private.network=Private network label.private.port=Private Port label.private.zone=Private Zone +label.project.dashboard=Project dashboard +label.project.id=Project ID +label.project.invite=Invite to project +label.project.name=Project name +label.project=Project +label.projects=Projects +label.project.view=Project View label.protocol=Protocol +label.providers=Providers label.public.interface=Public Interface label.public.ip=Public IP Address label.public.ips=Public IP Addresses +label.public.network=Public network label.public.port=Public Port -label.public.zone=Public Zone label.public=Public +label.public.traffic=Public traffic +label.public.zone=Public Zone +label.purpose=Purpose +label.Pxe.server.type=Pxe Server Type +label.quickview=Quickview +label.reboot=Reboot label.recent.errors=Recent Errors +label.redundant.router.capability=Redundant router capability +label.redundant.router=Redundant Router +label.redundant.state=Redundant state label.refresh=Refresh +label.region=Region label.related=Related +label.remind.later=Remind me later +label.remove.ACL=Remove ACL +label.remove.egress.rule=Remove egress rule label.remove.from.load.balancer=Removing instance from load balancer +label.remove.ingress.rule=Remove ingress rule +label.remove.ip.range=Remove IP range +label.remove.pf=Remove port forwarding rule +label.remove.project.account=Remove account from project +label.remove.project.account=Remove project account +label.remove.region=Remove Region +label.remove.rule=Remove rule +label.remove.static.nat.rule=Remove static NAT rule +label.remove.static.route=Remove static route +label.remove.tier=Remove tier +label.remove.vm.from.lb=Remove VM from load balancer rule +label.remove.vpc=remove VPC +label.removing=Removing label.removing.user=Removing User label.required=Required +label.reserved.system.gateway=Reserved system gateway label.reserved.system.ip=Reserved System IP +label.reserved.system.netmask=Reserved system netmask +label.reset.VPN.connection=Reset VPN connection +label.resize.new.offering.id=New Offering +label.resize.new.size=New Size(GB) +label.resize.shrink.ok=Shrink OK label.resource.limits=Resource Limits label.resource=Resource label.resources=Resources +label.resource.state=Resource state +label.restart.network=Restart network +label.restart.required=Restart required +label.restart.vpc=restart VPC +label.restore=Restore +label.review=Review +label.revoke.project.invite=Revoke invitation label.role=Role +label.root.disk.controller=Root disk controller label.root.disk.offering=Root Disk Offering +label.round.robin=Round-robin +label.rules=Rules label.running.vms=Running VMs +label.s3.access_key=Access Key +label.s3.bucket=Bucket +label.s3.connection_timeout=Connection Timeout +label.s3.endpoint=Endpoint +label.s3.max_error_retry=Max Error Retry +label.s3.secret_key=Secret Key +label.s3.socket_timeout=Socket Timeout +label.s3.use_https=Use HTTPS label.saturday=Saturday +label.save.and.continue=Save and continue label.save=Save label.saving.processing=Saving.... label.scope=Scope label.search=Search +label.secondary.storage.count=Secondary Storage Pools +label.secondary.storage.limits=Secondary Storage limits (GiB) label.secondary.storage=Secondary Storage +label.secondary.storage.vm=Secondary storage VM label.secondary.used=Secondary Storage Used label.secret.key=Secret Key label.security.group.name=Security Group Name label.security.group=Security Group label.security.groups.enabled=Security Groups Enabled label.security.groups=Security Groups +label.select.a.template=Select a template +label.select.a.zone=Select a zone +label.select.instance=Select instance +label.select.instance.to.attach.volume.to=Select instance to attach volume to +label.select.iso.or.template=Select ISO or template +label.select.offering=Select offering +label.select.project=Select Project +label.select=Select +label.select.tier=Select Tier +label.select-view=Select view +label.select.vm.for.static.nat=Select VM for static NAT label.sent=Sent label.server=Server +label.service.capabilities=Service Capabilities label.service.offering=Service Offering -label.system.service.offering=System Service Offering label.session.expired=Session Expired +label.setup.network=Setup Network +label.setup=Setup +label.setup.zone=Setup Zone +label.set.up.zone.type=Set up zone type +label.SharedMountPoint=SharedMountPoint label.shared=Shared +label.show.ingress.rule=Show Ingress Rule +label.shutdown.provider=Shutdown provider +label.site.to.site.VPN=Site-to-site VPN label.size=Size +label.skip.guide=I have used CloudStack before, skip this guide label.snapshot.limits=Snapshot Limits label.snapshot.name=Snapshot Name -label.snapshot.s=Snapshot (s) label.snapshot.schedule=Setup Recurring Snapshot label.snapshot=Snapshot +label.snapshot.s=Snapshot (s) label.snapshots=Snapshots label.source.nat=Source NAT +label.source=Source +label.specify.IP.ranges=Specify IP ranges label.specify.vlan=Specify VLAN +label.SR.name = SR Name-Label +label.srx=SRX +label.start.IP=Start IP label.start.port=Start Port +label.start.reserved.system.IP=Start Reserved system IP +label.start.vlan=Start Vlan label.state=State -label.static.nat.to=Static NAT to +label.static.nat.enabled=Static NAT Enabled label.static.nat=Static NAT +label.static.nat.to=Static NAT to +label.static.nat.vm.details=Static NAT VM Details label.statistics=Statistics label.status=Status -label.step.1.title=Step 1: Select a Template label.step.1=Step 1 -label.step.2.title=Step 2: Service Offering +label.step.1.title=Step 1: Select a Template label.step.2=Step 2 -label.step.3.title=Step 3: Select a Disk Offering +label.step.2.title=Step 2: Service Offering label.step.3=Step 3 -label.step.4.title=Step 4: Network +label.step.3.title=Step 3: Select a Disk Offering label.step.4=Step 4 -label.step.5.title=Step 5: Review +label.step.4.title=Step 4: Network label.step.5=Step 5 +label.step.5.title=Step 5: Review +label.stickiness=Stickiness +label.sticky.cookie-name=Cookie name +label.sticky.domain=Domain +label.sticky.expire=Expires +label.sticky.holdtime=Hold time +label.sticky.indirect=Indirect +label.sticky.length=Length +label.sticky.mode=Mode +label.sticky.nocache=No cache +label.sticky.postonly=Post only +label.sticky.prefix=Prefix +label.sticky.request-learn=Request learn +label.sticky.tablesize=Table size label.stopped.vms=Stopped VMs -label.storage.type=Storage Type +label.stop=Stop label.storage=Storage +label.storage.tags=Storage Tags +label.storage.traffic=Storage Traffic +label.storage.type=Storage Type +label.subdomain.access=Subdomain Access label.submit=Submit label.submitted.by=[Submitted by: ] label.succeeded=Succeeded label.sunday=Sunday +label.super.cidr.for.guest.networks=Super CIDR for Guest Networks +label.supported.services=Supported Services +label.supported.source.NAT.type=Supported Source NAT type +label.suspend.project=Suspend Project label.system.capacity=System Capacity -label.system.vm.type=System VM Type -label.system.vm=System VM +label.system.offering=System Offering +label.system.service.offering=System Service Offering label.system.vms=System VMs +label.system.vm=System VM +label.system.vm.type=System VM Type +label.system.wide.capacity=System-wide capacity label.tagged=Tagged label.tags=Tags label.target.iqn=Target IQN +label.task.completed=Task completed label.template.limits=Template Limits label.template=Template +label.TFTP.dir=TFTP Directory label.theme.default=Default Theme label.theme.grey=Custom - Grey label.theme.lightblue=Custom - Light Blue label.thursday=Thursday -label.time.zone=Timezone -label.time=Time +label.tier.details=Tier details +label.tier=Tier label.timeout.in.second = Timeout(seconds) +label.timeout=Timeout +label.time=Time +label.time.zone=Timezone label.timezone=Timezone +label.token=Token label.total.cpu=Total CPU +label.total.CPU=Total CPU +label.total.hosts=Total Hosts +label.total.memory=Total Memory +label.total.of.ip=Total of IP Address +label.total.of.vm=Total of VM +label.total.storage=Total Storage label.total.vms=Total VMs +label.traffic.label=Traffic label +label.traffic.types=Traffic Types label.traffic.type=Traffic Type label.tuesday=Tuesday label.type.id=Type ID @@ -1383,39 +1089,77 @@ label.type=Type label.unavailable=Unavailable label.unlimited=Unlimited label.untagged=Untagged +label.update.project.resources=Update project resources label.update.ssl.cert= SSL Certificate label.update.ssl= SSL Certificate label.updating=Updating +label.upload=Upload +label.upload.volume=Upload volume label.url=URL label.usage.interface=Usage Interface label.used=Used -label.user=User label.username=Username label.users=Users +label.user=User +label.use.vm.ip=Use VM IP: label.value=Value +label.vcdcname=vCenter DC name label.vcenter.cluster=vCenter Cluster label.vcenter.datacenter=vCenter Datacenter label.vcenter.datastore=vCenter Datastore label.vcenter.host=vCenter Host label.vcenter.password=vCenter Password label.vcenter.username=vCenter Username +label.vcipaddress=vCenter IP Address label.version=Version -label.virtual.appliance=Virtual Appliance +label.view.all=View all +label.view.console=View console +label.viewing=Viewing +label.view.more=View more +label.view=View label.virtual.appliances=Virtual Appliances +label.virtual.appliance=Virtual Appliance +label.virtual.machines=Virtual machines label.virtual.network=Virtual Network +label.virtual.routers=Virtual Routers +label.virtual.router=Virtual Router label.vlan.id=VLAN ID label.vlan.range=VLAN Range +label.vlan=VLAN label.vm.add=Add Instance label.vm.destroy=Destroy -label.vm.reboot=Reboot -label.vm.start=Start -label.vm.stop=Stop +label.vm.display.name=VM display name +label.VMFS.datastore=VMFS datastore label.vmfs=VMFS +label.vm.name=VM name +label.vm.reboot=Reboot +label.VMs.in.tier=VMs in tier +label.vmsnapshot.current=isCurrent +label.vmsnapshot.memory=Snapshot memory +label.vmsnapshot.parentname=Parent +label.vmsnapshot.type=Type +label.vmsnapshot=VM Snapshots +label.vm.start=Start +label.vm.state=VM state +label.vm.stop=Stop label.vms=VMs +label.vmware.traffic.label=VMware traffic label +label.volgroup=Volume Group label.volume.limits=Volume Limits label.volume.name=Volume Name -label.volume=Volume label.volumes=Volumes +label.volume=Volume +label.vpc.id=VPC ID +label.VPC.router.details=VPC router details +label.vpc=VPC +label.VPN.connection=VPN Connection +label.vpn.customer.gateway=VPN Customer Gateway +label.VPN.customer.gateway=VPN Customer Gateway +label.VPN.gateway=VPN Gateway +label.vpn=VPN +label.vsmctrlvlanid=Control VLAN ID +label.vsmpktvlanid=Packet VLAN ID +label.vsmstoragevlanid=Storage VLAN ID label.vsphere.managed=vSphere Managed label.waiting=Waiting label.warn=Warn @@ -1423,130 +1167,297 @@ label.wednesday=Wednesday label.weekly=Weekly label.welcome.cloud.console=Welcome to Management Console label.welcome=Welcome +label.what.is.cloudstack=What is CloudStack™? +label.xen.traffic.label=XenServer traffic label label.yes=Yes +label.zone.details=Zone details label.zone.id=Zone ID +label.zone.name=Zone name label.zone.step.1.title=Step 1: Select a Network label.zone.step.2.title=Step 2: Add a Zone label.zone.step.3.title=Step 3: Add a Pod label.zone.step.4.title=Step 4: Add an IP range +label.zones=Zones +label.zone.type=Zone Type label.zone.wide=Zone-Wide +label.zoneWizard.trafficType.guest=Guest: Traffic between end-user virtual machines +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.storage=Storage: Traffic between primary and secondary storage servers, such as VM templates and snapshots label.zone=Zone - -#VM snapshot label -label.vmsnapshot=VM Snapshots -label.vmsnapshot.type=Type -label.vmsnapshot.parentname=Parent -label.vmsnapshot.current=isCurrent -label.vmsnapshot.memory=Snapshot memory -message.action.vmsnapshot.delete=Please confirm that you want to delete this VM snapshot. -label.action.vmsnapshot.delete=Delete VM snapshot -label.action.vmsnapshot.revert=Revert to VM snapshot -message.action.vmsnapshot.revert=Revert VM snapshot -label.action.vmsnapshot.create=Take VM Snapshot - - - -#Messages +managed.state=Managed State +message.acquire.new.ip=Please confirm that you would like to acquire a new IP for this network. +message.acquire.new.ip.vpc=Please confirm that you would like to acquire a new IP for this VPC. message.acquire.public.ip=Please select a zone from which you want to acquire your new IP from. message.action.cancel.maintenance.mode=Please confirm that you want to cancel this maintenance. message.action.cancel.maintenance=Your host has been successfully canceled for maintenance. This process can take up to several minutes. -message.action.delete.ISO.for.all.zones=The ISO is used by all zones. Please confirm that you want to delete it from all zones. -message.action.delete.ISO=Please confirm that you want to delete this ISO. +message.action.change.service.warning.for.instance=Your instance must be stopped before attempting to change its current service offering. +message.action.change.service.warning.for.router=Your router must be stopped before attempting to change its current service offering. message.action.delete.cluster=Please confirm that you want to delete this cluster. message.action.delete.disk.offering=Please confirm that you want to delete this disk offering. message.action.delete.domain=Please confirm that you want to delete this domain. message.action.delete.external.firewall=Please confirm that you would like to remove this external firewall. Warning: If you are planning to add back the same external firewall, you must reset usage data on the device. message.action.delete.external.load.balancer=Please confirm that you would like to remove this external load balancer. Warning: If you are planning to add back the same external load balancer, you must reset usage data on the device. message.action.delete.ingress.rule=Please confirm that you want to delete this ingress rule. +message.action.delete.ISO.for.all.zones=The ISO is used by all zones. Please confirm that you want to delete it from all zones. +message.action.delete.ISO=Please confirm that you want to delete this ISO. message.action.delete.network=Please confirm that you want to delete this network. +message.action.delete.nexusVswitch=Please confirm that you want to delete this nexus 1000v +message.action.delete.physical.network=Please confirm that you want to delete this physical network message.action.delete.pod=Please confirm that you want to delete this pod. message.action.delete.primary.storage=Please confirm that you want to delete this primary storage. message.action.delete.secondary.storage=Please confirm that you want to delete this secondary storage. message.action.delete.security.group=Please confirm that you want to delete this security group. message.action.delete.service.offering=Please confirm that you want to delete this service offering. message.action.delete.snapshot=Please confirm that you want to delete this snapshot. +message.action.delete.system.service.offering=Please confirm that you want to delete this system service offering. message.action.delete.template.for.all.zones=The template is used by all zones. Please confirm that you want to delete it from all zones. message.action.delete.template=Please confirm that you want to delete this template. message.action.delete.volume=Please confirm that you want to delete this volume. message.action.delete.zone=Please confirm that you want to delete this zone. message.action.destroy.instance=Please confirm that you want to destroy this instance. message.action.destroy.systemvm=Please confirm that you want to destroy this System VM. +message.action.disable.cluster=Please confirm that you want to disable this cluster. +message.action.disable.nexusVswitch=Please confirm that you want to disable this nexus 1000v +message.action.disable.physical.network=Please confirm that you want to disable this physical network. +message.action.disable.pod=Please confirm that you want to disable this pod. message.action.disable.static.NAT=Please confirm that you want to disable static NAT. +message.action.disable.zone=Please confirm that you want to disable this zone. +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. +message.action.enable.cluster=Please confirm that you want to enable this cluster. message.action.enable.maintenance=Your host has been successfully prepared for maintenance. This process can take up to several minutes or longer depending on how many VMs are currently on this host. +message.action.enable.nexusVswitch=Please confirm that you want to enable this nexus 1000v +message.action.enable.physical.network=Please confirm that you want to enable this physical network. +message.action.enable.pod=Please confirm that you want to enable this pod. +message.action.enable.zone=Please confirm that you want to enable this zone. message.action.force.reconnect=Your host has been successfully forced to reconnect. This process can take up to several minutes. message.action.host.enable.maintenance.mode=Enabling maintenance mode will cause a live migration of all running instances on this host to any available host. message.action.instance.reset.password=Please confirm that you want to change the ROOT password for this virtual machine. +message.action.manage.cluster=Please confirm that you want to manage the cluster. message.action.primarystorage.enable.maintenance.mode=Warning: placing the primary storage into maintenance mode will cause all VMs using volumes from it to be stopped. Do you want to continue? message.action.reboot.instance=Please confirm that you want to reboot this instance. +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.reboot.systemvm=Please confirm that you want to reboot this system VM. message.action.release.ip=Please confirm that you want to release this IP. +message.action.remove.host=Please confirm that you want to remove this host. message.action.remove.host=Removing last/only host in cluster and reinstalling the host will destroy working environment/database on the host and render the VM Guests unuseable. +message.action.reset.password.off=Your instance currently does not support this feature. +message.action.reset.password.warning=Your instance must be stopped before attempting to change its current password. message.action.restore.instance=Please confirm that you want to restore this instance. message.action.start.instance=Please confirm that you want to start this instance. message.action.start.router=Please confirm that you want to start this router. message.action.start.systemvm=Please confirm that you want to start this system VM. message.action.stop.instance=Please confirm that you want to stop this instance. +message.action.stop.router=All services provided by this virtual router will be interrupted. Please confirm that you want to stop this router. message.action.stop.systemvm=Please confirm that you want to stop this system VM. message.action.take.snapshot=Please confirm that you want to take a snapshot of this volume. -message.add.cluster.zone=Add a hypervisor managed cluster for zone +message.action.unmanage.cluster=Please confirm that you want to unmanage the cluster. +message.action.vmsnapshot.delete=Please confirm that you want to delete this VM snapshot. +message.action.vmsnapshot.revert=Revert VM snapshot +message.activate.project=Are you sure you want to activate this project? message.add.cluster=Add a hypervisor managed cluster for zone , pod +message.add.cluster.zone=Add a hypervisor managed cluster for zone message.add.disk.offering=Please specify the following parameters to add a new disk offering +message.add.domain=Please specify the subdomain you want to create under this domain message.add.firewall=Add a firewall to zone +message.add.guest.network=Please confirm that you would like to add a guest network message.add.host=Please specify the following parameters to add a new host +message.adding.host=Adding host +message.adding.Netscaler.device=Adding Netscaler device +message.adding.Netscaler.provider=Adding Netscaler provider +message.add.ip.range=Add an IP range to public network in zone message.add.ip.range.direct.network=Add an IP range to direct network in zone message.add.ip.range.to.pod=

Add an IP range to pod:

-message.add.ip.range=Add an IP range to public network in zone +message.additional.networks.desc=Please select additional network(s) that your virtual instance will be connected to. message.add.load.balancer=Add a load balancer to zone +message.add.load.balancer.under.ip=The load balancer rule has been added under IP: message.add.network=Add a new network for zone: +message.add.new.gateway.to.vpc=Please specify the information to add a new gateway to this VPC. message.add.pod=Add a new pod for zone -message.add.primary.storage=Add a new Primary Storage for zone , pod +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.add.primary=Please specify the following parameters to add a new primary storage +message.add.primary.storage=Add a new Primary Storage for zone , pod +message.add.region=Please specify the required information to add a new region. message.add.secondary.storage=Add a new storage for zone message.add.service.offering=Please fill in the following data to add a new compute offering. +message.add.system.service.offering=Please fill in the following data to add a new system service offering. message.add.template=Please enter the following data to create your new template message.add.volume=Please fill in the following data to add a new volume. -message.additional.networks.desc=Please select additional network(s) that your virtual instance will be connected to. +message.add.VPN.gateway=Please confirm that you want to add a VPN Gateway message.advanced.mode.desc=Choose this network model if you wish to enable VLAN support. This network model provides the most flexibility in allowing administrators to provide custom network offerings such as providing firewall, vpn, or load balancer support as well as enabling direct vs virtual networking. message.advanced.security.group=Choose this if you wish to use security groups to provide guest VM isolation. message.advanced.virtual=Choose this if you wish to use zone-wide VLANs to provide guest VM isolation. +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. +message.after.enable.swift=Swift configured. Note: When you leave this page, you will not be able to re-configure Swift again. +message.alert.state.detected=Alert state detected message.allow.vpn.access=Please enter a username and password of the user that you want to allow VPN access. +message.apply.snapshot.policy=You have successfully updated your current snapshot policy. message.attach.iso.confirm=Please confirm that you want to attach the ISO to this virtual instance. message.attach.volume=Please fill in the following data to attach a new volume. If you are attaching a disk volume to a Windows based virtual machine, you will need to reboot the instance to see the attached disk. message.basic.mode.desc=Choose this network model if you do *not* want to enable any VLAN support. All virtual instances created under this network model will be assigned an IP directly from the network and security groups are used to provide security and segregation. message.change.offering.confirm=Please confirm that you wish to change the service offering of this virtual instance. +message.change.password=Please change your password. +message.configure.all.traffic.types=You have multiple physical networks; please configure labels for each traffic type by clicking on the Edit button. +message.configuring.guest.traffic=Configuring guest traffic +message.configuring.physical.networks=Configuring physical networks +message.configuring.public.traffic=Configuring public traffic +message.configuring.storage.traffic=Configuring storage traffic +message.confirm.action.force.reconnect=Please confirm that you want to force reconnect this host. +message.confirm.delete.F5=Please confirm that you would like to delete F5 +message.confirm.delete.NetScaler=Please confirm that you would like to delete NetScaler +message.confirm.delete.SRX=Please confirm that you would like to delete SRX +message.confirm.destroy.router=Please confirm that you would like to destroy this router +message.confirm.disable.provider=Please confirm that you would like to disable this provider +message.confirm.enable.provider=Please confirm that you would like to enable this provider +message.confirm.join.project=Please confirm you wish to join this project. +message.confirm.remove.IP.range=Please confirm that you would like to remove this IP range. +message.confirm.shutdown.provider=Please confirm that you would like to shutdown this provider message.copy.iso.confirm=Please confirm that you wish to copy your ISO to message.copy.template=Copy template XXX from zone to +message.create.template=Are you sure you want to create template? message.create.template.vm=Create VM from template message.create.template.volume=Please specify the following information before creating a template of your disk volume: . Creation of the template can range from several minutes to longer depending on the size of the volume. +message.creating.cluster=Creating cluster +message.creating.guest.network=Creating guest network +message.creating.physical.networks=Creating physical networks +message.creating.pod=Creating pod +message.creating.primary.storage=Creating primary storage +message.creating.secondary.storage=Creating secondary storage +message.creating.zone=Creating zone +message.decline.invitation=Are you sure you want to decline this project invitation? message.delete.account=Please confirm that you want to delete this account. +message.delete.gateway=Please confirm you want to delete the gateway +message.delete.project=Are you sure you want to delete this project? +message.delete.user=Please confirm that you would like to delete this user. +message.delete.VPN.connection=Please confirm that you want to delete VPN connection +message.delete.VPN.customer.gateway=Please confirm that you want to delete this VPN Customer Gateway +message.delete.VPN.gateway=Please confirm that you want to delete this VPN Gateway +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. +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). +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.

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.

Provide the IP address and exported path. +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. +message.detach.disk=Are you sure you want to detach this disk? message.detach.iso.confirm=Please confirm that you want to detach the ISO from this virtual instance. message.disable.account=Please confirm that you want to disable this account. By disabling the account, all users for this account will no longer have access to their cloud resources. All running virtual machines will be immediately shut down. +message.disable.snapshot.policy=You have successfully disabled your current snapshot policy. +message.disable.user=Please confirm that you would like to disable this user. message.disable.vpn.access=Please confirm that you want to disable VPN Access. +message.disable.vpn=Are you sure you want to disable VPN? message.download.ISO=Please click 00000 to download ISO message.download.template=Please click 00000 to download template +message.download.volume.confirm=Please confirm that you want to download this volume message.download.volume=Please click 00000 to download volume +message.edit.account=Edit ("-1" indicates no limit to the amount of resources create) message.edit.confirm=Please confirm that your changes before clicking "Save". message.edit.limits=Please specify limits to the following resources. A "-1" indicates no limit to the amount of resources create. +message.edit.traffic.type=Please specify the traffic label you want associated with this traffic type. message.enable.account=Please confirm that you want to enable this account. -message.enable.vpn.access=VPN is currently disabled for this IP Address. Would you like to enable VPN access? message.enabled.vpn.ip.sec=Your IPSec pre-shared key is message.enabled.vpn=Your VPN access is currently enabled and can be accessed via the IP +message.enable.user=Please confirm that you would like to enable this user. +message.enable.vpn.access=VPN is currently disabled for this IP Address. Would you like to enable VPN access? +message.enable.vpn=Please confirm that you want VPN access enabled for this IP address. +message.enabling.security.group.provider=Enabling Security Group provider +message.enabling.zone=Enabling zone +message.enter.token=Please enter the token that you were given in your invite e-mail. +message.generate.keys=Please confirm that you would like to generate new keys for this user. +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.installWizard.click.retry=Click the button to retry launch. +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™ deployment. Clusters are contained within pods, and pods are contained within zones.

CloudStack™ allows multiple clusters in a cloud deployment, but for a Basic Installation, we only need one cluster. +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.

The host is the smallest organizational unit within a CloudStack™ deployment. Hosts are contained within clusters, clusters are contained within pods, and pods are contained within zones. +message.installWizard.copy.whatIsAPod=A pod often represents a single rack. Hosts in the same pod are in the same subnet.

A pod is the second-largest organizational unit within a CloudStack™ 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™ 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™ is a software platform that pools computing resources to build public, private, and hybrid Infrastructure as a Service (IaaS) clouds. CloudStack™ manages the network, storage, and compute nodes that make up a cloud infrastructure. Use CloudStack™ to deploy, manage, and configure cloud computing environments.

Extending beyond individual virtual machine images running on commodity hardware, CloudStack™ 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.copy.whatIsPrimaryStorage=A CloudStack™ 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.

Primary storage 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.whatIsSecondaryStorage=Secondary storage is associated with a zone, and it stores the following:
  • Templates - OS images that can be used to boot VMs and can include additional configuration information, such as installed applications
  • ISO images - OS images that can be bootable or non-bootable
  • Disk volume snapshots - saved copies of VM data which can be used for data recovery or to create new templates
+message.installWizard.now.building=Now building your cloud... +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.addHost.hostname=The DNS name or IP address of the host. +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.addPod.name=A name for the pod +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.reservedSystemGateway=The gateway for the hosts in that pod. +message.installWizard.tooltip.addPod.reservedSystemNetmask=The netmask in use on the subnet the guests will use. +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.addPrimaryStorage.name=The name for the storage device. +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.addSecondaryStorage.nfsServer=The IP address of the NFS server hosting the secondary storage +message.installWizard.tooltip.addSecondaryStorage.path=The exported path, located on the server you specified above +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.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.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.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.name=A name for the zone +message.installWizard.tooltip.configureGuestTraffic.description=A description for your network +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.guestGateway=The gateway that the guests should use +message.installWizard.tooltip.configureGuestTraffic.guestNetmask=The netmask in use on the subnet that the guests should use +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.name=A name for your network +message.instanceWizard.noTemplates=You do not have any templates available; please add a compatible template, and re-launch the instance wizard. +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. +message.iso.desc=Disc image containing data or bootable media for OS +message.join.project=You have now joined a project. Please switch to Project view to see the project. message.launch.vm.on.private.network=Do you wish to launch your instance on your own private dedicated network? +message.launch.zone=Zone is ready to launch; please proceed to the next step. message.lock.account=Please confirm that you want to lock this account. By locking the account, all users for this account will no longer be able to manage their cloud resources. Existing resources can still be accessed. message.migrate.instance.confirm=Please confirm the host you wish to migrate the virtual instance to. +message.migrate.instance.to.host=Please confirm that you want to migrate instance to another host. +message.migrate.instance.to.ps=Please confirm that you want to migrate instance to another primary storage. +message.migrate.router.confirm=Please confirm the host you wish to migrate the router to: +message.migrate.systemvm.confirm=Please confirm the host you wish to migrate the system VM to: +message.migrate.volume=Please confirm that you want to migrate volume to another primary storage. message.new.user=Specify the following to add a new user to the account message.no.network.support.configuration.not.true=You do not have any zone that has security group enabled. Thus, no additional network features. Please continue to step 5. message.no.network.support=Your selected hypervisor, vSphere, does not have any additional network features. Please continue to step 5. +message.no.projects.adminOnly=You do not have any projects.
Please ask your administrator to create a new project. +message.no.projects=You do not have any projects.
Please create a new one from the projects section. message.number.clusters=

# of Clusters

message.number.hosts=

# of Hosts

message.number.pods=

# of Pods

message.number.storage=

# of Primary Storage Volumes

message.number.zones=

# of Zones

+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.please.add.at.lease.one.traffic.range=Please add at least one traffic range. +message.please.proceed=Please proceed to the next step. +message.please.select.a.configuration.for.your.zone=Please select a configuration for your zone. +message.please.select.a.different.public.and.management.network.before.removing=Please select a different public and management network before removing +message.please.select.networks=Please select networks for your virtual machine. +message.please.wait.while.zone.is.being.created=Please wait while your zone is being created; this may take a while... +message.project.invite.sent=Invite sent to user; they will be added to the project once they accept the invitation +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.

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.redirecting.region=Redirecting to region... +message.remove.region=Are you sure you want to remove this region from this management server? +message.remove.vpc=Please confirm that you want to remove the VPC message.remove.vpn.access=Please confirm that you want to remove VPN access from the following user. +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 +message.reset.VPN.connection=Please confirm that you want to reset VPN connection message.restart.mgmt.server=Please restart your management server(s) for your new settings to take effect. message.restart.mgmt.usage.server=Please restart your management server(s) and usage server(s) for your new settings to take effect. +message.restart.network=All services provided by this network will be interrupted. Please confirm that you want to restart this network. +message.restart.vpc=Please confirm that you want to restart the VPC message.security.group.usage=(Use Ctrl-click to select all applicable security groups) +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. +message.select.instance=Please select an instance. +message.select.iso=Please select an ISO for your new virtual instance. +message.select.item=Please select an item. +message.select.security.groups=Please select security group(s) for your new VM +message.select.template=Please select a template for your new virtual instance. +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.

You may also drag and drop other traffic types onto the physical network. +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.

Drag and drop one or more traffic types onto each physical network. +message.setup.successful=Cloud setup successful! message.snapshot.schedule=You can setup recurring snapshot schedules by selecting from the available options below and applying your policy preference +message.specify.url=Please specify URL message.step.1.continue=Please select a template or ISO to continue message.step.1.desc=Please select a template for your new virtual instance. You can also choose to select a blank template from which an ISO image can be installed onto. message.step.2.continue=Please select a service offering to continue @@ -1555,40 +1466,63 @@ message.step.3.continue=Please select a disk offering to continue message.step.3.desc= message.step.4.continue=Please select at least one network to continue message.step.4.desc=Please select the primary network that your virtual instance will be connected to. +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.suspend.project=Are you sure you want to suspend this project? +message.template.desc=OS image that can be used to boot VMs +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.tooltip.zone.name=A name for the zone. message.update.os.preference=Please choose a OS preference for this host. All virtual instances with similar preferences will be first allocated to this host before choosing another. +message.update.resource.count=Please confirm that you want to update resource counts for this account. message.update.ssl=Please submit a new X.509 compliant SSL certificate to be updated to each console proxy virtual instance: +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. message.virtual.network.desc=A dedicated virtualized network for your account. The broadcast domain is contained within a VLAN and all public network access is routed out by a virtual router. +message.vm.create.template.confirm=Create Template will reboot the VM automatically. +message.vm.review.launch=Please review the following information and confirm that your virtual instance is correct before launch. message.volume.create.template.confirm=Please confirm that you wish to create a template for this disk volume. Creation of the template can range from several minutes to longer depending on the size of the volume. +message.you.must.have.at.least.one.physical.network=You must have at least one physical network +message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation complete. Would you like to enable this zone? +message.Zone.creation.complete=Zone creation complete +message.zone.no.network.selection=The zone you selected does not have any choices for network selection. message.zone.step.1.desc=Please select a network model for your zone. message.zone.step.2.desc=Please enter the following info to add a new zone message.zone.step.3.desc=Please enter the following info to add a new pod -message.apply.snapshot.policy=You have successfully updated your current snapshot policy. -message.disable.snapshot.policy=You have successfully disabled your current snapshot policy. -message.action.change.service.warning.for.instance=Your instance must be stopped before attempting to change its current service offering. -message.action.change.service.warning.for.router=Your router must be stopped before attempting to change its current service offering. -message.action.reset.password.warning=Your instance must be stopped before attempting to change its current password. -message.action.reset.password.off=Your instance currently does not support this feature. - -#Errors -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.session.expired=Your session has expired. -error.unresolved.internet.name=Your internet name cannot be resolved. - -label.add.NiciraNvp.device=Add Nvp Controller -label.delete.NiciraNvp=Remove Nvp Controller -label.nicira.controller.address=Controller Address -label.nicira.transportzoneuuid=Transport Zone Uuid -label.nicira.l3gatewayserviceuuid=L3 Gateway Service Uuid - -label.add.BigSwitchVns.device=Add BigSwitch Vns Controller -label.delete.BigSwitchVns=Remove BigSwitch Vns Controller -label.bigswitch.controller.address=BigSwitch Vns Controller Address - -#resizeVolumes -label.resize.new.size=New Size(GB) -label.action.resize.volume=Resize Volume -label.action.resize.volume.processing=Resizing Volume.... -label.resize.new.offering.id=New Offering -label.resize.shrink.ok=Shrink OK +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:

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.

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.


Would you like to continue? +mode=Mode +network.rate=Network Rate +notification.reboot.instance=Reboot instance +notification.start.instance=Start instance +notification.stop.instance=Stop instance +side.by.side=Side by Side +state.Accepted=Accepted +state.Active=Active +state.Allocated=Allocated +state.Allocating=Allocating +state.BackedUp=Backed Up +state.BackingUp=Backing Up +state.Completed=Completed +state.Creating=Creating +state.Declined=Declined +state.Destroyed=Destroyed +state.Disabled=Disabled +state.enabled=Enabled +state.Enabled=Enabled +state.Error=Error +state.Expunging=Expunging +state.Migrating=Migrating +state.Pending=Pending +state.ready=Ready +state.Ready=Ready +state.Running=Running +state.Starting=Starting +state.Stopped=Stopped +state.Stopping=Stopping +state.Suspended=Suspended +ui.listView.filters.all=All +ui.listView.filters.mine=Mine diff --git a/client/WEB-INF/classes/resources/messages_ca.properties b/client/WEB-INF/classes/resources/messages_ca.properties new file mode 100644 index 00000000000..2d8e953419f --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_ca.properties @@ -0,0 +1,306 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +confirm.enable.swift=Si us plau ompliu la seg\u00fcent informaci\u00f3 per habilitar el suport per a Swift +error.installWizard.message=Quelcom ha fallat, vost\u00e8 pot tornar enrere i corregir els errors detalls suggerime +error.password.not.match=Els camps de contrasenya no coincideixen +extractable=Es pot extreure +inline=En l\u00ednia +label.accept.project.invitation=Accpetar invitaci\u00f3 al projecte +label.action.edit.host=Editar Host +label.action.migrate.router=Migrar router +label.action.migrate.router.processing=Migrant router... +label.action.migrate.systemvm=Migrar MV de Sistema +label.action.migrate.systemvm.processing=Migrant MV de Sistema... +label.activate.project=Activar projecte +label.add.accounts=Afegir comptes +label.add.accounts.to=Afegir comptes a +label.add.account.to.project=Afegir compte al projecte +label.add.by=Afegir per +label.add.egress.rule=Afegir regla de sortida +label.add.new.F5=Afegir nou F5 +label.add.new.NetScaler=Afegir un nou NetScaler +label.add.new.SRX=Afegir nou SRX +label.add.physical.network=Afegir xarxa f\u00edsica +label.add.rule=Afegir regla +label.add.static.nat.rule=Afegir regla de NAT est\u00e0tic +label.add.to.group=Afegir a grup +label.add.vm=Afegir MV +label.add.vms=Afegir MVs +label.add.vms.to.lb=Afegir MV(s) a la regla de balanceig de c\u00e0rrega +label.add.vpn.user=Afegir usuari VPN +label.agree=D\\'acord +label.apply=Aplicar +label.bandwidth=Ample de banda +label.broadcast.domain.range=Rang del domini de broadcast +label.capacity=Capacitat +label.change.service.offering=Canvia oferta de servei +label.change.value=Canviar valor +label.clear.list=Esborra llista +label.community=Comunitat +label.compute.and.storage=Computaci\u00f3 i Emmagatzematge +label.compute=Computaci\u00f3 +label.configuration=Configuraci\u00f3 +label.configure=Configurar +label.confirm.password=Confirmar contrasenya +label.congratulations=Enorabona\! +label.continue.basic.install=Continueu amb la instal\u00b7laci\u00f3 b\u00e0sica +label.continue=Continuar +label.corrections.saved=Correccions guardades +label.create.project=Crear projecte +label.decline.invitation=Declinar invitaci\u00f3 +label.dedicated=Dedicat +label.default=Per defecte +label.delete.F5=Esborrar F5 +label.delete.NetScaler=Esborrar NetScaler +label.delete.project=Esborrar projecte +label.delete.SRX=Esborar SRX +label.delete.vpn.user=Esborrar usuari VPN +label.destination.physical.network.id=ID de xarxa f\u00edsica de dest\u00ed +label.destination.zone=Zona de dest\u00ed +label.destroy.router=Destruir router +label.dhcp=DHCP +label.disabled=Deshabilitat +label.disable.provider=Deshabilitar prove\u00efdor +label.disable.vpn=Deshabilitar VPN +label.drag.new.position=Arrosegar a la nova posici\u00f3 +label.edit.project.details=Editar detalls del projecte +label.egress.rule=Regla de sortida +label.elastic=El\u00e0stic +label.enable.provider=Habilitar prove\u00efdor +label.enable.swift=Habilitar Swift +label.enable.vpn=Habilitar VPN +label.end.vlan=VLAN fi +label.f5=F5 +label.full.path=Cam\u00ed sencer +label.guest.end.ip=Fi d\\'IP per a MV +label.guest=MV +label.guest.start.ip=Inici d\\'IP per a MV +label.guest.traffic=Tr\u00e0fic de MV +label.hints=Pistes +label.installWizard.addClusterIntro.subtitle=Que \u00e9s un cluster? +label.installWizard.addClusterIntro.title=Anem a afegir un cluster +label.installWizard.addHostIntro.subtitle=Qu\u00e8 \u00e9s un amfitri\u00f3 "host"? +label.installWizard.addHostIntro.title=Anem a afegir un amfitri\u00f3 +label.installWizard.addPodIntro.subtitle=Que \u00e9s un pod? +label.installWizard.addPodIntro.title=Anem a afegir un pod +label.installWizard.addPrimaryStorageIntro.subtitle=Qu\u00e8 \u00e9s l\\'emmagatzematge primari? +label.installWizard.addPrimaryStorageIntro.title=Anem a afegir emmagatzematge primari +label.installWizard.addSecondaryStorageIntro.subtitle=Qu\u00e8 \u00e9s el emmagatzematge secundari? +label.installWizard.addSecondaryStorageIntro.title=Anem a afegir emmagatzematge secundari +label.installWizard.addZoneIntro.subtitle=Que \u00e9s una zona? +label.installWizard.addZoneIntro.title=Anem a afegir una zona +label.installWizard.addZone.title=Afegir zona +label.installWizard.click.launch=Feu clic al bot\u00f3 d\\'inici. +label.installWizard.subtitle=Auqesta guia us ajudar\u00e0 a configurar la vostra instal\u00b7laci\u00f3 de CloudStack&\#8482 +label.installWizard.title=Hola i benvigut a CloudStack&\#8482 +label.introduction.to.cloudstack=Introducci\u00f3 a la CloudStack&\#8482 +label.invitations=Invitacions +label.invite=Convidar +label.invited.accounts=Comptes convidades +label.invite.to=Convidar a +label.ip.ranges=Rangs d\\'IPs +label.item.listing=Llista d\\'articles +label.keyboard.type=Tipus de teclat +label.key=Clau +label.launch=Iniciar +label.launch.vm=Arrencar MV +label.load.balancing=Balanceig de c\u00e0rrega +label.load.balancing.policies=Pol\u00b7l\u00edtiques de balanceig de c\u00e0rrega +label.local.storage=Emmagatzemament local +label.make.project.owner=Feu la compta propiet\u00e0ria del projecte +label.management=Administraci\u00f3 +label.manage.resources=Administrar Recursos +label.max.public.ips=Max. IP p\u00fabliques +label.max.snapshots=Max. instant\u00e0nies +label.max.templates=Max. plantilles +label.max.vms=Max. MV d\\'usuari +label.max.volumes=Max. Volums +label.may.continue=Ara pot continuar +label.menu.configuration=Configuraci\u00f3 +label.migrate.instance.to.host=Migrar inst\u00e0ncia a un altre amfitri\u00f3 "Host" +label.migrate.instance.to.ps=Migrar inst\u00e0ncia a un altra emmagatzematge primari +label.migrate.router.to=Migrar router a +label.migrate.systemvm.to=Migrar MV de sistema a\: +label.move.down.row=Moure una fila cap a baix +label.move.to.top=Moure a dalt +label.move.up.row=Moure una fla cap a dalt +label.my.network=La meva xarxa +label.my.templates=Les meves plantilles +label.netScaler=NetScaler +label.networking.and.security=Xarxa i seguretat +label.network.rate=Velocitat de xarxa +label.networks=Xarxes +label.new=Nou +label.new.project=Nou projecte +label.new.vm=Nova MV +label.nic.adapter.type=Tipus de tarja de xarxa +label.no.data=No hi ha dades +label.no.thanks=No gr\u00e0cies +label.number.of.clusters=Nombre de cl\u00fasters +label.number.of.hosts=Nombre de Hosts +label.number.of.pods=Nombre de racks +label.number.of.zones=Nombre de zones +label.ocfs2=OCFS2 +label.order=Ordre +label.physical.network.ID=ID de xarxa f\u00edsica +label.please.specify.netscaler.info=Si us plau doneu informaci\u00f3 del NetScaler +label.pod.name=Nom de rack +label.pods=Racks +label.port.forwarding.policies=Pol\u00b7l\u00edtiques de reenviament de ports +label.previous=Anterior +label.private.network=Xarxa privada +label.project.dashboard=Quadre de comandament del projecte +label.project.id=ID de projecte +label.project.invite=Convidar al projecte +label.project.name=Nom del projecte +label.project=Projecte +label.projects=Projectes +label.providers=Prove\u00efdors +label.public.network=Xarxa p\u00fablica +label.Pxe.server.type=Tipus de servidor PXE +label.redundant.state=Estat redundant +label.remind.later=Recordeu-m\\'ho despr\u00e9s +label.remove.egress.rule=Esborrar regla de sortida +label.remove.ingress.rule=Esborrar regla d\\'entrada +label.remove.pf=Esborrar regla de reenviament de port +label.remove.rule=Esborrar regla +label.remove.static.nat.rule=Esborrar regla de NAT est\u00e0tic +label.remove.vm.from.lb=Treure VM de la regla de balanceig de c\u00e0rrega +label.removing=Esborrant +label.reserved.system.gateway=Pasarel\u00b7la reservada del sistema +label.reserved.system.netmask=M\u00e0scara reservada del sistema +label.revoke.project.invite=Revocar invitaci\u00f3 +label.root.disk.controller=Controlador de disc arrel +label.save.and.continue=Desa i continua +label.select.a.template=Sel\u00b7leccioni una plantilla +label.select.a.zone=Sel\u00b7leccioni una zona +label.select.iso.or.template=Sel\u00b7leccioni ISO o plantilla +label.select.project=Sel\u00b7leccionar projecte +label.select-view=Sel\u00b7lecioni vista +label.setup=Configuraci\u00f3 +label.shutdown.provider=Apagar prove\u00efdor +label.skip.guide=Si heu utilitzat CloudStack abans, ometi aquesta guia +label.srx=SRX +label.start.vlan=VLAN inici +label.static.nat.enabled=NAT est\u00e0tic habilitat +label.stickiness=Tend\u00e8ncia +label.sticky.mode=Mode +label.storage.traffic=Tr\u00e0fic d\\'emmagatzemament +label.subdomain.access=Acc\u00e9s de subdomini +label.suspend.project=Suspendre projecte +label.task.completed=Tasca complerta +label.timeout=Timeout +label.total.cpu=Total de CPU +label.total.CPU=Total de CPU +label.total.hosts=Total de hosts +label.total.memory=Total de RAM +label.total.of.ip=Total d\\'adre\u00e7es IP +label.total.of.vm=Total de MV +label.total.storage=Total d\\'emmagatzemament +label.traffic.types=Tipus de tr\u00e0fics +label.update.project.resources=Actualitzar recursos del projecte +label.view.all=Veure tots +label.view.console=Veure consola +label.viewing=Veient +label.view.more=Veure m\u00e9s +label.view=Veure +label.virtual.machines=M\u00e0quines virtuals +label.virtual.router=Router virtual +label.what.is.cloudstack=Que \u00e9s CloudStack&\#8482? +label.zone.details=Detalls de la zona +label.zones=Zones +message.acquire.new.ip=Si us plau confirmeu que voleu adquirir una nova IP per aquesta xarxa. +message.action.download.iso=Si us plau confirmeu que voleu descarregar aquesta ISO. +message.action.download.template=Si us plau confirmeu que voleu descarregar aquesta plantilla. +message.activate.project=Esteu segurs d\\'activar aquest projecte? +message.add.domain=Si us plau especifiqueu el sub-domini que voleu crear sota aquest domini +message.add.guest.network=Si us plau confirmeu que voleu afegir una xarxa per a MVs +message.after.enable.swift=Swift configurat. Nota\: Quan abandoneu aquesta p\u00e0gina, no sereu capa\u00e7os de reconfigurar Swift de nou. +message.alert.state.detected=Estat d\\'alerta detectat +message.change.password=Si us plau, canvieu la contrasenya. +message.confirm.delete.F5=Si us plau confirmeu que voleu esborrar l\\'F5 +message.confirm.delete.NetScaler=Si us plau confirmeu que voleu esborrar el NetScaler +message.confirm.delete.SRX=Si us plau confirmeu que voleu esborrar l\\'SRX +message.confirm.destroy.router=Si us plau confirmeu que voleu destruir aquest router +message.confirm.disable.provider=Si us plau confirmeu que voleu deshabilitar aquest prove\u00efdor +message.confirm.enable.provider=Si us plau confirmeu que voleu habilitar aquest prove\u00efdor +message.confirm.join.project=Si us plau confirmeu que voleu unir-vos al projecte. +message.confirm.shutdown.provider=Si us plau confirmeu que voleu apagar aquest prove\u00efdor +message.decline.invitation=Esteu segurs de declinar aquesta invitaci\u00f3 per al projecte? +message.delete.project=Esteu segurs d\\'eliminar el projecte? +message.delete.user=Si us plau confirmeu que voleu esborrar aquest usuari. +message.disable.user=Si us plao confirmeu que voleu deshabilitar aquest usuari. +message.disable.vpn=\u00bfEsteu segurs de deshabilitar la VPN? +message.edit.account=Editar ("-1" indica que no hi ha limit en la quantitat de recursos a crear) +message.enable.user=Si us plau confirmeu que voleu habilitar aquest usuari. +message.enable.vpn=Si us plau confirmeu que voleu habilitar l\\'acc\u00e9s VPN per aquesta adre\u00e7a IP +message.generate.keys=Si us plau confirmeu que voleu generar noves claus per aquest usuari. +message.installWizard.click.retry=Feu clic al bot\u00f3 per tornar a intentar l\\'inici. +message.installWizard.copy.whatIsSecondaryStorage=L\\'emmagatzemament secundari s\\'associa amb una zona, i emmagatzema el seg\u00fcent\:
  • Plantilles - Imatges de SO que es poden fer servir per arrencar MVs i poden incloure altra informaci\u00f3 de configuraci\u00f3, com ara aplicacions instal\u00b7lades
  • Imatges ISO - Imatges de SO que poden ser arrencables o no
  • Snapshots de disc - copies guardades de dades de MV que poden usar-se per recuperaci\u00f3 de dades o crear altres plantilles
+message.installWizard.tooltip.addCluster.name=Un nom per al cluster. Pot ser un text de la seva elecci\u00f3 i no utilitzat per CloudStack. +message.installWizard.tooltip.addHost.hostname=El nom DNS o adre\u00e7a de l\\'amfitri\u00f3 "host". +message.installWizard.tooltip.addHost.password=Aquesta \u00e9s la contrasenya per a l\\'usuari del d\\'amunt (des de la instal\u00b7laci\u00f3 de XenServer). +message.installWizard.tooltip.addHost.username=Normalment root +message.installWizard.tooltip.addPod.name=Un nom per al pod +message.installWizard.tooltip.addPod.reservedSystemEndIp=Aquest \u00e9s el rang IP a la xarxa privada que el CloudStack fa servir per administrar MVs per al Secondary Storage i Proxy de consoles. Aquestes IP es prenen de la mateixa sub-xarxa que els servidors de virtualitzaci\u00f3. +message.installWizard.tooltip.addPod.reservedSystemGateway=La passarel\u00b7la per als amfitrions en aquest pot. +message.installWizard.tooltip.addPod.reservedSystemNetmask=La m\u00e0scara de xarxa en \u00fas en la subxarxa dels clients a utilitzar +message.installWizard.tooltip.addPod.reservedSystemStartIp=Aquest \u00e9s el rang IP a la xarxa privada que el CloudStack fa servir per administrar MVs per al Secondary Storage i Proxy de consoles. Aquestes IP es prenen de la mateixa sub-xarxa que els servidors de virtualitzaci\u00f3. +message.installWizard.tooltip.addPrimaryStorage.name=El nom per al dispositiu d\\'emmagatzematge +message.installWizard.tooltip.addPrimaryStorage.path=(per a NFS) A NFS, aquest \u00e9s el cam\u00ed exportat des del servidor. Cam\u00ed (per SharedMountPoint). Amb KVM aquest \u00e9s el cam\u00ed a cada host on es munta el emmagatzemament primari. Per exemple, "/mnt/primary". +message.installWizard.tooltip.addPrimaryStorage.server=(per NFS, iSCSI, o PreSetup) La adre\u00e7a IP o nom DNS del dispositiu d\\'emmagatzematge. +message.installWizard.tooltip.addSecondaryStorage.nfsServer=L\\'adre\u00e7a IP del servidor NFS que allotja l\\'emmagatzematge secundari +message.installWizard.tooltip.addSecondaryStorage.path=La ruta d\\'exportaci\u00f3, que es troba en el servidor que s\\'ha especificat anteriorment +message.installWizard.tooltip.configureGuestTraffic.description=Una descripci\u00f3 de la xarxa +message.installWizard.tooltip.configureGuestTraffic.guestGateway=La passarel\u00b7la que els convidats han d\\'utilitzar +message.installWizard.tooltip.configureGuestTraffic.guestNetmask=La m\u00e0scara de xarxa en \u00fas en la subxarxa que els clients han d\\'utilitzar +message.installWizard.tooltip.configureGuestTraffic.name=Un nom per a la teva xarxa +message.instanceWizard.noTemplates=No teniu cap plantilla disponible; si us plau afegiu una plantilla disponible i torneu a usar l\\'assistent. +message.join.project=Us heu unit a un projecte. Si us pla canvieu a vista de projecte per veure el projecte. +message.migrate.instance.to.host=Si us plau, confirmi que vol migrar la inst\u00e0ncia a un altra amfitri\u00f3 "host" +message.migrate.instance.to.ps=Si us plau, confirmi que vol migrar la inst\u00e0ncia a un altra emmagatzematge primari. +message.migrate.router.confirm=Si us plau confirmeu que voleu migrar el router a\: +message.migrate.systemvm.confirm=Si us plau confirmeu que voleu migrar la MV de sistema a\: +message.no.projects.adminOnly=No teniu cap projecte.
Si us plau demaneu a l\\'administrador que us en crei un. +message.no.projects=No teniu cap projecte.
Si us plau creeu-ne un des de la secci\u00f3 de projecte. +message.pending.projects.1=Teniu invitacions pendents. +message.pending.projects.2=Per veure, si us plau aneu a la secci\u00f3 de projectes, i sel\u00b7leccioneu invitacions al desplegable. +message.project.invite.sent=Invitaci\u00f3 enviada a l\\'usuari; ser\u00e0 afegit al projecte quan accepti l\\'invitaci\u00f3 +message.select.item=Si us plau sel\u00b7leccioneu un article +message.setup.successful=Instal\u00b7laci\u00f3 del cloud correcte\! +message.step.2.desc= +message.step.3.desc= +message.suspend.project=Esteu segurs de suspendre aquest projecte? +message.update.resource.count=Si us plau confirmeu que voleu actualitzar el comptatge de recursos per aquest compte. +mode=Mode +network.rate=Velocitat de xarxa +side.by.side=Costat a costat +state.Accepted=Acceptat +state.Active=Actiu +state.Completed=Complert +state.Creating=Creant +state.Declined=Declinat +state.Disabled=Deshabilitat +state.enabled=Habilitat +state.Enabled=Habilitat +state.Expunging=Esborrant +state.Pending=Pendent +state.ready=Preparat +state.Ready=Preparat +state.Starting=Arrencant +state.Suspended=Susp\u00e9s diff --git a/client/WEB-INF/classes/resources/messages_de_DE.properties b/client/WEB-INF/classes/resources/messages_de_DE.properties new file mode 100644 index 00000000000..45812687d2f --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_de_DE.properties @@ -0,0 +1,747 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +error.installWizard.message=Ein Fehler ist aufgetreten; Sie k\u00f6nnen zur\u00fcckgehen und den Fehler korregieren +error.login=Ihr Benutzername / Passwort stimmt nicht mit uneren unseren Aufzeichnungen \u00fcberein. +error.session.expired=Ihre Sitzung ist abgelaufen. +force.delete.domain.warning=Achtung\: Diese Auswahl f\u00fchrt zu einer L\u00f6schung aller untergeordneten Domains und aller angeschlossenen Konten sowie ihrer Quellen. +force.delete=Erzwinge L\u00f6schung +force.remove=Erzwinge Entfernung +force.remove.host.warning=Achtung\: Diese Auswahl wird CloudStack zum sofortigen Anhalten der virtuellen Maschine f\u00fchren, bevor der Host vom Cluster entfernt wurde. +force.stop=Erzwinge Abbruch +ICMP.code=ICMP Code +ICMP.type=ICMP-Typ +image.directory=Bildverzeichnis +label.account=Benutzerkonto +label.account.id=Benutzerkonto-ID +label.account.name=Benutzerkonto-Name +label.accounts=Benutzerkonten +label.account.specific=Besonderheiten des Benutzerkontos +label.acquire.new.ip=Neue IP erwerben +label.action.attach.disk=Festplatte hinzuf\u00fcgen +label.action.attach.disk.processing=Hinzuf\u00fcgen einer Festplatte .... +label.action.attach.iso=ISO hinzuf\u00fcgen +label.action.attach.iso.processing=Hinzuf\u00fcgen einer ISO.... +label.action.cancel.maintenance.mode.processing=Abbruch des Wartungsmodus +label.action.cancel.maintenance.mode=Wartungsmodus abbrechen +label.action.change.password=Passwort \u00e4ndern +label.action.change.service=Dienst \u00e4ndern +label.action.change.service.processing=Wechseln des Dienstes .... +label.action.copy.ISO=ISO kopieren +label.action.copy.ISO.processing=Kopieren der ISO .... +label.action.copy.template.processing=Kopieren der Vorlage .... +label.action.copy.template=Vorlage kopieren +label.action.create.template.from.vm=Erstelle Vorlage aus VM +label.action.create.template.from.volume=Erstelle Vorlage vom Datentr\u00e4ger +label.action.create.template.processing=Erstellen der Vorlage .... +label.action.create.template=Vorlage erstellen +label.action.create.vm=Erstelle VM +label.action.create.vm.processing=Erstellung der VM.... +label.action.create.volume=Erstelle Volume +label.action.create.volume.processing=Erstellen von Volume .... +label.action.delete.account=Benutzerkonto l\u00f6schen +label.action.delete.account.processing=L\u00f6schung des Benutzerkontos .... +label.action.delete.cluster=L\u00f6schen des Clusters +label.action.delete.cluster.processing=L\u00f6schung des Clusters .... +label.action.delete.disk.offering=Festplatten-Angebot l\u00f6schen +label.action.delete.disk.offering.processing=L\u00f6schen des Festplatten-Angebots .... +label.action.delete.domain=L\u00f6schen der Domain +label.action.delete.domain.processing=L\u00f6schung der Domain .... +label.action.delete.firewall.processing=L\u00f6schung der Firewall .... +label.action.delete.ingress.rule.processing=L\u00f6schen der Zutrittsregel .... +label.action.delete.ingress.rule=Zutrittsregel l\u00f6schen +label.action.delete.IP.range=IP-Bereich l\u00f6schen +label.action.delete.IP.range.processing=L\u00f6schen von IP-Bereich .... +label.action.delete.ISO=ISO l\u00f6schen +label.action.delete.ISO.processing=L\u00f6schen der ISO .... +label.action.delete.load.balancer.processing=Beendigung der Serverlastverteilung.... +label.action.delete.network=L\u00f6schen des Netzwerks +label.action.delete.network.processing=L\u00f6schung des Netzwerks .... +label.action.delete.pod=Pod l\u00f6schen +label.action.delete.pod.processing=L\u00f6schen des Pod .... +label.action.delete.primary.storage=Hauptspeicher l\u00f6schen +label.action.delete.primary.storage.processing=L\u00f6schen des Hauptspeichers .... +label.action.delete.secondary.storage.processing=L\u00f6schen des Sekund\u00e4rspeichers.... +label.action.delete.secondary.storage=Sekund\u00e4rspeicher l\u00f6schen +label.action.delete.security.group.processing=L\u00f6schen der Sicherheitsgruppe .... +label.action.delete.security.group=Sicherheitsgruppe l\u00f6schen +label.action.delete.service.offering.processing=L\u00f6schen des Serviceangebots .... +label.action.delete.service.offering=Serviceangebot l\u00f6schen +label.action.delete.snapshot.processing=L\u00f6schen des Schnappschusses.... +label.action.delete.snapshot=Schnappschuss l\u00f6schen +label.action.delete.template.processing=L\u00f6schen der Vorlage .... +label.action.delete.template=Vorlage l\u00f6schen +label.action.delete.user=Benutzer l\u00f6schen +label.action.delete.user.processing=L\u00f6schung des Benutzers .... +label.action.delete.volume=Datentr\u00e4ger l\u00f6schen +label.action.delete.volume.processing=L\u00f6schen des Datentr\u00e4gers.... +label.action.delete.zone.processing=L\u00f6schen der Zone .... +label.action.delete.zone=Zone l\u00f6schen +label.action.destroy.instance=Die Instanz vernichten +label.action.destroy.instance.processing=Die Vernichtung der Instanz.... +label.action.destroy.systemvm.processing=Vernichtung des System-VM .... +label.action.destroy.systemvm=System-VM vernichten +label.action.detach.disk=Festplatte entfernen +label.action.detach.disk.processing=Entfernen der Festplatte +label.action.detach.iso=ISO entfernen +label.action.detach.iso.processing=Entfernen von ISO .... +label.action.disable.account=Benutzerkonto deaktivieren +label.action.disable.account.processing=Deaktivierung des Benutzerkontos .... +label.action.disable.cluster=Deaktivieren des Clusters +label.action.disable.cluster.processing=Deaktivierung des Clusters.... +label.action.disable.pod=Deaktiviere Pod +label.action.disable.pod.processing=Deaktivierung des Pod.... +label.action.disable.static.NAT.processing=Deaktivieren der statischen NAT .... +label.action.disable.static.NAT=Statische NAT deaktivieren +label.action.disable.user=Benutzer deaktivieren +label.action.disable.user.processing=Deaktivierung des Benutzers .... +label.action.disable.zone=Deaktivieren der Zone +label.action.disable.zone.processing=Deaktivierung der Zone.... +label.action.download.ISO=ISO herunterladen +label.action.download.template=Vorlage herunterladen +label.action.download.volume.processing=Herunterladen des Volumes .... +label.action.download.volume=Volume herunterladen +label.action.edit.account=Benutzerkonto bearbeiten +label.action.edit.disk.offering=Bearbeiten des Festplatten-Angebots +label.action.edit.domain=Domain bearbeiten +label.action.edit.global.setting=Globale Einstellungen bearbeiten +label.action.edit.host=Bearbeite Host +label.action.edit.instance=Instanz bearbeiten +label.action.edit.ISO=ISO bearbeiten +label.action.edit.network=Bearbeiten des Netzwerks +label.action.edit.network.offering=Bearbeiten des Netzwerk-Angebots +label.action.edit.network.processing=Bearbeitung des Netzwerks .... +label.action.edit.pod=Bearbeiten des Pods +label.action.edit.primary.storage=Hauptspeicher bearbeiten +label.action.edit.resource.limits=Resourcen Grenzen bearbeiten +label.action.edit.service.offering=Service-Angebot bearbeiten +label.action.edit.template=Vorlage bearbeiten +label.action.edit.user=Benutzer bearbeiten +label.action.edit.zone=Zone bearbeiten +label.action.enable.account=Konto aktivieren +label.action.enable.account.processing=Aktivierung des Kontos.... +label.action.enable.cluster=Aktivieren des Clusters +label.action.enable.cluster.processing=Aktivierung des Clusters.... +label.action.enable.maintenance.mode.processing=Aktivieren des Wartungsmodus +label.action.enable.maintenance.mode=Wartungsmodus aktivieren +label.action.enable.pod=Aktiviere Pod +label.action.enable.pod.processing=Aktivierung des Pod.... +label.action.enable.static.NAT.processing=Aktivieren der statischen NAT .... +label.action.enable.static.NAT=Statische NAT aktivieren +label.action.enable.user=Nutzer aktivieren +label.action.enable.user.processing=Aktivierung des Nutzers... +label.action.enable.zone=Aktivieren der Zone +label.action.enable.zone.processing=Aktivierung der Zone.... +label.action.force.reconnect=Erzwinge wieder verbinden +label.action.force.reconnect.processing=Wieder verbinden.... +label.action.generate.keys.processing=Genieren der Schl\u00fcssel +label.action.generate.keys=Schl\u00fcssel generieren +label.action.lock.account=Konto sperren +label.action.lock.account.processing=Kontosperrung .... +label.action.manage.cluster.processing=Verwaltung des Clusters.... +label.action.manage.cluster=Verwalte Cluster +label.action.migrate.instance=Mit einer Instanz umziehen +label.action.migrate.instance.processing=Umziehen einer Instanz +label.action.reboot.instance=Instanz neustarten +label.action.reboot.instance.processing=Neustarten der Instanz... +label.action.reboot.router.processing=Neustart vom Router .... +label.action.reboot.router=Router neu starten +label.action.reboot.systemvm.processing=Neustart-System VM .... +label.action.reboot.systemvm=System VM neu starten +label.action.release.ip=IP ver\u00f6ffentlichen +label.action.release.ip.processing=Ver\u00f6ffentlichung der IP.... +label.action.remove.host=Host entfernen +label.action.remove.host.processing=Entfernen des Hosts.... +label.action.reset.password=Passwort zur\u00fccksetzen +label.action.reset.password.processing=Zur\u00fccksetzen des Passworts .... +label.action.resource.limits=Grenzen der Ressourcen +label.action.restore.instance=Instanz wiederherstellen +label.action.restore.instance.processing=Wiederherstellen der Instanz.... +label.actions=Aktionen +label.action.start.instance=Instanz beginnen +label.action.start.instance.processing=Beginnen mit der Instanz.... +label.action.start.router.processing=Starten des Routers .... +label.action.start.router=Router starten +label.action.start.systemvm.processing=Starten von System VM .... +label.action.start.systemvm=System VM starten +label.action.stop.instance=Instanz stoppen +label.action.stop.instance.processing=Stoppen der Instanz.... +label.action.stop.router.processing=Stoppen des Routers .... +label.action.stop.router=Router stoppen +label.action.stop.systemvm.processing=Stoppen vom System VM .... +label.action.stop.systemvm=System VM stoppen +label.action.take.snapshot.processing=Schnappschuss erstellen... +label.action.take.snapshot=Schnappschuss erstellen +label.action.unmanage.cluster.processing=Vernachl\u00e4ssigung des Clusters .... +label.action.unmanage.cluster=Vernachl\u00e4ssige Cluster +label.action.update.OS.preference=Betriebssystem Pr\u00e4verenz aktualisieren +label.action.update.OS.preference.processing=Aktualisierung der Betriebssystem Pr\u00e4verenz.... +label.active.sessions=Aktive Sitzungen +label.add.account=Konto hinzuf\u00fcgen +label.add.by.cidr=Hinzuf\u00fcgen durch CIDR +label.add.by.group=Hinzuf\u00fcgen durch Gruppe +label.add.cluster=Cluster hinzuf\u00fcgen +label.add.direct.iprange=Direkten Ip-Bereich hinzuf\u00fcgen +label.add.disk.offering=Festplatten-Angebot hinzuf\u00fcgen +label.add.domain=Domain hinzuf\u00fcgen +label.add=Hinzuf\u00fcgen +label.add.host=Host hinzuf\u00fcgen +label.adding.cluster=Cluster hinzuf\u00fcgen +label.adding.failed=Hinzuf\u00fcgen fehlgeschlagen +label.adding=Hinzuf\u00fcgen +label.adding.pod=Hinzuf\u00fcgen des Pods +label.adding.processing=Hinzuf\u00fcgen.... +label.add.ingress.rule=Zutrittsregel hinzuf\u00fcgen +label.adding.succeeded=Erfolgreich hinzugef\u00fcgt +label.adding.user=Nutzer hinzuf\u00fcgen +label.adding.zone=Hinzuf\u00fcgen der Zone +label.add.ip.range=IP Bereich hinzuf\u00fcgen +label.additional.networks=Zus\u00e4tzliche Networks +label.add.load.balancer=Serverlastverteilung hinzuf\u00fcgen +label.add.more=Mehr hinzuf\u00fcgen +label.add.network.device=Hinzuf\u00fcgen eines Netzwerkger\u00e4tes +label.add.network=Netzwerk hinzuf\u00fcgen +label.add.pod=Pod hinzuf\u00fcgen +label.add.primary.storage=Hauptspeicher hinzuf\u00fcgen +label.add.secondary.storage=Sekund\u00e4rspeicher hinzuf\u00fcgen +label.add.security.group=Sicherheitsgruppe hinzuf\u00fcgen +label.add.service.offering=Service-Angebot hinzuf\u00fcgen +label.add.system.service.offering=System-Service-Angebot hinzuf\u00fcgen +label.add.template=Vorlage hinzuf\u00fcgen +label.add.user=Benutzer hinzuf\u00fcgen +label.add.vlan=VLAN hinzuf\u00fcgen +label.add.volume=Volume hinzuf\u00fcgen +label.add.zone=Zone hinzuf\u00fcgen +label.admin.accounts=Administrator-Konten +label.admin=Administrator +label.advanced.mode=Erweiterter Modus +label.advanced.search=Erweiterte Suche +label.advanced=Weitergehend +label.alert=Warnung +label.algorithm=Algorithmus +label.allocated=Zugeteilt +label.allocation.state=Belegungszustand +label.api.key=API Schl\u00fcssel +label.assign.to.load.balancer=Instanz zum Lastverteiler hinzuf\u00fcgen +label.assign=Zuweisen +label.associated.network.id=Assozierte Netzwerk ID +label.attached.iso=Angeh\u00e4ngte ISO +label.availability=Verf\u00fcgbarkeit +label.availability.zone=Verf\u00fcgbare Zone +label.available.public.ips=Verf\u00fcgbaren \u00f6ffentlichen IP-Adressen +label.available=Verf\u00fcgbar +label.back=Zur\u00fcck +label.basic.mode=Grundmodus +label.bootable=Bootbar +label.broadcast.domain.type=Benachrichtigung an alle Nutzer \u00fcber Domain Typ +label.by.account=Nach Benutzerkonto +label.by.availability=Nach Verf\u00fcgbarkeit +label.by.domain=Nach Domain +label.by.end.date=Nach Endedatum +label.by.level=Nach Level +label.by.pod=Nach Pod +label.by.role=Nach Rolle +label.by.start.date=Nach Beginndatum +label.by.state=\u00fcber den Zustand +label.bytes.received=Empfangene Bytes +label.bytes.sent=Gesendete Bytes +label.by.traffic.type=Nach Traffic-Typ +label.by.type.id=Nach Typ ID +label.by.type=Nach Typ +label.by.zone=Nach Zone +label.cancel=Abbrechen +label.certificate=Zertifikat +label.character=Buchstabe +label.cidr.account=CIDR oder Benutzerkonto/Sicherheitsgruppe +label.cidr=CIDR +label.cidr.list=Quelle CIDR +label.close=Schliessen +label.cloud.console=Cloud Management Konsole +label.cloud.managed=Geleitet von cloud.com +label.cluster=Cluster +label.cluster.type=Cluster-Typ +label.code=Code +label.configuration=Konfiguration +label.confirmation=Best\u00e4tigung +label.congratulations=Herzlichen Gl\u00fcckwunsch +label.corrections.saved=Korrekturen gespeichert +label.cpu.allocated=Zugeteilte CPU +label.CPU.cap=CPU Obergrenze +label.cpu=CPU +label.cpu.mhz=CPU (in MHz) +label.cpu.utilized=genutzte CPU +label.created=Erstellt +label.cross.zones=\u00fcberschneidende Zonen +label.custom.disk.size=Benutzerdefinierte Festplattengr\u00f6sse +label.daily=T\u00e4glich +label.data.disk.offering=Daten-Speicherplatz-Angebot +label.date=Datum +label.day.of.month=Tag des Monats +label.day.of.week=Tag der Woche +label.default.use=Standardeinstellung nutzen +label.delete=L\u00f6schen +label.deleting.failed=L\u00f6schen fehlgeschlagen +label.deleting.processing=L\u00f6schen .... +label.description=Beschreibung +label.destroy=Zerst\u00f6ren +label.detaching.disk=Entfernen der Festplatte +label.details=Details +label.device.id=Ger\u00e4te-ID +label.DHCP.server.type=DHCP Server Type +label.disabled=Deaktiviert +label.disabling.vpn.access=Deaktivierung des VPN Zugangs +label.disk.allocated=Zugeordnete Festplatte +label.disk.offering=Festplatten-Angebot +label.disk.size=Festplattengr\u00f6\u00dfe +label.disk.size.gb=Festplattengr\u00f6\u00dfe (in GB) +label.disk.total=Gesamtzahl der Festplatten +label.disk.volume=Festplatten Volume +label.display.text=Anzeigetext +label.dns.1=DNS 1 +label.dns.2=DNS 2 +label.domain.admin=Domain Administrator +label.domain=Domain +label.domain.id=Domain ID +label.domain.name=Domain Name +label.domain.suffix=DNS Domainsuffix (z.B. xzy.com) +label.double.quotes.are.not.allowed=Anf\u00fchrungszeichen sind nicht erlaubt +label.download.progress=Download-Fortschritt +label.edit=Bearbeiten +label.email=E-Mail +label.enabling.vpn.access=Aktivieren des VPN-Zugriffs +label.enabling.vpn=VPN aktivieren +label.endpoint.or.operation=Endpunkt oder Bedienung +label.end.port=Beende Port +label.error.code=Fehlercode +label.error=Fehler +label.esx.host=ESX / ESXi-Host +label.example=Beispiel +label.failed=Fehlgeschlagen +label.featured=Besonderheiten aufweisen +label.firewall=Firewall +label.first.name=Vorname +label.format=Format +label.friday=Freitag +label.full=Voll +label.gateway=Schnittstelle +label.general.alerts=Allgemeine Warnungen +label.generating.url=Generieren der URL +label.go.step.2=Gehe zu Schritt 2 +label.go.step.3=Weiter zu Schritt 3 +label.go.step.4=Weiter mit Schritt 4 +label.go.step.5=Weiter mit Schritt 5 +label.group=Gruppe +label.group.optional=Gruppe (optional) +label.guest.cidr=Gast CIDR +label.guest.gateway=Gast-Schnittstelle +label.guest.ip=Gast IP-Adresse +label.guest.ip.range=Gast IP Berecih +label.guest.netmask=Gast Netzmaske +label.ha.enabled=HA aktiviert +label.help=Hilfe +label.hide.ingress.rule=Verstecke Regeln, die den Zutritt steuern +label.host.alerts=Host Warnungen +label.host=Host +label.host.name=Host Name +label.hosts=Hosts +label.host.tags=Markierungen des Hosts +label.hourly=St\u00fcndlich +label.hypervisor=Hypervisor +label.hypervisor.type=Hypervisor Typ +label.id=Identifikation +label.info=Info +label.ingress.rule=Zutrittsregel +label.initiated.by=Initiiert durch +label.installWizard.addClusterIntro.subtitle=Was ist ein Cluster? +label.installWizard.addClusterIntro.title=cluster hinzuf\u00fcgen +label.installWizard.addHostIntro.subtitle=Was ist ein host? +label.installWizard.addHostIntro.title=host hinzuf\u00fcgen +label.installWizard.addPodIntro.subtitle=Was ist ein pod? +label.installWizard.addPodIntro.title=pod hinzuf\u00fcgen +label.installWizard.addPrimaryStorageIntro.subtitle=Was ist primay storage? +label.installWizard.addPrimaryStorageIntro.title=primary storage hinzuf\u00fcgen +label.installWizard.addSecondaryStorageIntro.subtitle=Was ist secondary storage? +label.installWizard.addSecondaryStorageIntro.title=secondary storage +label.installWizard.addZone.title=zone hinzuf\u00fcgen +label.installWizard.click.launch=Bitte den Start Button dr\u00fccken +label.instance=Instanz +label.instance.limits=Instanz Grenzen +label.instance.name=Name der Instanz +label.instances=Instanzen +label.internal.dns.1=Interne DNS 1 +label.internal.dns.2=Interne DNS 2 +label.interval.type=Interval Typ +label.invalid.integer=Ung\u00fcltige Ganzzahl +label.invalid.number=Ung\u00fcltige Anzahl +label.ip.address=IP-Adresse +label.ipaddress=IP-Adresse +label.ip=IP +label.ip.or.fqdn=IP oder FQDN +label.ip.range=IP-Bereich +label.ips=IPs +label.iscsi=iSCSI +label.is.default=Ist vorgegeben +label.iso.boot=ISO-Boot +label.iso=ISO +label.is.redundant.router=Redundant +label.is.shared=Gemeinsam +label.keep=Behalten +label.lang.chinese=chinesisch (vereinfacht) +label.lang.english=englisch +label.lang.japanese=japanisch +label.lang.spanish=spanisch +label.last.disconnected=Zuletzt getrennt +label.last.name=Nachname +label.launch=Start +label.level=Ebene +label.load.balancer=Serverlastverteilung +label.loading=Laden +label.local=Lokal +label.login=Login +label.logout=Abmelden +label.lun=LUN +label.manage=Verwalten +label.maximum=Maximum +label.may.continue=Sie k\u00f6nnen jetzt fortfahren +label.memory.allocated=zugeordneter Speicher +label.memory.mb=Speicher (in MB) +label.memory=Speicher (in MB) +label.memory.total=Speicher insgesamt +label.memory.used=Genutzter Speicher +label.menu.accounts=Benutzerkonten +label.menu.alerts=Warnungen +label.menu.all.accounts=Alle Konten +label.menu.all.instances=Alle Instanzen +label.menu.community.isos=Gemeinschaft ISOs +label.menu.community.templates=Gemeinschaft Vorlagen +label.menu.configuration=Konfiguration +label.menu.dashboard=Dashboard +label.menu.destroyed.instances=Zerst\u00f6rte Instanzen +label.menu.disk.offerings=Festplatten-Angebote +label.menu.domains=Domains +label.menu.events=Events +label.menu.featured.isos=Besondere ISOs +label.menu.global.settings=Allgemeine Einstellungen +label.menu.instances=Instanzen +label.menu.ipaddresses=IP-Adressen +label.menu.isos=ISOs +label.menu.my.accounts=Meine Konten +label.menu.my.instances=Meine F\u00e4lle +label.menu.my.isos=Meine ISOs +label.menu.my.templates=Meine Vorlagen +label.menu.network=Netzwerk +label.menu.network.offerings=Netzwerk-Angebote +label.menu.physical.resources=Technische Ressourcen +label.menu.running.instances=Laufende Instanzen +label.menu.security.groups=Sicherheitsgruppen +label.menu.service.offerings=Service-Angebote +label.menu.snapshots=Schnappsch\u00fcsse +label.menu.stopped.instances=Beendete Instanzen +label.menu.storage=Speicherung +label.menu.system=System +label.menu.system.vms=System VMs +label.menu.templates=Vorlagen +label.menu.virtual.resources=Virtuelle Ressourcen +label.menu.volumes=Volumes +label.migrate.instance.to.host=Instanz auf einen anderen Host migrieren +label.migrate.instance.to.ps=Instanz auf einen anderen Speicher migrieren +label.minimum=Minimum +label.monday=Montag +label.monthly=Monatlich +label.more.templates=Mehr Vorlagen +label.my.account=Ihr Benutzerkonto +label.name=Name +label.name.optional=Name (Optional) +label.netmask=Netzmaske +label.network.device=Netzwerkger\u00e4t +label.network.device.type=Netzwerkger\u00e4tetyp +label.network.domain=Netzwerk-Domain +label.network.id=Netzwerk-ID +label.network.name=Netzwerk Name +label.network=Netzwerk +label.network.offering=Netzwerk-Angebot +label.network.rate=Netzwerk-Rate +label.network.type=Netzwerk-Typ +label.new.password=Neues Passwort +label.next=Weiter +label.nfs=NFS +label.nfs.server=NFS Server +label.nfs.storage=NFS-Speicher +label.nics=NICs +label.no.actions=Nicht verf\u00fcgbare Aktionen +label.no.alerts=Keine neuen Warnungen +label.no.errors=Keine neuen Fehler +label.no.isos=Kein verf\u00fcgbaren ISOs +label.no.items=Keine verf\u00fcgbaren Eintr\u00e4ge +label.no=Nein +label.none=Kein +label.no.security.groups=Keine verf\u00fcgbare Sicherheitsgruppe +label.not.found=Nicht gefunden +label.numretries=Anzahl von Wiederholungen +label.ocfs2=OCFS2 +label.offer.ha=HA anbieten +label.optional=optional +label.os.preference=OS Pr\u00e4ferenz +label.os.type=OS Typ +label.password.enabled=Passwort aktiviert +label.password=Passwort +label.PING.CIFS.password=PING CIFS Passwort +label.PING.CIFS.username=PING CIFS Benutzername +label.PING.dir=PING-Verzeichnis +label.PING.storage.IP=IP des externen Speichers anpingen +label.please.wait=Bitte warten +label.pod=Pod +label.PreSetup=Voreinstellung +label.primary.allocated=Zugewiesener Hauptspeicher +label.primary.network=Hauptnetzwerk +label.primary.storage=Hauptspeicher +label.primary.used=Genutzter Hauptspeicher +label.private.interface=Privates Interface +label.private.ip=Private IP-Adresse +label.private.ips=Private IP-Adressen +label.private.port=Privater Port +label.private.zone=Private Zone +label.protocol=Protokoll +label.public.interface=\u00d6ffentliches Interface +label.public.ips=\u00d6ffentliche IP-Adressen +label.public.ip=\u00d6ffentliche IP-Adresse +label.public.port=\u00d6ffentlicher Port +label.public=\u00d6ffentlich +label.public.zone=\u00d6ffentliche Zone +label.Pxe.server.type=PXE Server Type +label.reboot=Neustart +label.recent.errors=Aktuelle Fehler +label.redundant.router=Redundanter Router +label.refresh=Aktualisieren +label.related=Verwandt +label.removing.user=Entfernen von Benutzern +label.required=Erforderlich +label.resource=Ressource +label.resources=Ressourcen +label.role=Rolle +label.running.vms=Laufende VMs +label.s3.secret_key=Secret Key +label.saturday=Samstag +label.save=Sichern +label.saving.processing=Sichern .... +label.search=Suche +label.secondary.storage=Sekund\u00e4rspeicher +label.secondary.used=Genutzter Sekund\u00e4rspeicher +label.secret.key=Secret Key +label.security.group.name=Sicherheitsgruppen-Name +label.security.groups.enabled=Sicherheitsgruppe aktiviert +label.security.group=Sicherheitsgruppe +label.security.groups=Sicherheitsgruppen +label.sent=Versendet +label.server=Server +label.service.offering=Service-Angebot +label.session.expired=Sitzung abgelaufen +label.shared=Gemeinsame +label.SharedMountPoint=Geteilter Einh\u00e4ngepunkt +label.show.ingress.rule=Zeige Regeln, die den Zutritt steuern +label.size=Gr\u00f6\u00dfe +label.snapshot.limits=Schnappschuss Grenzen +label.snapshot.name=Schnappschuss Name +label.snapshot=Schnappschuss +label.snapshots=Schnappsch\u00fcsse +label.snapshot.s=Schnappschuss (Schnappsch\u00fcsse) +label.static.nat=Statische NAT +label.statistics=Statistiken +label.status=Status +label.step.1=Schritt 1 +label.step.2=Schritt 2 +label.step.3=Schritt 3 +label.step.4=Schritt 4 +label.step.5=Schritt 5 +label.sticky.domain=Domain +label.stopped.vms=Gestoppte VMs +label.stop=Stopp +label.storage=Speicherung +label.storage.tags=Datenspeicher-Markierung +label.storage.type=Speichertyp +label.submit=\u00dcberreichen +label.succeeded=Erfolgreich +label.sunday=Sonntag +label.system.service.offering=System-Service-Angebot +label.system.vms=System VMs +label.system.vm=System-VM +label.system.vm.type=System VM Typ +label.tagged=Markiert +label.tags=Markierungen +label.target.iqn=Ziel IQN +label.template.limits=Vorlagen Grenzen +label.template=Vorlage +label.TFTP.dir=TFTP-Verzeichnis +label.theme.default=Motiv-Standardeinstellung +label.theme.grey=personalisiertes - grau +label.theme.lightblue=personalisiertes - hellblau +label.thursday=Donnerstag +label.time=Zeit +label.time.zone=Zeitzone +label.timezone=Zeitzone +label.total.cpu=Gesamtanzahl CPU +label.total.CPU=Gesamtanzahl CPU +label.total.vms=Insgesamte VMs +label.traffic.type=Traffic Typ +label.tuesday=Dienstag +label.type.id=Typ ID +label.type=Typ +label.unavailable=nichtverf\u00fcgbar +label.unlimited=uneingeschr\u00e4nkt +label.untagged=Unmarkiert +label.updating=Aktualisierung +label.url=URL +label.used=Gebraucht +label.user=Benutzer +label.username=Benutzername +label.users=Benutzer +label.value=Wert +label.vcenter.cluster=vCenter Cluster +label.vcenter.datacenter=vCenter Rechenzentrum +label.vcenter.datastore=vCenter Datenspeicher +label.vcenter.host=vCenter Host +label.vcenter.password=vCenter Passwort +label.vcenter.username=vCenter Benutzername +label.version=Version +label.virtual.network=Virtuelles Netzwerk +label.vlan.id=VLAN ID +label.vlan.range=VLAN Reichweite +label.vlan=VLAN +label.vm.add=Instanz hinzuf\u00fcgen +label.vm.destroy=Zerst\u00f6ren +label.VMFS.datastore=VMFS Datenspeicher +label.vmfs=VMFS +label.vm.reboot=Neustart +label.vmsnapshot.type=Typ +label.vm.start=Start +label.vm.stop=Stopp +label.vms=VMs +label.volume.limits=Volume Grenzen +label.volume.name=Volume Name +label.volumes=Volumes +label.volume=Volume +label.vpn=VPN +label.waiting=Warten +label.warn=Warnen +label.wednesday=Mittwoch +label.weekly=W\u00f6chentlich +label.welcome=Willkommen +label.yes=Ja +label.zone.id=Zone ID +label.zone=Zone +message.acquire.public.ip=Bitte w\u00e4hlen Sie eine Zone, von der Sie Ihre neue IP erlangen m\u00f6chten. +message.action.cancel.maintenance=Ihr Host ist erfolgreich f\u00fcr die Wartung abgebrochen. Dieser Prozess kann ein paar Minuten dauern. +message.action.cancel.maintenance.mode=Bitte best\u00e4tigen Sie, dass Sie die Wartung abbrechen m\u00f6chten. +message.action.change.service.warning.for.instance=Ihre Instanz muss zuerst unterbrochen werden, bevor Sie Ihr derzeitiges Service-Angebot \u00e4ndern m\u00f6chten. +message.action.change.service.warning.for.router=Ihre Instanz muss zuerst unterbrochen werden, bevor Sie Ihr derzeitiges Service-Angebot \u00e4ndern m\u00f6chten. +message.action.delete.cluster=Bitte best\u00e4tigen Sie, dass Sie dieses Cluster l\u00f6schen m\u00f6chten. +message.action.delete.disk.offering=Bitte best\u00e4tigen Sie, dass Sie dieses Festplatten-Angebot l\u00f6schen m\u00f6chten. +message.action.delete.domain=Bitte best\u00e4tigen Sie, dass Sie diese Domain l\u00f6schen m\u00f6chten. +message.action.delete.ingress.rule=Bitte best\u00e4tigen Sie, dass Sie diese Zutrittsregel l\u00f6schen wollen. +message.action.delete.ISO=Bitte best\u00e4tigen Sie, dass Sie diese ISO l\u00f6schen m\u00f6chten. +message.action.delete.ISO.for.all.zones=Die ISO gilt f\u00fcr alle Zonen. Bitte best\u00e4tigen Sie, dass Sie diese aus allen Zonen l\u00f6schen m\u00f6chten. +message.action.delete.network=Bitte best\u00e4tigen Sie, dass Sie dieses Netzwerk l\u00f6schen m\u00f6chten. +message.action.delete.pod=Bitte best\u00e4tigen Sie, dass Sie dieses pod l\u00f6schen m\u00f6chten. +message.action.delete.primary.storage=Bitte best\u00e4tigen Sie, dass Sie diese Hauptspeicher l\u00f6schen m\u00f6chten. +message.action.delete.secondary.storage=Bitte best\u00e4tigen Sie, dass Sie diesen Sekund\u00e4rspeicher l\u00f6schen m\u00f6chten. +message.action.delete.security.group=Bitte best\u00e4tigen Sie, dass Sie diese Sicherheitsgruppe l\u00f6schen m\u00f6chten. +message.action.delete.service.offering=Bitte best\u00e4tigen Sie, dass Sie diesen Service-Angebot l\u00f6schen m\u00f6chten. +message.action.delete.snapshot=Bitte best\u00e4tigen Sie, dass Sie diesen Schnappschuss l\u00f6schen m\u00f6chten. +message.action.delete.template=Bitte best\u00e4tigen Sie, dass Sie diese Vorlage l\u00f6schen m\u00f6chten. +message.action.delete.template.for.all.zones=Die Vorlage wird f\u00fcr alle Zonen genutzt. Bitte best\u00e4tigen Sie, dass Sie diese f\u00fcr alle Zonen l\u00f6schen m\u00f6chten. +message.action.delete.volume=Bitte best\u00e4tigen Sie, dass Sie dieses Volume l\u00f6schen m\u00f6chten. +message.action.delete.zone=Bitte best\u00e4tigen Sie, dass Sie diese Zone l\u00f6schen m\u00f6chten. +message.action.destroy.instance=Bitte best\u00e4tigen Sie, dass Sie diese Instanz l\u00f6schen m\u00f6chten. +message.action.destroy.systemvm=Bitte best\u00e4tigen Sie, dass Sie die System VM zerst\u00f6ren m\u00f6chten. +message.action.disable.cluster=Bitte best\u00e4tigen Sie, dass Sie diesen Cluster deaktivieren m\u00f6chten. +message.action.disable.pod=Bitte best\u00e4tigen Sie, dass Sie diesen Pod deaktivieren m\u00f6chten. +message.action.disable.static.NAT=Bitte best\u00e4tigen Sie, dass Sie die statische NAT deaktivieren m\u00f6chten. +message.action.disable.zone=Bitte best\u00e4tigen Sie, dass Sie diese Zone deaktivieren m\u00f6chten. +message.action.enable.cluster=Bitte best\u00e4tigen Sie, dass Sie diesen Cluster aktivieren m\u00f6chten. +message.action.enable.pod=Bitte best\u00e4tigen Sie, dass Sie diesen Pod aktivieren m\u00f6chten. +message.action.enable.zone=Bitte best\u00e4tigen Sie, dass Sie diese Zone aktivieren m\u00f6chten. +message.action.instance.reset.password=Bitte best\u00e4tigen Sie, dass Sie das ROOT Passwort f\u00fcr diese virtuelle Maschine \u00e4ndern m\u00f6chten. +message.action.manage.cluster=Bitte best\u00e4tigen Sie, dass das Cluster bearbeitet werden soll. +message.action.reboot.instance=Bitte best\u00e4tigen Sie, dass Sie diese Instanz neustarten m\u00f6chten. +message.action.reboot.systemvm=Bitte best\u00e4tigen Sie, dass Sie diese System VM neustarten m\u00f6chten. +message.action.reset.password.off=Ihre Instanz untersch\u00fctzt derzeitig nicht dieses Feature. +message.action.reset.password.warning=Ihre Instanz muss zuerst unterbrochen werden, bevor Sie Ihr derzeitiges Passwort \u00e4ndern k\u00f6nnen. +message.action.restore.instance=Bitte best\u00e4tigen Sie, dass Sie diese Instanz wiederherstellen m\u00f6chten. +message.action.start.instance=Bitte best\u00e4tigen Sie, dass Sie diese Instanz starten m\u00f6chten. +message.action.start.router=Bitte best\u00e4tigen Sie, dass Sie diesen Router starten m\u00f6chten. +message.action.start.systemvm=Bitte best\u00e4tigen Sie, dass Sie diese System VM starten m\u00f6chten. +message.action.stop.instance=Bitte best\u00e4tigen Sie, dass Sie diese Instanz anhalten m\u00f6chten. +message.action.stop.systemvm=Bitte best\u00e4tigen Sie, dass Sie diese System VM anhalten m\u00f6chten. +message.action.unmanage.cluster=Bitte best\u00e4tigen Sie, dass Sie das Cluster vernachl\u00e4ssigen m\u00f6chten. +message.add.firewall=Eine Firewall zur Zone hinzuf\u00fcgen +message.add.host=Bitte spezifizieren Sie die folgenden Parameter, um einen neuen Host hinzuzuf\u00fcgen. +message.additional.networks.desc=Bitte w\u00e4hlen Sie ein oder mehrere Netzwerke aus, an die Ihre virtuelle Instanz verbunden wird. +message.add.load.balancer=Einen Lastverteiler zur Zone hinzuf\u00fcgen +message.add.primary=Bitte spezifizieren Sie die folgenden Parameter, um einen neuen Hauptspeicher hinzuzuf\u00fcgen +message.add.template=Bitte geben Sie die folgende Daten ein, um Ihre neue Vorlage zu erstellen +message.add.volume=Bitte geben Sie die folgende Daten ein, um ein neues Volume hinzuzuf\u00fcgen. +message.allow.vpn.access=Bitte geben Sie einen Benutzernamen und ein Kennwort f\u00fcr den Benutzer ein, f\u00fcr den Sie VPN-Zugang m\u00f6chten. +message.apply.snapshot.policy=Sie haben Ihre derzeitige Schnappschuss Richtlinie erfolgreich aktualisiert. +message.attach.iso.confirm=Bitte best\u00e4tigen Sie, dass sie die ISO zu Ihrer virtuellen Instanz hinzuf\u00fcgen m\u00f6chten. +message.change.offering.confirm=Bitte best\u00e4tigen Sie, dass Sie das Service-Angebot dieser virtuellen Instanz \u00e4ndern m\u00f6chten. +message.copy.iso.confirm=Bitte best\u00e4tigen Sie, dass Sie Ihre ISO kopieren m\u00f6chten und zwar nach +message.delete.account=Bitte best\u00e4tigen Sie, dass Sie dieses Benutzerkonto l\u00f6schen m\u00f6chten. +message.detach.iso.confirm=Bitte best\u00e4tigen Sie, dass Sie die ISO von der virtuellen Instanz trennen m\u00f6chten. +message.disable.account=Bitte best\u00e4tigen Sie, dass Sie Ihr Benutzerkonto deaktivieren m\u00f6chten. Kein Nutzer dieses Kontos wird mehr Zugriff auf die Cloud Ressourcen haben. Alle laufenden virtuellen Maschinen werden sofort abgestellt. +message.disable.snapshot.policy=Sie haben Ihre derzeitige Schnappschuss Richtlinie erfolgreich deaktiviert. +message.disable.vpn.access=Bitte best\u00e4tigen Sie, dass Sie den VPN Zugriff deaktivieren m\u00f6chten. +message.enable.account=Bitte best\u00e4tigen Sie, dass Sie dieses Konto aktivieren m\u00f6chten. +message.enabled.vpn=Ihr VPN Zugriff ist zurzeit aktiv und via IP k\u00f6nnen Sie darauf zugreifen +message.enable.vpn.access=VPN ist zurzeit nicht f\u00fcr diese IP Addresse aktiviert. M\u00f6chten Sie den VPN Zugriff aktivieren? +message.installWizard.click.retry=Bitte den Start Button f\u00fcr einen neuen Versuch dr\u00fccken +message.installWizard.tooltip.addCluster.name=Der Name des Clusters. Der Name kann frei gew\u00e4hlt werden und wird von Cloudstack nicht genutzt. +message.installWizard.tooltip.addHost.hostname=Der DNS-Name oder die IP-Adresse des hosts +message.installWizard.tooltip.addHost.password=Dies ist das Passwort des o.a. Users (von der XenServer Installation) +message.installWizard.tooltip.addHost.username=\u00fcberlicherweise root +message.installWizard.tooltip.addPod.name=Der Name f\u00fcr den pod +message.installWizard.tooltip.addPod.reservedSystemGateway=Das Gateways f\u00fcr die Hosts des pod +message.installWizard.tooltip.addPod.reservedSystemNetmask=Die Subnetzmaske des Gast-Netzwerks +message.installWizard.tooltip.addPrimaryStorage.name=Der Name der Storage Devices +message.installWizard.tooltip.addPrimaryStorage.path=(f\u00fcr NFS) Bei NFS wird hier der exportierte Pfad (Shared Mount Point) angegeben. F\u00fcr KVM wird hier der Pfad angegeben, wo auf jedem Host das primary storage gemountet wurde. Z.B. "/mnt/primary" +message.installWizard.tooltip.addPrimaryStorage.server=(f\u00fcr NFS, iSCSI oder PreSetup) Die IP-Adresse oder der DNS-Name des storage devices. +message.installWizard.tooltip.addSecondaryStorage.nfsServer=Die IP-Adresse des NFS-Servers, der den Secondary Storage bereitstellt. +message.installWizard.tooltip.addSecondaryStorage.path=Der exportierte Pfad, der auf dem o.a. Server liegt. +message.installWizard.tooltip.addZone.name=Der Name f\u00fcr die zone +message.installWizard.tooltip.configureGuestTraffic.description=Eine Beschreibung des Netzwerkes. +message.installWizard.tooltip.configureGuestTraffic.guestGateway=Das gateway, welches der Gast benutzen soll. +message.installWizard.tooltip.configureGuestTraffic.guestNetmask=Die Subnetzmaske des Gast-Netzwerks +message.installWizard.tooltip.configureGuestTraffic.name=Der Name f\u00fcr das Netzwerk +message.migrate.instance.to.host=Bitte best\u00e4tigen sie, dass die Instanz auf einen anderen Host migriert werden soll +message.migrate.instance.to.ps=Bitte best\u00e4tigen sie, dass sie die Instanz auf einen anderen prim\u00e4ren Speicher migrieren wollen. +message.new.user=Spezifieren Sie das folgende um einen neuen Nutzer dem Benutzerkonto hinzuzuf\u00fcgen +message.remove.vpn.access=Bitte best\u00e4tigen Sie, dass Sie den VPN-Zugriff vom folgenden Benutzer entfernen m\u00f6chten. +message.setup.successful=Cloud setup erfolgreich +message.step.1.continue=Bitte w\u00e4hlen Sie eine Vorlage oder ISO, um fortzufahren +message.step.2.continue=Bitte w\u00e4hlen Sie ein Service-Angebot, um fortzufahren +message.step.2.desc= +message.step.3.continue=Bitte w\u00e4hlen Sie ein Festplatten-Angebot, um fortzufahren +message.step.3.desc= +message.step.4.continue=Bitte w\u00e4hlen Sie mindestens ein Netzwerk, um fortzufahren +message.step.4.desc=Bitte w\u00e4hlen Sie Ihr Hauptnetzwerk zu dem Ihre virtuelle Instanz verbunden sein wird. +message.vm.create.template.confirm=Das Erstellen einer Vorlage f\u00fchrt automatisch zu einem Neustart der VM. +message.zone.step.1.desc=Bitte w\u00e4hlen Sie ein Netzwerk-Modell f\u00fcr Ihre Zone. +message.zone.step.2.desc=Bitte geben Sie die folgende Information ein, um eine neue Zone hinzuzuf\u00fcgen +message.zone.step.3.desc=Bitte geben Sie die folgende Information ein, um einen neuen pod hinzuzuf\u00fcgen +network.rate=Netzwerk-Rate +state.Allocated=Zugeteilt +state.Disabled=Deaktiviert +state.Error=Fehler diff --git a/client/WEB-INF/classes/resources/messages_es.properties b/client/WEB-INF/classes/resources/messages_es.properties new file mode 100644 index 00000000000..28f9363724a --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_es.properties @@ -0,0 +1,861 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +error.installWizard.message=Algo salio mal, debes ir para atr\u00e1s y corregir los error. +error.login=Su nombre de usuario / contrase\u00c3\u00b1a no coincide con nuestros registros. +error.mgmt.server.inaccessible=El Servidor de Gesti\u00c3\u00b3n es inaccesible. Por favor, int\u00c3\u00a9ntelo de nuevo m\u00c3\u00a1s tarde. +error.session.expired=Su sesi\u00c3\u00b3n ha caducado. +error.unresolved.internet.name=El nombre de Internet no se puede resolver. +extractable=extra\u00c3\u00adble +force.delete.domain.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, la supresi\u00c3\u00b3n de todos los dominios secundarios y todas las cuentas asociadas y sus recursos. +force.delete=Fuerza Borrar +force.remove=Fuerza Retire +force.remove.host.warning=Advertencia\: Si elige esta opci\u00c3\u00b3n, CloudStack para detener la fuerza todas las m\u00c3\u00a1quinas virtuales en ejecuci\u00c3\u00b3n antes de retirar este host del cl\u00c3\u00baster. +force.stop=Grupo de Alto +force.stop.instance.warning=Advertencia\: Obligar a una parada en este caso deber\u00c3\u00ada ser su \u00c3\u00baltima opci\u00c3\u00b3n. Puede conducir a la p\u00c3\u00a9rdida de datos, as\u00c3\u00ad como un comportamiento incoherente del Estado de la m\u00c3\u00a1quina virtual. +ICMP.code=ICMP C\u00c3\u00b3digo +ICMP.type=Tipo ICMP +image.directory=Directorio de la imagen +inline=en l\u00c3\u00adnea +label.account=Cuenta +label.account.id=ID de la cuenta +label.account.name=Nombre de la cuenta +label.accounts=Cuentas +label.account.specific=espec\u00c3\u00adficas de la cuenta +label.acquire.new.ip=adquirir nuevas IP +label.action.attach.disk=Conecte el disco +label.action.attach.disk.processing=disco Fijaci\u00c3\u00b3n .... +label.action.attach.iso=Adjuntar ISO +label.action.attach.iso.processing=Colocaci\u00c3\u00b3n de la norma ISO .... +label.action.cancel.maintenance.mode=Cancelar modo de mantenimiento +label.action.cancel.maintenance.mode.processing=Cancelaci\u00c3\u00b3n del modo de mantenimiento .... +label.action.change.password=Cambiar contrase\u00c3\u00b1a +label.action.change.service=Cambio de Servicio +label.action.change.service.processing=Cambio de servicio .... +label.action.copy.ISO=Copia de la ISO +label.action.copy.ISO.processing=hacer frente ISO .... +label.action.copy.template=Copia de plantilla +label.action.copy.template.processing=hacer frente plantilla .... +label.action.create.template=Crear plantilla +label.action.create.template.from.vm=Crear plantilla de VM +label.action.create.template.from.volume=Crear plantilla de volumen +label.action.create.template.processing=Creaci\u00c3\u00b3n de plantillas .... +label.action.create.vm=Crear VM +label.action.create.vm.processing=Creaci\u00c3\u00b3n de m\u00c3\u00a1quina virtual .... +label.action.create.volume=Crear volumen +label.action.create.volume.processing=Crear volumen .... +label.action.delete.account=Eliminar cuenta +label.action.delete.account.processing=Eliminar cuentas .... +label.action.delete.cluster=Borrar Grupo +label.action.delete.cluster.processing=Borrar Grupo .... +label.action.delete.disk.offering=Borrar disco Ofrenda +label.action.delete.disk.offering.processing=Borrar disco ofrece .... +label.action.delete.domain=Eliminar de dominio +label.action.delete.domain.processing=Eliminaci\u00c3\u00b3n de dominio .... +label.action.delete.firewall=Eliminar servidor de seguridad +label.action.delete.firewall.processing=Eliminaci\u00c3\u00b3n de firewall .... +label.action.delete.ingress.rule=Borrar ingreso Regla +label.action.delete.ingress.rule.processing=Eliminaci\u00c3\u00b3n de ingreso regla .... +label.action.delete.IP.range=Eliminar Rango de IP +label.action.delete.IP.range.processing=Eliminar Rango de IP .... +label.action.delete.ISO=Eliminar ISO +label.action.delete.ISO.processing=Eliminaci\u00c3\u00b3n de la norma ISO .... +label.action.delete.load.balancer=Eliminar equilibrador de carga +label.action.delete.load.balancer.processing=Eliminaci\u00c3\u00b3n del equilibrador de carga .... +label.action.delete.network=Eliminar Red +label.action.delete.network.processing=Eliminaci\u00c3\u00b3n de red .... +label.action.delete.pod=Eliminar Pod +label.action.delete.pod.processing=Eliminar Pod .... +label.action.delete.primary.storage=Almacenamiento primario Eliminar +label.action.delete.primary.storage.processing=Eliminaci\u00c3\u00b3n de almacenamiento primaria .... +label.action.delete.secondary.storage.processing=Eliminaci\u00c3\u00b3n de almacenamiento secundario .... +label.action.delete.secondary.storage=secundaria almacenamiento Eliminar +label.action.delete.security.group=Borrar Grupo de Seguridad +label.action.delete.security.group.processing=Eliminar grupo de seguridad .... +label.action.delete.service.offering=Eliminar Oferta de Servicio +label.action.delete.service.offering.processing=Eliminaci\u00c3\u00b3n de Oferta de Servicio .... +label.action.delete.snapshot=Eliminar instant\u00c3\u00a1nea +label.action.delete.snapshot.processing=Eliminar instant\u00c3\u00a1nea .... +label.action.delete.template=Eliminar plantilla +label.action.delete.template.processing=Eliminar plantilla .... +label.action.delete.user=Eliminar usuario +label.action.delete.user.processing=Eliminar usuario .... +label.action.delete.volume=Eliminar volumen +label.action.delete.volume.processing=Eliminar volumen .... +label.action.delete.zone=Eliminar Zona +label.action.delete.zone.processing=Eliminaci\u00c3\u00b3n de la Zona .... +label.action.destroy.instance=Destruye Instancia +label.action.destroy.instance.processing=Destrucci\u00c3\u00b3n Instancia .... +label.action.destroy.systemvm=destruir el sistema VM +label.action.destroy.systemvm.processing=Destrucci\u00c3\u00b3n del sistema VM .... +label.action.detach.disk.processing=Extracci\u00c3\u00b3n disco .... +label.action.detach.disk=Separar disco +label.action.detach.iso.processing=Extracci\u00c3\u00b3n ISO .... +label.action.detach.iso=Separar ISO +label.action.disable.account=Desactivar cuenta +label.action.disable.account.processing=Deshabilitar cuenta .... +label.action.disable.cluster=Deshabilitar cl\u00c3\u00baster +label.action.disable.cluster.processing=Desactivaci\u00c3\u00b3n de Cluster Server .... +label.action.disable.pod=Deshabilitar Pod +label.action.disable.pod.processing=Deshabilitar Pod .... +label.action.disable.static.NAT=Deshabilitar NAT est\u00c3\u00a1tica +label.action.disable.static.NAT.processing=Deshabilitar NAT est\u00c3\u00a1tica .... +label.action.disable.user=Deshabilitar usuario +label.action.disable.user.processing=Desactivaci\u00c3\u00b3n de usuario .... +label.action.disable.zone=Deshabilitar la zona +label.action.disable.zone.processing=Desactivaci\u00c3\u00b3n de la zona .... +label.action.download.ISO=ISO Descargar +label.action.download.template=Descargar plantilla +label.action.download.volume=Descargar Volumen +label.action.download.volume.processing=Volumen Descargar .... +label.action.edit.account=Editar cuenta +label.action.edit.disk.offering=Editar disco Ofrenda +label.action.edit.domain=Editar Dominio +label.action.edit.global.setting=Editar Mundial Marco +label.action.edit.host=edici\u00c3\u00b3n Anfitri\u00c3\u00b3n +label.action.edit.instance=Editar Instancia +label.action.edit.ISO=Editar ISO +label.action.edit.network=Edici\u00c3\u00b3n de redes +label.action.edit.network.offering=Editar Red ofrece +label.action.edit.pod=Editar Pod +label.action.edit.primary.storage=Editar Almacenamiento primario +label.action.edit.resource.limits=Editar l\u00c3\u00admites de recursos +label.action.edit.service.offering=Editar Oferta de Servicio +label.action.edit.template=Editar plantilla +label.action.edit.user=Editar usuario +label.action.edit.zone=Edici\u00c3\u00b3n Zona +label.action.enable.account=Habilitar cuenta +label.action.enable.account.processing=cuenta de Habilitaci\u00c3\u00b3n .... +label.action.enable.cluster=Habilitar cl\u00c3\u00baster +label.action.enable.cluster.processing=Habilitar cl\u00c3\u00baster .... +label.action.enable.maintenance.mode=Activar el modo de mantenimiento +label.action.enable.maintenance.mode.processing=Habilitaci\u00c3\u00b3n del modo de mantenimiento .... +label.action.enable.pod=Habilitar Pod +label.action.enable.pod.processing=Habilitaci\u00c3\u00b3n Pod .... +label.action.enable.static.NAT=Habilitar NAT est\u00c3\u00a1tica +label.action.enable.static.NAT.processing=Habilitar NAT est\u00c3\u00a1tica .... +label.action.enable.user.processing=Habilitaci\u00c3\u00b3n del usuario .... +label.action.enable.user=usuario Activar +label.action.enable.zone=Habilitar la zona +label.action.enable.zone.processing=Habilitaci\u00c3\u00b3n de zona .... +label.action.force.reconnect=Fuerza Vuelva a conectar +label.action.force.reconnect.processing=Reconectando .... +label.action.generate.keys=Generar Claves +label.action.generate.keys.processing=Generar claves .... +label.action.lock.account=Bloqueo de cuenta +label.action.lock.account.processing=Bloqueo de cuenta .... +label.action.manage.cluster=gestionar racimo +label.action.manage.cluster.processing=La gesti\u00c3\u00b3n de cl\u00c3\u00basteres .... +label.action.migrate.instance=Migrar Instancia +label.action.migrate.instance.processing=Migrar Instancia .... +label.action.migrate.router=migrar Router +label.action.migrate.router.processing=Migraci\u00c3\u00b3n router .... +label.action.migrate.systemvm=Migrar del sistema VM +label.action.migrate.systemvm.processing=La migraci\u00c3\u00b3n de VM del sistema .... +label.action.reboot.instance.processing=Reiniciar Instancia .... +label.action.reboot.instance=Reiniciar Instancia +label.action.reboot.router.processing=Reiniciar router .... +label.action.reboot.router=Reiniciar router +label.action.reboot.systemvm.processing=reinicio del sistema VM .... +label.action.reboot.systemvm=Reiniciar sistema VM +label.action.recurring.snapshot=recurrente instant\u00c3\u00a1neas +label.action.release.ip=estreno IP +label.action.release.ip.processing=Liberar IP .... +label.action.remove.host.processing=Extracci\u00c3\u00b3n de host .... +label.action.remove.host=Quitar host +label.action.reset.password.processing=Restablecimiento de la contrase\u00c3\u00b1a .... +label.action.reset.password=Restablecer contrase\u00c3\u00b1a +label.action.resource.limits=Recursos l\u00c3\u00admites +label.action.restore.instance.processing=Restaurar Instancia .... +label.action.restore.instance=Restaurar Instancia +label.actions=Acciones +label.action.start.instance=Iniciar Instancia +label.action.start.instance.processing=A partir Instancia .... +label.action.start.router=inicio del router +label.action.start.router.processing=A partir del router .... +label.action.start.systemvm=Inicio del sistema VM +label.action.start.systemvm.processing=A partir del sistema VM .... +label.action.stop.instance=Detener Instancia +label.action.stop.instance.processing=Detener Instancia .... +label.action.stop.router=Detener router +label.action.stop.router.processing=Detener router .... +label.action.stop.systemvm=parada del sistema VM +label.action.stop.systemvm.processing=Detener sistema VM .... +label.action.take.snapshot.processing=Tomar instant\u00c3\u00a1neas .... +label.action.take.snapshot=Tomar instant\u00c3\u00a1nea +label.action.unmanage.cluster.processing=Unmanaging Grupo .... +label.action.unmanage.cluster=Unmanage racimo +label.action.update.OS.preference=Actualizar OS Preferencia +label.action.update.OS.preference.processing=Actualizaci\u00c3\u00b3n de sistema operativo preferencia .... +label.action.update.resource.count=Actualizaci\u00c3\u00b3n de recursos Conde +label.action.update.resource.count.processing=Actualizaci\u00c3\u00b3n de Conde de recursos .... +label.active.sessions=Sesiones activas +label.add.account=A\u00c3\u00b1adir cuenta +label.add=Agregar +label.add.by.cidr=A\u00c3\u00b1adir Por CIDR +label.add.by.group=A\u00c3\u00b1adir Por el Grupo de +label.add.cluster=A\u00c3\u00b1adir Grupo +label.add.direct.iprange=A\u00c3\u00b1adir Direct IP Gama +label.add.disk.offering=A\u00c3\u00b1adir disco Ofrenda +label.add.domain=Agregar dominio +label.add.firewall=Agregar Servidor de seguridad +label.add.host=Agregar host +label.adding=Agregar +label.adding.cluster=Adici\u00c3\u00b3n de cl\u00c3\u00baster +label.adding.failed=No se pudo agregar +label.adding.pod=Agregar Pod +label.adding.processing=A\u00c3\u00b1adir .... +label.add.ingress.rule=A\u00c3\u00b1adir regla del ingreso +label.adding.succeeded=Agregar Sucesor +label.adding.user=Agregar usuario +label.adding.zone=Agregar la zona +label.add.ip.range=A\u00c3\u00b1adir Rango de IP +label.additional.networks=Redes adicional +label.add.load.balancer=A\u00c3\u00b1adir equilibrador de carga +label.add.more=A\u00c3\u00b1adir m\u00c3\u00a1s +label.add.network=Agregar sitios de red +label.add.network.device=A\u00c3\u00b1adir dispositivo de red +label.add.pod=A\u00c3\u00b1adir Pod +label.add.primary.storage=A\u00c3\u00b1adir Almacenamiento primario +label.add.secondary.storage=A\u00c3\u00b1adir secundaria almacenamiento +label.add.security.group=Agregar grupo de seguridad +label.add.service.offering=A\u00c3\u00b1adir Servicio de Oferta +label.add.template=A\u00c3\u00b1adir plantilla +label.add.to.group=Agregar al grupo +label.add.user=Agregar usuario +label.add.vlan=A\u00c3\u00b1adir VLAN +label.add.volume=A\u00c3\u00b1adir volumen +label.add.zone=A\u00c3\u00b1adir Zona +label.admin.accounts=Administrador de Cuentas +label.admin=Admin +label.advanced=Avanzado +label.advanced.mode=Modo avanzado +label.advanced.search=B\u00c3\u00basqueda Avanzada +label.alert=Alerta +label.algorithm=Algoritmo +label.allocated=Asignados +label.api.key=clave de API +label.assign=Asignar +label.assign.to.load.balancer=instancia de Asignaci\u00c3\u00b3n de equilibrador de carga +label.associated.network.id=ID de red asociados +label.attached.iso=adjunta ISO +label.availability=Disponibilidad +label.availability.zone=Disponibilidad de la zona +label.available=Disponible +label.available.public.ips=Disponible direcciones IP p\u00c3\u00bablicas +label.back=Volver +label.basic.mode=Modo b\u00c3\u00a1sico +label.bootable=arranque +label.broadcast.domain.type=Tipo de dominio de difusi\u00c3\u00b3n +label.by.account=Por Cuenta +label.by.availability=Por Disponibilidad +label.by.domain=Por dominio +label.by.end.date=Por Fecha de finalizaci\u00c3\u00b3n +label.by.level=por Nivel +label.by.pod=Por Pod +label.by.role=por funci\u00c3\u00b3n +label.by.start.date=Por Fecha de inicio +label.by.state=Por Estado +label.bytes.received=Bytes recibidos +label.bytes.sent=Bytes enviados +label.by.traffic.type=Por tipo de tr\u00c3\u00a1fico +label.by.type.id=Por tipo de identificaci\u00c3\u00b3n +label.by.type=Por tipo +label.by.zone=Por Zona +label.cancel=Cancelar +label.certificate=Certificado +label.character=Personaje +label.cidr.account=CIDR o de cuenta / Grupo de Seguridad +label.cidr=CIDR +label.cidr.list=fuente CIDR +label.close=Cerrar +label.cloud.console=Cloud Management Console +label.cloud.managed=Cloud.com Gestionado +label.cluster=Grupo +label.cluster.type=Tipo de Cluster Server +label.clvm=CLVM +label.code=C\u00c3\u00b3digo +label.configuration=Configuraci\u00c3\u00b3n +label.confirmation=Confirmation +label.congratulations=Felicitaciones \! +label.cpu.allocated=CPU asignado +label.cpu.allocated.for.VMs=CPU asignado para m\u00c3\u00a1quinas virtuales +label.CPU.cap=CPU Cap +label.cpu=CPU +label.cpu.utilized=CPU Utilizado +label.created=creaci\u00c3\u00b3n +label.cross.zones=Cruz Zonas +label.custom.disk.size=Personal Disk Size +label.daily=diario +label.data.disk.offering=Datos Disco Offering +label.date=Fecha +label.day.of.month=D\u00c3\u00ada del mes +label.day.of.week=d\u00c3\u00ada de la semana +label.default.use=Usar por defecto +label.delete=Eliminar +label.deleting.failed=No se pudo eliminar +label.deleting.processing=Eliminar .... +label.description=Descripci\u00c3\u00b3n +label.destroy=Destroy +label.detaching.disk=Extracci\u00c3\u00b3n del disco +label.details=Detalles +label.device.id=ID de dispositivo +label.DHCP.server.type=Tipo de servidor DHCP +label.disabled=personas de movilidad reducida +label.disabling.vpn.access=Desactivaci\u00c3\u00b3n de VPN de acceso +label.disk.allocated=disco asignado +label.disk.offering=disco Ofrenda +label.disk.size.gb=tama\u00c3\u00b1o de disco (en GB) +label.disk.size=tama\u00c3\u00b1o de disco +label.disk.total=disco Total +label.disk.volume=volumen de disco +label.display.text=visualizaci\u00c3\u00b3n de texto +label.dns.1=DNS 1 +label.dns.2=DNS 2 +label.domain.admin=Administrador de dominio +label.domain=dominio +label.domain.id=ID de dominio +label.domain.name=Nombre de dominio +label.domain.suffix=DNS sufijo de dominio (es decir, xyz.com) +label.double.quotes.are.not.allowed=comillas dobles no se permite +label.download.progress=Progreso de la descarga +label.edit=Editar +label.email=correo electr\u00c3\u00b3nico +label.enabling.vpn.access=Habilitaci\u00c3\u00b3n de Acceso VPN +label.enabling.vpn=Habilitaci\u00c3\u00b3n VPN +label.endpoint.or.operation=punto final o de Operaci\u00c3\u00b3n +label.end.port=Puerto final +label.error.code=C\u00c3\u00b3digo de error +label.error=Error +label.esx.host=ESX / ESXi anfitri\u00c3\u00b3n +label.example=Ejemplo +label.failed=Error +label.featured=destacados +label.firewall=Servidor de seguridad +label.first.name=Nombre +label.format=Formato +label.friday=Viernes +label.full=completo +label.gateway=puerta de enlace +label.general.alerts=General de Alertas +label.generating.url=Generar URL +label.go.step.2=Ir al paso 2 +label.go.step.3=Ir al paso 3 +label.go.step.4=Ir al paso 4 +label.go.step.5=Ir al paso 5 +label.group=Grupo +label.group.optional=Grupo (Opcional) +label.guest.cidr=Habitaci\u00c3\u00b3n CIDR +label.guest.gateway=Habitaci\u00c3\u00b3n Gateway +label.guest.ip=Habitaci\u00c3\u00b3n direcci\u00c3\u00b3n IP +label.guest.ip.range=Habitaci\u00c3\u00b3n Rango de IP +label.guest.netmask=Habitaci\u00c3\u00b3n m\u00c3\u00a1scara de red +label.ha.enabled=HA Activado +label.help=Ayuda +label.hide.ingress.rule=Ocultar el art\u00c3\u00adculo ingreso +label.host.alerts=Host Alertas +label.host=Ej\u00c3\u00a9rcitos +label.host.name=nombre de host +label.hosts=Ej\u00c3\u00a9rcitos +label.hourly=por hora +label.hypervisor=Hypervisor +label.hypervisor.type=Tipo Hypervisor +label.id=ID +label.info=Informaci\u00c3\u00b3n +label.ingress.rule=ingreso Regla +label.initiated.by=Iniciado por +label.installWizard.click.launch=Click en el bot\u00f3n de lanzar. +label.instance=Instancia +label.instance.limits=Instancia L\u00c3\u00admites +label.instance.name=Nombre de instancia +label.instances=Instancias +label.internal.dns.1=DNS interno una +label.internal.dns.2=DNS interno 2 +label.interval.type=Tipo de intervalo +label.invalid.integer=entero no v\u00c3\u00a1lido +label.invalid.number=N\u00c3\u00bamero no v\u00c3\u00a1lido +label.invite=Invitar +label.invite.to=Invitar a . +label.ip.address=Direcci\u00c3\u00b3n IP +label.ipaddress=Direcci\u00c3\u00b3n IP +label.ip.allocations=IP asignaciones +label.ip=IP +label.ip.limits=IP p\u00c3\u00bablica L\u00c3\u00admites +label.ip.or.fqdn=IP o FQDN +label.ip.range=Rango de IP +label.ips=IP +label.iscsi=iSCSI +label.is.default=Es por defecto +label.iso.boot=ISO de arranque +label.iso=ISO +label.isolation.mode=modo de aislamiento +label.is.redundant.router=redundante +label.is.shared=es compartido +label.is.system=es el Sistema +label.keep=Mantener +label.lang.chinese=Chino (simplificado) +label.lang.english=Ingl\u00c3\u00a9s +label.lang.japanese=japon\u00c3\u00a9s +label.lang.spanish=Espa\u00c3\u00b1ol +label.last.disconnected=\u00c3\u009altima Desconectado +label.last.name=Apellido +label.launch=Lanzar +label.launch.vm=Lanzar maquina virtual +label.level=Nivel +label.load.balancer=equilibrador de carga +label.loading=Carga +label.local=local +label.login=Login +label.logout=Cerrar sesi\u00c3\u00b3n +label.lun=LUN +label.manage=Administrar +label.maximum=m\u00c3\u00a1ximo +label.max.volumes=Maxima cantidad de Volumes +label.memory.allocated=memoria asignada +label.memory=memoria (en MB) +label.memory.total=Total de memoria +label.memory.used=memoria usada +label.menu.accounts=Cuentas +label.menu.alerts=Alertas +label.menu.all.accounts=Todas las cuentas +label.menu.all.instances=todas las instancias +label.menu.community.isos=Comunidad ISOs +label.menu.community.templates=plantillas de la comunidad +label.menu.configuration=Configuraci\u00c3\u00b3n +label.menu.dashboard=Interfaz +label.menu.destroyed.instances=Destruir instancias +label.menu.disk.offerings=disco ofertas +label.menu.domains=dominio +label.menu.events=Eventos +label.menu.featured.isos=destacados ISO +label.menu.featured.templates=destacados plantillas +label.menu.global.settings=Configuraci\u00c3\u00b3n global +label.menu.instances=Instancias +label.menu.ipaddresses=Direcciones IP +label.menu.isos=ISO +label.menu.my.accounts=Mis cuentas +label.menu.my.instances=Mi instancias +label.menu.my.isos=Mi ISOs +label.menu.my.templates=Mis plantillas +label.menu.network.offerings=Red de ofertas +label.menu.network=Red +label.menu.physical.resources=Recursos F\u00c3\u00adsicos +label.menu.running.instances=Ejecuci\u00c3\u00b3n de instancias +label.menu.security.groups=Grupos de seguridad +label.menu.service.offerings=Ofertas de Servicios +label.menu.snapshots=instant\u00c3\u00a1neas +label.menu.stopped.instances=Detenido instancias +label.menu.storage=Almacenamiento +label.menu.system=Sistema +label.menu.system.vms=Sistema de m\u00c3\u00a1quinas virtuales +label.menu.templates=plantillas +label.menu.virtual.appliances=Virtual Appliances +label.menu.virtual.resources=Virtual de Recursos +label.menu.volumes=Vol\u00c3\u00bamenes +label.migrate.instance.to.host=Migrar instancia a otro host. +label.migrate.instance.to=Migraci\u00c3\u00b3n de ejemplo para +label.migrate.instance.to.ps=Migrar instancia a otro primary storage. +label.migrate.router.to=Router para migrar +label.migrate.systemvm.to=Migrar m\u00c3\u00a1quina virtual del sistema para +label.minimum=M\u00c3\u00adnimo +label.minute.past.hour=Minuto (s) despu\u00c3\u00a9s de la hora +label.monday=lunes +label.monthly=mensual +label.more.templates=plantillas \= M\u00c3\u00a1s +label.my.account=Mi Cuenta +label.my.templates=Mis plantillas +label.name=Nombre +label.name.optional=Nombre (Opcional) +label.netmask=m\u00c3\u00a1scara de red +label.network.desc=Red de Desc +label.network.device=De dispositivos de red +label.network.device.type=Tipo de red de dispositivos +label.network.domain=red de dominio +label.network.id=ID de red +label.network.name=Nombre de red +label.network.offering.display.text=Red ofrece visualizaci\u00c3\u00b3n de texto +label.network.offering.id=Red ofrece ID +label.network.offering.name=Red ofrece Nombre +label.network.offering=Red ofrece +label.network.rate=Tasa de Red +label.network.read=Leer de la red +label.network=Red +label.networks=Redes +label.network.type=Tipo de red +label.network.write=Escribir en la red +label.new=Nuevo +label.new.password=Nueva contrase\u00c3\u00b1a +label.new.vm=Nueva maquina virtual +label.next=Siguiente +label.nfs=NFS +label.nfs.server=servidor NFS +label.nfs.storage=NFS Almacenamiento +label.nics=NIC +label.no.actions=No Acciones disponibles +label.no.alerts=No alertas recientes +label.no.errors=No recientes errores +label.no.isos=No ISOs disponibles +label.no.items=No art\u00c3\u00adculos disponibles +label.none=Ninguno +label.no=No +label.no.security.groups=No hay grupos disponibles de Seguridad +label.not.found=No se ha encontrado +label.no.thanks=No, gracias +label.num.cpu.cores=n\u00c3\u00bamero de n\u00c3\u00bacleos de CPU +label.numretries=N\u00c3\u00bamero de reintentos +label.ocfs2=OCFS2 +label.offer.ha=Oferta HA +label.optional=Opcional +label.os.preference=OS Preferencia +label.os.type=tipo de Sistema Operativo +label.owned.public.ips=propiedad p\u00c3\u00bablica Direcciones IP +label.owner.account=titular de la cuenta +label.parent.domain=Padres de dominio +label.password=Contrase\u00c3\u00b1a +label.password.enabled=Contrase\u00c3\u00b1a Activado +label.path=Ruta +label.PING.CIFS.password=PING CIFS contrase\u00c3\u00b1a +label.PING.CIFS.username=PING CIFS nombre de usuario +label.PING.dir=PING Directorio +label.PING.storage.IP=PING almacenamiento IP +label.please.wait=Por favor espere +label.pod=Pod +label.port.forwarding=Port Forwarding +label.port.range=rango de puertos +label.PreSetup=PreSetup +label.prev=Anterior +label.previous=Previo +label.primary.allocated=primaria asignado de almacenamiento +label.primary.network=Red Primaria +label.primary.storage=Almacenamiento Primario +label.primary.used=Primaria Almacenado +label.private.interface=Interfaz privada +label.private.ip=direcci\u00c3\u00b3n IP privada +label.private.ip.range=IP privada Gama +label.private.ips=direcciones IP privadas +label.privatekey=PKCS\#8 la clave privada +label.private.port=Puerto privado +label.private.zone=Zona Privada +label.project.name=Nombre del Proyecto +label.protocol=Protocolo +label.public.interface=interfaz p\u00c3\u00bablica +label.public.ip=direcci\u00c3\u00b3n IP p\u00c3\u00bablica +label.public.ips=direcciones IP p\u00c3\u00bablicas +label.public.port=Puerto P\u00c3\u00bablico +label.public=P\u00c3\u00bablica +label.public.zone=Zona P\u00c3\u00bablica +label.Pxe.server.type=Tipo de servidor Pxe +label.reboot=Reiniciar +label.recent.errors=recientes errores +label.redundant.router=enrutador redundante +label.refresh=Actualizar +label.related=relacionados +label.remind.later=Recordar mas tarde +label.remove.from.load.balancer=ejemplo Eliminaci\u00c3\u00b3n de equilibrador de carga +label.removing=Borrando. +label.removing.user=Eliminar usuario +label.required=Requerido +label.reserved.system.ip=Reservados sistema de PI +label.resource.limits=L\u00c3\u00admites de Recursos +label.resource=Recursos +label.resources=Recursos +label.role=Papel +label.root.disk.offering=Root Disco Offering +label.running.vms=Ejecuci\u00c3\u00b3n de m\u00c3\u00a1quinas virtuales +label.s3.secret_key=clave secreta +label.saturday=s\u00c3\u00a1bado +label.save=Guardar +label.saving.processing=ahorro .... +label.scope=Alcance +label.search=Buscar +label.secondary.storage=Almacenamiento secundario +label.secondary.used=Secundaria Almacenado +label.secret.key=clave secreta +label.security.group=Grupo de Seguridad +label.security.group.name=Nombre de grupo de seguridad +label.security.groups.enabled=Los grupos de seguridad habilitado +label.security.groups=Grupos de seguridad +label.select.a.zone=Seleccione una zona. +label.sent=Enviados +label.server=Servidor +label.service.offering=Oferta de Servicio +label.session.expired=Session Caducado +label.shared=compartidas +label.SharedMountPoint=SharedMountPoint +label.show.ingress.rule=Mostrar la regla del ingreso +label.size=Tama\u00c3\u00b1o +label.snapshot=Instant\u00c3\u00a1nea +label.snapshot.limits=instant\u00c3\u00a1neas L\u00c3\u00admites +label.snapshot.name=Nombre de instant\u00c3\u00a1neas +label.snapshot.schedule=Lista de instant\u00c3\u00a1neas +label.snapshot.s=Instant\u00c3\u00a1nea (s) +label.snapshots=instant\u00c3\u00a1neas +label.source.nat=NAT Fuente +label.specify.vlan=Especifique VLAN +label.SR.name = SR Nombre de etiqueta +label.start.port=Iniciar Puerto +label.state=Estado +label.static.nat=NAT est\u00c3\u00a1tica +label.static.nat.to=est\u00c3\u00a1tico NAT para +label.statistics=Estad\u00c3\u00adsticas +label.status=Estado +label.step.1=Paso 1 +label.step.1.title=Paso 1\: Seleccione una plantilla +label.step.2=Paso 2 +label.step.2.title=Paso 2\: Oferta de Servicio +label.step.3=Paso 3 +label.step.3.title=Paso 3\: Seleccione un disco Ofrenda +label.step.4=Paso 4 +label.step.4.title=Paso 4\: Red +label.step.5=Paso 5 +label.step.5.title=Paso 5\: Revisi\u00c3\u00b3n +label.sticky.domain=dominio +label.sticky.mode=modo +label.stop=Detener +label.stopped.vms=Detenido m\u00c3\u00a1quinas virtuales +label.storage=Almacenamiento +label.storage.tags=Etiquetas de almacenamiento +label.storage.type=Tipo de almacenamiento +label.submit=Enviar +label.submitted.by=[Enviado por\: ] +label.succeeded=Sucesor +label.sunday=domingo +label.system.capacity=Capacidad de todo el sistema +label.system.vm=Sistema de VM +label.system.vms=Sistema de m\u00c3\u00a1quinas virtuales +label.system.vm.type=Tipo de sistema VM +label.tagged=etiqueta +label.tags=Etiquetas +label.target.iqn=Objetivo IQN +label.task.completed=Tarea finalizada. +label.template.limits=Plantilla L\u00c3\u00admites +label.template=plantilla +label.TFTP.dir=Directorio de TFTP +label.theme.default=Tema Por Defecto +label.theme.grey=Personal - Gris +label.theme.lightblue=Personal - Azul +label.thursday=Jueves +label.timeout.in.second = Tiempo de espera (segundos) +label.time=Tiempo +label.time.zone=Zona horaria +label.timezone=Zona horaria +label.total.cpu=Total CPU +label.total.CPU=Total CPU +label.total.vms=Total de m\u00c3\u00a1quinas virtuales +label.traffic.type=Tipo de Tr\u00c3\u00a1fico +label.tuesday=martes +label.type.id=Tipo de identificaci\u00c3\u00b3n +label.type=Tipo +label.unavailable=no disponible +label.unlimited=Unlimited +label.untagged=sin etiquetar +label.updating=Actualizar +label.url=URL +label.usage.interface=Interfaz de uso +label.used=Usado +label.username=Nombre de usuario +label.users=usuario +label.user=Usuario +label.value=Valor +label.vcenter.cluster=vCenter cl\u00c3\u00baster +label.vcenter.datacenter=vCenter de centros de datos +label.vcenter.datastore=vCenter almac\u00c3\u00a9n de datos +label.vcenter.host=vCenter anfitri\u00c3\u00b3n +label.vcenter.password=vCenter Contrase\u00c3\u00b1a +label.vcenter.username=vCenter Nombre de usuario +label.version=Versi\u00c3\u00b3n +label.virtual.appliances=Virtual Appliances +label.virtual.appliance=Virtual Appliance +label.virtual.machines=Maquinas virtuales +label.virtual.network=Red Virtual +label.vlan.id=ID de VLAN +label.vlan.range=VLAN Gama +label.vlan=VLAN +label.vm.add=A\u00c3\u00b1adir Instancia +label.vm.destroy=Destroy +label.VMFS.datastore=VMFS de datos tienda +label.vmfs=VMFS +label.vm.reboot=Reiniciar +label.vmsnapshot.type=Tipo +label.vm.start=Inicio +label.vm.stop=Detener +label.vms=VM +label.volgroup=Volume Group +label.volume.limits=l\u00c3\u00admites de volumen +label.volume.name=Nombre de Volumen +label.volumes=Vol\u00c3\u00bamenes +label.volume=Volumen +label.vpn=VPN +label.vsphere.managed=Gestionado \= vSphere +label.waiting=Esperando +label.warn=Advertir +label.wednesday=mi\u00c3\u00a9rcoles +label.weekly=Semanal +label.welcome=Bienvenido +label.welcome.cloud.console=Bienvenido a la consola de administraci\u00c3\u00b3n +label.yes=S\u00c3\u00ad +label.zone.id=Zona de identificaci\u00c3\u00b3n +label.zone.step.1.title=Paso 1\: Seleccione una red +label.zone.step.2.title=Paso 2\: A\u00c3\u00b1adir una zona +label.zone.step.3.title=Paso 3\: A\u00c3\u00b1adir una vaina +label.zone.step.4.title=Paso 4\: A\u00c3\u00b1adir un rango de IP +label.zone.wide=Zona para todo el +label.zone=Zona +managed.state=Estado logr\u00c3\u00b3 +message.acquire.public.ip=Por favor seleccione una zona de la que desea adquirir su nueva IP. +message.action.cancel.maintenance.mode=Por favor, confirme que desea cancelar el mantenimiento +message.action.cancel.maintenance=Su acogida ha sido cancelado con \u00c3\u00a9xito para el mantenimiento. Este proceso puede tardar hasta varios minutos. +message.action.delete.cluster=Por favor, confirme que desea eliminar del cl\u00c3\u00baster +message.action.delete.disk.offering=Por favor, confirme que desea eliminar ofreciendo disco +message.action.delete.domain=Por favor, confirme que desea eliminar de dominio +message.action.delete.external.firewall=Por favor, confirme que desea quitar este servidor de seguridad externo. Advertencia\: Si usted est\u00c3\u00a1 planeando volver a agregar el servidor de seguridad externo mismo, debe restablecer los datos de uso en el dispositivo. +message.action.delete.external.load.balancer=Por favor, confirme que desea eliminar este equilibrador de carga externa. Advertencia\: Si usted est\u00c3\u00a1 planeando volver a agregar la misma equilibrador de carga externo, debe restablecer los datos de uso en el dispositivo. +message.action.delete.ingress.rule=Por favor, confirme que desea eliminar la regla de ingreso +message.action.delete.ISO.for.all.zones=La ISO es utilizado por todas las zonas. Por favor, confirme que desea eliminar de todas las zonas. +message.action.delete.ISO=Por favor, confirme que desea eliminar la norma ISO +message.action.delete.network=Por favor, confirme que desea eliminar de la red +message.action.delete.pod=Por favor, confirme que desea eliminar de la vaina +message.action.delete.primary.storage=Por favor, confirme que desea eliminar el almacenamiento primario +message.action.delete.secondary.storage=Por favor, confirme que desea eliminar de almacenamiento secundario +message.action.delete.security.group=Por favor, confirme que desea eliminar el grupo de seguridad +message.action.delete.service.offering=Por favor, confirme que desea eliminar oferta de servicios +message.action.delete.snapshot=Por favor, confirme que desea eliminar instant\u00c3\u00a1neas +message.action.delete.template.for.all.zones=La plantilla es utilizada por todas las zonas. Por favor, confirme que desea eliminar de todas las zonas. +message.action.delete.template=Por favor, confirme que desea eliminar la plantilla +message.action.delete.volume=Por favor, confirme que desea eliminar el volumen +message.action.delete.zone=Por favor, confirme que desea eliminar la zona +message.action.destroy.instance=Por favor, confirme que desea destruir ejemplo +message.action.destroy.systemvm=Por favor, confirme que desea destruir la m\u00c3\u00a1quina virtual del sistema. +message.action.disable.cluster=Por favor, confirme que desea desactivar este grupo. +message.action.disable.pod=Por favor, confirme que desea desactivar esta vaina. +message.action.disable.static.NAT=Por favor, confirme que desea desactivar NAT est\u00c3\u00a1tica +message.action.disable.zone=Por favor, confirme que desea desactivar esta zona. +message.action.enable.cluster=Por favor, confirme que desea habilitar este grupo. +message.action.enable.maintenance=Su acogida ha sido preparado con \u00c3\u00a9xito para el mantenimiento. Este proceso puede tardar hasta varios minutos o m\u00c3\u00a1s dependiendo de c\u00c3\u00b3mo las m\u00c3\u00a1quinas virtuales se encuentran actualmente en este servidor. +message.action.enable.pod=Por favor, confirme que desea habilitar esta vaina. +message.action.enable.zone=Por favor, confirme que desea habilitar esta zona. +message.action.force.reconnect=Por favor, confirme que desea forzar una reconexi\u00c3\u00b3n para el anfitri\u00c3\u00b3n +message.action.host.enable.maintenance.mode=mode \= mantenimiento de Habilitaci\u00c3\u00b3n provocar\u00c3\u00a1 una migraci\u00c3\u00b3n en vivo de todas las instancias que se ejecutan en el sistema para cualquier m\u00c3\u00a1quina disponible. +message.action.manage.cluster=Por favor, confirme que desea para administrar el cl\u00c3\u00baster. +message.action.primarystorage.enable.maintenance.mode=Advertencia\: colocar el almacenamiento principal en modo de mantenimiento har\u00c3\u00a1 que todas las m\u00c3\u00a1quinas virtuales utilizando vol\u00c3\u00bamenes de que sea detenido. \u00c2\u00bfDesea continuar? +message.action.reboot.instance=Por favor, confirme que desea reiniciar el ejemplo +message.action.reboot.systemvm=Por favor, confirme que desea reiniciar el sistema VM +message.action.release.ip=Por favor, confirme que desea liberar IP +message.action.reset.password.off=Su ejemplo en la actualidad no es compatible con esta funci\u00c3\u00b3n. +message.action.reset.password.warning=Su ejemplo debe ser detenido antes de intentar cambiar su contrase\u00c3\u00b1a actual. +message.action.restore.instance=Por favor, confirme que desea restaurar ejemplo +message.action.start.instance=Por favor, confirme que desea iniciar la instancia +message.action.start.router=Por favor, confirme que desea iniciar router +message.action.start.systemvm=Por favor, confirme que desea iniciar el sistema VM +message.action.stop.instance=Por favor, confirme que desea detener la instancia +message.action.stop.systemvm=Por favor, confirme que desea detener sistema VM +message.action.take.snapshot=Por favor, confirme que desea tomar instant\u00c3\u00a1neas +message.action.unmanage.cluster=Por favor, confirme que desea unmanage del cl\u00c3\u00baster. +message.add.cluster=A\u00c3\u00b1adir un hipervisor administradas por cl\u00c3\u00baster de zona , la consola de +message.add.cluster.zone=A\u00c3\u00b1adir un hipervisor administradas por cl\u00c3\u00baster de zona +message.add.disk.offering=Por favor, especifique los par\u00c3\u00a1metros siguientes para agregar un nuevo disco que ofrece +message.add.firewall=A\u00c3\u00b1adir un servidor de seguridad a la zona +message.add.host=Por favor, especifique los par\u00c3\u00a1metros siguientes para agregar un nuevo host +message.add.ip.range=A\u00c3\u00b1adir un rango de IP a la red p\u00c3\u00bablica en la zona +message.add.ip.range.direct.network=A\u00c3\u00b1adir un rango de IP para dirigir red en la zona +message.add.ip.range.to.pod=

A\u00c3\u00b1adir un rango de IP de la vaina\:

+message.additional.networks.desc=Por favor seleccione de red adicionales (s) que la instancia virtual estar\u00c3\u00a1 conectado. +message.add.load.balancer=A\u00c3\u00b1adir un equilibrador de carga a la zona +message.add.network=Agregar una nueva red para la zona\: +message.add.pod=Agregar una vaina nueva zona +message.add.primary=Por favor, especifique los par\u00c3\u00a1metros siguientes para agregar un nuevo almacenamiento primario +message.add.primary.storage=Agregar una nueva almacenamiento primario para zona , la consola de +message.add.secondary.storage=A\u00c3\u00b1adir un nuevo almacenamiento de zona +message.add.service.offering=Por favor, rellene los siguientes datos para agregar una nueva oferta de servicio. +message.add.template=Por favor ingrese los siguientes datos para crear la nueva plantilla +message.add.volume=Por favor, rellene los siguientes datos para agregar un nuevo volumen. +message.advanced.mode.desc=Seleccione este modelo de red si desea habilitar soporte VLAN. Este modelo de red proporciona la m\u00c3\u00a1xima flexibilidad al permitir a los administradores proporcionar ofertas personalizadas de la red como el suministro de firewall, VPN, o el apoyo equilibrador de carga, as\u00c3\u00ad como permitir vs directa de redes virtuales. +message.advanced.security.group=Elija esta opci\u00c3\u00b3n si desea utilizar grupos de seguridad para proporcionar resultados de aislamiento VM. +message.advanced.virtual=Elija esta opci\u00c3\u00b3n si desea utilizar VLAN toda la zona para proporcionar el aislamiento VM invitado. +message.allow.vpn.access=Por favor, introduzca un nombre de usuario y la contrase\u00c3\u00b1a del usuario que desea permitir el acceso de VPN. +message.apply.snapshot.policy=Ha actualizado su pol\u00c3\u00adtica instant\u00c3\u00a1nea actual. +message.attach.iso.confirm=Por favor, confirme que desea conectar el ISO a la instancia virtual +message.attach.volume=Por favor, rellene los siguientes datos para fijar un nuevo volumen. Si est\u00c3\u00a1 colocando un volumen de disco a una m\u00c3\u00a1quina virtual de Windows basado, usted tendr\u00c3\u00a1 que reiniciar la instancia para ver el disco adjunto. +message.basic.mode.desc=Seleccione este modelo de red si lo haces * no * desea habilitar cualquier soporte VLAN. Todas las instancias virtuales creados en virtud de este modelo de red se le asignar\u00c3\u00a1 una direcci\u00c3\u00b3n IP directamente desde la red y grupos de seguridad se utilizan para proporcionar la seguridad y la segregaci\u00c3\u00b3n. +message.change.offering.confirm=Por favor, confirme que desea cambiar la oferta de servicio de la instancia virtual. +message.copy.iso.confirm=Por favor, confirme que desea copiar el ISO a +message.copy.template=Copia plantilla XXX de la zona +message.create.template.vm=Crear VM de la plantilla +message.create.template.volume=Por favor, especifique la siguiente informaci\u00c3\u00b3n antes de crear una plantilla de su volumen de disco\: . Creaci\u00c3\u00b3n de la plantilla puede oscilar entre varios minutos m\u00c3\u00a1s, dependiendo del tama\u00c3\u00b1o del volumen. +message.delete.account=Por favor, confirme que desea eliminar esta cuenta. +message.detach.iso.confirm=Por favor, confirme que desea quitar el ISO de la instancia virtual +message.disable.snapshot.policy=Ha desactivado su pol\u00c3\u00adtica instant\u00c3\u00a1nea actual. +message.disable.vpn.access=Por favor, confirme que desea desactivar VPN de acceso. +message.download.volume=Por favor, haga clic 00000 para bajar el volumen +message.edit.confirm=Por favor confirmar los cambios antes de hacer clic en "Guardar" +message.edit.limits=Por favor, especifique los l\u00c3\u00admites de los recursos siguientes. A "-1" indica que no hay l\u00c3\u00admite a la cantidad de los recursos de crear. +message.enable.account=Por favor, confirme que desea habilitar esta cuenta. +message.enabled.vpn.ip.sec=La clave pre-compartida IPSec es +message.enabled.vpn=Su acceso a la VPN est\u00c3\u00a1 habilitado y se puede acceder a trav\u00c3\u00a9s de la IP +message.enable.vpn.access=VPN \= est\u00c3\u00a1 desactivado para esta direcci\u00c3\u00b3n IP. \u00c2\u00bfTe gustar\u00c3\u00ada que permitan el acceso VPN? +message.enable.vpn=VPN de acceso actualmente no est\u00c3\u00a1 habilitado. Por favor, haga clic aqu\u00c3\u00ad para habilitar VPN. +message.installWizard.click.retry=Haz click en el bot\u00f3n para re-intentar el lanzamiento de la instancia. +message.installWizard.tooltip.addCluster.name=Nombre del Cluster. Puede ser alfanum\u00e9rico .Este no es usado por CloudStack +message.installWizard.tooltip.addHost.hostname=El nombre DNS o direcci\u00f3n IP del host +message.installWizard.tooltip.addHost.username=Generalmente root +message.installWizard.tooltip.addPod.name=Nombre del POD +message.installWizard.tooltip.addPod.reservedSystemGateway=El gateway ,puerta de enlace, para los host en ese pod. +message.installWizard.tooltip.addPrimaryStorage.name=\ Nombre para el storage +message.installWizard.tooltip.addSecondaryStorage.nfsServer=Direcci\u00f3n IP del servidor NFS que contiene el secondary storage +message.installWizard.tooltip.addZone.name=Nombre de la zona. +message.installWizard.tooltip.configureGuestTraffic.description=Una breve descripci\u00f3n para su red. +message.installWizard.tooltip.configureGuestTraffic.guestGateway=El gatway, puerta de enlace, que las maquinas guest deben usar. +message.installWizard.tooltip.configureGuestTraffic.name=Nombre de su RED +message.lock.account=Por favor, confirme que desea bloquear esta cuenta. Al bloquear la cuenta, todos los usuarios de esta cuenta ya no ser\u00c3\u00a1 capaz de gestionar sus recursos de la nube. Los recursos existentes todav\u00c3\u00ada se puede acceder. +message.migrate.instance.confirm=Por favor, confirme el anfitri\u00c3\u00b3n desea migrar la instancia virtual. +message.migrate.instance.to.host=Por favor, confirmar que desea mover la instancia a otro host. +message.migrate.instance.to.ps=Por favor, confirmar que desea mover la instancia a otro primary storage. +message.migrate.router.confirm=Por favor, confirme el hu\u00c3\u00a9sped que desea migrar el router\: +message.migrate.systemvm.confirm=Por favor, confirme el hu\u00c3\u00a9sped que desea migrar la m\u00c3\u00a1quina virtual de sistema\: +message.no.network.support.configuration.not.true=Usted no tiene ninguna zona que ha permitido a grupo de seguridad. Por lo tanto, no hay funciones de red adicionales. Por favor, contin\u00c3\u00bae con el paso 5. +message.no.network.support=El hipervisor seleccionado, vSphere, no tiene funciones de red adicionales. Por favor, contin\u00c3\u00bae con el paso 5. +message.number.clusters=

\# de Grupos

+message.number.hosts=

\# de Anfitri\u00c3\u00b3n

+message.number.pods=

\# de Las vainas

+message.number.storage=

\# de Almacenamiento primario

+message.number.zones=

\# de Zonas

+message.remove.vpn.access=Por favor, confirme que desea eliminar el acceso VPN desde el siguiente usuario +message.restart.mgmt.server=Por favor, reinicie el servidor de administraci\u00c3\u00b3n (s) para la nueva configuraci\u00c3\u00b3n surta efecto. +message.security.group.usage=(Uso pulse Ctrl para seleccionar todos los grupos de seguridad se aplica) +message.select.item=Por favor, seleccionar un item . +message.setup.successful=La configuraci\u00f3n de la cloud finalizo satisfactoriamente. +message.snapshot.schedule=Puede horarios de configuraci\u00c3\u00b3n recurrente instant\u00c3\u00a1neas mediante la selecci\u00c3\u00b3n de las opciones disponibles a continuaci\u00c3\u00b3n y la aplicaci\u00c3\u00b3n de su preferencia pol\u00c3\u00adtica +message.step.1.continue=Por favor seleccione una plantilla o ISO para continuar +message.step.1.desc=Por favor seleccione una plantilla para la instancia virtual. Tambi\u00c3\u00a9n puede optar por seleccionar una plantilla en blanco desde el que puede ser una imagen ISO instalado en. +message.step.2.continue=Por favor seleccione una oferta de servicio para continuar +message.step.2.desc= +message.step.3.continue=Por favor seleccione una oferta en disco para continuar +message.step.3.desc= +message.step.4.continue=Por favor seleccione al menos una red social para continuar +message.step.4.desc=Por favor, seleccione la red primaria que la instancia virtual estar\u00c3\u00a1 conectado. +message.update.os.preference=Por favor seleccione un sistema operativo de preferencia para este equipo. Todas las instancias virtuales con preferencias similares ser\u00c3\u00a1n los primeros asignados a este equipo antes de elegir otro. +message.update.ssl=Por favor, env\u00c3\u00ade una nueva X.509 compatible con certificado SSL que se actualizar\u00c3\u00a1 a cada instancia virtual de la consola del servidor proxy\: +message.virtual.network.desc=Una red dedicada virtualizados para su cuenta. El dominio de difusi\u00c3\u00b3n est\u00c3\u00a1 contenida dentro de una VLAN y todos los acceso a la red p\u00c3\u00bablica se encamina a cabo por un router virtual. +message.vm.create.template.confirm=Crear plantilla de la m\u00c3\u00a1quina virtual se reiniciar\u00c3\u00a1 autom\u00c3\u00a1ticamente. +message.volume.create.template.confirm=Por favor, confirme que desea crear una plantilla para este volumen de disco. Creaci\u00c3\u00b3n de la plantilla puede oscilar entre varios minutos m\u00c3\u00a1s, dependiendo del tama\u00c3\u00b1o del volumen. +message.zone.step.1.desc=Por favor seleccione un modelo de red para su zona. +mode=modo +network.rate=Tasa de Red +side.by.side=Juntos +state.Allocated=Asignados +state.Disabled=personas de movilidad reducida +state.Error=Error diff --git a/client/WEB-INF/classes/resources/messages_fr_FR.properties b/client/WEB-INF/classes/resources/messages_fr_FR.properties index 267baec0270..6a7cc9a9d55 100644 --- a/client/WEB-INF/classes/resources/messages_fr_FR.properties +++ b/client/WEB-INF/classes/resources/messages_fr_FR.properties @@ -128,8 +128,8 @@ label.action.delete.nexusVswitch=Supprimer le Nexus 1000v label.action.delete.physical.network=Supprimer le r\u00E9seau physique label.action.delete.pod=Supprimer le Pod label.action.delete.pod.processing=Suppression du pod... -label.action.delete.primary.storage=Supprimer le stockage primaire -label.action.delete.primary.storage.processing=Suppression du stockage primaire... +label.action.delete.primary.storage=Supprimer le stockage principal +label.action.delete.primary.storage.processing=Suppression du stockage principal... label.action.delete.secondary.storage=Supprimer le stockage secondaire label.action.delete.secondary.storage.processing=Suppression du stockage secondaire... label.action.delete.security.group=Supprimer le groupe de s\u00E9curit\u00E9 @@ -184,7 +184,7 @@ label.action.edit.network=Modifier le r\u00E9seau label.action.edit.network.offering=Modifier l\\'offre de service r\u00E9seau label.action.edit.network.processing=Modification du R\u00E9seau... label.action.edit.pod=Modifier le pod -label.action.edit.primary.storage=Modifier le stockage primaire +label.action.edit.primary.storage=Modifier le stockage principal label.action.edit.resource.limits=Modifier les limites de ressources label.action.edit.service.offering=Modifier l\\'offre de service label.action.edit.template=Modifier le mod\u00E8le @@ -236,6 +236,8 @@ label.action.remove.host=Supprimer l\\'h\u00F4te label.action.remove.host.processing=Suppression de l\\'h\u00F4te... label.action.reset.password=R\u00E9-initialiser le mot de passe label.action.reset.password.processing=R\u00E9-initialisation du mot de passe... +label.action.resize.volume=Redimensionner Volume +label.action.resize.volume.processing=Redimensionnement en cours... label.action.resource.limits=Limites de ressources label.action.restore.instance=Restaurer l\\'instance label.action.restore.instance.processing=Restauration de l\\'instance... @@ -263,7 +265,7 @@ label.actions=Actions label.activate.project=Activer projet label.active.sessions=Sessions actives label.add=Ajouter -label.add.ACL=Ajouter une r\u00E8gle ACL +label.add.ACL=Ajouter r\u00E8gle ACL label.add.F5.device=Ajouter un F5 label.add.NiciraNvp.device=Ajouter un contr\u00F4leur Nvp label.add.SRX.device=Ajouter un SRX @@ -302,10 +304,10 @@ label.add.new.tier=Ajouter un nouveau tiers label.add.physical.network=Ajouter un r\u00E9seau physique label.add.pod=Ajouter un pod label.add.port.forwarding.rule=Ajouter une r\u00E8gle de transfert de port -label.add.primary.storage=Ajouter un stockage primaire -label.add.resources=Ajouter des ressources -label.add.route=Ajouter une route -label.add.rule=Ajouter une r\u00E8gle +label.add.primary.storage=Ajouter un stockage principal +label.add.resources=Ajouter ressources +label.add.route=Ajouter route +label.add.rule=Ajouter r\u00E8gle label.add.secondary.storage=Ajouter un stockage secondaire label.add.security.group=Ajouter un groupe de s\u00E9curit\u00E9 label.add.service.offering=Ajouter une offre de service @@ -344,7 +346,7 @@ label.agree=Accepter label.alert=Alerte label.algorithm=Algorithme label.allocated=Allou\u00E9 -label.allocation.state=\u00C9tat de l\\'allocation +label.allocation.state=\u00C9tat label.api.key=Cl\u00E9 d\\'API label.apply=Appliquer label.assign=Assigner @@ -402,7 +404,7 @@ label.clvm=CLVM label.code=Code label.community=Communaut\u00E9 label.compute=Processeur -label.compute.and.storage=Processeur et Stockage +label.compute.and.storage=Calcul et Stockage label.compute.offering=Offre de calcul label.compute.offerings=Offres de calcul label.configuration=Configuration @@ -474,7 +476,7 @@ label.disk.size=Taille du disque label.disk.size.gb=Taille du disque (en Go) label.disk.total=Espace disque total label.disk.volume=Volume disque -label.display.name=Nom d\\'affichage +label.display.name=Nom commun label.display.text=Texte affich\u00E9 label.dns=DNS label.dns.1=DNS 1 @@ -508,7 +510,7 @@ label.enable.swift=Activer Swift label.enable.vpn=Activer VPN label.enabling.vpn=Activation du VPN label.enabling.vpn.access=Activation de l\\'acc\u00E8s VPN -label.end.IP=R\u00E9silier l\\'IP +label.end.IP=Fin de plage IP label.end.port=Port de fin label.end.reserved.system.IP=Adresse IP de fin r\u00E9serv\u00E9e Syst\u00E8me label.end.vlan=VLAN de fin @@ -522,7 +524,7 @@ label.f5=F5 label.failed=\u00C9chou\u00E9 label.featured=Sponsoris\u00E9 label.fetch.latest=Rafra\u00EEchir -label.filterBy=Filtrer par +label.filterBy=Filtre label.firewall=Pare-feu label.first.name=Pr\u00E9nom label.format=Format @@ -574,8 +576,8 @@ label.installWizard.addHostIntro.subtitle=Qu\\'est ce qu\\'un h\u00F4te ? label.installWizard.addHostIntro.title=Ajoutons un h\u00F4te label.installWizard.addPodIntro.subtitle=Qu\\'est ce qu\\'un pod ? label.installWizard.addPodIntro.title=Ajoutons un pod -label.installWizard.addPrimaryStorageIntro.subtitle=Qu\\'est ce que le stockage primaire ? -label.installWizard.addPrimaryStorageIntro.title=Ajoutons du stockage primaire +label.installWizard.addPrimaryStorageIntro.subtitle=Qu\\'est ce que le stockage principal ? +label.installWizard.addPrimaryStorageIntro.title=Ajoutons du stockage principal label.installWizard.addSecondaryStorageIntro.subtitle=Qu\\'est ce que le stockage secondaire ? label.installWizard.addSecondaryStorageIntro.title=Ajoutons du stockage secondaire label.installWizard.addZone.title=Ajouter une zone @@ -626,10 +628,15 @@ label.keyboard.type=Type de clavier label.kvm.traffic.label=Libell\u00E9 pour le trafic KVM label.label=Libell\u00E9 label.lang.brportugese=Portuguais Br\u00E9sil +label.lang.catalan=Catalan label.lang.chinese=Chinois (simplifi\u00E9) label.lang.english=Anglais label.lang.french=Fran\u00E7ais +label.lang.german=Allemand +label.lang.italian=Italien label.lang.japanese=Japonais +label.lang.korean=Cor\u00E9en +label.lang.norwegian=Norv\u00E9gien label.lang.russian=Russe label.lang.spanish=Espagnol label.last.disconnected=Derni\u00E8re D\u00E9connexion @@ -712,12 +719,12 @@ label.menu.virtual.resources=Ressources Virtuelles label.menu.volumes=Volumes label.migrate.instance.to=Migrer l\\'instance vers label.migrate.instance.to.host=Migration de l\\'instance sur un autre h\u00F4te -label.migrate.instance.to.ps=Migration de l\\'instance sur un autre stockage primaire +label.migrate.instance.to.ps=Migration de l\\'instance sur un autre stockage principal label.migrate.router.to=Migrer le routeur vers label.migrate.systemvm.to=Migrer la VM syst\u00E8me vers label.migrate.to.host=Migrer vers un h\u00F4te label.migrate.to.storage=Migrer vers un stockage -label.migrate.volume=Migration du volume vers un autre stockage primaire +label.migrate.volume=Migration du volume vers un autre stockage principal label.minimum=Minimum label.minute.past.hour=minute(s) label.monday=Lundi @@ -785,7 +792,7 @@ label.no.thanks=Non merci label.none=Aucun label.not.found=Introuvable label.notifications=Messages -label.num.cpu.cores=Nombre de coeurs de processeur +label.num.cpu.cores=Nombre de c\u0153urs label.number.of.clusters=Nombre de clusters label.number.of.hosts=Nombre d\\'H\u00F4tes label.number.of.pods=Nombre de Pods @@ -798,11 +805,11 @@ label.offer.ha=Offrir la haute disponibilit\u00E9 label.ok=OK label.optional=Facultatif label.order=Ordre -label.os.preference=Pr\u00E9f\u00E9rence du OS +label.os.preference=Pr\u00E9f\u00E9rence OS label.os.type=Type du OS label.owned.public.ips=Adresses IP Publiques d\u00E9tenues -label.owner.account=Propri\u00E9taire du compte -label.owner.domain=Propri\u00E9taire du domaine +label.owner.account=Propri\u00E9taire +label.owner.domain=Propri\u00E9taire label.parent.domain=Parent du Domaine label.password=Mot de passe label.password.enabled=Mot de passe activ\u00E9 @@ -820,11 +827,11 @@ label.port.forwarding.policies=R\u00E8gles de transfert de port label.port.range=Plage de ports label.prev=Pr\u00E9c\u00E9dent label.previous=Retour -label.primary.allocated=Stockage primaire allou\u00E9 -label.primary.network=R\u00E9seau primaire +label.primary.allocated=Stockage principal allou\u00E9 +label.primary.network=R\u00E9seau principal label.primary.storage=Premier stockage -label.primary.storage.count=Groupes de stockage primaire -label.primary.used=Stockage primaire utilis\u00E9 +label.primary.storage.count=Groupes de stockage principal +label.primary.used=Stockage principal utilis\u00E9 label.private.Gateway=Passerelle priv\u00E9e label.private.interface=Interface priv\u00E9e label.private.ip=Adresse IP Priv\u00E9e @@ -881,6 +888,9 @@ label.reserved.system.gateway=Passerelle r\u00E9serv\u00E9e Syst\u00E8me label.reserved.system.ip=Adresse IP Syst\u00E8me r\u00E9serv\u00E9e label.reserved.system.netmask=Masque de sous-r\u00E9seau r\u00E9serv\u00E9 Syst\u00E8me label.reset.VPN.connection=R\u00E9-initialiser la connexion VPN +label.resize.new.offering.id=Nouvelle Offre +label.resize.new.size=Nouvelle Taille (Go) +label.resize.shrink.ok=R\u00E9duction OK label.resource=Ressource label.resource.limits=Limite des ressources label.resource.state=\u00C9tat des ressources @@ -921,7 +931,7 @@ label.security.group.name=Nom du groupe de s\u00E9curit\u00E9 label.security.groups=Groupes de s\u00E9curit\u00E9 label.security.groups.enabled=Groupes de s\u00E9curit\u00E9 Activ\u00E9s label.select=S\u00E9lectionner -label.select-view=S\u00E9lectionner la vue +label.select-view=S\u00E9lectionner la vue label.select.a.template=S\u00E9lectionner un mod\u00E8le label.select.a.zone=S\u00E9lectionner une zone label.select.instance=S\u00E9lectionner une instance @@ -947,8 +957,8 @@ label.site.to.site.VPN=VPN Site-\u00E0-Site label.size=Taille label.skip.guide=J\\'ai d\u00E9j\u00E0 utilis\u00E9 CloudStack avant, passer ce tutoriel label.snapshot=Instantan\u00E9 -label.snapshot.limits=Limites d\\'instantan\u00E9 -label.snapshot.name=Nom de l\\'instantan\u00E9 +label.snapshot.limits=Limites d\\'instantan\u00E9s +label.snapshot.name=Nom Instantan\u00E9 label.snapshot.s=Instantan\u00E9(s) label.snapshot.schedule=Configurer un instantan\u00E9 r\u00E9current label.snapshots=Instantan\u00E9s @@ -957,7 +967,7 @@ label.source.nat=NAT Source label.specify.IP.ranges=Sp\u00E9cifier des plages IP label.specify.vlan=Pr\u00E9ciser le VLAN label.srx=SRX -label.start.IP=D\u00E9marrer l\\'IP +label.start.IP=Plage de d\u00E9but IP label.start.port=Port de d\u00E9but label.start.reserved.system.IP=Adresse IP de d\u00E9but r\u00E9serv\u00E9e Syst\u00E8me label.start.vlan=VLAN de d\u00E9part @@ -1086,7 +1096,7 @@ label.vlan.id=ID du VLAN label.vlan.range=Plage du VLAN label.vm.add=Ajouter une instance label.vm.destroy=D\u00E9truire -label.vm.display.name=Nom d\\'affichage de la VM +label.vm.display.name=Nom commun VM label.vm.name=Nom de la VM label.vm.reboot=Red\u00E9marrer label.vm.start=D\u00E9marrer @@ -1120,7 +1130,7 @@ label.yes=Oui label.zone=Zone label.zone.details=D\u00E9tails de la zone label.zone.id=ID de la zone -label.zone.name=Nom de la zone +label.zone.name=Nom de zone label.zone.step.1.title=\u00C9tape 1 \: S\u00E9lectionnez un r\u00E9seau label.zone.step.2.title=\u00C9tape 2 \: Ajoutez une zone label.zone.step.3.title=\u00C9tape 3 \: Ajoutez un Pod @@ -1130,7 +1140,7 @@ label.zone.wide=Transverse \u00E0 la zone label.zoneWizard.trafficType.guest=Invit\u00E9 \: Trafic entre les machines virtuelles utilisateurs label.zoneWizard.trafficType.management=Administration \: Trafic entre les ressources internes de CloudStack, incluant tous les composants qui communiquent avec le serveur d\\'administration, tels que les h\u00F4tes and les machines virtuelles Syst\u00E8mes CloudStack label.zoneWizard.trafficType.public=Public \: Trafic entre Internet et les machines virtuelles dans le nuage -label.zoneWizard.trafficType.storage=Stockage \: Trafic entre les serveurs de stockages primaires et secondaires, tel que le transfert de machines virtuelles mod\u00E8les et des instantan\u00E9s de disques +label.zoneWizard.trafficType.storage=Stockage \: Trafic entre les serveurs de stockages principaux et secondaires, tel que le transfert de machines virtuelles mod\u00E8les et des instantan\u00E9s de disques label.zones=Zones managed.state=\u00C9tat de la gestion message.Zone.creation.complete=Cr\u00E9ation de la zone termin\u00E9e @@ -1141,63 +1151,63 @@ message.action.cancel.maintenance=Votre h\u00F4te a quitt\u00E9 la maintenance. message.action.cancel.maintenance.mode=Confirmer l\\'annulation de cette maintenance. message.action.change.service.warning.for.instance=Votre instance doit \u00EAtre arr\u00EAt\u00E9e avant d\\'essayer de changer son offre de service. message.action.change.service.warning.for.router=Votre routeur doit \u00EAtre arr\u00EAt\u00E9 avant d\\'essayer de changer son offre de service. -message.action.delete.ISO=Confirmer que vous souhaitez supprimer cette ISO. +message.action.delete.ISO=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cette ISO. message.action.delete.ISO.for.all.zones=L\\'ISO est utilis\u00E9 par toutes les zones. S\\'il vous pla\u00EEt confirmer que vous voulez le supprimer de toutes les zones. -message.action.delete.cluster=Confirmer que vous voulez supprimer ce cluster. -message.action.delete.disk.offering=Confirmer que vous souhaitez supprimer cette offre de disque. -message.action.delete.domain=Confirmer que vous voulez supprimer ce domaine. -message.action.delete.external.firewall=Confirmer que vous souhaitez supprimer ce pare-feu externe. Attention \: Si vous pr\u00E9voyez de rajouter le m\u00EAme pare-feu externe de nouveau, vous devez r\u00E9-initialiser les donn\u00E9es d\\'utilisation sur l\\'appareil. -message.action.delete.external.load.balancer=Confirmez que vous souhaitez supprimer ce r\u00E9partiteur de charge externe. Attention \: Si vous pensez ajouter le m\u00EAme r\u00E9partiteur de charge plus tard, vous devez remettre \u00E0 z\u00E9ro les statistiques d\\'utilisation de cet \u00E9quipement. -message.action.delete.ingress.rule=Confirmez que vous souhaitez supprimer cette r\u00E8gle d\\'entr\u00E9e. -message.action.delete.network=Confirmer que vous voulez supprimer ce r\u00E9seau. +message.action.delete.cluster=\u00CAtes-vous s\u00FBr que vous voulez supprimer ce cluster. +message.action.delete.disk.offering=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cette offre de disque. +message.action.delete.domain=\u00CAtes-vous s\u00FBr que vous voulez supprimer ce domaine. +message.action.delete.external.firewall=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce pare-feu externe. Attention \: Si vous pr\u00E9voyez de rajouter le m\u00EAme pare-feu externe de nouveau, vous devez r\u00E9-initialiser les donn\u00E9es d\\'utilisation sur l\\'appareil. +message.action.delete.external.load.balancer=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce r\u00E9partiteur de charge externe. Attention \: Si vous pensez ajouter le m\u00EAme r\u00E9partiteur de charge plus tard, vous devez remettre \u00E0 z\u00E9ro les statistiques d\\'utilisation de cet \u00E9quipement. +message.action.delete.ingress.rule=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cette r\u00E8gle d\\'entr\u00E9e. +message.action.delete.network=\u00CAtes-vous s\u00FBr que vous voulez supprimer ce r\u00E9seau. message.action.delete.nexusVswitch=Confirmer la suppession de ce Nexus 1000v message.action.delete.physical.network=Confirmer la suppression du r\u00E9seau physique -message.action.delete.pod=Confirmez que vous souhaitez supprimer ce pod. -message.action.delete.primary.storage=Confirmer que vous voulez supprimer ce stockage primaire. -message.action.delete.secondary.storage=Confirmez que vous souhaitez supprimer ce stockage secondaire. -message.action.delete.security.group=Confirmez que vous souhaitez supprimer ce groupe de s\u00E9curit\u00E9. -message.action.delete.service.offering=Confirmez que vous souhaitez supprimer cette offre de service. -message.action.delete.snapshot=Confirmez que vous souhaitez supprimer cet instantan\u00E9 -message.action.delete.system.service.offering=Confirmer la suppression de l\\'offre syst\u00E8me. -message.action.delete.template=Confirmez que vous souhaitez supprimer ce mod\u00E8le. -message.action.delete.template.for.all.zones=Ce mod\u00E8le est utilis\u00E9 par toutes les zones. Confirmez que vous souhaitez le supprimer de toutes les zones. -message.action.delete.volume=Confirmez que vous souhaitez supprimer ce volume. -message.action.delete.zone=Confirmez que vous souhaitez supprimer cette zone. -message.action.destroy.instance=Confirmez que vous souhaitez supprimer cette instance. -message.action.destroy.systemvm=Confirmez que vous souhaitez supprimer cette VM Syst\u00E8me. -message.action.disable.cluster=Confirmez que vous souhaitez d\u00E9sactiver ce cluster +message.action.delete.pod=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce pod. +message.action.delete.primary.storage=\u00CAtes-vous s\u00FBr que vous voulez supprimer ce stockage principal. +message.action.delete.secondary.storage=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce stockage secondaire. +message.action.delete.security.group=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce groupe de s\u00E9curit\u00E9. +message.action.delete.service.offering=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cette offre de service. +message.action.delete.snapshot=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cet instantan\u00E9 +message.action.delete.system.service.offering=\u00CAtes-vous s\u00FBr que vous voulez supprimer l\\'offre syst\u00E8me. +message.action.delete.template=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce mod\u00E8le. +message.action.delete.template.for.all.zones=Ce mod\u00E8le est utilis\u00E9 par toutes les zones. \u00CAtes-vous s\u00FBr que vous souhaitez le supprimer de toutes les zones. +message.action.delete.volume=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce volume. +message.action.delete.zone=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cette zone. +message.action.destroy.instance=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cette instance. +message.action.destroy.systemvm=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer cette VM Syst\u00E8me. +message.action.disable.cluster=\u00CAtes-vous s\u00FBr que vous souhaitez d\u00E9sactiver ce cluster message.action.disable.nexusVswitch=Confirmer la d\u00E9sactivation de ce Nexus 1000v message.action.disable.physical.network=Confirmer l\\'activation de ce r\u00E9seau physique. -message.action.disable.pod=Confirmez que vous voulez d\u00E9sactiver ce Pod -message.action.disable.static.NAT=Confirmez que vous souhaitez d\u00E9sactiver le NAT statique. -message.action.disable.zone=Confirmez que vous voulez d\u00E9sactiver cette zone +message.action.disable.pod=\u00CAtes-vous s\u00FBr que vous souhaitez d\u00E9sactiver ce Pod +message.action.disable.static.NAT=\u00CAtes-vous s\u00FBr que vous souhaitez d\u00E9sactiver le NAT statique. +message.action.disable.zone=\u00CAtes-vous s\u00FBr que vous souhaitez d\u00E9sactiver cette zone message.action.download.iso=Confirmer le t\u00E9l\u00E9chargement de cet ISO message.action.download.template=Confirmer le t\u00E9l\u00E9chargement de ce mod\u00E8le -message.action.enable.cluster=Confirmez que vous souhaitez activer ce cluster +message.action.enable.cluster=\u00CAtes-vous s\u00FBr que vous souhaitez activer ce cluster message.action.enable.maintenance=Votre h\u00F4te a \u00E9t\u00E9 mis en mode maintenance avec succ\u00E8s. Ce processus peut durer plusieurs minutes ou plus, suivant le nombre de VMs actives sur cet h\u00F4te. message.action.enable.nexusVswitch=Confirmer l\\'activation de ce Nexus 1000v message.action.enable.physical.network=Confirmer l\\'activation de ce r\u00E9seau physique. -message.action.enable.pod=Confirmez que vous souhaitez activer ce Pod -message.action.enable.zone=Confirmez que vous voulez activer cette zone +message.action.enable.pod=\u00CAtes-vous s\u00FBr que vous souhaitez activer ce Pod +message.action.enable.zone=\u00CAtes-vous s\u00FBr que vous souhaitez activer cette zone message.action.force.reconnect=Votre h\u00F4te a \u00E9t\u00E9 forc\u00E9e \u00E0 se reconnecter avec succ\u00E8s. Ce processus peut prendre jusqu\\'\u00E0 plusieurs minutes. message.action.host.enable.maintenance.mode=Activer le mode maintenance va causer la migration \u00E0 chaud de l\\'ensemble des instances de cet h\u00F4te sur les autres h\u00F4tes disponibles. message.action.instance.reset.password=Confirmer le changement du mot de passe ROOT pour cette machine virtuelle. -message.action.manage.cluster=Confirmez que vous voulez g\u00E9rer le cluster -message.action.primarystorage.enable.maintenance.mode=Attention \: placer ce stockage primaire en mode maintenance va provoquer l\\'arr\u00EAt de l\\'ensemble des VMs utilisant des volumes sur ce stockage. Souhaitez-vous continuer ? -message.action.reboot.instance=Confirmez que vous souhaitez red\u00E9marrer cette instance. +message.action.manage.cluster=\u00CAtes-vous s\u00FBr que vous souhaitez g\u00E9rer le cluster +message.action.primarystorage.enable.maintenance.mode=Attention \: placer ce stockage principal en mode maintenance va provoquer l\\'arr\u00EAt de l\\'ensemble des VMs utilisant des volumes sur ce stockage. Souhaitez-vous continuer ? +message.action.reboot.instance=\u00CAtes-vous s\u00FBr que vous souhaitez red\u00E9marrer cette instance. message.action.reboot.router=Tous les services fournit par ce routeur virtuel vont \u00EAtre interrompus. Confirmer le r\u00E9-amor\u00E7age de ce routeur. -message.action.reboot.systemvm=Confirmez que vous souhaitez red\u00E9marrer cette VM Syst\u00E8me -message.action.release.ip=Confirmez que vous souhaitez lib\u00E9rer cette IP. -message.action.remove.host=Confirmer la suppression de cet h\u00F4te. +message.action.reboot.systemvm=\u00CAtes-vous s\u00FBr que vous souhaitez red\u00E9marrer cette VM Syst\u00E8me +message.action.release.ip=\u00CAtes-vous s\u00FBr que vous souhaitez lib\u00E9rer cette IP. +message.action.remove.host=\u00CAtes-vous s\u00FBr que vous voulez supprimer cet h\u00F4te. message.action.reset.password.off=Votre instance ne supporte pas pour le moment cette fonctionnalit\u00E9. message.action.reset.password.warning=Votre instance doit \u00EAtre arr\u00EAt\u00E9e avant d\\'essayer de changer son mot de passe. -message.action.restore.instance=Confirmez que vous souhaitez restaurer cette instance. -message.action.start.instance=Confirmez que vous souhaitez d\u00E9marrer cette instance. -message.action.start.router=Confirmez que vous souhaitez d\u00E9marrer ce routeur. -message.action.start.systemvm=Confirmez que vous souhaitez red\u00E9marrer cette VM syst\u00E8me. -message.action.stop.instance=Confirmez que vous souhaitez arr\u00EAter cette instance. +message.action.restore.instance=\u00CAtes-vous s\u00FBr que vous souhaitez restaurer cette instance. +message.action.start.instance=\u00CAtes-vous s\u00FBr que vous souhaitez d\u00E9marrer cette instance. +message.action.start.router=\u00CAtes-vous s\u00FBr que vous souhaitez d\u00E9marrer ce routeur. +message.action.start.systemvm=\u00CAtes-vous s\u00FBr que vous souhaitez red\u00E9marrer cette VM syst\u00E8me. +message.action.stop.instance=\u00CAtes-vous s\u00FBr que vous souhaitez arr\u00EAter cette instance. message.action.stop.router=Tous les services fournit par ce routeur virtuel vont \u00EAtre interrompus. Confirmer l\\'arr\u00EAt de ce routeur. -message.action.stop.systemvm=Confirmez que vous souhaitez arr\u00EAter cette VM. +message.action.stop.systemvm=\u00CAtes-vous s\u00FBr que vous souhaitez arr\u00EAter cette VM. message.action.take.snapshot=Confirmer la prise d\\'un instantan\u00E9 pour ce volume. message.action.unmanage.cluster=Confirmez que vous ne voulez plus g\u00E9rer le cluster message.activate.project=\u00CAtes-vous s\u00FBr de vouloir activer ce projet ? @@ -1217,9 +1227,9 @@ message.add.load.balancer.under.ip=La r\u00E8gle de r\u00E9partition de charge \ message.add.network=Ajouter un nouveau r\u00E9seau \u00E0 la zone\: message.add.new.gateway.to.vpc=Renseigner les informations suivantes pour ajouter une nouvelle passerelle pour ce VPC message.add.pod=Ajouter un nouveau pod \u00E0 la zone -message.add.pod.during.zone.creation=Chaque zone doit contenir un ou plusieurs pods, et le premier pod sera ajout\u00E9 maintenant. Une pod contient les h\u00F4tes et les serveurs de stockage primaire, qui seront ajout\u00E9s dans une \u00E9tape ult\u00E9rieure. Configurer une plage d\\'adresses IP r\u00E9serv\u00E9es pour le trafic de gestion interne de CloudStack. La plage d\\'IP r\u00E9serv\u00E9e doit \u00EAtre unique pour chaque zone dans le nuage. -message.add.primary=Renseignez les param\u00E8tres suivants pour ajouter un stockage primaire -message.add.primary.storage=Ajouter un nouveau stockage primaire \u00E0 la zone , pod +message.add.pod.during.zone.creation=Chaque zone doit contenir un ou plusieurs pods, et le premier pod sera ajout\u00E9 maintenant. Une pod contient les h\u00F4tes et les serveurs de stockage principal, qui seront ajout\u00E9s dans une \u00E9tape ult\u00E9rieure. Configurer une plage d\\'adresses IP r\u00E9serv\u00E9es pour le trafic de gestion interne de CloudStack. La plage d\\'IP r\u00E9serv\u00E9e doit \u00EAtre unique pour chaque zone dans le nuage. +message.add.primary=Renseignez les param\u00E8tres suivants pour ajouter un stockage principal +message.add.primary.storage=Ajouter un nouveau stockage principal \u00E0 la zone , pod message.add.secondary.storage=Ajouter un nouveau stockage pour la zone message.add.service.offering=Renseigner les informations suivantes pour ajouter une nouvelle offre de service de calcul. message.add.system.service.offering=Ajouter les informations suivantes pour cr\u00E9er une nouvelle offre syst\u00E8me. @@ -1237,10 +1247,10 @@ message.after.enable.swift=Swift configur\u00E9. Remarque \: une fois que vous q message.alert.state.detected=\u00C9tat d\\'alerte d\u00E9tect\u00E9 message.allow.vpn.access=Entrez un nom d\\'utilisateur et un mot de passe pour l\\'utilisateur que vous souhaitez autoriser \u00E0 utiliser l\\'acc\u00E8s VPN. message.apply.snapshot.policy=Vous avez mis \u00E0 jour votre politique d\\'instantan\u00E9s avec succ\u00E8s. -message.attach.iso.confirm=Confirmez que vous souhaitez attacher l\\'image ISO \u00E0 cette instance. +message.attach.iso.confirm=\u00CAtes-vous s\u00FBr que vous souhaitez attacher l\\'image ISO \u00E0 cette instance. message.attach.volume=Renseignez les donn\u00E9es suivantes pour attacher un nouveau volume. Si vous attachez un volume disque \u00E0 une machine virtuelle sous Windows, vous aurez besoin de red\u00E9marrer l\\'instance pour voir le nouveau disque. message.basic.mode.desc=Choisissez ce mod\u00E8le de r\u00E9seau si vous *ne voulez pas* activer le support des VLANs. Toutes les instances cr\u00E9\u00E9es avec ce mod\u00E8le de r\u00E9seau se verront assigner une adresse IP et les groupes de s\u00E9curit\u00E9 seront utilis\u00E9s pour fournir l\\'isolation entre les VMs. -message.change.offering.confirm=Confirmez que vous souhaitez changer l\\'offre de service de cette instance. +message.change.offering.confirm=\u00CAtes-vous s\u00FBr que vous souhaitez changer l\\'offre de service de cette instance. message.change.password=Merci de modifier votre mot de passe. message.configure.all.traffic.types=Vous avez de multiples r\u00E9seaux physiques ; veuillez configurer les libell\u00E9s pour chaque type de trafic en cliquant sur le bouton Modifier. message.configuring.guest.traffic=Configuration du r\u00E9seau VM @@ -1251,13 +1261,13 @@ message.confirm.action.force.reconnect=Confirmer la re-connexion forc\u00E9e de message.confirm.delete.F5=Confirmer la suppression du F5 message.confirm.delete.NetScaler=Confirmer la suppression du Netscaler message.confirm.delete.SRX=Confirmer la suppression du SRX -message.confirm.destroy.router=Confirmer la suppression de ce routeur +message.confirm.destroy.router=\u00CAtes-vous s\u00FBr que vous voulez supprimer ce routeur message.confirm.disable.provider=Confirmer la d\u00E9sactivation de ce fournisseur message.confirm.enable.provider=Confirmer l\\'activation de ce fournisseur -message.confirm.join.project=Confirmer que vous souhaitez rejoindre ce projet. -message.confirm.remove.IP.range=Confirmer la suppression de cette plage d\\'adresses IP +message.confirm.join.project=\u00CAtes-vous s\u00FBr que vous souhaitez rejoindre ce projet. +message.confirm.remove.IP.range=\u00CAtes-vous s\u00FBr que vous voulez supprimer cette plage d\\'adresses IP message.confirm.shutdown.provider=Confirmer l\\'arr\u00EAt de ce fournisseur -message.copy.iso.confirm=Confirmez que vous souhaitez copier votre image ISO vers +message.copy.iso.confirm=\u00CAtes-vous s\u00FBr que vous souhaitez copier votre image ISO vers message.copy.template=Copier le mod\u00E8le XXX de la zone vers message.create.template=Voulez vous cr\u00E9er un mod\u00E8le ? message.create.template.vm=Cr\u00E9er la VM depuis le mod\u00E8le @@ -1266,31 +1276,31 @@ message.creating.cluster=Cr\u00E9ation du cluster message.creating.guest.network=Cr\u00E9ation du r\u00E9seau pour les invit\u00E9s message.creating.physical.networks=Cr\u00E9ation des r\u00E9seaux physiques message.creating.pod=Cr\u00E9ation d\\'un pod -message.creating.primary.storage=Cr\u00E9ation du stockage primaire +message.creating.primary.storage=Cr\u00E9ation du stockage principal message.creating.secondary.storage=Cr\u00E9ation du stockage secondaire message.creating.zone=Cr\u00E9ation de la zone message.decline.invitation=Voulez-vous refuser cette invitation au projet ? -message.delete.VPN.connection=Confirmer la suppression de la connexion VPN -message.delete.VPN.customer.gateway=Confirmer la suppression de cette passerelle VPN client -message.delete.VPN.gateway=Confirmer la suppression de cette passerelle VPN -message.delete.account=Confirmez que vous souhaitez supprimer ce compte. -message.delete.gateway=Confirmer la suppression de cette passerelle +message.delete.VPN.connection=\u00CAtes-vous s\u00FBr que vous voulez supprimer la connexion VPN +message.delete.VPN.customer.gateway=\u00CAtes-vous s\u00FBr que vous voulez supprimer cette passerelle VPN client +message.delete.VPN.gateway=\u00CAtes-vous s\u00FBr que vous voulez supprimer cette passerelle VPN +message.delete.account=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer ce compte. +message.delete.gateway=\u00CAtes-vous s\u00FBr que vous voulez supprimer cette passerelle message.delete.project=\u00CAtes-vous s\u00FBr de vouloir supprimer ce projet ? -message.delete.user=Confirmer la suppression de cet utilisateur. +message.delete.user=\u00CAtes-vous s\u00FBr que vous voulez supprimer cet utilisateur. message.desc.advanced.zone=Pour des topologies de r\u00E9seau plus sophistiqu\u00E9es. Ce mod\u00E8le de r\u00E9seau permet plus de flexibilit\u00E9 dans la d\u00E9finition des r\u00E9seaux d\\'invit\u00E9s et propose des offres personnalis\u00E9es telles que le support de pare-feu, VPN ou d\\'\u00E9quilibrage de charge. message.desc.basic.zone=Fournit un r\u00E9seau unique o\u00F9 chaque instance de machine virtuelle se voit attribuer une adresse IP directement depuis le r\u00E9seau. L\\'isolation des invit\u00E9s peut \u00EAtre assur\u00E9 au niveau de la couche r\u00E9seau-3 tels que les groupes de s\u00E9curit\u00E9 (filtrage d\\'adresse IP source). -message.desc.cluster=Chaque pod doit contenir un ou plusieurs clusters, et le premier cluster sera ajout\u00E9 tout de suite. Un cluster est un regroupement pour h\u00F4tes. Les h\u00F4tes d\\'un cluster ont tous un mat\u00E9riel identique, ex\u00E9cutent le m\u00EAme hyperviseur, sont dans le m\u00EAme sous-r\u00E9seau, et acc\u00E8dent au m\u00EAme stockage partag\u00E9. Chaque cluster comprend une ou plusieurs h\u00F4tes et un ou plusieurs serveurs de stockage primaire. +message.desc.cluster=Chaque pod doit contenir un ou plusieurs clusters, et le premier cluster sera ajout\u00E9 tout de suite. Un cluster est un regroupement pour h\u00F4tes. Les h\u00F4tes d\\'un cluster ont tous un mat\u00E9riel identique, ex\u00E9cutent le m\u00EAme hyperviseur, sont dans le m\u00EAme sous-r\u00E9seau, et acc\u00E8dent au m\u00EAme stockage partag\u00E9. Chaque cluster comprend une ou plusieurs h\u00F4tes et un ou plusieurs serveurs de stockage principal. message.desc.host=Chaque cluster doit contenir au moins un h\u00F4te (machine) pour ex\u00E9cuter des machines virtuelles invit\u00E9es, et le premier h\u00F4te sera ajout\u00E9 tout de suite. Pour un h\u00F4te fonctionnant dans CloudStack, vous devez installer un logiciel hyperviseur sur l\\'h\u00F4te, attribuer une adresse IP \u00E0 l\\'h\u00F4te, et s\\'assurer que l\\'h\u00F4te est connect\u00E9 au serveur d\\'administration CloudStack.

Indiquer le nom de l\\'h\u00F4te ou son adresse IP, l\\'identifiant de connexion (g\u00E9n\u00E9ralement root) et le mot de passe ainsi que toutes les \u00E9tiquettes permettant de classer les h\u00F4tes. -message.desc.primary.storage=Chaque cluster doit contenir un ou plusieurs serveurs de stockage primaire, et le premier sera ajout\u00E9 tout de suite. Le stockage principal contient les volumes de disque pour les machines virtuelles s\\'ex\u00E9cutant sur les h\u00F4tes dans le cluster. Utiliser les protocoles standards pris en charge par l\\'hyperviseur sous-jacent. +message.desc.primary.storage=Chaque cluster doit contenir un ou plusieurs serveurs de stockage principal, et le premier sera ajout\u00E9 tout de suite. Le stockage principal contient les volumes de disque pour les machines virtuelles s\\'ex\u00E9cutant sur les h\u00F4tes dans le cluster. Utiliser les protocoles standards pris en charge par l\\'hyperviseur sous-jacent. message.desc.secondary.storage=Chaque zone doit avoir au moins un serveur NFS ou un serveur de stockage secondaire, et sera ajout\u00E9 en premier tout de suite. Le stockage secondaire entrepose les mod\u00E8les de machines virtuelles, les images ISO et les images disques des volumes des machines virtuelles. Ce serveur doit \u00EAtre accessible pour toutes les machines h\u00F4tes dans la zone.

Saisir l\\'adresse IP et le chemin d\\'export. -message.desc.zone=Une zone est la plus grande unit\u00E9 organisationnelle dans CloudStack, et correspond typiquement \u00E0 un centre de donn\u00E9es. Les zones fournissent un isolement physique et de la redondance. Une zone est constitu\u00E9e d\\'un ou plusieurs pods (dont chacun contient les h\u00F4tes et les serveurs de stockage primaire) et un serveur de stockage secondaire qui est partag\u00E9e par tous les pods dans la zone. +message.desc.zone=Une zone est la plus grande unit\u00E9 organisationnelle dans CloudStack, et correspond typiquement \u00E0 un centre de donn\u00E9es. Les zones fournissent un isolement physique et de la redondance. Une zone est constitu\u00E9e d\\'un ou plusieurs pods (dont chacun contient les h\u00F4tes et les serveurs de stockage principal) et un serveur de stockage secondaire qui est partag\u00E9e par tous les pods dans la zone. message.detach.disk=Voulez-vous d\u00E9tacher ce disque ? -message.detach.iso.confirm=Confirmez que vous souhaitez d\u00E9tacher l\\'image ISO de cette instance. +message.detach.iso.confirm=\u00CAtes-vous s\u00FBr que vous souhaitez d\u00E9tacher l\\'image ISO de cette instance. message.disable.account=Veuillez confirmer que vous voulez d\u00E9sactiver ce compte. En d\u00E9sactivant le compte, tous les utilisateurs pour ce compte n\\'auront plus acc\u00E8s \u00E0 leurs ressources sur le cloud. Toutes les machines virtuelles vont \u00EAtre arr\u00EAt\u00E9es imm\u00E9diatement. message.disable.snapshot.policy=Vous avez d\u00E9sactiv\u00E9 votre politique d\\'instantan\u00E9 avec succ\u00E8s. message.disable.user=Confirmer la d\u00E9sactivation de cet utilisateur. message.disable.vpn=\u00CAtes-vous s\u00FBr de vouloir d\u00E9sactiver le VPN ? -message.disable.vpn.access=Confirmez que vous souhaitez d\u00E9sactiver l\\'acc\u00E8s VPN. +message.disable.vpn.access=\u00CAtes-vous s\u00FBr que vous souhaitez d\u00E9sactiver l\\'acc\u00E8s VPN. message.download.ISO=Cliquer 00000 pour t\u00E9l\u00E9charger une image ISO message.download.template=Cliquer sur 00000 pour t\u00E9l\u00E9charger le mod\u00E8le message.download.volume=Cliquer sur 00000 pour t\u00E9l\u00E9charger le volume @@ -1299,7 +1309,7 @@ message.edit.account=Modifier ("-1" signifie pas de limite de ressources) message.edit.confirm=Confirmer les changements avant de cliquer sur "Enregistrer". message.edit.limits=Renseignez les limites pour les ressources suivantes. "-1" indique qu\\'il n\\'y a pas de limites pour la cr\u00E9ation de ressources. message.edit.traffic.type=Sp\u00E9cifier le libell\u00E9 de trafic associ\u00E9 avec ce type de trafic. -message.enable.account=Confirmez que vous souhaitez activer ce compte. +message.enable.account=\u00CAtes-vous s\u00FBr que vous souhaitez activer ce compte. message.enable.user=Confirmer l\\'activation de cet utilisateur. message.enable.vpn=Confirmer l\\'activation de l\\'acc\u00E8s VPN pour cette adresse IP. message.enable.vpn.access=Le VPN est d\u00E9sactiv\u00E9 pour cette adresse IP. Voulez vous activer l\\'acc\u00E8s VPN ? @@ -1317,7 +1327,7 @@ message.installWizard.copy.whatIsAHost=Un h\u00F4te est une machine. Les h\u00F4 message.installWizard.copy.whatIsAPod=Un pod repr\u00E9sente souvent un seul rack. Les h\u00F4tes dans le m\u00EAme pod sont dans le m\u00EAme sous-r\u00E9seau.
Un pod est la deuxi\u00E8me plus grande unit\u00E9 organisationnelle au sein d\\'un d\u00E9ploiement CloudStack&\#8482;. Les pods sont contenus dans les zones. Chaque zone peut contenir un ou plusieurs pods ; dans l\\'Installation Basique, vous aurez juste un pod dans votre zone. message.installWizard.copy.whatIsAZone=Une zone est la plus grande unit\u00E9 organisationnelle au sein d\\'un d\u00E9ploiement CloudStack&\#8482;. Une zone correspond typiquement \u00E0 un centre de donn\u00E9es, mais il est permis d\\'avoir plusieurs zones dans un centre de donn\u00E9es. L\\'avantage d\\'organiser une infrastructure en zones est de fournir une isolation physique et de la redondance. Par exemple, chaque zone peut avoir sa propre alimentation et de liaison avec le r\u00E9seau, et les zones peuvent \u00EAtre tr\u00E8s \u00E9loign\u00E9es g\u00E9ographiquement (m\u00EAme si ce n\\'est pas une obligation). message.installWizard.copy.whatIsCloudStack=CloudStack&\#8482; est une plate-forme logicielle de pools de ressources informatiques pour construire des infrastructures publiques, priv\u00E9es et hybrides en tant que services (IaaS) dans les nuages. CloudStack&\#8482; g\u00E8re le r\u00E9seau, le stockage et les noeuds de calcul qui composent une infrastructure dans les nuages. Utilisez CloudStack&\#8482; pour d\u00E9ployer, g\u00E9rer et configurer les environnements d\\'informatiques dans les nuages.

S\\'\u00E9tendant au-del\u00E0 des machines virtuelles individuelles fonctionnant sur du mat\u00E9riel standard, CloudStack&\#8482; offre une solution d\\'informatique en nuage cl\u00E9 en main pour fournir des centres de donn\u00E9es virtuels comme service - fournissant tous les composants essentiels pour construire, d\u00E9ployer et g\u00E9rer des applications \\'cloud\\' multi-niveaux et multi-locataire. Les versions libre et Premium sont disponibles, la version Libre offrant des caract\u00E9ristiques presque identiques. -message.installWizard.copy.whatIsPrimaryStorage=Une infrastructure CloudStack&\#8482; utilise deux types de stockage \: stockage primaire et stockage secondaire. Les deux peuvent \u00EAtre des serveurs iSCSI ou NFS, ou sur disque local.

Le stockage primaire est associ\u00E9 \u00E0 un cluster, et stocke les volumes disques de chaque machine virtuelle pour toutes les VMs s\\'ex\u00E9cutant sur les h\u00F4tes dans le cluster. Le serveur de stockage primaire est typiquement proche des h\u00F4tes. +message.installWizard.copy.whatIsPrimaryStorage=Une infrastructure CloudStack&\#8482; utilise deux types de stockage \: stockage principal et stockage secondaire. Les deux peuvent \u00EAtre des serveurs iSCSI ou NFS, ou sur disque local.

Le stockage principal est associ\u00E9 \u00E0 un cluster, et stocke les volumes disques de chaque machine virtuelle pour toutes les VMs s\\'ex\u00E9cutant sur les h\u00F4tes dans le cluster. Le serveur de stockage principal est typiquement proche des h\u00F4tes. message.installWizard.copy.whatIsSecondaryStorage=Le stockage secondaire est associ\u00E9 \u00E0 une zone, et il stocke les \u00E9l\u00E9ments suivants\:
  • Mod\u00E8les - images de syst\u00E8mes d\\'exploitation qui peuvent \u00EAtre utilis\u00E9es pour d\u00E9marrer les machines virtuelles et peuvent inclure des informations de configuration suppl\u00E9mentaires, telles que les applications pr\u00E9-install\u00E9es
  • Images ISO - images de syst\u00E8me d\\'exploitation ou d\\'installation d\\'OS qui peuvent \u00EAtre amor\u00E7able ou non-amor\u00E7able
  • Images de volume disque - capture des donn\u00E9es de machines virtuelles qui peuvent \u00EAtre utilis\u00E9es pour la r\u00E9cup\u00E9ration des donn\u00E9es ou cr\u00E9er des mod\u00E8les
message.installWizard.now.building=Construction de votre Cloud en cours message.installWizard.tooltip.addCluster.name=Un nom pour le cluster. Ce choix est libre et n\\'est pas utilis\u00E9 par CloudStack. @@ -1330,7 +1340,7 @@ message.installWizard.tooltip.addPod.reservedSystemGateway=Passerelle pour les s message.installWizard.tooltip.addPod.reservedSystemNetmask=Le masque r\u00E9seau que les instances utiliseront sur le r\u00E9seau message.installWizard.tooltip.addPod.reservedSystemStartIp=Ceci est la plage d\\'adresses IP dans le r\u00E9seau priv\u00E9 que CloudStack utilise la gestion des VMs du stockage secondaire et les VMs Console Proxy. Ces adresses IP sont prises dans le m\u00EAme sous-r\u00E9seau que les serveurs h\u00F4tes. message.installWizard.tooltip.addPrimaryStorage.name=Nom pour ce stockage -message.installWizard.tooltip.addPrimaryStorage.path=(pour NFS) Dans NFS, ceci est le chemin d\\'export depuis le serveur. (pour SharedMountPoint) Le chemin. Avec KVM, c\\'est le chemin sur chaque h\u00F4te o\u00F9 ce stockage primaire est mont\u00E9. Par exemple, "/mnt/primary". +message.installWizard.tooltip.addPrimaryStorage.path=(pour NFS) Dans NFS, ceci est le chemin d\\'export depuis le serveur. (pour SharedMountPoint) Le chemin. Avec KVM, c\\'est le chemin sur chaque h\u00F4te o\u00F9 ce stockage principal est mont\u00E9. Par exemple, "/mnt/primary". message.installWizard.tooltip.addPrimaryStorage.server=(pour NFS, iSCSI ou PreSetup) Adresse IP ou nom DNS du stockage message.installWizard.tooltip.addSecondaryStorage.nfsServer=Adresse IP du serveur NFS supportant le stockage secondaire message.installWizard.tooltip.addSecondaryStorage.path=Le chemin export\u00E9, situ\u00E9 sur le serveur sp\u00E9cifi\u00E9 pr\u00E9c\u00E9demment @@ -1351,13 +1361,13 @@ message.iso.desc=Image disque contenant des donn\u00E9es ou un support amor\u00E message.join.project=Vous avez rejoint un projet. S\u00E9lectionnez la vue Projet pour le voir. message.launch.vm.on.private.network=Souhaitez vous d\u00E9marrer cette instance sur votre propre r\u00E9seau priv\u00E9 ? message.launch.zone=La zone est pr\u00EAte \u00E0 d\u00E9marrer ; passer \u00E0 l\\'\u00E9tape suivante. -message.lock.account=Confirmez que vous souhaitez verrouiller ce compte. En le verrouillant, les utilisateurs de ce compte ne seront plus capables de g\u00E9rer leurs ressources. Les ressources existantes resteront toutefois accessibles. +message.lock.account=\u00CAtes-vous s\u00FBr que vous souhaitez verrouiller ce compte. En le verrouillant, les utilisateurs de ce compte ne seront plus capables de g\u00E9rer leurs ressources. Les ressources existantes resteront toutefois accessibles. message.migrate.instance.confirm=Confirmez l\\'h\u00F4te vers lequel vous souhaitez migrer cette instance message.migrate.instance.to.host=Confirmer la migration de l\\'instance vers un autre h\u00F4te -message.migrate.instance.to.ps=Confirmer la migration de l\\'instance vers un autre stockage primaire +message.migrate.instance.to.ps=Confirmer la migration de l\\'instance vers un autre stockage principal message.migrate.router.confirm=Confirmer la migration du routeur vers \: message.migrate.systemvm.confirm=Confirmer la migration de la VM syst\u00E8me vers \: -message.migrate.volume=Confirmer la migration du volume vers un autre stockage primaire. +message.migrate.volume=Confirmer la migration du volume vers un autre stockage principal. message.new.user=Renseigner les informations suivantes pour ajouter un nouveau compte utilisateur message.no.network.support=S\u00E9lectionnez l\\'hyperviseur. vSphere, n\\'a pas de fonctionnalit\u00E9s suppl\u00E9mentaires pour le r\u00E9seau. Continuez \u00E0 l\\'\u00E9tape 5. message.no.network.support.configuration.not.true=Il n\\'y a pas de zone avec la fonction groupe de s\u00E9curit\u00E9 active. D\u00E8s lors, pas de fonction r\u00E9seau suppl\u00E9mentaires disponibles. Continuer \u00E0 l\\'\u00E9tape 5. @@ -1366,7 +1376,7 @@ message.no.projects.adminOnly=Vous n\\'avez pas de projet.
Contacter votre a message.number.clusters=

\# de Clusters

message.number.hosts=

\# d\\' H\u00F4tes

message.number.pods=

\# de Pods

-message.number.storage=

\# de Volumes de Stockage Primaire

+message.number.storage=

\# de Volumes de Stockage Principal

message.number.zones=

\# de Zones

message.pending.projects.1=Vous avez des invitations projet en attente \: message.pending.projects.2=Pour les visualiser, aller dans la section projets, puis s\u00E9lectionner invitation dans la liste d\u00E9roulante. @@ -1380,7 +1390,7 @@ message.project.invite.sent=Invitation envoy\u00E9e ; les utilisateurs seront aj message.public.traffic.in.advanced.zone=Le trafic public est g\u00E9n\u00E9r\u00E9 lorsque les machines virtuelles dans le nuage acc\u00E8dent \u00E0 Internet. Des adresses IP publiquement accessibles doivent \u00EAtre pr\u00E9vues \u00E0 cet effet. Les utilisateurs peuvent utiliser l\\'interface d\\'administration de CloudStack pour acqu\u00E9rir ces adresses IP qui impl\u00E9menteront une translation d\\'adresse NAT entre le r\u00E9seau d\\'invit\u00E9 et le r\u00E9seau public.

Fournir au moins une plage d\\'adresses IP pour le trafic Internet. message.public.traffic.in.basic.zone=Le trafic public est g\u00E9n\u00E9r\u00E9 lorsque les machines virtuelles dans le nuage acc\u00E8dent \u00E0 Internet ou fournissent des services \u00E0 des utilisateurs sur Internet. Des adresses IP publiquement accessibles doivent \u00EAtre pr\u00E9vus \u00E0 cet effet. Quand une instance est cr\u00E9\u00E9e, une adresse IP publique depuis un ensemble d\\'adresses IP publiques sera allou\u00E9e \u00E0 l\\'instance, en plus de l\\'adresse IP de l\\'invit\u00E9. La translation d\\'adresses statique NAT 1-1 sera mises en place automatiquement entre l\\'adresse IP publique et l\\'adresse IP de l\\'invit\u00E9. Les utilisateurs peuvent \u00E9galement utiliser l\\'interface d\\'administration CloudStack pour acqu\u00E9rir des adresses IP suppl\u00E9mentaires pour ajouter une translation d\\'adresse statique NAT entre leurs instances et le r\u00E9seau d\\'adresses IP publiques. message.remove.vpc=Confirmer la suppression du VPC -message.remove.vpn.access=Confirmez que vous souhaitez supprimer l\\'acc\u00E8s VPN \u00E0 l\\'utilisateur suivant. +message.remove.vpn.access=\u00CAtes-vous s\u00FBr que vous souhaitez supprimer l\\'acc\u00E8s VPN \u00E0 l\\'utilisateur suivant. message.reset.VPN.connection=Confirmer le r\u00E9-initialisation de la connexion VPN message.reset.password.warning.notPasswordEnabled=Le mod\u00E8le de cette instance a \u00E9t\u00E9 cr\u00E9\u00E9 sans la gestion de mot de passe message.reset.password.warning.notStopped=Votre instance doit \u00EAtre arr\u00EAt\u00E9e avant de changer son mot de passe @@ -1425,14 +1435,14 @@ message.validate.instance.name=Le nom de l\\'instance ne peut d\u00E9passer 63 c message.virtual.network.desc=Un r\u00E9seau virtuel d\u00E9di\u00E9 pour votre compte. Ce domaine de multi-diffusion est contenu dans un VLAN et l\\'ensemble des r\u00E9seaux d\\'acc\u00E8s publique sont rout\u00E9s par un routeur virtuel. message.vm.create.template.confirm=Cr\u00E9er un mod\u00E8le va red\u00E9marrer la VM automatiquement message.vm.review.launch=Merci de v\u00E9rifier les informations suivantes et de confirmer que votre instance virtuelle est correcte avant de la d\u00E9marrer. -message.volume.create.template.confirm=Confirmez que vous souhaitez cr\u00E9er un mod\u00E8le pour ce disque. La cr\u00E9ation peut prendre plusieurs minutes, voire plus, selon la taille du volume. +message.volume.create.template.confirm=\u00CAtes-vous s\u00FBr que vous souhaitez cr\u00E9er un mod\u00E8le pour ce disque. La cr\u00E9ation peut prendre plusieurs minutes, voire plus, selon la taille du volume. message.you.must.have.at.least.one.physical.network=Vous devez avoir au moins un r\u00E9seau physique message.zone.creation.complete.would.you.like.to.enable.this.zone=Cr\u00E9ation de la zone termin\u00E9e. Voulez-vous l\\'activer ? message.zone.no.network.selection=La zone s\u00E9lectionn\u00E9e ne propose pas le r\u00E9seau choisi message.zone.step.1.desc=S\u00E9lectionnez un mod\u00E8le de r\u00E9seau pour votre zone. message.zone.step.2.desc=Renseigner les informations suivantes pour ajouter une nouvelle zone message.zone.step.3.desc=Renseigner les informations suivantes pour ajouter un nouveau pod -message.zoneWizard.enable.local.storage=ATTENTION \: si vous activez le stockage local pour cette zone, vous devez effectuer les op\u00E9rations suivantes, selon l\\'endroit o\u00F9 vous souhaitez lancer vos machines virtuelles Syst\u00E8mes \:

1. Si les machines virtuelles Syst\u00E8mes doivent \u00EAtre lanc\u00E9es depuis le stockage primaire, ce dernier doit \u00EAtre ajout\u00E9 \u00E0 la zone apr\u00E8s la cr\u00E9ation. Vous devez \u00E9galement d\u00E9marrer la zone dans un \u00E9tat d\u00E9sactiv\u00E9.

2. Si les machines virtuelles Syst\u00E8mes doivent \u00EAtre lanc\u00E9es depuis le stockage local, le param\u00E8tre system.vm.use.local.storage doit \u00EAtre d\u00E9fini \u00E0 \\'true\\' avant d\\'activer la zone.


Voulez-vous continuer ? +message.zoneWizard.enable.local.storage=ATTENTION \: si vous activez le stockage local pour cette zone, vous devez effectuer les op\u00E9rations suivantes, selon l\\'endroit o\u00F9 vous souhaitez lancer vos machines virtuelles Syst\u00E8mes \:

1. Si les machines virtuelles Syst\u00E8mes doivent \u00EAtre lanc\u00E9es depuis le stockage principal, ce dernier doit \u00EAtre ajout\u00E9 \u00E0 la zone apr\u00E8s la cr\u00E9ation. Vous devez \u00E9galement d\u00E9marrer la zone dans un \u00E9tat d\u00E9sactiv\u00E9.

2. Si les machines virtuelles Syst\u00E8mes doivent \u00EAtre lanc\u00E9es depuis le stockage local, le param\u00E8tre system.vm.use.local.storage doit \u00EAtre d\u00E9fini \u00E0 \\'true\\' avant d\\'activer la zone.


Voulez-vous continuer ? mode=Mode network.rate=D\u00E9bit R\u00E9seau notification.reboot.instance=Red\u00E9marrer l\\'instance diff --git a/client/WEB-INF/classes/resources/messages_it_IT.properties b/client/WEB-INF/classes/resources/messages_it_IT.properties new file mode 100644 index 00000000000..c6bc2dba127 --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_it_IT.properties @@ -0,0 +1,618 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +changed.item.properties=Elementi delle propriet\u00e0 modificati +confirm.enable.s3=Si prega di inserire i valori richiesti per abilitare il supporto per il Secondary Storage di tipo S3 +confirm.enable.swift=Si prega di inserire i valori richiesti per abilitare il supporto per Swift +error.could.not.enable.zone=Impossibile abilitare la zona +error.installWizard.message=E\\' stato rilevato un errore\: tornare agli step precedenti e correggere gli errori +error.invalid.username.password=Username o Password non valida +error.password.not.match=I campi password non corrispondono +error.please.specify.physical.network.tags=Le offerte di rete non sono disponibili se non si specificano tag per questa rete fisica. +error.something.went.wrong.please.correct.the.following=E\\' stato rilevato un errore; si prega di correggere quanto indicato di seguito +error.unable.to.reach.management.server=Impossibile raggiungere il Management Server +instances.actions.reboot.label=Riavviare una instanza +label.accept.project.invitation=Accettare un invito ad un progetto +label.account.and.security.group=Account, Security group +label.action.delete.nexusVswitch=Cancellare Nexus 1000v +label.action.delete.physical.network=Cancellazione di una rete fisica +label.action.delete.system.service.offering=Cancellare Offerta di Servizio di Sistema +label.action.disable.nexusVswitch=Disabilitare Nexus 1000v +label.action.disable.physical.network=Disabilitare la rete fisica +label.action.enable.nexusVswitch=Abilitare Nexus 1000v +label.action.enable.physical.network=Abilitare la rete fisica +label.action.list.nexusVswitch=Elencare Nexus 1000v +label.action.migrate.router.processing=Migrazione Router... +label.action.register.iso=Registrare una ISO +label.action.register.template=Registrare un template +label.activate.project=Attivare il Progetto +label.add.accounts=Aggiungere utenti +label.add.accounts.to=Aggiungere utenti a +label.add.account.to.project=Aggiungere account al progetto +label.add.ACL=Aggiungere ACL +label.add.compute.offering=Aggiungere una offerta computazionale +label.add.egress.rule=Aggiungere una regola d\\'uscita +label.add.F5.device=Aggiungere device F5 +label.add.guest.network=Aggiungere una rete guest +label.add.netScaler.device=Aggiungere device Netscaler +label.add.network.ACL=Aggiungere le ACL di rete +label.add.network.offering=Aggiungere offerta di rete +label.add.new.F5=Aggiungere nuovo F5 +label.add.new.gateway=Aggiungere un nuovo gateway +label.add.new.NetScaler=Aggiungere nuovo NetScaler +label.add.new.SRX=Aggiungere nuovo SRX +label.add.new.tier=Aggiungere un nuovo livello +label.add.physical.network=Aggiungere rete fisica +label.add.port.forwarding.rule=Aggiungere una regola di port forwarding +label.add.resources=Aggiungere Risorse +label.add.route=Aggiungere una rotta +label.add.rule=Aggiungere regola +label.add.SRX.device=Aggiungere device SRX +label.add.static.nat.rule=Aggiungere regola di NAT statico +label.add.static.route=Aggiungere una rotta statica +label.add.system.service.offering=Aggiungere Offerte di Servizio di Sistema +label.add.to.group=Aggiungere al gruppo +label.add.vm=Aggiungere VM +label.add.vms=Aggiunvere VM +label.add.vms.to.lb=Aggiungere VM a regola di bilanciamento di carico +label.add.VM.to.tier=Aggiungere una VM al livello +label.add.vpc=Aggiungere VPC +label.add.vpn.customer.gateway=Aggiungere Gateway VPN del Cliente +label.add.VPN.gateway=Aggiungere un Gateway VPN +label.add.vpn.user=Aggiungere utente VPN +label.advanced=Avanzato +label.agent.password=Password per l\\'Agent +label.agent.username=Username per l\\'Agent +label.allocated=Allocato +label.apply=Applicare +label.associated.network=Rete Associata +label.bandwidth=Capacit\u00e0 della banda (Bandwidth) +label.basic=Basic +label.broadcast.uri=URI di Broadcast +label.change.service.offering=Modificare offerta di servizio +label.checksum=Checksum MD5 +label.CIDR.list=Lista CIDR +label.CIDR.of.destination.network=Valore CIDR della rete di destinazione +label.clear.list=Pulizia dell\\'elenco +label.cluster=Cluster +label.cluster.name=Nome del Cluster +label.clusters=Cluster +label.community=Community +label.compute.and.storage=Computazione e Storage +label.compute=Compute +label.compute.offering=Offerta computazionale +label.compute.offerings=Offerte computazionali +label.configuration=Configurazione +label.configure=Configurare +label.configure.network.ACLs=Configurare le ACL di rete +label.configure.vpc=Configurare VPC +label.confirm.password=Confermare la password +label.congratulations=Congratulazioni\! +label.console.proxy=Proxy di Console +label.continue.basic.install=Proseguire con l\\'installazione di base +label.continue=Continuare +label.corrections.saved=Salvataggio correzioni effettuato +label.cpu.mhz=CPU (in MHz) +label.created.by.system=Creato dal sistema +label.create.project=Creare un progetto +label.create.template=Creare un template +label.create.VPN.connection=Creare una Connessione VPN +label.decline.invitation=Declinare un invito +label.dedicated=Dedicato +label.default=Default +label.default.view=Vista di default +label.delete.F5=Rimozione F5 +label.delete.gateway=rimuovere il gateway +label.delete.NetScaler=Rimozione NetScaler +label.delete.project=Cancellare progetto +label.delete.SRX=Rimozione SRX +label.delete.VPN.connection=cancellare la connessione VPN +label.delete.VPN.customer.gateway=cancellare il Gateway VPN del Cliente +label.delete.VPN.gateway=cancellare un Gateway VPN +label.delete.vpn.user=Cancellare utente VPN +label.destination.physical.network.id=ID della rete fisica di destinazione +label.destination.zone=Zona di destinazione +label.destroy=Destroy +label.devices=Device +label.dhcp=DHCP +label.direct.ips=Indirizzi IP di Rete condivisi +label.disabled=Disabilitato +label.disable.provider=Disabilitare il provider +label.disable.vpn=Disabilitare VPN +label.display.name=Nome visualizzato +label.dns=DNS +label.DNS.domain.for.guest.networks=Dominio DNS per Reti Guest +label.domain=Dominio +label.domain.router=Router di Dominio +label.done=Fatto +label.drag.new.position=Trascina nella nuova posizione +label.edit.lb.rule=Modifica regola LB +label.edit.network.details=Modificare le impostazioni di rete +label.edit.project.details=Modificare i dettagli del progetto +label.edit.tags=Modifica dei tag +label.edit.traffic.type=Modifica del tipo di traffico +label.edit.vpc=Modificare VPC +label.egress.rule=Regola d\\'uscita +label.egress.rules=Regole d\\'uscita +label.enable.provider=Abilitare il provider +label.enable.s3=Abilitare il Secondary Storage di tipo S3 +label.enable.swift=Abilitare Swift +label.enable.vpn=Abilitare VPN +label.end.IP=Indirizzo IP finale +label.endpoint=Dispositivo +label.end.reserved.system.IP=Indirizzo IP finale riservato di sistema +label.end.vlan=Vlan finale +label.enter.token=Inserire il token +label.error=Errore +label.ESP.encryption=Encryption di ESP +label.ESP.hash=Hash di ESP +label.ESP.policy=Policy di ESP +label.f5=F5 +label.full.path=Path completo +label.guest.end.ip=Indirizzo IP guest finale +label.guest=Guest +label.guest.networks=Reti guest +label.guest.start.ip=Indirizzo IP guest iniziale +label.guest.traffic=Traffico della rete Guest +label.guest.type=Tipo di Guest +label.hints=Suggerimenti +label.host.MAC=MAC del sistema host +label.hypervisor.capabilities=Funzionalit\u00e0 del Hypervisor +label.hypervisor=Hypervisor +label.hypervisor.version=Versione hypervisor +label.IKE.DH=DH di IKE +label.IKE.encryption=Encryption di IKE +label.IKE.hash=Hash di IKE +label.IKE.policy=Policy di IKE +label.installWizard.addClusterIntro.subtitle=Che cosa \u00e8 un cluster? +label.installWizard.addClusterIntro.title=Let’s aggiungere un cluster +label.installWizard.addHostIntro.subtitle=Che cosa \u00e8 un host? +label.installWizard.addHostIntro.title=Let’s aggiungere un host +label.installWizard.addPodIntro.subtitle=Che cosa \u00e8 un pod? +label.installWizard.addPodIntro.title=Let’s aggiungere un pod +label.installWizard.addPrimaryStorageIntro.subtitle=Che cosa \u00e8 un primary storage? +label.installWizard.addPrimaryStorageIntro.title=Let’s aggiungere primary storage +label.installWizard.addSecondaryStorageIntro.subtitle=Che cosa \u00e8 un secondary storage? +label.installWizard.addSecondaryStorageIntro.title=Let’s aggiungere secondary storage +label.installWizard.addZoneIntro.subtitle=Che cosa \u00e8 una zona? +label.installWizard.addZoneIntro.title=Let’s aggiungere una zone +label.installWizard.addZone.title=Aggiungere una zona +label.installWizard.click.launch=Fare click sul pulsante di avvio. +label.installWizard.subtitle=Questa guida fornisce supporto nelle attivit\u00e0 di configurazione di una installazione CloudStack&\#8482 +label.installWizard.title=Ciao e Benvenuti nel mondo di CloudStack&\#8482 +label.internal.name=Nome Interno +label.introduction.to.cloudstack=Introduzione a CloudStack&\#8482 +label.invitations=Inviti +label.invited.accounts=Utenti invitati +label.invite=Invito +label.invite.to=Invito a +label.ip.address=Indirizzo IP +label.ipaddress=Indirizzo IP +label.ip.ranges=Intervalli di indirizzi IP +label.IPsec.preshared.key=Preshared-Key di IPsec +label.isolated.networks=Reti isolate +label.isolation.method=Metodo di isolamento +label.isolation.uri=URI di isolamento +label.keyboard.type=Tipo di tastiera +label.key=Key +label.kvm.traffic.label=Etichetta del traffico via KVM +label.label=Label +label.latest.events=Ultimi eventi +label.launch=Avvio +label.launch.vm=Avviare una VM +label.LB.isolation=Isolamento di LB +label.load.balancing=Bilanciamento di Carico +label.load.balancing.policies=Politiche di Bilanciamento di Carico +label.local.storage.enabled=Local storage abilitato +label.local.storage=Storage locale +label.LUN.number=LUN \# +label.management=Gestione +label.management.ips=Indirizzo IP di Management +label.manage.resources=Gestione Risorse +label.max.guest.limit=Limite max di guest +label.max.networks=Numero Max di reti +label.max.public.ips=Numero max di indirizzi IP pubblici +label.max.snapshots=Numero max di snapshot +label.max.templates=Numero max di template +label.max.vms=Numero max di VM utente +label.max.volumes=Numero max di volumi +label.max.vpcs=Numero max di VPC +label.may.continue=E\\' ora possibile continuare. +label.memory.mb=Memoria (in MB) +label.menu.configuration=Configurazione +label.menu.infrastructure=Infrastruttura +label.menu.system.service.offerings=Offerte di Sistema +label.menu.templates=Template +label.migrate.instance.to.host=Migrare instance verso un altro host +label.migrate.instance.to.ps=Migrare instance verso un altro primary storage +label.migrate.to.host=Migrare verso un host +label.migrate.to.storage=Migrare verso uno storage +label.migrate.volume=Migrare un volume verso un altro primary storage +label.move.down.row=Sposta gi\u00f9 di una riga +label.move.to.bottom=Sposta gi\u00f9 alla fine +label.move.to.top=Sposta in su all\\'inizio +label.move.up.row=Sposta su di una riga +label.my.network=La mia rete +label.my.templates=I miei template +label.nat.port.range=Intervallo di porte NAT +label.netScaler=NetScaler +label.network.ACL=ACL di rete +label.network.ACLs=ACL di rete +label.network.ACL.total=Totale ACL di rete +label.network.domain.text=Dominio di Rete +label.networking.and.security=Networking e sicurezza +label.network.label.display.for.blank.value=Utilizzare il default gateway +label.network.service.providers=Service Provider di Rete +label.networks=Reti +label.new=Nuovo +label.new.project=Nuovo Progetto +label.new.vm=Nuova VM +label.nexusVswitch=Nexus 1000v +label.nfs=NFS +label.nic.adapter.type=Tipo di scheda NIC +label.no.data=Nessun dato da mostrare +label.no=No +label.no.thanks=No grazie +label.notifications=Notifiche +label.number.of.clusters=Numero di Cluster +label.number.of.hosts=Numero di Host +label.number.of.pods=Numero di Pod +label.number.of.system.vms=Numero delle VM di Sistema +label.number.of.virtual.routers=Numero dei Router Virtuali +label.number.of.zones=Numero di Zone +label.ok=OK +label.order=Ordine +label.perfect.forward.secrecy=Segretezza di Forward perfetta +label.physical.network.ID=ID della rete fisica +label.please.specify.netscaler.info=Si prega di specificare le informazioni per Netscaler +label.pod.name=Nome del Pod +label.pods=Pod +label.port.forwarding.policies=Politiche di Port Forwarding +label.previous=Precedente +label.primary.storage.count=Pool del Primary Storage +label.primary.storage=Storage Primario +label.private.Gateway=Gateway Privato +label.private.network=Rete privata +label.project.dashboard=Dashboard di progetto +label.project.id=Project ID +label.project.invite=Invitare ad un progetto +label.project.name=Nome del progetto +label.project=Project +label.projects=Progetti +label.project.view=Vista Progetto +label.providers=Fornitori +label.public.network=Rete pubblica +label.purpose=Scopo +label.quickview=Panoramica rapida +label.reboot=Reboot +label.redundant.router.capability=Capacit\u00e0 di ridondanza del router +label.remind.later=Ricordami in seguito +label.remove.ACL=Rimuovere ACL +label.remove.egress.rule=Rimuovere una regola d\\'uscita +label.remove.ip.range=Rimuovere intervallo di indirizzi IP +label.remove.pf=Rimuovere regola di port forwarding +label.remove.rule=Rimuovere regola +label.remove.static.nat.rule=Rimuovere regola di NAT statico +label.remove.static.route=Rimuovere una rotta statica +label.remove.tier=Rimuovere un livello +label.remove.vm.from.lb=Rimuovere una VM da regola di bilanciamento di carico +label.remove.vpc=Rimuovere VPC +label.removing=Rimozione +label.reserved.system.gateway=Gateway di sistema riservato +label.reserved.system.netmask=Netmask di sistema riservata +label.reset.VPN.connection=Reset della connessione VPN +label.resource.state=Stato della risorsa +label.restart.network=Riavviare il servizio di rete +label.restart.required=E\\' necessario un riavvio +label.restart.vpc=Riavviare VPC +label.restore=Restore +label.review=Riesaminare +label.revoke.project.invite=Revocare un invit +label.root.disk.controller=Controller del disco root +label.round.robin=Round-robin +label.rules=Regole +label.s3.access_key=Access Key +label.s3.connection_timeout=Tempo di scadenza connessione +label.s3.endpoint=Dispositivo +label.s3.max_error_retry=Numero massimo di tentativi a seguito di errore +label.s3.secret_key=Secret Key +label.s3.socket_timeout=Tempo di scadenza del Socket +label.s3.use_https=Utilizzare HTTPS +label.save.and.continue=Salvare e proseguire +label.secondary.storage.count=Pool del Secondary Storage +label.secondary.storage=Storage Secondario +label.secondary.storage.vm=VM di Secondary Storage +label.secret.key=Secret Key +label.select.a.template=Selezionare un template +label.select.a.zone=Selezionare una zone +label.select.instance=Selezionare una instanza +label.select.instance.to.attach.volume.to=Selezionare l\\'instanza da collegare al volume +label.select.iso.or.template=Selezionare immagine ISO o template +label.select.offering=Seleziona l\\'offerta +label.select.project=Selezionare un Progetto +label.select=Selezionare +label.select.tier=Selezionare il Livello +label.select-view=Selezionare la vista +label.select.vm.for.static.nat=Selezionare una VM per il NAT statico +label.service.capabilities=Capacit\u00e0 di Servizio +label.setup=Installazione +label.setup.network=Configurazione Rete +label.setup.zone=Configurazione Zona +label.set.up.zone.type=Configurazione del tipo di Zona +label.shutdown.provider=Arresto del provider +label.site.to.site.VPN=Site-to-site VPN +label.skip.guide=Se si ha familiarit\u00e0 con CloudStack per utilizzi precedenti, si pu\u00f2 saltare questa guida +label.source=Sorgente +label.specify.IP.ranges=Specificare intervallo di indirizzi IP +label.srx=SRX +label.start.IP=Indirizzo IP iniziale +label.start.reserved.system.IP=Indirizzo IP iniziale riservato di sistema +label.start.vlan=Vlan iniziale +label.static.nat.enabled=NAT Statico Abilitato +label.static.nat.vm.details=Dettagli di NAT Statico della VM +label.sticky.cookie-name=Nome del cookie +label.sticky.domain=Dominio +label.sticky.expire=Scadenza +label.sticky.length=Lunghezza +label.sticky.mode=Modalit\u00e0 +label.sticky.nocache=Senza cache +label.sticky.prefix=Prefisso +label.sticky.tablesize=Dimensione della tabella +label.stop=Stop +label.storage.traffic=Traffico della rete Storage +label.super.cidr.for.guest.networks=Super CIDR per Reti Guest +label.supported.services=Servizi Supportati +label.supported.source.NAT.type=Tipo di Source NAT supportato +label.suspend.project=Sospendere il Progett +label.system.offering=Offerta del sistema +label.system.wide.capacity=Capacit\u00e0 del Sistema +label.task.completed=Attivit\u00e0 completata +label.tier.details=Dettagli del livello +label.tier=Livello +label.timeout=Timeout +label.token=Token +label.total.cpu=CPU Totali +label.total.CPU=CPU Totali +label.total.hosts=Host Totali +label.total.memory=Memoria Totale +label.total.of.ip=Totale di Indirizzo IP +label.total.of.vm=Totale di VM +label.total.storage=Storage Totale +label.traffic.label=Etichetta del traffico +label.traffic.types=Tipi di Traffico +label.update.project.resources=Aggiornare le risorse di progetto +label.upload=Upload +label.upload.volume=Volume di upload +label.vcdcname=Nome DC del vCenter +label.vcipaddress=Indirizzo IP del vCenter +label.viewing=Visualizzazione +label.view=Vista +label.virtual.machines=Virtual machine +label.virtual.routers=Router Virtuali +label.virtual.router=Virtual Router +label.vlan=VLAN +label.vm.destroy=Destroy +label.vm.display.name=Nome visualizzato della VM +label.vm.name=Nome VM +label.vm.reboot=Reboot +label.VMs.in.tier=VM nei livelli +label.vm.state=Stato VM +label.vm.stop=Stop +label.vmware.traffic.label=Etichetta del traffico via VMware +label.vpc.id=ID del VPC +label.VPC.router.details=Dettagli del router VPC +label.vpc=VPC +label.VPN.connection=Connessione VPN +label.vpn.customer.gateway=Gateway VPN del Cliente +label.VPN.customer.gateway=Gateway VPN del Cliente +label.VPN.gateway=Gateway VPN +label.vpn=VPN +label.vsmctrlvlanid=VLAN ID di Controllo +label.vsmpktvlanid=VLAN ID del Pacchetto +label.vsmstoragevlanid=VLAN ID di Storage +label.what.is.cloudstack=Che cosa \u00e8 CloudStack&\#8482? +label.xen.traffic.label=Etichetta del traffico via XenServer +label.yes=S\u00ec +label.zone.details=Dettagli della Zona +label.zone.name=Nome Zona +label.zones=Zone +label.zone.type=Tipo di Zona +label.zoneWizard.trafficType.guest=Guest\: Traffico di rete tra le virtual machine dell\\'utente finale +label.zoneWizard.trafficType.management=Management\: Traffico di rete tra le risorse interne di CloudStack, incluso qualsiasi componente che comunichi con il Management Server, come ad esempio gli host e le VM di Sistema di CloudStack +label.zoneWizard.trafficType.public=Public\: Traffico di rete tra la rete internet e le virtual machine nell\\'infrastruttura cloud. +label.zoneWizard.trafficType.storage=Storage\: Traffico di rete tra i server di primary e secondary storage, come ad esempio i template delle VM e le operazioni di snapshot +message.acquire.new.ip=Si prega di confermare di voler acquisire un nuovo indirizzo IP per questa rete. +message.acquire.new.ip.vpc=Si prega di confermare di voler acquisire un nuovo indirizzo IP per questo VPC. +message.action.delete.nexusVswitch=Si prega di confermare di voler cancellare questo nexus 1000v +message.action.delete.physical.network=Si prega di confermare di voler cancellare questa rete fisica +message.action.delete.system.service.offering=Si prega di confermare di voler cancellare questa offerta di servizio di sistema. +message.action.disable.nexusVswitch=Si prega di confermare di voler disabilitare questo nexus 1000v +message.action.disable.physical.network=Si prega di confermare di voler disabilitare questa rete fisica. +message.action.download.iso=Si prega di confermare di voler scaricare questa immagine ISO. +message.action.download.template=Si prega di confermare di voler scaricare questo template. +message.action.enable.nexusVswitch=Si prega di confermare di voler abilitare questo nexus 1000v +message.action.enable.physical.network=Si prega di confermare l\\'intenzione di abilitare questa rete fisica. +message.action.reboot.router=Tutti i servizi forniti da questo router virtuale saranno interrotti. Si prega di confermare di voler riavviare questo router. +message.action.remove.host=Si prega di confermare di voler rimuovere questo host. +message.action.stop.router=Tutti i servizi forniti da questo router virtuale saranno interrotti. Si prega di confermare di voler arrestare questo router. +message.activate.project=Si \u00e8 sicuri di voler attivare questo progetto? +message.add.domain=Si prega di specificare il sottodominio che si vuole creare in questo dominio +message.add.guest.network=Si prega di confermare di voler aggiungere una rete guest +message.adding.host=Aggiunta host +message.adding.Netscaler.device=Aggiunta di dispositivo Netscaler +message.adding.Netscaler.provider=Aggiunta di un provider Netscaler +message.add.load.balancer.under.ip=La regola di bilanciamento di carico \u00e8 stata aggiunta all\\'indirizzo IP\: +message.add.new.gateway.to.vpc=Si prega di specificare le informazioni per aggiungere un nuovo gateway a questo VPC. +message.add.system.service.offering=Si prega di inserire le seguenti informazioni per aggiungere una nuova offerta di servizio di sistema. +message.add.VPN.gateway=Si prega di confermare di voler aggiungere un Gateway VPN +message.after.enable.s3=Il Secondary Storage S3 \u00e8 configurato. NOTA\: Una volta chiusa questa pagina, non sar\u00e0 pi\u00f9 possibile ri-configurare S3. +message.after.enable.swift=Configurazione Swift completata. NOTA\: Una volta che questa pagina viene chiusa, non sar\u00e0 possibile ri-configurare nuovamente Swift. +message.alert.state.detected=Rilevato uno stato di Alert +message.change.password=Si prega di modificare la propria password. +message.configure.all.traffic.types=Si dispone di pi\u00f9 reti fisiche; si prega di configurare le label per ogni tipo di traffico facendo click sul tasto \\'Edit\\'. +message.configuring.guest.traffic=Configurazione del traffico guest +message.configuring.physical.networks=Configurazione di reti fisiche +message.configuring.public.traffic=Configurazione del traffico pubblico +message.configuring.storage.traffic=Configurazione del traffico storage +message.confirm.action.force.reconnect=Si prega di confermare di voler forzare la riconnessione a questo host. +message.confirm.delete.F5=Si prega di confermare di voler rimuovere F5 +message.confirm.delete.NetScaler=Si prega di confermare di voler rimuovere NetScaler +message.confirm.delete.SRX=Si prega di confermare di voler rimuovere SRX +message.confirm.destroy.router=Si prega di confermare di voler rimuovere questo router +message.confirm.disable.provider=Si prega di confermare di voler disabilitare questo provider +message.confirm.enable.provider=Si prega di confermare di voler abilitare questo provider +message.confirm.join.project=Si prega di confermare di volersi unire a questo progetto. +message.confirm.remove.IP.range=Si prega di confermare di voler rimuovere questo intervallo di indirizzi IP. +message.confirm.shutdown.provider=Si prega di confermare di voler arrestare questo provider +message.create.template=Si \u00e8 sicuri di voler creare il template? +message.creating.cluster=Creazione cluster +message.creating.guest.network=Creazione di una rete guest +message.creating.physical.networks=Creazione di reti fisiche +message.creating.pod=Creazione pod +message.creating.primary.storage=Creazione storage primario +message.creating.secondary.storage=Creazione storage secondario +message.creating.zone=Creazione della zona in corso +message.decline.invitation=Si \u00e8 sicuri di voler declinare l\\'invito a questo progetto? +message.delete.gateway=Si prega di confermare di voler cancellare il gateway +message.delete.project=Si \u00e8 sicuri di voler cancellare questo progetto? +message.delete.user=Si prega di confermare di voler cancellare questo utente. +message.delete.VPN.connection=Si prega di confermare di voler cancellare la connessione VPN +message.delete.VPN.customer.gateway=Si prega di confermare di voler cancellare questo Gateway VPN del Cliente +message.delete.VPN.gateway=Si prega di confermare di voler cancellare questo Gateway VPN +message.desc.advanced.zone=Per topologie di rete pi\u00f9 sofisticate. Queto modello di rete fornisce la maggior flessibilit\u00e0 nel definire reti guest e offrendo funzionalit\u00e0 di rete personalizzate come per esempio firewall, VPN, o supporto per bilanciamento di carico. +message.desc.basic.zone=Indicare una rete singola in cui ogni instanza VM ricever\u00e0 un indirizzo IP assegnato. L\\'isolamento di istanze guest viene effettuato attraverso funzioni di tipo layer-3 come ad esempio i security group (filtraggio dell\\'indirizzo IP sorgente). +message.desc.zone=Una zona \u00e8 l\\'unit\u00e0 organizzativa pi\u00f9 grandi in CloudStack, e corrisponde tipicamente ad un datacenter singolo. Le zono offrono isolamento fisico e ridondanza. Una zona \u00e8 costituita da uno o pi\u00f9 pod (ognuno dei quali contiene pi\u00f9 host e server di storage primario) ed un server di storage secondario condiviso da tutti i pod appartenenti alla zona. +message.detach.disk=Si \u00e8 sicuri di voler sganciare questo disco? +message.disable.user=Si prega di confermare di voler disabilitare questo utente. +message.disable.vpn=Si \u00e8 sicuri di voler disabilitare la VPN? +message.download.volume.confirm=Si prega di confermare di voler scaricare questo volume +message.edit.traffic.type=Si prega si specificare la label del traffico che si vuole associare a questo tipo di traffico. +message.enable.user=Si prega di confermare di voler abilitare questo utente. +message.enable.vpn=Si prega di confermare di voler abilitare l\\'accesso VPN per questo indirizzo IP. +message.enabling.security.group.provider=Abilitazione di un provider di Security Group +message.enabling.zone=Abilitazione zona +message.enter.token=Si prega di inserire il token ricevuto nella e-mail di invito. +message.generate.keys=Si prega di confermare di voler generare nuove chiavi per questo utente. +message.installWizard.click.retry=Fare click sul pulsante per riprovare l\\'avvio. +message.installWizard.copy.whatIsAPod=Un pod pu\u00f2 essere utilizzato ad esempio per identificare un singolo rack. Gli host appartenenti al pod sono nella stessa subnet.

Un pod \u00e8 il secondo componente organizzativo pi\u00f9 grande in una installazione CloudStack&\#8482;. I pod sono contenuti in zone. Ogni zona pu\u00f2 contenere uno o pi\u00f9 pod; in una Installazione di Base, si configura un solo pod nella zona. +message.installWizard.copy.whatIsAZone=Una zona \u00e8 il componente organizzativo pi\u00f9 grande in una installazione CloudStack&\#8482;. Una zona corrisponde solitamente ad un singolo datacenter, sebbene sia consentito avere pi\u00f9 zone in un datacenter. Il beneficio di organizzare l\\'infrastruttura in zone deriva dalla possibilit\u00e0 di creare isolamento e ridondanza. Per esempio, ogni zona pu\u00f2 avere la propria configurazione di alimentazione elettrica e collegamenti di rete, e le zone possono essere anche separate geograficamente (anche se non \u00e8 un requisito). +message.installWizard.copy.whatIsSecondaryStorage=Un Secondary storage \u00e8 associato ad una zona, ed \u00e8 utilizzato per la memorizzazione di\:
  • Template - Immagini SO che possono essere usate per eseguire il boot delle VM e che possono includere informazioni di configurazioni aggiuntive, come ad esempio applicazioni installate
  • Immagini ISO - Immagini OS utilizzabili che possono anche essere non-bootable
  • Snapshot di volumi disco - copie salvate di dati delle VM utilizzabili per il recupero di dati o per la creazione di nuovi template
+message.installWizard.tooltip.addCluster.name=Un nome per il cluster. Questo pu\u00f2 essere assegnato utilizzando testo a scelta e non \u00e8 utilizzato da CloudStack. +message.installWizard.tooltip.addHost.hostname=Il nome DNS o l\\'indirizzo IP del sistema host. +message.installWizard.tooltip.addHost.password=Questa \u00e8 la password per l\\'utente identificato precedentemente (dall\\'installazione XenServer). +message.installWizard.tooltip.addHost.username=Tipicamente root. +message.installWizard.tooltip.addPod.name=Un nome per il pod +message.installWizard.tooltip.addPod.reservedSystemEndIp=Questo \u00e8 l\\'intervallo di indirizzi IP nella rete privata che CloudStack utilizza per la gestione delle VM del Secondary Storage e le VM della Console Proxy. Questi indirizzi IP sono ricavati dalla stessa subnet dei server computazionali. +message.installWizard.tooltip.addPod.reservedSystemGateway=Il gateway per gli host appartenenti al pod. +message.installWizard.tooltip.addPod.reservedSystemNetmask=La netmask in uso nella subnet utilizzata dalle VM guest. +message.installWizard.tooltip.addPod.reservedSystemStartIp=Questo \u00e8 l\\'intervallo di indirizzi IP nella rete privata che CloudStack utilizza per la gestione delle VM del Secondary Storage e le VM della Console Proxy. Questi indirizzi IP sono ricavati dalla stessa subnet dei server computazionali. +message.installWizard.tooltip.addPrimaryStorage.name=Il nome del dispositivo storage. +message.installWizard.tooltip.addPrimaryStorage.path=(per NFS) In NFS questo corrisponde al path condiviso dal server. Path (per SharedMountPoint). Con KVM questo \u00e8 il path su ogni host su cui viene effettuato il mount di questo primary storage. Per esempio, "/mnt/primary". +message.installWizard.tooltip.addPrimaryStorage.server=(per NFS, iSCSI, o PreSetup) L\\'indirizzo IP o il nome DNS del dispositivo di storage. +message.installWizard.tooltip.addSecondaryStorage.nfsServer=L\\'indirizzo IP del server NFS su cui \u00e8 condiviso il secondary storage +message.installWizard.tooltip.addSecondaryStorage.path=Il percorso esportato, posizionato sul server precedentemente specificato +message.installWizard.tooltip.addZone.dns1=Questi sono i server DNS da usare per le VM guest nella zona. Questi server DNS saranno raggiunti attraverso la rete pubblica che si configurer\u00e0 nel seguito. Gli indirizzi IP pubblici per la zona devono disporre di una rotta per raggiungere i server DNS indicati qui. +message.installWizard.tooltip.addZone.dns2=Questi sono i server DNS da usare per le VM guest nella zona. Questi server DNS saranno raggiunti attraverso la rete pubblica che si configurer\u00e0 nel seguito. Gli indirizzi IP pubblici per la zona devono disporre di una rotta per raggiungere i server DNS indicati qui. +message.installWizard.tooltip.addZone.internaldns1=Questi sono i server DNS da utilizzare per le VM di sistema nella zona. Questi server DNS saranno raggiunti attraverso l\\'interfaccia di rete configurata nella rete privata delle VM di Sistema. L\\'indirizzo IP privato fornito ai pod devono disporre di una rotta per raggiungere il server DNS indicato qui. +message.installWizard.tooltip.addZone.internaldns2=Questi sono i server DNS da utilizzare per le VM di sistema nella zona. Questi server DNS saranno raggiunti attraverso l\\'interfaccia di rete configurata nella rete privata delle VM di Sistema. L\\'indirizzo IP privato fornito ai pod devono disporre di una rotta per raggiungere il server DNS indicato qui. +message.installWizard.tooltip.addZone.name=Un nome per la zona +message.installWizard.tooltip.configureGuestTraffic.description=Una descrizione per identificare la rete +message.installWizard.tooltip.configureGuestTraffic.guestEndIp=L\\'intervallo degli indirizzi IP che saranno disponibili per l\\'allocazione alle VM guest in questa zona. Se viene usata una NIC, questi indirizzi IP dovrebbero appartenere allo stesso CIDR a cui appartiene il pod. +message.installWizard.tooltip.configureGuestTraffic.guestGateway=Il gateway da assegnare alle VM guest +message.installWizard.tooltip.configureGuestTraffic.guestNetmask=La netmask in uso nella subnet utilizzata dalle VM guest +message.installWizard.tooltip.configureGuestTraffic.guestStartIp=L\\'intervallo degli indirizzi IP che saranno disponibili per l\\'allocazione alle VM guest in questa zona. Se viene usata una NIC, questi indirizzi IP dovrebbero appartenere allo stesso CIDR a cui appartiene il pod. +message.installWizard.tooltip.configureGuestTraffic.name=Un nome da assegnare alla rete +message.instanceWizard.noTemplates=Non ci sono template disponibili\: si prega di aggiungere un template compatibile, e ri-avviare il wizard per la instanza. +message.ip.address.changed=Il tuo indirizzo IP potrebbe essere cambiato; si desidera aggiornare l\\'elenco? Notare che in tal caso verr\u00e0 chiusa la finestra dettagli. +message.iso.desc=Immagine disco contenente dati o supporto avviabile di boot per il SO +message.join.project=Ora appartieni al progetto. Si prega di passare alla vista Progetto per accedere. +message.launch.zone=La Zona \u00e8 pronta per l\\'avvio; si prega di procedere al passo successivo. +message.migrate.instance.to.host=Si prega di confermare di voler migrare instance verso un altro host. +message.migrate.instance.to.ps=Si prega di confermare di voler migrare instance verso un altro primary storage. +message.migrate.router.confirm=Si prega di confermare l\\'host a cui si intende migrare il router\: +message.migrate.volume=Si prega di confermare di voler migrare il volume verso un altro primary storage. +message.no.projects.adminOnly=Non si dispone di alcun progetto.
Si prega di chiedere la creazione di un nuovo progetto al proprio amministratore. +message.no.projects=Non si possiedono progetti.
Si prega di creare un nuovo progetto dalla sezione progetti. +message.pending.projects.1=Ci sono inviti a progetti in attesa di risposta\: +message.please.add.at.lease.one.traffic.range=Si prega di aggiungere almeno un intervallo relativo al traffico. +message.please.proceed=Si prega di procedere al passo successivo. +message.please.select.a.configuration.for.your.zone=Si prega di selezionare una configurazione per la zona. +message.please.select.a.different.public.and.management.network.before.removing=Si prega di selezionare una diversa rete pubblica e di management prima della rimozione +message.please.select.networks=Si prega di selezionare le reti per la virtual machine. +message.please.wait.while.zone.is.being.created=Si prega di attendere la creazione della zona; pu\u00f2 richiedere tempo... +message.project.invite.sent=L\\'invito \u00e8 stato spedito all\\'utente; l\\'utente sar\u00e0 aggiunto al progetto solo dopo aver accettato l\\'invito +message.remove.vpc=Si prega di confermare di voler rimuovere VPC +message.reset.password.warning.notPasswordEnabled=L\\'immagine template di questa instanza \u00e8 stata creata senza l\\'abilitazione della password +message.reset.password.warning.notStopped=L\\'instanza deve essere arrestata prima di poter modificare la password +message.reset.VPN.connection=Si prega di confermare di voler effettuare il reset della connessione VPN +message.restart.network=Tutti i servizi forniti da questa rete saranno interrotti. Si prega di confermare di voler riavviare questa rete. +message.restart.vpc=Si prega di confermare di voler riavviare VPC +message.select.a.zone=Una zona corrisponde tipicamente ad un singolo datacenter. Zone multiple consentono di aumentare l\\'affidabilit\u00e0 creando isolamento fisico e ridondanza. +message.select.instance=Si prega di selezionare una instanza. +message.select.iso=Si prega di selezionare una immagine ISO per la nuova instanza virtuale. +message.select.item=Si prega di selezionare un elemento. +message.select.security.groups=Si prega di selezionare i security group per la nuova VM +message.select.template=Si prega di selezionare un template per la nuova instanza virtuale. +message.setup.physical.network.during.zone.creation.basic=Quando si aggiunge una zona di base, si pu\u00f2 configurare una rete fisica, che corrisponde ad una NIC sul sistema host di virtualizzazione. La rete consente il trasporto di vari tipi di traffico di comunicazione.

E\\' possibile anche spostare altri tipi di traffico sulla rete fisica in modalit\u00e0 drag and drop. +message.setup.successful=L\\'installazione del cloud \u00e8 completata con successo\! +message.specify.url=Si prega di specificare la URL +message.step.2.desc= +message.step.3.desc= +message.suspend.project=Si \u00e8 sicuri di voler sospendere questo progetto? +message.template.desc=Immagine SO utilizzabile per eseguire il boot delle VM +message.tooltip.dns.1=Nome di un server DNS per l\\'uso da parte delle VM in questa zona. Gli indirizzi IP pubblici per la zona devono avere un percorso di instradamento verso questo server. +message.tooltip.dns.2=Un nome di un server DNS aggiuntivo per l\\'uso da parte delle VM in questa zona. Gli indirizzi IP pubblici per la zona devono avere un percorso di instradamento verso questo server. +message.tooltip.internal.dns.1=Nome di un server DNS per l\\'uso da parte delle VM interne di CloudStack di sistema nella zona. Gli indirizzi IP privati per i pod devono avere un percorso di instradamento verso questo server. +message.tooltip.internal.dns.2=Nome di un server DNS per l\\'uso da parte delle VM interne di CloudStack di sistema nella zona. Gli indirizzi IP privati per i pod devono avere un percorso di instradamento verso questo server. +message.tooltip.network.domain=Un suffisso DNS che consentir\u00e0 la creazione di un nome di dominio personalizzato per la rete a cui accedono le VM ospiti. +message.tooltip.pod.name=Un nome per questo pod +message.tooltip.reserved.system.gateway=Il gateway per gli host appartenenti al pod. +message.tooltip.reserved.system.netmask=Il prefisso di rete che definisce la subnet del pod. Utilizza la notazione CIDR. +message.tooltip.zone.name=Un nome per la zona. +message.update.resource.count=Si prega di confermare di voler aggiornare il valore delle risorse per questo account. +message.validate.instance.name=Il nome dell\\'instanza non pu\u00f2 avere lunghezza superiore a 63 caratteri. Sono consentite solo lettere ASCII a-z, A-Z, numeri 0-9, segni \\'-\\'. Il primo carattere deve essere una lettera, e l\\'ultimo una lettera o un numero. +message.vm.review.launch=Si prega di riesaminare le informazioni e confermare l\\'instance virtuale scelta sia corretta prima di avviarla. +message.you.must.have.at.least.one.physical.network=E\\' necessario disporre di almeno una rete fisica +message.Zone.creation.complete=Creazione zona completata +message.zone.creation.complete.would.you.like.to.enable.this.zone=Creazione zona completata. Si desidera abilitare questa zona? +message.zone.no.network.selection=La zona selezionata non contiene opzioni per la selezione della rete. +message.zoneWizard.enable.local.storage=ATTENZIONE\: Se si abilita lo storage locale per questa zona, \u00e8 necessario procedere come segue, a seconda di dove si intende avviare le VM di sistema\:

1. Se le VM di sistema devono essere avviate dal primary storage, questo deve essere aggiunto alla zona dopo la sua creazione. E\\' anche necessario avviare la zona in uno stato disabilitato.

2. Se le VM di sistema devono essere avviate dallo storage locale, system.vm.use.local.storage deve essere impostato a true prima di abilitare la zona.


Si intende procedere? +mode=Modalit\u00e0 +notification.reboot.instance=Riavviare una instanza +notification.start.instance=Avviare una instanza +notification.stop.instance=Arrestare una instanza +state.Accepted=Accettato +state.Active=Attivo +state.Allocated=Allocato +state.Allocating=Allocazione in corso +state.BackedUp=Salvataggio eseguito +state.BackingUp=Salvataggio in esecuzione +state.Completed=Completato +state.Creating=Creazione in corso +state.Declined=Declinato +state.Disabled=Disabilitato +state.enabled=Abilitato +state.Enabled=Abilitato +state.Error=Errore +state.Migrating=Migrazione in corso +state.ready=Pronto +state.Ready=Pronto +state.Running=In esecuzione +state.Starting=Avvio in corso +state.Stopped=Arrestato +state.Stopping=Arresto in corso +state.Suspended=Sospeso diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index 977c0109f7b..2380e914a75 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,1505 +15,1444 @@ # specific language governing permissions and limitations # under the License. - -#new labels (begin) ********************************************************************************************** - - -#new labels (end) ************************************************************************************************ - - -#modified labels (begin) ***************************************************************************************** - - -#modified labels (end) ******************************************************************************************* - -label.configure.network.ACLs=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ACL ã®æ§‹æˆ -label.network.ACLs=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ACL -label.add.network.ACL=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ACL ã®è¿½åŠ  -label.private.Gateway=プライベート ゲートウェイ -label.VPC.router.details=VPC ルーターã®è©³ç´° -label.VMs.in.tier=階層内㮠VM - -message.zoneWizard.enable.local.storage=警告: ã“ã®ã‚¾ãƒ¼ãƒ³ã®ãƒ­ãƒ¼ã‚«ãƒ« ストレージを有効ã«ã™ã‚‹å ´åˆã¯ã€ã‚·ã‚¹ãƒ†ãƒ  VM ã®èµ·å‹•å ´æ‰€ã«å¿œã˜ã¦æ¬¡ã®æ“作ãŒå¿…è¦ã§ã™ã€‚

1. システム VM をプライマリ ストレージã§èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹å ´åˆã¯ã€ãƒ—ライマリ ストレージを作æˆã—ãŸå¾Œã§ã‚¾ãƒ¼ãƒ³ã«è¿½åŠ ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ã¾ãŸã€ç„¡åŠ¹çŠ¶æ…‹ã®ã‚¾ãƒ¼ãƒ³ã‚’èµ·å‹•ã™ã‚‹å¿…è¦ã‚‚ã‚ã‚Šã¾ã™ã€‚

2. システム VM をローカル ストレージã§èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚‹å ´åˆã¯ã€system.vm.use.local.storage ã‚’ true ã«è¨­å®šã—ã¦ã‹ã‚‰ã‚¾ãƒ¼ãƒ³ã‚’有効ã«ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚


続行ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.local.storage.enabled=ローカル ストレージã¯æœ‰åŠ¹ã§ã™ -label.tier.details=階層ã®è©³ç´° -label.edit.tags=ã‚¿ã‚°ã®ç·¨é›† -label.network.rate.megabytes=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯é€Ÿåº¦ (MB/秒) -label.action.enable.physical.network=物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®æœ‰åŠ¹åŒ– -label.action.disable.physical.network=物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ç„¡åŠ¹åŒ– -message.action.enable.physical.network=ã“ã®ç‰©ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.disable.physical.network=ã“ã®ç‰©ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? - -label.select.tier=階層ã®é¸æŠž -label.add.ACL=ACL ã®è¿½åŠ  -label.remove.ACL=ACL ã®å‰Šé™¤ -label.tier=階層 -label.network.ACL=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ACL -label.network.ACL.total=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ACL åˆè¨ˆ -label.add.new.gateway=æ–°ã—ã„ゲートウェイã®è¿½åŠ  -message.add.new.gateway.to.vpc=ã“ã® VPC ã«æ–°ã—ã„ゲートウェイを追加ã™ã‚‹ãŸã‚ã®æƒ…報を指定ã—ã¦ãã ã•ã„。 -label.delete.gateway=ゲートウェイã®å‰Šé™¤ -message.delete.gateway=ã“ã®ã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤ã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.CIDR.of.destination.network=宛先ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã® CIDR -label.add.route=ルートã®è¿½åŠ  -label.add.static.route=é™çš„ルートã®è¿½åŠ  -label.remove.static.route=é™çš„ルートã®å‰Šé™¤ -label.site.to.site.VPN=サイト間 VPN -label.add.VPN.gateway=VPN ゲートウェイã®è¿½åŠ  -message.add.VPN.gateway=VPN ゲートウェイを追加ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.VPN.gateway=VPN ゲートウェイ -label.delete.VPN.gateway=VPN ゲートウェイã®å‰Šé™¤ -message.delete.VPN.gateway=ã“ã® VPN ゲートウェイを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.VPN.connection=VPN 接続 -label.IPsec.preshared.key=IPsec 事å‰å…±æœ‰ã‚­ãƒ¼ -label.IKE.policy=IKE ãƒãƒªã‚·ãƒ¼ -label.ESP.policy=ESP ãƒãƒªã‚·ãƒ¼ -label.create.VPN.connection=VPN 接続ã®ä½œæˆ -label.VPN.customer.gateway=VPN カスタマー ゲートウェイ -label.CIDR.list=CIDR 一覧 -label.IKE.lifetime=IKE 有効期間 (秒) -label.ESP.lifetime=ESP 有効期間 (秒) -label.dead.peer.detection=åœæ­¢ãƒ”ã‚¢ã®æ¤œå‡º -label.reset.VPN.connection=VPN 接続ã®ãƒªã‚»ãƒƒãƒˆ -message.reset.VPN.connection=VPN 接続をリセットã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.delete.VPN.connection=VPN 接続ã®å‰Šé™¤ -message.delete.VPN.connection=VPN 接続を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.add.new.tier=æ–°ã—ã„階層ã®è¿½åŠ  -label.add.VM.to.tier=階層ã¸ã® VM ã®è¿½åŠ  -label.remove.tier=階層ã®å‰Šé™¤ - -label.local.storage.enabled=ローカル ストレージã¯æœ‰åŠ¹ã§ã™ -label.associated.network=関連ã¥ã‘られãŸãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.add.port.forwarding.rule=ãƒãƒ¼ãƒˆè»¢é€è¦å‰‡ã®è¿½åŠ  -label.dns=DNS - -label.vpc=VPC -label.vpc.id=VPC ID -label.tier=階層 -label.add.vpc=VPC ã®è¿½åŠ  -label.super.cidr.for.guest.networks=ゲスト ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ã‚¹ãƒ¼ãƒ‘ー CIDR -label.DNS.domain.for.guest.networks=ゲスト ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã® DNS ドメイン -label.configure.vpc=VPC ã®æ§‹æˆ -label.edit.vpc=VPC ã®ç·¨é›† -label.restart.vpc=VPC ã®å†èµ·å‹• -message.restart.vpc=VPC ã‚’å†èµ·å‹•ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.remove.vpc=VPC ã®å‰Šé™¤ -message.remove.vpc=VPC を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.vpn.customer.gateway=VPN カスタマー ゲートウェイ -label.add.vpn.customer.gateway=VPN カスタマー ゲートウェイã®è¿½åŠ  -label.IKE.encryption=IKE æš—å·åŒ– -label.IKE.hash=IKE ãƒãƒƒã‚·ãƒ¥ -label.IKE.DH=IKE DH -label.ESP.encryption=ESP æš—å·åŒ– -label.ESP.hash=ESP ãƒãƒƒã‚·ãƒ¥ -label.perfect.forward.secrecy=Perfect Forward Secrecy -label.IKE.lifetime=IKE 有効期間 (秒) -label.ESP.lifetime=ESP 有効期間 (秒) -label.dead.peer.detection=åœæ­¢ãƒ”ã‚¢ã®æ¤œå‡º -label.delete.VPN.customer.gateway=VPN カスタマー ゲートウェイã®å‰Šé™¤ -message.delete.VPN.customer.gateway=ã“ã® VPN カスタマー ゲートウェイを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? - -label.network.domain.text=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ドメイン -label.memory.mb=メモリ (MB) -label.cpu.mhz=CPU (MHz) -message.action.remove.host=ã“ã®ãƒ›ã‚¹ãƒˆã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? - -message.action.reboot.router=ã“ã®ä»®æƒ³ãƒ«ãƒ¼ã‚¿ãƒ¼ã§æä¾›ã™ã‚‹ã™ã¹ã¦ã®ã‚µãƒ¼ãƒ“スãŒä¸­æ–­ã•ã‚Œã¾ã™ã€‚ã“ã®ãƒ«ãƒ¼ã‚¿ãƒ¼ã‚’å†èµ·å‹•ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.stop.router=ã“ã®ä»®æƒ³ãƒ«ãƒ¼ã‚¿ãƒ¼ã§æä¾›ã™ã‚‹ã™ã¹ã¦ã®ã‚µãƒ¼ãƒ“スãŒä¸­æ–­ã•ã‚Œã¾ã™ã€‚ã“ã®ãƒ«ãƒ¼ã‚¿ãƒ¼ã‚’åœæ­¢ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.restart.network=ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã§æä¾›ã™ã‚‹ã™ã¹ã¦ã®ã‚µãƒ¼ãƒ“スãŒä¸­æ–­ã•ã‚Œã¾ã™ã€‚ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’å†èµ·å‹•ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? - - -label.ipaddress=IP アドレス -label.vcdcname=vCenter DC å -label.vcipaddress=vCenter IP アドレス -label.vsmctrlvlanid=コントロール VLAN ID -label.vsmpktvlanid=パケット VLAN ID -label.vsmstoragevlanid=ストレージ VLAN ID -label.nexusVswitch=Nexus 1000V -label.action.delete.nexusVswitch=Nexus 1000V ã®å‰Šé™¤ -label.action.enable.nexusVswitch=Nexus 1000V ã®æœ‰åŠ¹åŒ– -label.action.disable.nexusVswitch=Nexus 1000V ã®ç„¡åŠ¹åŒ– -label.action.list.nexusVswitch=Nexus 1000V ã®ä¸€è¦§è¡¨ç¤º -message.action.delete.nexusVswitch=ã“ã® Nexus 1000V を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.enable.nexusVswitch=ã“ã® Nexus 1000V を有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.disable.nexusVswitch=ã“ã® Nexus 1000V を無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.specify.url=URL を指定ã—ã¦ãã ã•ã„ -label.select.instance.to.attach.volume.to=ボリュームをアタッãƒã™ã‚‹ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’é¸æŠžã—ã¦ãã ã•ã„ -label.upload=アップロード -label.upload.volume=ボリュームã®ã‚¢ãƒƒãƒ—ロード -label.virtual.routers=仮想ルーター -label.primary.storage.count=プライマリ ストレージ プール -label.secondary.storage.count=セカンダリ ストレージ プール -label.number.of.system.vms=システム VM æ•° -label.number.of.virtual.routers=仮想ルーター数 -label.action.register.iso=ISO ã®ç™»éŒ² -label.isolation.method=分離方法 -label.action.register.template=テンプレートã®ç™»éŒ² -label.checksum=MD5 ãƒã‚§ãƒƒã‚¯ã‚µãƒ  -label.vpn=VPN -label.vlan=VLAN - - -label.management.ips=ç®¡ç† IP アドレス -label.devices=デãƒã‚¤ã‚¹ -label.rules=è¦å‰‡ -label.traffic.label=トラフィック ラベル -label.vm.state=VM ã®çŠ¶æ…‹ -message.setup.physical.network.during.zone.creation.basic=基本ゾーンを追加ã™ã‚‹ã¨ãã¯ã€ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ä¸Šã® NIC ã«å¯¾å¿œã™ã‚‹ 1 ã¤ã®ç‰©ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’セットアップã§ãã¾ã™ã€‚ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¯ã„ãã¤ã‹ã®ç¨®é¡žã®ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚’ä¼é€ã—ã¾ã™ã€‚

物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«ã»ã‹ã®ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã®ç¨®é¡žã‚’ドラッグ アンド ドロップã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ -label.domain.router=ドメイン ルーター -label.console.proxy=コンソール プロキシ -label.secondary.storage.vm=セカンダリ ストレージ VM -label.add.netScaler.device=Netscaler デãƒã‚¤ã‚¹ã®è¿½åŠ  -label.add.F5.device=F5 デãƒã‚¤ã‚¹ã®è¿½åŠ  -label.add.SRX.device=SRX デãƒã‚¤ã‚¹ã®è¿½åŠ  -label.account.and.security.group=アカウントã€ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ グループ -label.fetch.latest=最新情報ã®å–å¾— -label.system.offering=システム オファリング -message.validate.instance.name=インスタンスå㯠63 文字以内ã§æŒ‡å®šã—ã¦ãã ã•ã„。ASCII 文字㮠a～zã€A～Zã€æ•°å­—ã® 0～9ã€ãŠã‚ˆã³ãƒã‚¤ãƒ•ãƒ³ã®ã¿ã‚’使用ã§ãã¾ã™ã€‚文字ã§å§‹ã¾ã‚Šã€æ–‡å­—ã¾ãŸã¯æ•°å­—ã§çµ‚ã‚ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ - - -label.isolated.networks=分離ã•ã‚ŒãŸãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.latest.events=最新イベント -state.Enabled=有効 -label.system.wide.capacity=システム全体ã®å‡¦ç†èƒ½åŠ› -label.network.service.providers=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ サービス プロãƒã‚¤ãƒ€ãƒ¼ -message.launch.zone=ゾーンを起動ã™ã‚‹æº–å‚™ãŒã§ãã¾ã—ãŸã€‚次ã®æ‰‹é †ã«é€²ã‚“ã§ãã ã•ã„。 -error.unable.to.reach.management.server=管ç†ã‚µãƒ¼ãƒãƒ¼ã¨é€šä¿¡ã§ãã¾ã›ã‚“ -label.internal.name=内部å -message.configure.all.traffic.types=複数ã®ç‰©ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãŒã‚ã‚Šã¾ã™ã€‚[編集] をクリックã—ã¦ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã®ç¨®é¡žã”ã¨ã«ãƒ©ãƒ™ãƒ«ã‚’構æˆã—ã¦ãã ã•ã„。 -message.edit.traffic.type=ã“ã®ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã®ç¨®é¡žã«é–¢é€£ä»˜ã‘るトラフィック ラベルを指定ã—ã¦ãã ã•ã„。 -label.edit.traffic.type=トラフィックã®ç¨®é¡žã®ç·¨é›† -label.label=ラベル -label.max.networks=最大ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æ•° -error.invalid.username.password=無効ãªãƒ¦ãƒ¼ã‚¶ãƒ¼åã¾ãŸã¯ãƒ‘スワード -message.enabling.security.group.provider=セキュリティ グループ プロãƒã‚¤ãƒ€ãƒ¼ã‚’有効ã«ã—ã¦ã„ã¾ã™ -message.adding.Netscaler.provider=Netscaler プロãƒã‚¤ãƒ€ãƒ¼ã‚’追加ã—ã¦ã„ã¾ã™ -message.creating.guest.network=ゲスト ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’作æˆã—ã¦ã„ã¾ã™ -label.action.delete.physical.network=物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®å‰Šé™¤ -message.action.delete.physical.network=ã“ã®ç‰©ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.installWizard.copy.whatIsAHost=ホストã¯å˜ä¸€ã®ã‚³ãƒ³ãƒ”ューターã§ã€ã‚²ã‚¹ãƒˆä»®æƒ³ãƒžã‚·ãƒ³ã‚’実行ã™ã‚‹ã‚³ãƒ³ãƒ”ューティング リソースをæä¾›ã—ã¾ã™ã€‚ベア メタル ホストを除ã„ã¦ã€å„ホストã«ã¯ã‚²ã‚¹ãƒˆä»®æƒ³ãƒžã‚·ãƒ³ã‚’管ç†ã™ã‚‹ãŸã‚ã®ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ ソフトウェアをインストールã—ã¾ã™ã€‚ベア メタル ホストã«ã¤ã„ã¦ã¯ã€ã€Žã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã‚¬ã‚¤ãƒ‰ä¸Šç´šç·¨ã€ã§ç‰¹æ®Šä¾‹ã¨ã—ã¦èª¬æ˜Žã—ã¾ã™ã€‚ãŸã¨ãˆã°ã€KVM ãŒæœ‰åŠ¹ãª Linux サーãƒãƒ¼ã€Citrix XenServer ãŒå‹•ä½œã™ã‚‹ã‚µãƒ¼ãƒãƒ¼ã€ãŠã‚ˆã³ ESXi サーãƒãƒ¼ãŒãƒ›ã‚¹ãƒˆã§ã™ã€‚基本インストールã§ã¯ã€XenServer ã¾ãŸã¯ KVM を実行ã™ã‚‹å˜ä¸€ã®ãƒ›ã‚¹ãƒˆã‚’使用ã—ã¾ã™ã€‚

ホスト㯠CloudStack™ 環境内ã®æœ€å°ã®çµ„ç¹”å˜ä½ã§ã™ã€‚ホストã¯ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã«å«ã¾ã‚Œã€ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã¯ãƒãƒƒãƒ‰ã«å«ã¾ã‚Œã€ãƒãƒƒãƒ‰ã¯ã‚¾ãƒ¼ãƒ³ã«å«ã¾ã‚Œã¾ã™ã€‚ - - -label.add.compute.offering=コンピューティング オファリングã®è¿½åŠ  -label.compute.offering=コンピューティング オファリング -label.compute.offerings=コンピューティング オファリング -label.select.offering=オファリングã®é¸æŠž -label.menu.infrastructure=インフラストラクãƒãƒ£ -label.sticky.tablesize=テーブル サイズ -label.sticky.expire=失効 -label.sticky.cookie-name=Cookie å -label.sticky.mode=モード -label.sticky.length=é•·ã• -label.sticky.holdtime=ä¿æŒæ™‚é–“ -label.sticky.request-learn=ラーニングã®è¦æ±‚ -label.sticky.prefix=プレフィックス -label.sticky.nocache=キャッシュãªã— -label.sticky.indirect=間接 -label.sticky.postonly=ãƒã‚¹ãƒˆã®ã¿ -label.sticky.domain=ドメイン -state.Allocating=割り当ã¦ä¸­ -state.Migrating=移行中 -error.please.specify.physical.network.tags=ã“ã®ç‰©ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ã‚¿ã‚°ã‚’指定ã—ãªã‘ã‚Œã°ã€ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ オファリングã¯ä½¿ç”¨ã§ãã¾ã›ã‚“。 - - -state.Stopping=åœæ­¢ã—ã¦ã„ã¾ã™ -message.add.load.balancer.under.ip=è² è·åˆ†æ•£è¦å‰‡ãŒæ¬¡ã® IP アドレスã«å¯¾ã—ã¦è¿½åŠ ã•ã‚Œã¾ã—ãŸ: -message.select.instance=インスタンスをé¸æŠžã—ã¦ãã ã•ã„。 -label.select=é¸æŠž -label.select.vm.for.static.nat=é™çš„ NAT 用 VM ã®é¸æŠž -label.select.instance=インスタンスã®é¸æŠž -label.nat.port.range=NAT ãƒãƒ¼ãƒˆã®ç¯„囲 -label.static.nat.vm.details=é™çš„ NAT VM ã®è©³ç´° -label.edit.lb.rule=è² è·åˆ†æ•£è¦å‰‡ã®ç·¨é›† -message.migrate.instance.to.host=別ã®ãƒ›ã‚¹ãƒˆã«ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’移行ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.migrate.instance.to.host=別ã®ãƒ›ã‚¹ãƒˆã¸ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ç§»è¡Œ -message.migrate.instance.to.ps=別ã®ãƒ—ライマリ ストレージã«ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’移行ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.migrate.instance.to.ps=別ã®ãƒ—ライマリ ストレージã¸ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ç§»è¡Œ -label.corrections.saved=接続ãŒä¿å­˜ã•ã‚Œã¾ã—㟠-message.installWizard.copy.whatIsSecondaryStorage=セカンダリ ストレージã¯ã‚¾ãƒ¼ãƒ³ã¨é–¢é€£ä»˜ã‘られã€æ¬¡ã®é …目を格ç´ã—ã¾ã™ã€‚
  • テンプレート - VM ã®èµ·å‹•ã«ä½¿ç”¨ã§ãã‚‹ OS イメージã§ã€ã‚¢ãƒ—リケーションã®ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ãªã©è¿½åŠ ã®æ§‹æˆã‚’å«ã‚ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚
  • ISO イメージ - èµ·å‹•å¯èƒ½ã¾ãŸã¯èµ·å‹•ä¸å¯ã® OS イメージã§ã™ã€‚
  • ディスク ボリュームã®ã‚¹ãƒŠãƒƒãƒ—ショット - VM データã®ä¿å­˜ã‚³ãƒ”ーã§ã™ã€‚データã®å¾©å…ƒã¾ãŸã¯æ–°ã—ã„テンプレートã®ä½œæˆã«ä½¿ç”¨ã§ãã¾ã™ã€‚
-message.installWizard.copy.whatIsPrimaryStorage=CloudStack™ ã®ã‚¯ãƒ©ã‚¦ãƒ‰ インフラストラクãƒãƒ£ã§ã¯ã€ãƒ—ライマリ ストレージã¨ã‚»ã‚«ãƒ³ãƒ€ãƒª ストレージ㮠2 種類ã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã‚’使用ã—ã¾ã™ã€‚ã©ã¡ã‚‰ã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã«ã‚‚ã€iSCSIã€NFS サーãƒãƒ¼ã€ã¾ãŸã¯ãƒ­ãƒ¼ã‚«ãƒ« ディスクを使用ã§ãã¾ã™ã€‚

プライマリ ストレージã¯ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã«é–¢é€£ä»˜ã‘られã€ãã®ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼å†…ã®ãƒ›ã‚¹ãƒˆã§å‹•ä½œã™ã‚‹ã™ã¹ã¦ã® VM ã®å„ゲスト VM ã®ãƒ‡ã‚£ã‚¹ã‚¯ ボリュームを格ç´ã—ã¾ã™ã€‚通常ã€ãƒ—ライマリ ストレージ サーãƒãƒ¼ã¯ãƒ›ã‚¹ãƒˆã®è¿‘ãã«è¨­ç½®ã—ã¾ã™ã€‚ -message.installWizard.copy.whatIsACluster=クラスターã¯ãƒ›ã‚¹ãƒˆã‚’グループ化ã™ã‚‹æ–¹æ³•ã§ã™ã€‚1 ã¤ã®ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼å†…ã®ãƒ›ã‚¹ãƒˆã¯ã™ã¹ã¦åŒä¸€ã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‹ã‚‰æ§‹æˆã•ã‚Œã€åŒã˜ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã‚’実行ã—ã€åŒã˜ã‚µãƒ–ãƒãƒƒãƒˆä¸Šã«ã‚ã‚Šã€åŒã˜å…±æœ‰ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã¾ã™ã€‚åŒã˜ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼å†…ã®ãƒ›ã‚¹ãƒˆé–“ã§ã¯ã€ãƒ¦ãƒ¼ã‚¶ãƒ¼ã¸ã®ã‚µãƒ¼ãƒ“スを中断ã›ãšã«ã€ä»®æƒ³ãƒžã‚·ãƒ³ インスタンスをライブ マイグレーションã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚クラスター㯠CloudStack™ 環境内㮠3 番目ã«å¤§ããªçµ„ç¹”å˜ä½ã§ã™ã€‚クラスターã¯ãƒãƒƒãƒ‰ã«å«ã¾ã‚Œã€ãƒãƒƒãƒ‰ã¯ã‚¾ãƒ¼ãƒ³ã«å«ã¾ã‚Œã¾ã™ã€‚

CloudStack™ ã§ã¯ 1 ã¤ã®ã‚¯ãƒ©ã‚¦ãƒ‰ç’°å¢ƒã«è¤‡æ•°ã®ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã‚’設定ã§ãã¾ã™ãŒã€åŸºæœ¬ã‚¤ãƒ³ã‚¹ãƒˆãƒ¼ãƒ«ã§ã¯ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã¯ 1 ã¤ã§ã™ã€‚ -message.installWizard.copy.whatIsAPod=通常ã€1 ã¤ã®ãƒãƒƒãƒ‰ã¯å˜ä¸€ã®ãƒ©ãƒƒã‚¯ã‚’表ã—ã¾ã™ã€‚åŒã˜ãƒãƒƒãƒ‰å†…ã®ãƒ›ã‚¹ãƒˆã¯åŒã˜ã‚µãƒ–ãƒãƒƒãƒˆã«å«ã¾ã‚Œã¾ã™ã€‚

ãƒãƒƒãƒ‰ã¯ CloudStack™ 環境内㮠2 番目ã«å¤§ããªçµ„ç¹”å˜ä½ã§ã™ã€‚ãƒãƒƒãƒ‰ã¯ã‚¾ãƒ¼ãƒ³ã«å«ã¾ã‚Œã¾ã™ã€‚å„ゾーン㯠1 ã¤ä»¥ä¸Šã®ãƒãƒƒãƒ‰ã‚’å«ã‚€ã“ã¨ãŒã§ãã¾ã™ã€‚基本インストールã§ã¯ã€ã‚¾ãƒ¼ãƒ³å†…ã®ãƒãƒƒãƒ‰ã¯ 1 ã¤ã§ã™ã€‚ -message.installWizard.copy.whatIsAZone=ゾーン㯠CloudStack™ 環境内ã®æœ€å¤§ã®çµ„ç¹”å˜ä½ã§ã™ã€‚1 ã¤ã®ãƒ‡ãƒ¼ã‚¿ã‚»ãƒ³ã‚¿ãƒ¼å†…ã«è¤‡æ•°ã®ã‚¾ãƒ¼ãƒ³ã‚’設定ã§ãã¾ã™ãŒã€é€šå¸¸ã€ã‚¾ãƒ¼ãƒ³ã¯å˜ä¸€ã®ãƒ‡ãƒ¼ã‚¿ã‚»ãƒ³ã‚¿ãƒ¼ã«ç›¸å½“ã—ã¾ã™ã€‚インフラストラクãƒãƒ£ã‚’ゾーンã«çµ„織化ã™ã‚‹ã¨ã€ã‚¾ãƒ¼ãƒ³ã‚’物ç†çš„ã«åˆ†é›¢ã—ã¦å†—長化ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ãŸã¨ãˆã°ã€å„ゾーンã«é›»æºã¨ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ アップリンクをé…å‚™ã—ã¾ã™ã€‚å¿…é ˆã§ã¯ã‚ã‚Šã¾ã›ã‚“ãŒã€ã‚¾ãƒ¼ãƒ³ã¯é éš”地ã«åˆ†æ•£ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ -message.installWizard.copy.whatIsCloudStack=CloudStack™ ã¯ã‚³ãƒ³ãƒ”ューティング リソースをプールã™ã‚‹ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ プラットフォームã§ã€ãƒ‘ブリックã€ãƒ—ライベートã€ãŠã‚ˆã³ãƒã‚¤ãƒ–リッド㮠Infrastructure as a Service (IaaS) クラウドを構築ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚CloudStack™ を使用ã—ã¦ã€ã‚¯ãƒ©ã‚¦ãƒ‰ インフラストラクãƒãƒ£ã‚’構æˆã™ã‚‹ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã€ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã€ãŠã‚ˆã³ã‚³ãƒ³ãƒ”ューティング ノードを管ç†ã—ã€ã‚¯ãƒ©ã‚¦ãƒ‰ コンピューティング環境を展開ã€ç®¡ç†ã€ãŠã‚ˆã³æ§‹æˆã—ã¾ã™ã€‚

CloudStack™ ã¯ã‚³ãƒ¢ãƒ‡ã‚£ãƒ†ã‚£åŒ–ã—ãŸãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ä¸Šã§å‹•ä½œã™ã‚‹å€‹åˆ¥ã®ä»®æƒ³ãƒžã‚·ãƒ³ イメージを超ãˆã¦æ‹¡å¼µã™ã‚‹ã“ã¨ãŒã§ãã€ç°¡å˜ãªè¨­å®šã§å‹•ä½œã™ã‚‹ã‚¯ãƒ©ã‚¦ãƒ‰ インフラストラクãƒãƒ£ã®ã‚½ãƒ•ãƒˆã‚¦ã‚§ã‚¢ スタックã«ã‚ˆã£ã¦ã€ä»®æƒ³ãƒ‡ãƒ¼ã‚¿ã‚»ãƒ³ã‚¿ãƒ¼ã¤ã¾ã‚Šå¤šå±¤åž‹ã®ãƒžãƒ«ãƒãƒ†ãƒŠãƒ³ãƒˆ クラウド アプリケーションをサービスã¨ã—ã¦æ§‹ç¯‰ã—ã€å±•é–‹ã—ã€ç®¡ç†ã™ã‚‹ãŸã‚ã«ä¸å¯æ¬ ãªã‚³ãƒ³ãƒãƒ¼ãƒãƒ³ãƒˆãŒã™ã¹ã¦æä¾›ã•ã‚Œã¾ã™ã€‚オープン ソース ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã¨ãƒ—レミアム ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã®ä¸¡æ–¹ãŒæä¾›ã•ã‚Œã¾ã™ãŒã€ã‚ªãƒ¼ãƒ—ン ソース ãƒãƒ¼ã‚¸ãƒ§ãƒ³ã§ã‚‚ã»ã¨ã‚“ã©ã®æ©Ÿèƒ½ã‚’使用ã§ãã¾ã™ã€‚ -message.installWizard.tooltip.addSecondaryStorage.path=上ã«æŒ‡å®šã—ãŸã‚µãƒ¼ãƒãƒ¼ã«å­˜åœ¨ã™ã‚‹ã€ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã•ã‚ŒãŸãƒ‘スã§ã™ã€‚ -message.installWizard.tooltip.addSecondaryStorage.nfsServer=セカンダリ ストレージをホストã™ã‚‹ NFS サーãƒãƒ¼ã® IP アドレスã§ã™ã€‚ -message.installWizard.tooltip.addPrimaryStorage.path=(NFS ã®å ´åˆ) サーãƒãƒ¼ã‹ã‚‰ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã•ã‚ŒãŸãƒ‘スã§ã™ã€‚(SharedMountPoint ã®å ´åˆ) パスã§ã™ã€‚KVM ã§ã¯ã“ã®ãƒ—ライマリ ストレージãŒãƒžã‚¦ãƒ³ãƒˆã•ã‚Œã‚‹å„ホスト上ã®ãƒ‘スã§ã™ã€‚ãŸã¨ãˆã°ã€/mnt/primary ã§ã™ã€‚ -message.installWizard.tooltip.addPrimaryStorage.server=(NFSã€iSCSIã€ã¾ãŸã¯ PreSetup ã®å ´åˆ) ストレージ デãƒã‚¤ã‚¹ã® IP アドレスã¾ãŸã¯ DNS åã§ã™ã€‚ -message.installWizard.tooltip.addPrimaryStorage.name=ストレージ デãƒã‚¤ã‚¹ã®åå‰ã§ã™ã€‚ -message.installWizard.tooltip.addHost.password=XenServer å´ã§æŒ‡å®šã—ãŸã€ä¸Šã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åã«å¯¾ã™ã‚‹ãƒ‘スワードã§ã™ã€‚ -message.installWizard.tooltip.addHost.username=通常㯠root ã§ã™ã€‚ -message.installWizard.tooltip.addHost.hostname=ホスト㮠DNS åã¾ãŸã¯ IP アドレスã§ã™ã€‚ -message.installWizard.tooltip.addCluster.name=クラスターã®åå‰ã§ã™ã€‚CloudStack ã§ä½¿ç”¨ã•ã‚Œã¦ã„ãªã„ã€ä»»æ„ã®ãƒ†ã‚­ã‚¹ãƒˆã‚’指定ã§ãã¾ã™ã€‚ -message.installWizard.tooltip.addPod.reservedSystemEndIp=ã“ã‚Œã¯ã€ã‚»ã‚«ãƒ³ãƒ€ãƒª ストレージ VM ãŠã‚ˆã³ã‚³ãƒ³ã‚½ãƒ¼ãƒ« プロキシ VM を管ç†ã™ã‚‹ãŸã‚ã« CloudStack ã§ä½¿ç”¨ã™ã‚‹ã€ãƒ—ライベート ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯å†…ã® IP アドレスã®ç¯„囲ã§ã™ã€‚ã“れら㮠IP アドレスã¯ã‚³ãƒ³ãƒ”ューティング サーãƒãƒ¼ã¨åŒã˜ã‚µãƒ–ãƒãƒƒãƒˆã‹ã‚‰å‰²ã‚Šå½“ã¦ã¾ã™ã€‚ -message.installWizard.tooltip.addPod.reservedSystemStartIp=ã“ã‚Œã¯ã€ã‚»ã‚«ãƒ³ãƒ€ãƒª ストレージ VM ãŠã‚ˆã³ã‚³ãƒ³ã‚½ãƒ¼ãƒ« プロキシ VM を管ç†ã™ã‚‹ãŸã‚ã« CloudStack ã§ä½¿ç”¨ã™ã‚‹ã€ãƒ—ライベート ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯å†…ã® IP アドレスã®ç¯„囲ã§ã™ã€‚ã“れら㮠IP アドレスã¯ã‚³ãƒ³ãƒ”ューティング サーãƒãƒ¼ã¨åŒã˜ã‚µãƒ–ãƒãƒƒãƒˆã‹ã‚‰å‰²ã‚Šå½“ã¦ã¾ã™ã€‚ -message.installWizard.tooltip.addPod.reservedSystemNetmask=ゲストã®ä½¿ç”¨ã™ã‚‹ã‚µãƒ–ãƒãƒƒãƒˆä¸Šã§ä½¿ç”¨ã•ã‚Œã‚‹ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ã§ã™ã€‚ -message.installWizard.tooltip.addPod.reservedSystemGateway=ã“ã®ãƒãƒƒãƒ‰å†…ã®ãƒ›ã‚¹ãƒˆã®ã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤ã§ã™ã€‚ -message.installWizard.tooltip.addPod.name=ãƒãƒƒãƒ‰ã®åå‰ã§ã™ã€‚ -message.installWizard.tooltip.configureGuestTraffic.guestEndIp=ã“ã®ã‚¾ãƒ¼ãƒ³ã®ã‚²ã‚¹ãƒˆã«å‰²ã‚Šå½“ã¦ã‚‹ã“ã¨ãŒã§ãã‚‹ IP アドレスã®ç¯„囲ã§ã™ã€‚使用ã™ã‚‹ NIC ㌠1 ã¤ã®å ´åˆã¯ã€ã“れら㮠IP アドレスã¯ãƒãƒƒãƒ‰ã® CIDR ã¨åŒã˜ CIDR ã«å«ã¾ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.installWizard.tooltip.configureGuestTraffic.guestStartIp=ã“ã®ã‚¾ãƒ¼ãƒ³ã®ã‚²ã‚¹ãƒˆã«å‰²ã‚Šå½“ã¦ã‚‹ã“ã¨ãŒã§ãã‚‹ IP アドレスã®ç¯„囲ã§ã™ã€‚使用ã™ã‚‹ NIC ㌠1 ã¤ã®å ´åˆã¯ã€ã“れら㮠IP アドレスã¯ãƒãƒƒãƒ‰ã® CIDR ã¨åŒã˜ CIDR ã«å«ã¾ã‚Œã¦ã„ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.installWizard.tooltip.configureGuestTraffic.guestNetmask=ゲストã®ä½¿ç”¨ã™ã‚‹ã‚µãƒ–ãƒãƒƒãƒˆä¸Šã§ä½¿ç”¨ã•ã‚Œã‚‹ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ã§ã™ã€‚ -message.installWizard.tooltip.configureGuestTraffic.guestGateway=ゲストã®ä½¿ç”¨ã™ã‚‹ã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤ã§ã™ã€‚ -message.installWizard.tooltip.configureGuestTraffic.description=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®èª¬æ˜Žã§ã™ã€‚ -message.installWizard.tooltip.configureGuestTraffic.name=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®åå‰ã§ã™ã€‚ -message.installWizard.tooltip.addZone.internaldns2=ゾーン内ã®ã‚·ã‚¹ãƒ†ãƒ  VM ã§ä½¿ç”¨ã™ã‚‹ DNS サーãƒãƒ¼ã§ã™ã€‚ã“れら㮠DNS サーãƒãƒ¼ã¯ã€ã‚·ã‚¹ãƒ†ãƒ  VM ã®ãƒ—ライベート ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インターフェイスを介ã—ã¦ã‚¢ã‚¯ã‚»ã‚¹ã•ã‚Œã¾ã™ã€‚ãƒãƒƒãƒ‰ã®ãƒ—ライベート IP アドレスã‹ã‚‰ã€ã“ã“ã§æŒ‡å®šã™ã‚‹ DNS サーãƒãƒ¼ã«é€šä¿¡ã§ãã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.installWizard.tooltip.addZone.internaldns1=ゾーン内ã®ã‚·ã‚¹ãƒ†ãƒ  VM ã§ä½¿ç”¨ã™ã‚‹ DNS サーãƒãƒ¼ã§ã™ã€‚ã“れら㮠DNS サーãƒãƒ¼ã¯ã€ã‚·ã‚¹ãƒ†ãƒ  VM ã®ãƒ—ライベート ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ インターフェイスを介ã—ã¦ã‚¢ã‚¯ã‚»ã‚¹ã•ã‚Œã¾ã™ã€‚ãƒãƒƒãƒ‰ã®ãƒ—ライベート IP アドレスã‹ã‚‰ã€ã“ã“ã§æŒ‡å®šã™ã‚‹ DNS サーãƒãƒ¼ã«é€šä¿¡ã§ãã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.installWizard.tooltip.addZone.dns2=ゾーン内ã®ã‚²ã‚¹ãƒˆ VM ã§ä½¿ç”¨ã™ã‚‹ DNS サーãƒãƒ¼ã§ã™ã€‚ã“れら㮠DNS サーãƒãƒ¼ã«ã¯ã€å¾Œã§è¿½åŠ ã™ã‚‹ãƒ‘ブリック ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯çµŒç”±ã§ã‚¢ã‚¯ã‚»ã‚¹ã—ã¾ã™ã€‚ゾーンã®ãƒ‘ブリック IP アドレスã‹ã‚‰ã€ã“ã“ã§æŒ‡å®šã™ã‚‹ãƒ‘ブリック DNS サーãƒãƒ¼ã«é€šä¿¡ã§ãã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.installWizard.tooltip.addZone.name=ゾーンã®åå‰ã§ã™ã€‚ -message.installWizard.tooltip.addZone.dns1=ゾーン内ã®ã‚²ã‚¹ãƒˆ VM ã§ä½¿ç”¨ã™ã‚‹ DNS サーãƒãƒ¼ã§ã™ã€‚ã“れら㮠DNS サーãƒãƒ¼ã«ã¯ã€å¾Œã§è¿½åŠ ã™ã‚‹ãƒ‘ブリック ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯çµŒç”±ã§ã‚¢ã‚¯ã‚»ã‚¹ã—ã¾ã™ã€‚ゾーンã®ãƒ‘ブリック IP アドレスã‹ã‚‰ã€ã“ã“ã§æŒ‡å®šã™ã‚‹ãƒ‘ブリック DNS サーãƒãƒ¼ã«é€šä¿¡ã§ãã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.setup.successful=クラウドãŒã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã•ã‚Œã¾ã—ãŸã€‚ -label.may.continue=続行ã§ãã¾ã™ã€‚ -error.installWizard.message=å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚戻ã£ã¦ã‚¨ãƒ©ãƒ¼ã‚’修正ã§ãã¾ã™ã€‚ -message.installWizard.now.building=クラウドを構築ã—ã¦ã„ã¾ã™... -message.installWizard.click.retry=èµ·å‹•ã‚’å†è©¦è¡Œã™ã‚‹ã«ã¯ãƒœã‚¿ãƒ³ã‚’クリックã—ã¦ãã ã•ã„。 -label.launch=èµ·å‹• -label.installWizard.click.launch=[èµ·å‹•] をクリックã—ã¦ãã ã•ã„。 -label.congratulations=セットアップã¯ã“ã‚Œã§å®Œäº†ã§ã™ã€‚ -label.installWizard.addSecondaryStorageIntro.subtitle=セカンダリ ストレージã«ã¤ã„㦠-label.installWizard.addSecondaryStorageIntro.title=セカンダリ ストレージを追加ã—ã¾ã—ょㆠ-label.installWizard.addPrimaryStorageIntro.subtitle=プライマリ ストレージã«ã¤ã„㦠-label.installWizard.addPrimaryStorageIntro.title=プライマリ ストレージを追加ã—ã¾ã—ょㆠ-label.installWizard.addHostIntro.subtitle=ホストã«ã¤ã„㦠-label.installWizard.addHostIntro.title=ホストを追加ã—ã¾ã—ょㆠ-label.installWizard.addClusterIntro.subtitle=クラスターã«ã¤ã„㦠-label.installWizard.addClusterIntro.title=クラスターを追加ã—ã¾ã—ょㆠ-label.installWizard.addPodIntro.subtitle=ãƒãƒƒãƒ‰ã«ã¤ã„㦠-label.installWizard.addPodIntro.title=ãƒãƒƒãƒ‰ã‚’追加ã—ã¾ã—ょㆠ-label.installWizard.addZone.title=ゾーンã®è¿½åŠ  -label.installWizard.addZoneIntro.subtitle=ゾーンã«ã¤ã„㦠-label.installWizard.addZoneIntro.title=ゾーンを追加ã—ã¾ã—ょㆠ-error.password.not.match=パスワードãŒä¸€è‡´ã—ã¾ã›ã‚“ -label.confirm.password=パスワードã®ç¢ºèªå…¥åŠ› -message.change.password=パスワードを変更ã—ã¦ãã ã•ã„。 -label.save.and.continue=ä¿å­˜ã—ã¦ç¶šè¡Œ -label.skip.guide=CloudStack を使用ã—ãŸã“ã¨ãŒã‚ã‚‹ã®ã§ã€ã“ã®ã‚¬ã‚¤ãƒ‰ã‚’スキップã™ã‚‹ -label.continue.basic.install=基本インストールを続行ã™ã‚‹ -label.introduction.to.cloudstack=CloudStack™ ã®ç´¹ä»‹ -label.what.is.cloudstack=CloudStack™ ã«ã¤ã„㦠-label.hints=ヒント -label.installWizard.subtitle=ã“ã®ã‚¬ã‚¤ãƒ‰ ツアー㯠CloudStack™ 環境ã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã«å½¹ç«‹ã¡ã¾ã™ -label.continue=続行 -label.installWizard.title=CloudStack™ ã¸ã‚ˆã†ã“ã -label.agree=åŒæ„ã™ã‚‹ -label.manage.resources=リソースã®ç®¡ç† -label.port.forwarding.policies=ãƒãƒ¼ãƒˆè»¢é€ãƒãƒªã‚·ãƒ¼ -label.load.balancing.policies=è² è·åˆ†æ•£ãƒãƒªã‚·ãƒ¼ -label.networking.and.security=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¨ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ -label.bandwidth=帯域幅 -label.virtual.machines=仮想マシン -label.compute.and.storage=コンピューティングã¨ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ -label.task.completed=タスクãŒå®Œäº†ã—ã¾ã—㟠-label.update.project.resources=プロジェクト リソースã®æ›´æ–° -label.remove.project.account=プロジェクト アカウントã®å‰Šé™¤ -label.item.listing=項目一覧 -message.select.item=項目をé¸æŠžã—ã¦ãã ã•ã„。 -label.removing=削除ã—ã¦ã„ã¾ã™ -label.invite=招待 -label.add.by=追加å˜ä½ -label.max.vms=最大ユーザー VM æ•° -label.max.public.ips=最大パブリック IP アドレス数 -label.max.volumes=最大ボリューム数 -label.max.snapshots=最大スナップショット数 -label.max.templates=最大テンプレート数 -label.project.dashboard=プロジェクト ダッシュボード -label.remind.later=アラームを表示ã™ã‚‹ -label.invited.accounts=招待済ã¿ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ -label.invite.to=招待ã™ã‚‹ãƒ—ロジェクト: -label.add.accounts.to=アカウントã®è¿½åŠ å…ˆ: -label.add.accounts=アカウントã®è¿½åŠ  -label.project.name=プロジェクトå -label.create.project=プロジェクトã®ä½œæˆ -label.networks=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.launch.vm=VM ã®èµ·å‹• -label.new.vm=æ–°ã—ã„ VM -label.previous=戻る -label.add.to.group=グループã¸ã®è¿½åŠ  -message.vm.review.launch=次ã®æƒ…報をå‚ç…§ã—ã¦ã€ä»®æƒ³ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’æ­£ã—ã設定ã—ãŸã“ã¨ã‚’確èªã—ã¦ã‹ã‚‰èµ·å‹•ã—ã¦ãã ã•ã„。 -message.select.security.groups=æ–°ã—ã„仮想マシンã®ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ グループをé¸æŠžã—ã¦ãã ã•ã„。 -label.new=æ–°è¦ -message.please.select.networks=仮想マシンã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’é¸æŠžã—ã¦ãã ã•ã„。 -message.please.proceed=次ã®æ‰‹é †ã«é€²ã‚“ã§ãã ã•ã„。 -message.zone.no.network.selection=é¸æŠžã—ãŸã‚¾ãƒ¼ãƒ³ã§ã¯ã€ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’é¸æŠžã§ãã¾ã›ã‚“。 -label.no.thanks=設定ã—ãªã„ -label.my.templates=マイ テンプレート -message.select.template=æ–°ã—ã„仮想インスタンスã®ãƒ†ãƒ³ãƒ—レートをé¸æŠžã—ã¦ãã ã•ã„。 -message.select.iso=æ–°ã—ã„仮想インスタンス㮠ISO ã‚’é¸æŠžã—ã¦ãã ã•ã„。 -message.template.desc=VM ã®èµ·å‹•ã«ä½¿ç”¨ã§ãã‚‹ OS イメージ -message.iso.desc=データã¾ãŸã¯ OS èµ·å‹•å¯èƒ½ãƒ¡ãƒ‡ã‚£ã‚¢ã‚’å«ã‚€ãƒ‡ã‚£ã‚¹ã‚¯ イメージ -label.select.iso.or.template=ISO ã¾ãŸã¯ãƒ†ãƒ³ãƒ—レートã®é¸æŠž -message.select.a.zone=ゾーンã¯é€šå¸¸ã€å˜ä¸€ã®ãƒ‡ãƒ¼ã‚¿ã‚»ãƒ³ã‚¿ãƒ¼ã«ç›¸å½“ã—ã¾ã™ã€‚複数ã®ã‚¾ãƒ¼ãƒ³ã‚’設定ã—ã€ç‰©ç†çš„ã«åˆ†é›¢ã—ã¦å†—長性をæŒãŸã›ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€ã‚¯ãƒ©ã‚¦ãƒ‰ã®ä¿¡é ¼æ€§ã‚’高ã‚ã¾ã™ã€‚ -label.select.a.zone=ゾーンã®é¸æŠž -label.review=ç¢ºèª -label.select.a.template=テンプレートã®é¸æŠž -label.setup=セットアップ -state.Allocated=割り当ã¦æ¸ˆã¿ -changed.item.properties=é …ç›®ã®ãƒ—ロパティã®å¤‰æ›´ -label.apply=é©ç”¨ -label.default=デフォルト -label.viewing=表示項目: -label.move.to.top=最上ä½ã«ç§»å‹• -label.move.up.row=1 行上ã«ç§»å‹• -label.move.down.row=1 行下ã«ç§»å‹• -label.move.to.bottom=最下ä½ã«ç§»å‹• -label.drag.new.position=æ–°ã—ã„ä½ç½®ã«ãƒ‰ãƒ©ãƒƒã‚° -label.order=é †åº -label.no.data=表示ã™ã‚‹ãƒ‡ãƒ¼ã‚¿ãŒã‚ã‚Šã¾ã›ã‚“ -label.change.value=値ã®å¤‰æ›´ -label.clear.list=一覧ã®æ¶ˆåŽ» -label.full.path=フル パス -message.add.domain=ã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã«ä½œæˆã™ã‚‹ã‚µãƒ–ドメインを指定ã—ã¦ãã ã•ã„。 -message.delete.user=ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.enable.user=ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.disable.user=ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‚’無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.generate.keys=ã“ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã«æ–°ã—ã„キーを生æˆã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.update.resource.count=ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ãƒªã‚½ãƒ¼ã‚¹æ•°ã‚’æ›´æ–°ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.edit.account=編集 ("-1" ã¯ã€ãƒªã‚½ãƒ¼ã‚¹ä½œæˆã®é‡ã«åˆ¶é™ãŒãªã„ã“ã¨ã‚’示ã—ã¾ã™) -label.total.of.vm=VM åˆè¨ˆ -label.total.of.ip=IP アドレスåˆè¨ˆ -state.enabled=有効 -message.action.download.iso=ã“ã® ISO をダウンロードã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.download.template=ã“ã®ãƒ†ãƒ³ãƒ—レートをダウンロードã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.destination.zone=コピー先ゾーン -label.keyboard.type=キーボードã®ç¨®é¡ž -label.nic.adapter.type=NIC アダプターã®ç¨®é¡ž -label.root.disk.controller=ルート ディスク コントローラー -label.community=コミュニティ -label.remove.egress.rule=é€ä¿¡è¦å‰‡ã®å‰Šé™¤ -label.add.egress.rule=é€ä¿¡è¦å‰‡ã®è¿½åŠ  -label.egress.rule=é€ä¿¡è¦å‰‡ -label.remove.ingress.rule=å—ä¿¡è¦å‰‡ã®å‰Šé™¤ -label.delete.vpn.user=VPN ユーザーã®å‰Šé™¤ -label.add.vpn.user=VPN ユーザーã®è¿½åŠ  -label.remove.pf=ãƒãƒ¼ãƒˆè»¢é€è¦å‰‡ã®å‰Šé™¤ -label.remove.vm.from.lb=è² è·åˆ†æ•£è¦å‰‡ã‹ã‚‰ã® VM ã®å‰Šé™¤ -label.add.vms.to.lb=è² è·åˆ†æ•£è¦å‰‡ã¸ã® VM ã®è¿½åŠ  -label.add.vm=VM ã®è¿½åŠ  -label.remove.static.nat.rule=é™çš„ NAT è¦å‰‡ã®å‰Šé™¤ -label.remove.rule=è¦å‰‡ã®å‰Šé™¤ -label.add.static.nat.rule=é™çš„ NAT è¦å‰‡ã®è¿½åŠ  -label.add.rule=è¦å‰‡ã®è¿½åŠ  -label.configuration=æ§‹æˆ -message.disable.vpn=VPN を無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.disable.vpn=VPN ã®ç„¡åŠ¹åŒ– -message.enable.vpn=ã“ã® IP アドレスã«å¯¾ã™ã‚‹ VPN アクセスを有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.enable.vpn=VPN ã®æœ‰åŠ¹åŒ– -message.acquire.new.ip=ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®æ–°ã—ã„ IP アドレスをå–å¾—ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.elastic=エラスティック -label.my.network=マイ ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.add.vms=VM ã®è¿½åŠ  -label.configure=æ§‹æˆ -label.stickiness=æŒç¶šæ€§ -label.source=é€ä¿¡å…ƒ -label.least.connections=最å°æŽ¥ç¶š -label.round.robin=ラウンドロビン -label.restart.required=å†èµ·å‹•ãŒå¿…è¦ -label.clean.up=クリーン アップ -label.restart.network=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®å†èµ·å‹• -label.edit.network.details=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®è©³ç´°ã®ç·¨é›† -label.add.guest.network=ゲスト ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®è¿½åŠ  -label.guest.networks=ゲスト ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -message.ip.address.changed=ãŠä½¿ã„ã® IP アドレスãŒå¤‰æ›´ã•ã‚Œã¦ã„ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚一覧を更新ã—ã¾ã™ã‹? ãã®å ´åˆã¯ã€è©³ç´°ãƒšã‚¤ãƒ³ãŒé–‰ã˜ã‚‹ã“ã¨ã«æ³¨æ„ã—ã¦ãã ã•ã„。 -state.BackingUp=ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—中 -state.BackedUp=ãƒãƒƒã‚¯ã‚¢ãƒƒãƒ—済㿠-label.done=完了 -label.vm.name=VM å -message.migrate.volume=別ã®ãƒ—ライマリ ストレージã«ãƒœãƒªãƒ¥ãƒ¼ãƒ ã‚’移行ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.migrate.volume=別ã®ãƒ—ライマリ ストレージã¸ã®ãƒœãƒªãƒ¥ãƒ¼ãƒ ã®ç§»è¡Œ -message.create.template=テンプレートを作æˆã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.create.template=テンプレートã®ä½œæˆ -message.download.volume.confirm=ã“ã®ãƒœãƒªãƒ¥ãƒ¼ãƒ ã‚’ダウンロードã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.detach.disk=ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ã‚’デタッãƒã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -state.ready=準備完了 -state.Ready=準備完了 -label.vm.display.name=VM 表示å -label.select-view=ビューã®é¸æŠž -label.local.storage=ローカル ストレージ -label.direct.ips=直接 IP アドレス -label.view.all=ã™ã¹ã¦è¡¨ç¤º -label.zone.details=ゾーンã®è©³ç´° -message.alert.state.detected=アラート状態ãŒæ¤œå‡ºã•ã‚Œã¾ã—㟠-state.Starting=開始中 -state.Expunging=抹消中 -state.Creating=作æˆä¸­ -message.decline.invitation=ã“ã®ãƒ—ロジェクトã¸ã®æ‹›å¾…を辞退ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.decline.invitation=招待ã®è¾žé€€ -message.confirm.join.project=ã“ã®ãƒ—ロジェクトã«å‚加ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.join.project=ã“ã‚Œã§ã€ãƒ—ロジェクトã«å‚加ã—ã¾ã—ãŸã€‚プロジェクトをå‚ç…§ã™ã‚‹ã«ã¯ãƒ—ロジェクト ビューã«åˆ‡ã‚Šæ›¿ãˆã¦ãã ã•ã„。 -label.accept.project.invitation=プロジェクトã¸ã®æ‹›å¾…ã®æ‰¿è«¾ -label.token=トークン -label.project.id=プロジェクト ID -message.enter.token=é›»å­ãƒ¡ãƒ¼ãƒ«ã®æ‹›å¾…状ã«è¨˜è¼‰ã•ã‚Œã¦ã„るトークンを入力ã—ã¦ãã ã•ã„。 -label.enter.token=トークンã®å…¥åŠ› -state.Accepted=承諾済㿠-state.Pending=ä¿ç•™ -state.Completed=完了 -state.Declined=辞退 -label.project=プロジェクト -label.invitations=招待状 -label.delete.project=プロジェクトã®å‰Šé™¤ -message.delete.project=ã“ã®ãƒ—ロジェクトを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.activate.project=ã“ã®ãƒ—ロジェクトをアクティブã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.activate.project=プロジェクトã®ã‚¢ã‚¯ãƒ†ã‚£ãƒ–化 -label.suspend.project=プロジェクトã®ä¸€æ™‚åœæ­¢ -message.suspend.project=ã“ã®ãƒ—ロジェクトを一時åœæ­¢ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -state.Suspended=一時åœæ­¢ -label.edit.project.details=プロジェクトã®è©³ç´°ã®ç·¨é›† -label.new.project=æ–°ã—ã„プロジェクト -state.Active=アクティブ -state.Disabled=無効 -label.projects=プロジェクト -label.make.project.owner=アカウントã®ãƒ—ロジェクト所有者化 -label.remove.project.account=アカウントã®ãƒ—ロジェクトã‹ã‚‰ã®å‰Šé™¤ -message.project.invite.sent=ユーザーã«æ‹›å¾…状ãŒé€ä¿¡ã•ã‚Œã¾ã—ãŸã€‚ユーザーãŒæ‹›å¾…を承諾ã™ã‚‹ã¨ã€ãƒ—ロジェクトã«è¿½åŠ ã•ã‚Œã¾ã™ã€‚ -label.add.account.to.project=アカウントã®ãƒ—ロジェクトã¸ã®è¿½åŠ  -label.revoke.project.invite=招待ã®å–り消㗠-label.project.invite=プロジェクトã¸ã®æ‹›å¾… -label.select.project=プロジェクトã®é¸æŠž -message.no.projects=プロジェクトãŒã‚ã‚Šã¾ã›ã‚“。
プロジェクト セクションã‹ã‚‰æ–°ã—ã„プロジェクトを作æˆã—ã¦ãã ã•ã„。 -message.no.projects.adminOnly=プロジェクトãŒã‚ã‚Šã¾ã›ã‚“。
管ç†è€…ã«æ–°ã—ã„プロジェクトã®ä½œæˆã‚’ä¾é ¼ã—ã¦ãã ã•ã„。 -message.pending.projects.1=ä¿ç•™ä¸­ã®ãƒ—ロジェクト招待状ãŒã‚ã‚Šã¾ã™ã€‚ -message.pending.projects.2=表示ã™ã‚‹ã«ã¯ãƒ—ロジェクト セクションã«ç§»å‹•ã—ã¦ã€ä¸€è¦§ã‹ã‚‰æ‹›å¾…状をé¸æŠžã—ã¾ã™ã€‚ -message.instanceWizard.noTemplates=使用å¯èƒ½ãªãƒ†ãƒ³ãƒ—レートãŒã‚ã‚Šã¾ã›ã‚“。互æ›æ€§ã®ã‚るテンプレートを追加ã—ã¦ã€ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ ウィザードをå†èµ·å‹•ã—ã¦ãã ã•ã„。 -label.view=表示 - -instances.actions.reboot.label=インスタンスã®å†èµ·å‹• -label.filterBy=フィルター -label.ok=OK -notification.reboot.instance=インスタンスã®å†èµ·å‹• -notification.start.instance=インスタンスã®èµ·å‹• -notification.stop.instance=インスタンスã®åœæ­¢ -label.display.name=表示å -label.zone.name=ゾーンå -ui.listView.filters.all=ã™ã¹ã¦ -ui.listView.filters.mine=自分ã®ã‚‚ã® -state.Running=実行中 -state.Stopped=åœæ­¢æ¸ˆã¿ -state.Destroyed=破棄済㿠-state.Error=エラー -message.reset.password.warning.notPasswordEnabled=ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ãƒ†ãƒ³ãƒ—レートã¯ã€ãƒ‘スワード管ç†ã‚’有効ã«ã›ãšã«ä½œæˆã•ã‚Œã¾ã—ãŸã€‚ -message.reset.password.warning.notStopped=ç¾åœ¨ã®ãƒ‘スワードを変更ã™ã‚‹å‰ã«ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’åœæ­¢ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -label.notifications=通知 -label.default.view=デフォルト ビュー -label.project.view=プロジェクト ビュー - -message.add.system.service.offering=æ–°ã—ã„システム サービス オファリングを追加ã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®ãƒ‡ãƒ¼ã‚¿ã‚’入力ã—ã¦ãã ã•ã„。 -message.action.delete.system.service.offering=ã“ã®ã‚·ã‚¹ãƒ†ãƒ  サービス オファリングを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.action.delete.system.service.offering=システム サービス オファリングã®å‰Šé™¤ -label.hypervisor.capabilities=ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã®æ©Ÿèƒ½ -label.hypervisor.version=ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã®ãƒãƒ¼ã‚¸ãƒ§ãƒ³ -label.max.guest.limit=æœ€å¤§ã‚²ã‚¹ãƒˆåˆ¶é™ -label.add.network.offering=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ オファリングã®è¿½åŠ  -label.supported.services=サãƒãƒ¼ãƒˆã•ã‚Œã‚‹ã‚µãƒ¼ãƒ“ス -label.service.capabilities=サービスã®æ©Ÿèƒ½ -label.guest.type=ゲストã®ç¨®é¡ž -label.specify.IP.ranges=IP アドレスã®ç¯„囲ã®æŒ‡å®š -label.conserve.mode=節約モード -label.created.by.system=ã‚·ã‚¹ãƒ†ãƒ ä½œæˆ -label.menu.system.service.offerings=システム オファリング -label.add.system.service.offering=システム サービス オファリングã®è¿½åŠ  -label.redundant.router.capability=冗長ルーター機能 -label.supported.source.NAT.type=サãƒãƒ¼ãƒˆã•ã‚Œã‚‹é€ä¿¡å…ƒ NAT ã®ç¨®é¡ž -label.elastic.LB=エラスティック負è·åˆ†æ•£ -label.LB.isolation=è² è·åˆ†æ•£åˆ†é›¢ -label.elastic.IP=エラスティック IP アドレス -label.network.label.display.for.blank.value=デフォルト ゲートウェイを使用 -label.xen.traffic.label=XenServer トラフィックã®ãƒ©ãƒ™ãƒ« -label.kvm.traffic.label=KVM トラフィックã®ãƒ©ãƒ™ãƒ« -label.vmware.traffic.label=VMware トラフィックã®ãƒ©ãƒ™ãƒ« -label.start.IP=開始 IP アドレス -label.end.IP=終了 IP アドレス -label.remove.ip.range=IP アドレスã®ç¯„囲ã®å‰Šé™¤ -label.ip.ranges=IP アドレスã®ç¯„囲 -label.start.vlan=開始 VLAN -label.end.vlan=終了 VLAN -label.broadcast.domain.range=ブロードキャスト ドメインã®ç¯„囲 -label.compute=コンピューティング -message.add.guest.network=ゲスト ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’追加ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.subdomain.access=サブドメイン アクセス -label.guest.start.ip=ゲストã®é–‹å§‹ IP アドレス -label.guest.end.ip=ゲストã®çµ‚了 IP アドレス -label.virtual.router=仮想ルーター -label.physical.network.ID=物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ID -label.destination.physical.network.id=ブリッジ先物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ID -label.dhcp=DHCP -label.destroy.router=ルーターã®ç ´æ£„ -message.confirm.destroy.router=ã“ã®ãƒ«ãƒ¼ã‚¿ãƒ¼ã‚’破棄ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.change.service.offering=サービス オファリングã®å¤‰æ›´ -label.view.console=コンソールã®è¡¨ç¤º -label.redundant.state=冗長状態 -label.enable.provider=プロãƒã‚¤ãƒ€ãƒ¼ã®æœ‰åŠ¹åŒ– -message.confirm.enable.provider=ã“ã®ãƒ—ロãƒã‚¤ãƒ€ãƒ¼ã‚’有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.disable.provider=プロãƒã‚¤ãƒ€ãƒ¼ã®ç„¡åŠ¹åŒ– -message.confirm.disable.provider=ã“ã®ãƒ—ロãƒã‚¤ãƒ€ãƒ¼ã‚’無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.shutdown.provider=プロãƒã‚¤ãƒ€ãƒ¼ã®ã‚·ãƒ£ãƒƒãƒˆãƒ€ã‚¦ãƒ³ -message.confirm.shutdown.provider=ã“ã®ãƒ—ロãƒã‚¤ãƒ€ãƒ¼ã‚’シャットダウンã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.netScaler=NetScaler -label.add.new.NetScaler=æ–°ã—ã„ NetScaler ã®è¿½åŠ  -label.capacity=処ç†èƒ½åŠ› -label.dedicated=専用 -label.f5=F5 -label.add.new.F5=æ–°ã—ã„ F5 ã®è¿½åŠ  -label.srx=SRX -label.providers=プロãƒã‚¤ãƒ€ãƒ¼ -label.add.new.SRX=æ–°ã—ã„ SRX ã®è¿½åŠ  -label.timeout=タイムアウト -label.public.network=パブリック ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.private.network=プライベート ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.enable.swift=Swift ã®æœ‰åŠ¹åŒ– -confirm.enable.swift=Swift ã®ã‚µãƒãƒ¼ãƒˆã‚’有効ã«ã™ã‚‹ã«ã¯ã€æ¬¡ã®æƒ…報を入力ã—ã¦ãã ã•ã„。 -message.after.enable.swift=Swift ãŒæ§‹æˆã•ã‚Œã¾ã—ãŸã€‚注: ã“ã®ãƒšãƒ¼ã‚¸ã‚’é–‰ã˜ã‚‹ã¨ã€Swift ã‚’å†æ§‹æˆã™ã‚‹ã“ã¨ã¯ã§ãã¾ã›ã‚“。 -label.key=キー -label.delete.NetScaler=NetScaler ã®å‰Šé™¤ -message.confirm.delete.NetScaler=NetScaler を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.delete.F5=F5 ã®å‰Šé™¤ -message.confirm.delete.F5=F5 を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.delete.SRX=SRX ã®å‰Šé™¤ -message.confirm.delete.SRX=SRX を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.pods=ãƒãƒƒãƒ‰ -label.pod.name=ãƒãƒƒãƒ‰å -label.reserved.system.gateway=予約済ã¿ã‚·ã‚¹ãƒ†ãƒ  ゲートウェイ -label.reserved.system.netmask=予約済ã¿ã‚·ã‚¹ãƒ†ãƒ  ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ -label.start.reserved.system.IP=予約済ã¿é–‹å§‹ã‚·ã‚¹ãƒ†ãƒ  IP アドレス -label.end.reserved.system.IP=予約済ã¿çµ‚了システム IP アドレス -label.clusters=クラスター -label.cluster.name=クラスターå -label.host.MAC=ホスト㮠MAC -label.agent.username=エージェント ユーザーå -label.agent.password=エージェント パスワード -message.confirm.action.force.reconnect=ã“ã®ãƒ›ã‚¹ãƒˆã‚’強制å†æŽ¥ç¶šã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.resource.state=リソースã®çŠ¶æ…‹ -label.LUN.number=LUN ç•ªå· -message.confirm.remove.IP.range=ã“ã® IP アドレスã®ç¯„囲を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.tooltip.zone.name=ゾーンã®åå‰ã§ã™ã€‚ -message.tooltip.dns.1=ゾーン内㮠VM ã§ä½¿ç”¨ã™ã‚‹ DNS サーãƒãƒ¼ã®åå‰ã§ã™ã€‚ゾーンã®ãƒ‘ブリック IP アドレスã‹ã‚‰ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ã«é€šä¿¡ã§ãã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.tooltip.dns.2=ゾーン内㮠VM ã§ä½¿ç”¨ã™ã‚‹ 2 番目㮠DNS サーãƒãƒ¼ã®åå‰ã§ã™ã€‚ゾーンã®ãƒ‘ブリック IP アドレスã‹ã‚‰ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ã«é€šä¿¡ã§ãã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.tooltip.internal.dns.1=ゾーン内㮠CloudStack 内部システム VM ã§ä½¿ç”¨ã™ã‚‹ DNS サーãƒãƒ¼ã®åå‰ã§ã™ã€‚ãƒãƒƒãƒ‰ã®ãƒ—ライベート IP アドレスã‹ã‚‰ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ã«é€šä¿¡ã§ãã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.tooltip.internal.dns.2=ゾーン内㮠CloudStack 内部システム VM ã§ä½¿ç”¨ã™ã‚‹ DNS サーãƒãƒ¼ã®åå‰ã§ã™ã€‚ãƒãƒƒãƒ‰ã®ãƒ—ライベート IP アドレスã‹ã‚‰ã€ã“ã®ã‚µãƒ¼ãƒãƒ¼ã«é€šä¿¡ã§ãã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.tooltip.network.domain=DNS サフィックスã§ã™ã€‚ã“ã®ã‚µãƒ•ã‚£ãƒƒã‚¯ã‚¹ã‹ã‚‰ã‚²ã‚¹ãƒˆ VM ã§ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ã‚«ã‚¹ã‚¿ãƒ  ドメインåãŒä½œæˆã•ã‚Œã¾ã™ã€‚ -message.tooltip.pod.name=ã“ã®ãƒãƒƒãƒ‰ã®åå‰ã§ã™ã€‚ -message.tooltip.reserved.system.gateway=ãƒãƒƒãƒ‰å†…ã®ãƒ›ã‚¹ãƒˆã®ã‚²ãƒ¼ãƒˆã‚¦ã‚§ã‚¤ã§ã™ã€‚ -message.tooltip.reserved.system.netmask=ãƒãƒƒãƒ‰ã®ã‚µãƒ–ãƒãƒƒãƒˆã‚’定義ã™ã‚‹ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ プレフィックスã§ã™ã€‚CIDR 表記を使用ã—ã¾ã™ã€‚ -message.creating.zone=ゾーンを作æˆã—ã¦ã„ã¾ã™ -message.creating.physical.networks=物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’作æˆã—ã¦ã„ã¾ã™ -message.configuring.physical.networks=物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’構æˆã—ã¦ã„ã¾ã™ -message.adding.Netscaler.device=Netscaler デãƒã‚¤ã‚¹ã‚’追加ã—ã¦ã„ã¾ã™ -message.creating.pod=ãƒãƒƒãƒ‰ã‚’作æˆã—ã¦ã„ã¾ã™ -message.configuring.public.traffic=パブリック トラフィックを構æˆã—ã¦ã„ã¾ã™ -message.configuring.storage.traffic=ストレージ トラフィックを構æˆã—ã¦ã„ã¾ã™ -message.configuring.guest.traffic=ゲスト トラフィックを構æˆã—ã¦ã„ã¾ã™ -message.creating.cluster=クラスターを作æˆã—ã¦ã„ã¾ã™ -message.adding.host=ホストを追加ã—ã¦ã„ã¾ã™ -message.creating.primary.storage=プライマリ ストレージを作æˆã—ã¦ã„ã¾ã™ -message.creating.secondary.storage=セカンダリ ストレージを作æˆã—ã¦ã„ã¾ã™ -message.Zone.creation.complete=ゾーンãŒä½œæˆã•ã‚Œã¾ã—㟠-message.enabling.zone=ゾーンを有効ã«ã—ã¦ã„ã¾ã™ -error.something.went.wrong.please.correct.the.following=å•é¡ŒãŒç™ºç”Ÿã—ã¾ã—ãŸã€‚次ã®å†…容を修正ã—ã¦ãã ã•ã„ -error.could.not.enable.zone=ゾーンを有効ã«ã§ãã¾ã›ã‚“ã§ã—㟠-message.zone.creation.complete.would.you.like.to.enable.this.zone=ゾーンãŒä½œæˆã•ã‚Œã¾ã—ãŸã€‚ã“ã®ã‚¾ãƒ¼ãƒ³ã‚’有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.please.add.at.lease.one.traffic.range=å°‘ãªãã¨ã‚‚ 1 ã¤ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã®ç¯„囲を追加ã—ã¦ãã ã•ã„。 -message.you.must.have.at.least.one.physical.network=å°‘ãªãã¨ã‚‚ 1 ã¤ç‰©ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ãŒå¿…è¦ã§ã™ -message.please.select.a.different.public.and.management.network.before.removing=削除ã®å‰ã«ç•°ãªã‚‹ãƒ‘ブリックãŠã‚ˆã³ç®¡ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’é¸æŠžã—ã¦ãã ã•ã„。 - -label.zone.type=ゾーンã®ç¨®é¡ž -label.setup.zone=ゾーンã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ— -label.setup.network=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ— -label.add.resources=リソースã®è¿½åŠ  -label.launch=èµ·å‹• -label.set.up.zone.type=ゾーンã®ç¨®é¡žã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ— -message.please.select.a.configuration.for.your.zone=ゾーンã®æ§‹æˆã‚’é¸æŠžã—ã¦ãã ã•ã„。 -message.desc.basic.zone=å„ VM インスタンス㫠IP アドレスãŒãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‹ã‚‰ç›´æŽ¥å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã‚‹ã€å˜ä¸€ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’æä¾›ã—ã¾ã™ã€‚セキュリティ グループ (é€ä¿¡å…ƒ IP アドレスã®ãƒ•ã‚£ãƒ«ã‚¿ãƒ¼) ã®ã‚ˆã†ãªãƒ¬ã‚¤ãƒ¤ãƒ¼ 3 レベルã®æ–¹æ³•ã§ã‚²ã‚¹ãƒˆã‚’分離ã§ãã¾ã™ã€‚ -label.basic=基本 -message.desc.advanced.zone=より洗練ã•ã‚ŒãŸãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æŠ€è¡“をサãƒãƒ¼ãƒˆã—ã¾ã™ã€‚ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ モデルをé¸æŠžã™ã‚‹ã¨ã€ã‚ˆã‚ŠæŸ”軟ã«ã‚²ã‚¹ãƒˆã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’定義ã—ã€ãƒ•ã‚¡ã‚¤ã‚¢ã‚¦ã‚©ãƒ¼ãƒ«ã€VPNã€è² è·åˆ†æ•£è£…ç½®ã®ã‚µãƒãƒ¼ãƒˆã®ã‚ˆã†ãªã‚«ã‚¹ã‚¿ãƒžã‚¤ã‚ºã—ãŸãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ オファリングをæä¾›ã§ãã¾ã™ã€‚ -label.advanced=æ‹¡å¼µ -message.desc.zone=ゾーン㯠CloudStack 環境内ã®æœ€å¤§ã®çµ„ç¹”å˜ä½ã§ã€é€šå¸¸ã€å˜ä¸€ã®ãƒ‡ãƒ¼ã‚¿ã‚»ãƒ³ã‚¿ãƒ¼ã«ç›¸å½“ã—ã¾ã™ã€‚ゾーンã«ã‚ˆã£ã¦ç‰©ç†çš„ãªåˆ†é›¢ã¨å†—長性ãŒæä¾›ã•ã‚Œã¾ã™ã€‚ゾーン㯠1 ã¤ä»¥ä¸Šã®ãƒãƒƒãƒ‰ (å„ãƒãƒƒãƒ‰ã¯ãƒ›ã‚¹ãƒˆã¨ãƒ—ライマリ ストレージ サーãƒãƒ¼ã‹ã‚‰æ§‹æˆã•ã‚Œã¾ã™) ã¨ã€ã‚¾ãƒ¼ãƒ³å†…ã®ã™ã¹ã¦ã®ãƒãƒƒãƒ‰ã§å…±æœ‰ã•ã‚Œã‚‹ã‚»ã‚«ãƒ³ãƒ€ãƒª ストレージ サーãƒãƒ¼ã‹ã‚‰æ§‹æˆã•ã‚Œã¾ã™ã€‚ -label.physical.network=物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.public.traffic=パブリック トラフィック -label.guest.traffic=ゲスト トラフィック -label.storage.traffic=ストレージ トラフィック -message.setup.physical.network.during.zone.creation=拡張ゾーンを追加ã™ã‚‹ã¨ãã¯ã€1 ã¤ä»¥ä¸Šã®ç‰©ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’セットアップã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚å„ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¯ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ä¸Šã® 1 ã¤ã® NIC ã«å¯¾å¿œã—ã¾ã™ã€‚å„物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã§ã¯ã€çµ„ã¿åˆã‚ã›ã«åˆ¶é™ãŒã‚ã‚Šã¾ã™ãŒã€1 ã¤ä»¥ä¸Šã®ç¨®é¡žã®ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã‚’通信ã§ãã¾ã™ã€‚

å„物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã«å¯¾ã—ã¦ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã®ç¨®é¡žã‚’ドラッグ アンド ドロップã—ã¦ãã ã•ã„。 -label.add.physical.network=物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®è¿½åŠ  -label.traffic.types=トラフィックã®ç¨®é¡ž -label.management=ç®¡ç† -label.guest=ゲスト -label.please.specify.netscaler.info=Netscaler 情報を指定ã—ã¦ãã ã•ã„ -message.public.traffic.in.advanced.zone=クラウド内㮠VM ãŒã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã¨ã€ãƒ‘ブリック トラフィックãŒç”Ÿæˆã•ã‚Œã¾ã™ã€‚ã“ã®ãŸã‚ã«ã€ä¸€èˆ¬ã«ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ãª IP アドレスを割り当ã¦ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚エンド ユーザー㯠CloudStack ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ インターフェイスを使用ã—ã¦ã“れら㮠IP アドレスをå–å¾—ã—ã€ã‚²ã‚¹ãƒˆ ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¨ãƒ‘ブリック ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®é–“ã« NAT を実装ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚

インターãƒãƒƒãƒˆ トラフィックã®ãŸã‚ã«ã€å°‘ãªãã¨ã‚‚ 1 㤠IP アドレスã®ç¯„囲を入力ã—ã¦ãã ã•ã„。 -message.public.traffic.in.basic.zone=クラウド内㮠VM ãŒã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆã«ã‚¢ã‚¯ã‚»ã‚¹ã™ã‚‹ã‹ã‚¤ãƒ³ã‚¿ãƒ¼ãƒãƒƒãƒˆçµŒç”±ã§ã‚¯ãƒ©ã‚¤ã‚¢ãƒ³ãƒˆã«ã‚µãƒ¼ãƒ“スをæä¾›ã™ã‚‹ã¨ã€ãƒ‘ブリック トラフィックãŒç”Ÿæˆã•ã‚Œã¾ã™ã€‚ã“ã®ãŸã‚ã«ã€ä¸€èˆ¬ã«ã‚¢ã‚¯ã‚»ã‚¹å¯èƒ½ãª IP アドレスを割り当ã¦ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚インスタンスを作æˆã™ã‚‹ã¨ã€ã‚²ã‚¹ãƒˆ IP アドレスã®ã»ã‹ã«ã“ã®ãƒ‘ブリック IP アドレスã®ç¯„囲ã‹ã‚‰ã‚¢ãƒ‰ãƒ¬ã‚¹ãŒ 1 ã¤ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¾ã™ã€‚パブリック IP アドレスã¨ã‚²ã‚¹ãƒˆ IP アドレスã®é–“ã«ã€é™çš„㪠1 対 1 ã® NAT ãŒè‡ªå‹•çš„ã«ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ—ã•ã‚Œã¾ã™ã€‚エンド ユーザー㯠CloudStack ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ インターフェイスを使用ã—ã¦è¿½åŠ ã® IP アドレスをå–å¾—ã—ã€ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã¨ãƒ‘ブリック IP アドレスã®é–“ã«é™çš„ NAT を実装ã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ -message.add.pod.during.zone.creation=å„ゾーンã«ã¯ 1 ã¤ä»¥ä¸Šã®ãƒãƒƒãƒ‰ãŒå¿…è¦ã§ã™ã€‚今ã“ã“ã§æœ€åˆã®ãƒãƒƒãƒ‰ã‚’追加ã—ã¾ã™ã€‚ãƒãƒƒãƒ‰ã¯ãƒ›ã‚¹ãƒˆã¨ãƒ—ライマリ ストレージ サーãƒãƒ¼ã‹ã‚‰æ§‹æˆã•ã‚Œã¾ã™ãŒã€ã“れらã¯å¾Œã®æ‰‹é †ã§è¿½åŠ ã—ã¾ã™ã€‚最åˆã«ã€CloudStack ã®å†…部管ç†ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã®ãŸã‚ã« IP アドレスã®ç¯„囲を予約ã—ã¾ã™ã€‚IP アドレスã®ç¯„囲ã¯ã€ã‚¯ãƒ©ã‚¦ãƒ‰å†…ã®å„ゾーンã§é‡è¤‡ã—ãªã„よã†ã«äºˆç´„ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.guest.traffic.in.advanced.zone=ゲスト ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ トラフィックã¯ã€ã‚¨ãƒ³ãƒ‰ ユーザーã®ä»®æƒ³ãƒžã‚·ãƒ³é–“ã®é€šä¿¡ã§ã™ã€‚å„物ç†ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ã‚²ã‚¹ãƒˆ トラフィックを通信ã™ã‚‹ãŸã‚ã® VLAN ID ã®ç¯„囲を指定ã—ã¦ãã ã•ã„。 -message.guest.traffic.in.basic.zone=ゲスト ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ トラフィックã¯ã€ã‚¨ãƒ³ãƒ‰ ユーザーã®ä»®æƒ³ãƒžã‚·ãƒ³é–“ã®é€šä¿¡ã§ã™ã€‚CloudStack ã§ã‚²ã‚¹ãƒˆ VM ã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã‚‹ IP アドレスã®ç¯„囲を指定ã—ã¦ãã ã•ã„。ã“ã®ç¯„囲ãŒäºˆç´„済ã¿ã®ã‚·ã‚¹ãƒ†ãƒ  IP アドレスã®ç¯„囲ã¨é‡è¤‡ã—ãªã„よã†ã«æ³¨æ„ã—ã¦ãã ã•ã„。 -message.storage.traffic=ホストや CloudStack システム VM ãªã©ã€ç®¡ç†ã‚µãƒ¼ãƒãƒ¼ã¨é€šä¿¡ã™ã‚‹ CloudStack ã®å†…部リソース間ã®ãƒˆãƒ©ãƒ•ã‚£ãƒƒã‚¯ã§ã™ã€‚ã“ã“ã§ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ トラフィックを構æˆã—ã¦ãã ã•ã„。 -message.desc.cluster=å„ãƒãƒƒãƒ‰ã«ã¯ 1 ã¤ä»¥ä¸Šã®ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ãŒå¿…è¦ã§ã™ã€‚今ã“ã“ã§æœ€åˆã®ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã‚’追加ã—ã¾ã™ã€‚クラスターã¯ãƒ›ã‚¹ãƒˆã‚’グループ化ã™ã‚‹æ–¹æ³•ã§ã™ã€‚1 ã¤ã®ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼å†…ã®ãƒ›ã‚¹ãƒˆã¯ã™ã¹ã¦åŒä¸€ã®ãƒãƒ¼ãƒ‰ã‚¦ã‚§ã‚¢ã‹ã‚‰æ§‹æˆã•ã‚Œã€åŒã˜ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã‚’実行ã—ã€åŒã˜ã‚µãƒ–ãƒãƒƒãƒˆä¸Šã«ã‚ã‚Šã€åŒã˜å…±æœ‰ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ã«ã‚¢ã‚¯ã‚»ã‚¹ã—ã¾ã™ã€‚å„クラスター㯠1 ã¤ä»¥ä¸Šã®ãƒ›ã‚¹ãƒˆã¨ 1 ã¤ä»¥ä¸Šã®ãƒ—ライマリ ストレージ サーãƒãƒ¼ã‹ã‚‰æ§‹æˆã•ã‚Œã¾ã™ã€‚ -message.desc.host=å„クラスターã«ã¯å°‘ãªãã¨ã‚‚ 1 ã¤ã€ã‚²ã‚¹ãƒˆ VM を実行ã™ã‚‹ãŸã‚ã®ãƒ›ã‚¹ãƒˆ (コンピューター) ãŒå¿…è¦ã§ã™ã€‚今ã“ã“ã§æœ€åˆã®ãƒ›ã‚¹ãƒˆã‚’追加ã—ã¾ã™ã€‚CloudStack ã§ãƒ›ã‚¹ãƒˆã‚’機能ã•ã›ã‚‹ã«ã¯ã€ãƒ›ã‚¹ãƒˆã«ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã‚’インストールã—㦠IP アドレスを割り当ã¦ã€ãƒ›ã‚¹ãƒˆãŒ CloudStack 管ç†ã‚µãƒ¼ãƒãƒ¼ã«æŽ¥ç¶šã—ã¦ã„ã‚‹ã“ã¨ã‚’確èªã—ã¾ã™ã€‚

ホスト㮠DNS åã¾ãŸã¯ IP アドレスã€ãƒ¦ãƒ¼ã‚¶ãƒ¼å (通常㯠root) ã¨ãƒ‘スワードã€ãŠã‚ˆã³ãƒ›ã‚¹ãƒˆã®åˆ†é¡žã«ä½¿ç”¨ã™ã‚‹ãƒ©ãƒ™ãƒ«ã‚’入力ã—ã¦ãã ã•ã„。 -message.desc.primary.storage=å„クラスターã«ã¯å°‘ãªãã¨ã‚‚ 1 ã¤ã€ãƒ—ライマリ ストレージ サーãƒãƒ¼ãŒå¿…è¦ã§ã™ã€‚今ã“ã“ã§æœ€åˆã®ã‚µãƒ¼ãƒãƒ¼ã‚’追加ã—ã¾ã™ã€‚プライマリ ストレージã¯ã€ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼å†…ã®ãƒ›ã‚¹ãƒˆä¸Šã§å‹•ä½œã™ã‚‹ã™ã¹ã¦ã® VM ã®ãƒ‡ã‚£ã‚¹ã‚¯ ボリュームを格ç´ã—ã¾ã™ã€‚基礎ã¨ãªã‚‹ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã§ã‚µãƒãƒ¼ãƒˆã•ã‚Œã‚‹ã€æ¨™æº–ã«æº–æ‹ ã—ãŸãƒ—ロトコルを使用ã—ã¦ãã ã•ã„。 -message.desc.secondary.storage=å„ゾーンã«ã¯å°‘ãªãã¨ã‚‚ 1 ã¤ã€NFS ã¤ã¾ã‚Šã‚»ã‚«ãƒ³ãƒ€ãƒª ストレージ サーãƒãƒ¼ãŒå¿…è¦ã§ã™ã€‚今ã“ã“ã§æœ€åˆã®ã‚µãƒ¼ãƒãƒ¼ã‚’追加ã—ã¾ã™ã€‚セカンダリ ストレージ㯠VM テンプレートã€ISO イメージã€ãŠã‚ˆã³VM ディスク ボリュームã®ã‚¹ãƒŠãƒƒãƒ—ショットを格ç´ã—ã¾ã™ã€‚ã“ã®ã‚µãƒ¼ãƒãƒ¼ã¯ã‚¾ãƒ¼ãƒ³å†…ã®ã™ã¹ã¦ã®ãƒ›ã‚¹ãƒˆã§ä½¿ç”¨ã§ãã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚

IP アドレスã¨ã‚¨ã‚¯ã‚¹ãƒãƒ¼ãƒˆã•ã‚ŒãŸãƒ‘スを入力ã—ã¦ãã ã•ã„。 -label.launch.zone=ゾーンã®èµ·å‹• -message.please.wait.while.zone.is.being.created=ゾーンãŒä½œæˆã•ã‚Œã‚‹ã¾ã§ã—ã°ã‚‰ããŠå¾…ã¡ãã ã•ã„... - -label.load.balancing=è² è·åˆ†æ•£ -label.static.nat.enabled=é™çš„ NAT 有効 -label.zones=ゾーン -label.view.more=詳細表示 -label.number.of.zones=ゾーン数 -label.number.of.pods=ãƒãƒƒãƒ‰æ•° -label.number.of.clusters=クラスター数 -label.number.of.hosts=ホスト数 -label.total.hosts=ホストåˆè¨ˆ -label.total.CPU=CPU åˆè¨ˆ -label.total.memory=メモリåˆè¨ˆ -label.total.storage=ストレージåˆè¨ˆ -label.purpose=目的 - - - - -label.action.migrate.router=ルーターã®ç§»è¡Œ -label.action.migrate.router.processing=ルーターを移行ã—ã¦ã„ã¾ã™... -message.migrate.router.confirm=ルーターã®ç§»è¡Œå…ˆã¯æ¬¡ã®ãƒ›ã‚¹ãƒˆã§ã‚ˆã‚ã—ã„ã§ã™ã‹? -label.migrate.router.to=ルーターã®ç§»è¡Œå…ˆ: - -label.action.migrate.systemvm=システム VM ã®ç§»è¡Œ -label.action.migrate.systemvm.processing=システム VM を移行ã—ã¦ã„ã¾ã™... -message.migrate.systemvm.confirm=システム VM ã®ç§»è¡Œå…ˆã¯æ¬¡ã®ãƒ›ã‚¹ãƒˆã§ã‚ˆã‚ã—ã„ã§ã™ã‹? -label.migrate.systemvm.to=システム VM ã®ç§»è¡Œå…ˆ: - - -mode=モード -side.by.side=並列 -inline=直列 - -extractable=抽出å¯èƒ½ - -label.ocfs2=OCFS2 - -label.action.edit.host=ホストã®ç·¨é›† - -network.rate=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯é€Ÿåº¦ - -ICMP.type=ICMP ã®ç¨®é¡ž -ICMP.code=ICMP コード - -image.directory=ç”»åƒãƒ‡ã‚£ãƒ¬ã‚¯ãƒˆãƒª - -label.action.create.template.from.vm=VM ã‹ã‚‰ã®ãƒ†ãƒ³ãƒ—ãƒ¬ãƒ¼ãƒˆä½œæˆ -label.action.create.template.from.volume=ボリュームã‹ã‚‰ã®ãƒ†ãƒ³ãƒ—ãƒ¬ãƒ¼ãƒˆä½œæˆ - -message.vm.create.template.confirm=テンプレートを作æˆã™ã‚‹ã¨ VM ãŒè‡ªå‹•çš„ã«å†èµ·å‹•ã•ã‚Œã¾ã™ã€‚ - -label.action.manage.cluster=クラスターã®ç®¡ç†å¯¾è±¡åŒ– -message.action.manage.cluster=クラスターを管ç†å¯¾è±¡ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.action.manage.cluster.processing=クラスターを管ç†å¯¾è±¡ã«ã—ã¦ã„ã¾ã™... - -label.action.unmanage.cluster=クラスターã®éžç®¡ç†å¯¾è±¡åŒ– -message.action.unmanage.cluster=クラスターをéžç®¡ç†å¯¾è±¡ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.action.unmanage.cluster.processing=クラスターをéžç®¡ç†å¯¾è±¡ã«ã—ã¦ã„ã¾ã™... - -label.allocation.state=割り当ã¦çŠ¶æ…‹ -managed.state=管ç†å¯¾è±¡çŠ¶æ…‹ - -label.default.use=デフォルト使用 -label.host.tags=ホスト ã‚¿ã‚° - +changed.item.properties=\u9805\u76EE\u306E\u30D7\u30ED\u30D1\u30C6\u30A3\u306E\u5909\u66F4 +confirm.enable.s3=S3\u57fa\u76e4\u30bb\u30ab\u30f3\u30c0\u30ea\u30b9\u30c8\u30ec\u30fc\u30b8\u3092\u6709\u52b9\u5316\u3059\u308b\u305f\u3081\u306b\u306f\u3001\u4ee5\u4e0b\u306e\u60c5\u5831\u3092\u5165\u529b\u3057\u3066\u304f\u3060\u3055\u3044 +confirm.enable.swift=Swift1 \u306E\u30B5\u30DD\u30FC\u30C8\u3092\u6709\u52B9\u306B\u3059\u308B\u306B\u306F\u3001\u6B21\u306E\u60C5\u5831\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +error.could.not.enable.zone=\u30BE\u30FC\u30F3\u3092\u6709\u52B9\u306B\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F +error.installWizard.message=\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u623B\u3063\u3066\u30A8\u30E9\u30FC\u3092\u4FEE\u6B63\u3067\u304D\u307E\u3059\u3002 +error.invalid.username.password=\u7121\u52B9\u306A\u30E6\u30FC\u30B6\u30FC\u540D\u307E\u305F\u306F\u30D1\u30B9\u30EF\u30FC\u30C9 +error.login=\u30E6\u30FC\u30B6\u30FC\u540D/\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u8A18\u9332\u3068\u4E00\u81F4\u3057\u307E\u305B\u3093\u3002 +error.menu.select=\u00e3\u0082\u00a2\u00e3\u0082\u00a4\u00e3\u0083\u0086\u00e3\u0083\u00a0\u00e3\u0081\u008c\u00e9\u0081\u00b8\u00e6\u008a\u009e\u00e3\u0081\u0095\u00e3\u0082\u008c\u00e3\u0081\u00a6\u00e3\u0081\u0084\u00e3\u0081\u00aa\u00e3\u0081\u0084\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0082\u00a2\u00e3\u0082\u00af\u00e3\u0082\u00b7\u00e3\u0083\u00a7\u00e3\u0083\u00b3\u00e3\u0082\u0092\u00e5\u00ae\u009f\u00e8\u00a1\u008c\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u0093\u00e3\u0081\u00a8\u00e3\u0081\u008c\u00e3\u0081\u00a7\u00e3\u0081\u008d\u00e3\u0081\u00be\u00e3\u0081\u009b\u00e3\u0082\u0093 +error.mgmt.server.inaccessible=\u7BA1\u7406\u30B5\u30FC\u30D0\u30FC\u306B\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u305B\u3093\u3002\u5F8C\u3067\u518D\u5B9F\u884C\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +error.password.not.match=\u30D1\u30B9\u30EF\u30FC\u30C9\u304C\u4E00\u81F4\u3057\u307E\u305B\u3093 +error.please.specify.physical.network.tags=\u3053\u306E\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u30BF\u30B0\u3092\u6307\u5B9A\u3057\u306A\u3051\u308C\u3070\u3001\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093\u3002 +error.session.expired=\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u6709\u52B9\u671F\u9650\u304C\u5207\u308C\u307E\u3057\u305F\u3002 +error.something.went.wrong.please.correct.the.following=\u554F\u984C\u304C\u767A\u751F\u3057\u307E\u3057\u305F\u3002\u6B21\u306E\u5185\u5BB9\u3092\u4FEE\u6B63\u3057\u3066\u304F\u3060\u3055\u3044 +error.unable.to.reach.management.server=\u7BA1\u7406\u30B5\u30FC\u30D0\u30FC\u3068\u901A\u4FE1\u3067\u304D\u307E\u305B\u3093 +error.unresolved.internet.name=\u3042\u306a\u305f\u306e\u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u540d\u306f\u89e3\u6c7a\u3055\u308c\u307e\u305b\u3093\u3067\u3057\u305f\u3002 +extractable=\u62BD\u51FA\u53EF\u80FD +force.delete.domain.warning=\u8B66\u544A\: \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u3059\u3079\u3066\u306E\u5B50\u30C9\u30E1\u30A4\u30F3\u304A\u3088\u3073\u95A2\u9023\u3059\u308B\u3059\u3079\u3066\u306E\u30A2\u30AB\u30A6\u30F3\u30C8\u3068\u305D\u306E\u30EA\u30BD\u30FC\u30B9\u304C\u524A\u9664\u3055\u308C\u307E\u3059\u3002 +force.delete=\u5F37\u5236\u524A\u9664 +force.remove.host.warning=\u8B66\u544A\: \u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u5B9F\u884C\u4E2D\u306E\u3059\u3079\u3066\u306E\u4EEE\u60F3\u30DE\u30B7\u30F3\u304C\u5F37\u5236\u7684\u306B\u505C\u6B62\u3055\u308C\u3001\u30AF\u30E9\u30B9\u30BF\u30FC\u304B\u3089\u3053\u306E\u30DB\u30B9\u30C8\u304C\u5F37\u5236\u7684\u306B\u89E3\u9664\u3055\u308C\u307E\u3059\u3002 +force.remove=\u5F37\u5236\u89E3\u9664 +force.stop.instance.warning=\u8B66\u544A\: \u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u5F37\u5236\u505C\u6B62\u306F\u3001\u6700\u7D42\u624B\u6BB5\u306B\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30C7\u30FC\u30BF\u3092\u640D\u5931\u3059\u308B\u3060\u3051\u3067\u306A\u304F\u3001\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u52D5\u4F5C\u304C\u4E00\u8CAB\u3057\u306A\u304F\u306A\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 +force.stop=\u5F37\u5236\u505C\u6B62 +ICMP.code=ICMP \u30B3\u30FC\u30C9 +ICMP.type=ICMP \u306E\u7A2E\u985E +image.directory=\u753B\u50CF\u30C7\u30A3\u30EC\u30AF\u30C8\u30EA +inline=\u76F4\u5217 +instances.actions.reboot.label=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u518D\u8D77\u52D5 +label.accept.project.invitation=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3078\u306E\u62DB\u5F85\u306E\u627F\u8AFE +label.account.and.security.group=\u30A2\u30AB\u30A6\u30F3\u30C8\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7 +label.account.id=\u30A2\u30AB\u30A6\u30F3\u30C8 ID +label.account.name=\u30A2\u30AB\u30A6\u30F3\u30C8\u540D +label.account.specific=\u30A2\u30AB\u30A6\u30F3\u30C8\u56FA\u6709 +label.accounts=\u30A2\u30AB\u30A6\u30F3\u30C8 +label.account=\u30A2\u30AB\u30A6\u30F3\u30C8 +label.acquire.new.ip=\u65B0\u3057\u3044 IP \u30A2\u30C9\u30EC\u30B9\u306E\u53D6\u5F97 +label.action.attach.disk.processing=\u30C7\u30A3\u30B9\u30AF\u3092\u30A2\u30BF\u30C3\u30C1\u3057\u3066\u3044\u307E\u3059... +label.action.attach.disk=\u30C7\u30A3\u30B9\u30AF\u306E\u30A2\u30BF\u30C3\u30C1 +label.action.attach.iso=ISO \u306E\u30A2\u30BF\u30C3\u30C1 +label.action.attach.iso.processing=ISO \u3092\u30A2\u30BF\u30C3\u30C1\u3057\u3066\u3044\u307E\u3059... +label.action.cancel.maintenance.mode.processing=\u4FDD\u5B88\u30E2\u30FC\u30C9\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u3066\u3044\u307E\u3059... +label.action.cancel.maintenance.mode=\u4FDD\u5B88\u30E2\u30FC\u30C9\u306E\u30AD\u30E3\u30F3\u30BB\u30EB +label.action.change.password=\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u5909\u66F4 +label.action.change.service.processing=\u30B5\u30FC\u30D3\u30B9\u3092\u5909\u66F4\u3057\u3066\u3044\u307E\u3059... +label.action.change.service=\u30B5\u30FC\u30D3\u30B9\u306E\u5909\u66F4 +label.action.copy.ISO=ISO \u306E\u30B3\u30D4\u30FC +label.action.copy.ISO.processing=ISO \u3092\u30B3\u30D4\u30FC\u3057\u3066\u3044\u307E\u3059... +label.action.copy.template.processing=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u30B3\u30D4\u30FC\u3057\u3066\u3044\u307E\u3059... +label.action.copy.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u30B3\u30D4\u30FC +label.action.create.template.from.vm=VM \u304B\u3089\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u4F5C\u6210 +label.action.create.template.from.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u304B\u3089\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u4F5C\u6210 +label.action.create.template.processing=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059... +label.action.create.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u4F5C\u6210 +label.action.create.vm.processing=VM \u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059... +label.action.create.vm=VM \u306E\u4F5C\u6210 +label.action.create.volume.processing=\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059... +label.action.create.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u4F5C\u6210 +label.action.delete.account.processing=\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u524A\u9664 +label.action.delete.cluster.processing=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u524A\u9664 +label.action.delete.disk.offering.processing=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.disk.offering=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u524A\u9664 +label.action.delete.domain.processing=\u30C9\u30E1\u30A4\u30F3\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.domain=\u30C9\u30E1\u30A4\u30F3\u306E\u524A\u9664 +label.action.delete.firewall.processing=\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.firewall=\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u898F\u5247\u306E\u524A\u9664 +label.action.delete.ingress.rule.processing=\u53D7\u4FE1\u898F\u5247\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.ingress.rule=\u53D7\u4FE1\u898F\u5247\u306E\u524A\u9664 +label.action.delete.IP.range=IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u306E\u524A\u9664 +label.action.delete.IP.range.processing=IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.ISO=ISO \u306E\u524A\u9664 +label.action.delete.ISO.processing=ISO \u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.load.balancer.processing=\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.load.balancer=\u8CA0\u8377\u5206\u6563\u898F\u5247\u306E\u524A\u9664 +label.action.delete.network.processing=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.network=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u524A\u9664 +label.action.delete.nexusVswitch=Nexus 1000V \u306E\u524A\u9664 +label.action.delete.physical.network=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u524A\u9664 +label.action.delete.pod.processing=\u30DD\u30C3\u30C9\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.pod=\u30DD\u30C3\u30C9\u306E\u524A\u9664 +label.action.delete.primary.storage.processing=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.primary.storage=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u524A\u9664 +label.action.delete.secondary.storage.processing=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.secondary.storage=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u524A\u9664 +label.action.delete.security.group.processing=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.security.group=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u306E\u524A\u9664 +label.action.delete.service.offering.processing=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.service.offering=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u524A\u9664 +label.action.delete.snapshot.processing=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.snapshot=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306E\u524A\u9664 +label.action.delete.system.service.offering=\u30B7\u30B9\u30C6\u30E0 \u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u524A\u9664 +label.action.delete.template.processing=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u524A\u9664 +label.action.delete.user.processing=\u30E6\u30FC\u30B6\u30FC\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.user=\u30E6\u30FC\u30B6\u30FC\u306E\u524A\u9664 +label.action.delete.volume.processing=\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u524A\u9664 +label.action.delete.zone.processing=\u30BE\u30FC\u30F3\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.delete.zone=\u30BE\u30FC\u30F3\u306E\u524A\u9664 +label.action.destroy.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u7834\u68C4\u3057\u3066\u3044\u307E\u3059... +label.action.destroy.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u7834\u68C4 +label.action.destroy.systemvm.processing=\u30B7\u30B9\u30C6\u30E0 VM \u3092\u7834\u68C4\u3057\u3066\u3044\u307E\u3059... +label.action.destroy.systemvm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u7834\u68C4 +label.action.detach.disk.processing=\u30C7\u30A3\u30B9\u30AF\u3092\u30C7\u30BF\u30C3\u30C1\u3057\u3066\u3044\u307E\u3059... +label.action.detach.disk=\u30C7\u30A3\u30B9\u30AF\u306E\u30C7\u30BF\u30C3\u30C1 +label.action.detach.iso=ISO \u306E\u30C7\u30BF\u30C3\u30C1 +label.action.detach.iso.processing=ISO \u3092\u30C7\u30BF\u30C3\u30C1\u3057\u3066\u3044\u307E\u3059... +label.action.disable.account.processing=\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.disable.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u7121\u52B9\u5316 +label.action.disable.cluster.processing=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.disable.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u7121\u52B9\u5316 +label.action.disable.nexusVswitch=Nexus 1000V \u306E\u7121\u52B9\u5316 +label.action.disable.physical.network=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u7121\u52B9\u5316 +label.action.disable.pod.processing=\u30DD\u30C3\u30C9\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.disable.pod=\u30DD\u30C3\u30C9\u306E\u7121\u52B9\u5316 +label.action.disable.static.NAT.processing=\u9759\u7684 NAT \u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.disable.static.NAT=\u9759\u7684 NAT \u306E\u7121\u52B9\u5316 +label.action.disable.user.processing=\u30E6\u30FC\u30B6\u30FC\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.disable.user=\u30E6\u30FC\u30B6\u30FC\u306E\u7121\u52B9\u5316 +label.action.disable.zone.processing=\u30BE\u30FC\u30F3\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.disable.zone=\u30BE\u30FC\u30F3\u306E\u7121\u52B9\u5316 +label.action.download.ISO=ISO \u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9 +label.action.download.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9 +label.action.download.volume.processing=\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u3044\u307E\u3059... +label.action.download.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9 +label.action.edit.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u7DE8\u96C6 +label.action.edit.disk.offering=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u7DE8\u96C6 +label.action.edit.domain=\u30C9\u30E1\u30A4\u30F3\u306E\u7DE8\u96C6 +label.action.edit.global.setting=\u30B0\u30ED\u30FC\u30D0\u30EB\u8A2D\u5B9A\u306E\u7DE8\u96C6 +label.action.edit.host=\u30DB\u30B9\u30C8\u306E\u7DE8\u96C6 +label.action.edit.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u7DE8\u96C6 +label.action.edit.ISO=ISO \u306E\u7DE8\u96C6 +label.action.edit.network.offering=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u7DE8\u96C6 +label.action.edit.network.processing=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u7DE8\u96C6\u3057\u3066\u3044\u307E\u3059... +label.action.edit.network=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u7DE8\u96C6 +label.action.edit.pod=\u30DD\u30C3\u30C9\u306E\u7DE8\u96C6 +label.action.edit.primary.storage=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u7DE8\u96C6 +label.action.edit.resource.limits=\u30EA\u30BD\u30FC\u30B9\u5236\u9650\u306E\u7DE8\u96C6 +label.action.edit.service.offering=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u7DE8\u96C6 +label.action.edit.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u7DE8\u96C6 +label.action.edit.user=\u30E6\u30FC\u30B6\u30FC\u306E\u7DE8\u96C6 +label.action.edit.zone=\u30BE\u30FC\u30F3\u306E\u7DE8\u96C6 +label.action.enable.account.processing=\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.enable.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u6709\u52B9\u5316 +label.action.enable.cluster.processing=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.enable.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u6709\u52B9\u5316 +label.action.enable.maintenance.mode.processing=\u4FDD\u5B88\u30E2\u30FC\u30C9\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.enable.maintenance.mode=\u4FDD\u5B88\u30E2\u30FC\u30C9\u306E\u6709\u52B9\u5316 +label.action.enable.nexusVswitch=Nexus 1000V \u306E\u6709\u52B9\u5316 +label.action.enable.physical.network=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u6709\u52B9\u5316 +label.action.enable.pod.processing=\u30DD\u30C3\u30C9\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.enable.pod=\u30DD\u30C3\u30C9\u306E\u6709\u52B9\u5316 +label.action.enable.static.NAT.processing=\u9759\u7684 NAT \u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.enable.static.NAT=\u9759\u7684 NAT \u306E\u6709\u52B9\u5316 +label.action.enable.user.processing=\u30E6\u30FC\u30B6\u30FC\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.enable.user=\u30E6\u30FC\u30B6\u30FC\u306E\u6709\u52B9\u5316 +label.action.enable.zone.processing=\u30BE\u30FC\u30F3\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.enable.zone=\u30BE\u30FC\u30F3\u306E\u6709\u52B9\u5316 +label.action.force.reconnect.processing=\u518D\u63A5\u7D9A\u3057\u3066\u3044\u307E\u3059... +label.action.force.reconnect=\u5F37\u5236\u518D\u63A5\u7D9A +label.action.generate.keys.processing=\u30AD\u30FC\u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059... +label.action.generate.keys=\u30AD\u30FC\u306E\u751F\u6210 +label.action.list.nexusVswitch=Nexus 1000V \u306E\u4E00\u89A7\u8868\u793A +label.action.lock.account.processing=\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u30ED\u30C3\u30AF\u3057\u3066\u3044\u307E\u3059... +label.action.lock.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u30ED\u30C3\u30AF +label.action.manage.cluster.processing=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u7BA1\u7406\u5BFE\u8C61\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.manage.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u7BA1\u7406\u5BFE\u8C61\u5316 +label.action.migrate.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u79FB\u884C\u3057\u3066\u3044\u307E\u3059... +label.action.migrate.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u79FB\u884C +label.action.migrate.router.processing=\u30EB\u30FC\u30BF\u30FC\u3092\u79FB\u884C\u3057\u3066\u3044\u307E\u3059... +label.action.migrate.router=\u30EB\u30FC\u30BF\u30FC\u306E\u79FB\u884C +label.action.migrate.systemvm.processing=\u30B7\u30B9\u30C6\u30E0 VM \u3092\u79FB\u884C\u3057\u3066\u3044\u307E\u3059... +label.action.migrate.systemvm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u79FB\u884C +label.action.reboot.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u518D\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059... +label.action.reboot.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u518D\u8D77\u52D5 +label.action.reboot.router.processing=\u30EB\u30FC\u30BF\u30FC\u3092\u518D\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059... +label.action.reboot.router=\u30EB\u30FC\u30BF\u30FC\u306E\u518D\u8D77\u52D5 +label.action.reboot.systemvm.processing=\u30B7\u30B9\u30C6\u30E0 VM \u3092\u518D\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059... +label.action.reboot.systemvm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u518D\u8D77\u52D5 +label.action.recurring.snapshot=\u5B9A\u671F\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8 +label.action.register.iso=ISO \u306E\u767B\u9332 +label.action.register.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u767B\u9332 +label.action.release.ip=IP \u30A2\u30C9\u30EC\u30B9\u306E\u89E3\u653E +label.action.release.ip.processing=IP \u30A2\u30C9\u30EC\u30B9\u3092\u89E3\u653E\u3057\u3066\u3044\u307E\u3059... +label.action.remove.host.processing=\u30DB\u30B9\u30C8\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.action.remove.host=\u30DB\u30B9\u30C8\u306E\u524A\u9664 +label.action.reset.password.processing=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u3044\u307E\u3059... +label.action.reset.password=\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u30EA\u30BB\u30C3\u30C8 +label.action.resource.limits=\u30EA\u30BD\u30FC\u30B9\u5236\u9650 +label.action.restore.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u5FA9\u5143\u3057\u3066\u3044\u307E\u3059... +label.action.restore.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u5FA9\u5143 +label.action.start.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059... +label.action.start.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u8D77\u52D5 +label.action.start.router.processing=\u30EB\u30FC\u30BF\u30FC\u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059... +label.action.start.router=\u30EB\u30FC\u30BF\u30FC\u306E\u8D77\u52D5 +label.action.start.systemvm.processing=\u30B7\u30B9\u30C6\u30E0 VM \u3092\u8D77\u52D5\u3057\u3066\u3044\u307E\u3059... +label.action.start.systemvm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u8D77\u52D5 +label.action.stop.instance.processing=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u505C\u6B62\u3057\u3066\u3044\u307E\u3059... +label.action.stop.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u505C\u6B62 +label.action.stop.router.processing=\u30EB\u30FC\u30BF\u30FC\u3092\u505C\u6B62\u3057\u3066\u3044\u307E\u3059... +label.action.stop.router=\u30EB\u30FC\u30BF\u30FC\u306E\u505C\u6B62 +label.action.stop.systemvm.processing=\u30B7\u30B9\u30C6\u30E0 VM \u3092\u505C\u6B62\u3057\u3066\u3044\u307E\u3059... +label.action.stop.systemvm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u505C\u6B62 +label.actions=\u64CD\u4F5C +label.action.take.snapshot.processing=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059.... +label.action.take.snapshot=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306E\u4F5C\u6210 +label.action.unmanage.cluster.processing=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u975E\u7BA1\u7406\u5BFE\u8C61\u306B\u3057\u3066\u3044\u307E\u3059... +label.action.unmanage.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u975E\u7BA1\u7406\u5BFE\u8C61\u5316 +label.action.update.OS.preference=OS \u57FA\u672C\u8A2D\u5B9A\u306E\u66F4\u65B0 +label.action.update.OS.preference.processing=OS \u57FA\u672C\u8A2D\u5B9A\u3092\u66F4\u65B0\u3057\u3066\u3044\u307E\u3059... +label.action.update.resource.count.processing=\u30EA\u30BD\u30FC\u30B9\u6570\u3092\u66F4\u65B0\u3057\u3066\u3044\u307E\u3059... +label.action.update.resource.count=\u30EA\u30BD\u30FC\u30B9\u6570\u306E\u66F4\u65B0 +label.activate.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u30A2\u30AF\u30C6\u30A3\u30D6\u5316 +label.active.sessions=\u30A2\u30AF\u30C6\u30A3\u30D6\u306A\u30BB\u30C3\u30B7\u30E7\u30F3 +label.add.accounts.to=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u8FFD\u52A0\u5148\: +label.add.accounts=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u8FFD\u52A0 +label.add.account.to.project=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3078\u306E\u8FFD\u52A0 +label.add.account=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u8FFD\u52A0 +label.add.ACL=ACL \u306E\u8FFD\u52A0 +label.add.by.cidr=CIDR \u3067\u8FFD\u52A0 +label.add.by.group=\u30B0\u30EB\u30FC\u30D7\u3067\u8FFD\u52A0 +label.add.by=\u8FFD\u52A0\u5358\u4F4D +label.add.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u8FFD\u52A0 +label.add.compute.offering=\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u8FFD\u52A0 +label.add.direct.iprange=\u76F4\u63A5 IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u306E\u8FFD\u52A0 +label.add.disk.offering=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u8FFD\u52A0 +label.add.domain=\u30C9\u30E1\u30A4\u30F3\u306E\u8FFD\u52A0 +label.add.egress.rule=\u9001\u4FE1\u898F\u5247\u306E\u8FFD\u52A0 +label.add.F5.device=F5 \u30C7\u30D0\u30A4\u30B9\u306E\u8FFD\u52A0 +label.add.firewall=\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u898F\u5247\u306E\u8FFD\u52A0 +label.add.guest.network=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8FFD\u52A0 +label.add.host=\u30DB\u30B9\u30C8\u306E\u8FFD\u52A0 +label.adding.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059 +label.adding.failed=\u8FFD\u52A0\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F +label.adding.pod=\u30DD\u30C3\u30C9\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059 +label.adding.processing=\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059... +label.add.ingress.rule=\u53D7\u4FE1\u898F\u5247\u306E\u8FFD\u52A0 +label.adding.succeeded=\u8FFD\u52A0\u3057\u307E\u3057\u305F +label.adding=\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059 +label.adding.user=\u30E6\u30FC\u30B6\u30FC\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059 +label.adding.zone=\u30BE\u30FC\u30F3\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059 +label.add.ip.range=IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u306E\u8FFD\u52A0 +label.additional.networks=\u8FFD\u52A0\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.add.load.balancer=\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u306E\u8FFD\u52A0 +label.add.more=\u305D\u306E\u307B\u304B\u306E\u9805\u76EE\u306E\u8FFD\u52A0 +label.add.netScaler.device=Netscaler \u30C7\u30D0\u30A4\u30B9\u306E\u8FFD\u52A0 +label.add.network.ACL=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ACL \u306E\u8FFD\u52A0 +label.add.network.device=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30C7\u30D0\u30A4\u30B9\u306E\u8FFD\u52A0 +label.add.network.offering=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u8FFD\u52A0 +label.add.network=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8FFD\u52A0 +label.add.new.F5=\u65B0\u3057\u3044 F5 \u306E\u8FFD\u52A0 +label.add.new.gateway=\u65B0\u3057\u3044\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u8FFD\u52A0 +label.add.new.NetScaler=\u65B0\u3057\u3044 NetScaler \u306E\u8FFD\u52A0 +label.add.new.SRX=\u65B0\u3057\u3044 SRX \u306E\u8FFD\u52A0 +label.add.new.tier=\u65B0\u3057\u3044\u968E\u5C64\u306E\u8FFD\u52A0 +label.add.NiciraNvp.device=NVP\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u8ffd\u52a0 +label.add.physical.network=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8FFD\u52A0 +label.add.pod=\u30DD\u30C3\u30C9\u306E\u8FFD\u52A0 +label.add.port.forwarding.rule=\u30DD\u30FC\u30C8\u8EE2\u9001\u898F\u5247\u306E\u8FFD\u52A0 +label.add.primary.storage=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u8FFD\u52A0 +label.add.resources=\u30EA\u30BD\u30FC\u30B9\u306E\u8FFD\u52A0 +label.add.route=\u30EB\u30FC\u30C8\u306E\u8FFD\u52A0 +label.add.rule=\u898F\u5247\u306E\u8FFD\u52A0 +label.add.secondary.storage=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u8FFD\u52A0 +label.add.security.group=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u306E\u8FFD\u52A0 +label.add.service.offering=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u8FFD\u52A0 +label.add.SRX.device=SRX \u30C7\u30D0\u30A4\u30B9\u306E\u8FFD\u52A0 +label.add.static.nat.rule=\u9759\u7684 NAT \u898F\u5247\u306E\u8FFD\u52A0 +label.add.static.route=\u9759\u7684\u30EB\u30FC\u30C8\u306E\u8FFD\u52A0 +label.add.system.service.offering=\u30B7\u30B9\u30C6\u30E0 \u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u8FFD\u52A0 +label.add.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u8FFD\u52A0 +label.add.to.group=\u30B0\u30EB\u30FC\u30D7\u3078\u306E\u8FFD\u52A0 +label.add=\u8FFD\u52A0 +label.add.user=\u30E6\u30FC\u30B6\u30FC\u306E\u8FFD\u52A0 +label.add.vlan=VLAN \u306E\u8FFD\u52A0 +label.add.vms.to.lb=\u8CA0\u8377\u5206\u6563\u898F\u5247\u3078\u306E VM \u306E\u8FFD\u52A0 +label.add.vms=VM \u306E\u8FFD\u52A0 +label.add.VM.to.tier=\u968E\u5C64\u3078\u306E VM \u306E\u8FFD\u52A0 +label.add.vm=VM \u306E\u8FFD\u52A0 +label.add.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u8FFD\u52A0 +label.add.vpc=VPC \u306E\u8FFD\u52A0 +label.add.vpn.customer.gateway=VPN \u30AB\u30B9\u30BF\u30DE\u30FC \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u8FFD\u52A0 +label.add.VPN.gateway=VPN \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u8FFD\u52A0 +label.add.vpn.user=VPN \u30E6\u30FC\u30B6\u30FC\u306E\u8FFD\u52A0 +label.add.zone=\u30BE\u30FC\u30F3\u306E\u8FFD\u52A0 +label.admin.accounts=\u7BA1\u7406\u8005\u30A2\u30AB\u30A6\u30F3\u30C8 +label.admin=\u7BA1\u7406\u8005 +label.advanced.mode=\u62E1\u5F35\u30E2\u30FC\u30C9 +label.advanced.search=\u9AD8\u5EA6\u306A\u691C\u7D22 +label.advanced=\u62E1\u5F35 +label.agent.password=\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8 \u30D1\u30B9\u30EF\u30FC\u30C9 +label.agent.username=\u30A8\u30FC\u30B8\u30A7\u30F3\u30C8 \u30E6\u30FC\u30B6\u30FC\u540D +label.agree=\u540C\u610F\u3059\u308B +label.alert=\u30A2\u30E9\u30FC\u30C8 +label.algorithm=\u30A2\u30EB\u30B4\u30EA\u30BA\u30E0 +label.allocated=\u5272\u308A\u5F53\u3066\u6E08\u307F +label.allocation.state=\u5272\u308A\u5F53\u3066\u72B6\u614B +label.api.key=API \u30AD\u30FC +label.apply=\u9069\u7528 +label.assign.to.load.balancer=\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u5272\u308A\u5F53\u3066\u3066\u3044\u307E\u3059 +label.assign=\u5272\u308A\u5F53\u3066 +label.associated.network.id=\u95A2\u9023\u3065\u3051\u3089\u308C\u305F\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ID +label.associated.network=\u95A2\u9023\u3065\u3051\u3089\u308C\u305F\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.attached.iso=\u30A2\u30BF\u30C3\u30C1\u3055\u308C\u305F ISO +label.availability=\u53EF\u7528\u6027 +label.availability.zone=\u5229\u7528\u53EF\u80FD\u30BE\u30FC\u30F3 +label.available.public.ips=\u4F7F\u7528\u3067\u304D\u308B\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9 +label.available=\u4F7F\u7528\u53EF\u80FD +label.back=\u623B\u308B +label.bandwidth=\u5E2F\u57DF\u5E45 +label.basic.mode=\u57FA\u672C\u30E2\u30FC\u30C9 +label.basic=\u57FA\u672C +label.bootable=\u8D77\u52D5\u53EF\u80FD +label.broadcast.domain.range=\u30D6\u30ED\u30FC\u30C9\u30AD\u30E3\u30B9\u30C8 \u30C9\u30E1\u30A4\u30F3\u306E\u7BC4\u56F2 +label.broadcast.domain.type=\u30D6\u30ED\u30FC\u30C9\u30AD\u30E3\u30B9\u30C8 \u30C9\u30E1\u30A4\u30F3\u306E\u7A2E\u985E +label.broadcast.uri=Broadcast URI +label.by.account=\u30A2\u30AB\u30A6\u30F3\u30C8 +label.by.availability=\u53EF\u7528\u6027 +label.by.domain=\u30C9\u30E1\u30A4\u30F3 +label.by.end.date=\u7D42\u4E86\u65E5 +label.by.level=\u30EC\u30D9\u30EB +label.by.pod=\u30DD\u30C3\u30C9 +label.by.role=\u5F79\u5272 +label.by.start.date=\u958B\u59CB\u65E5 +label.by.state=\u72B6\u614B +label.bytes.received=\u53D7\u4FE1\u30D0\u30A4\u30C8 +label.bytes.sent=\u9001\u4FE1\u30D0\u30A4\u30C8 +label.by.traffic.type=\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7A2E\u985E +label.by.type.id=\u7A2E\u985E ID +label.by.type=\u7A2E\u985E +label.by.zone=\u30BE\u30FC\u30F3 +label.cancel=\u30AD\u30E3\u30F3\u30BB\u30EB +label.capacity=\u51E6\u7406\u80FD\u529B +label.certificate=\u8A3C\u660E\u66F8 +label.change.service.offering=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u5909\u66F4 +label.change.value=\u5024\u306E\u5909\u66F4 +label.character=\u6587\u5B57 +label.checksum=MD5 \u30C1\u30A7\u30C3\u30AF\u30B5\u30E0 +label.cidr.account=CIDR \u307E\u305F\u306F\u30A2\u30AB\u30A6\u30F3\u30C8/\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7 label.cidr=CIDR -label.cidr.list=é€ä¿¡å…ƒ CIDR - -label.storage.tags=ストレージ ã‚¿ã‚° - -label.redundant.router=冗長ルーター -label.is.redundant.router=冗長 - -force.delete=強制削除 -force.delete.domain.warning=警告: ã“ã®ã‚ªãƒ—ションをé¸æŠžã™ã‚‹ã¨ã€ã™ã¹ã¦ã®å­ãƒ‰ãƒ¡ã‚¤ãƒ³ãŠã‚ˆã³é–¢é€£ã™ã‚‹ã™ã¹ã¦ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã¨ãã®ãƒªã‚½ãƒ¼ã‚¹ãŒå‰Šé™¤ã•ã‚Œã¾ã™ã€‚ - -force.remove=強制解除 -force.remove.host.warning=警告: ã“ã®ã‚ªãƒ—ションをé¸æŠžã™ã‚‹ã¨ã€å®Ÿè¡Œä¸­ã®ã™ã¹ã¦ã®ä»®æƒ³ãƒžã‚·ãƒ³ãŒå¼·åˆ¶çš„ã«åœæ­¢ã•ã‚Œã€ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã‹ã‚‰ã“ã®ãƒ›ã‚¹ãƒˆãŒå¼·åˆ¶çš„ã«è§£é™¤ã•ã‚Œã¾ã™ã€‚ - -force.stop=強制åœæ­¢ -force.stop.instance.warning=警告: インスタンスã®å¼·åˆ¶åœæ­¢ã¯ã€æœ€çµ‚手段ã«ã—ã¦ãã ã•ã„。データをæ失ã™ã‚‹ã ã‘ã§ãªãã€ä»®æƒ³ãƒžã‚·ãƒ³ã®å‹•ä½œãŒä¸€è²«ã—ãªããªã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ - -label.PreSetup=PreSetup -label.SR.name = SR åラベル -label.SharedMountPoint=SharedMountPoint +label.CIDR.list=CIDR \u4E00\u89A7 +label.cidr.list=\u9001\u4FE1\u5143 CIDR +label.CIDR.of.destination.network=\u5B9B\u5148\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E CIDR +label.clean.up=\u30AF\u30EA\u30FC\u30F3 \u30A2\u30C3\u30D7 +label.clear.list=\u4E00\u89A7\u306E\u6D88\u53BB +label.close=\u9589\u3058\u308B +label.cloud.console=\u30AF\u30E9\u30A6\u30C9\u7BA1\u7406\u30B3\u30F3\u30BD\u30FC\u30EB +label.cloud.managed=Cloud.com \u306B\u3088\u308B\u7BA1\u7406 +label.cluster.name=\u30AF\u30E9\u30B9\u30BF\u30FC\u540D +label.clusters=\u30AF\u30E9\u30B9\u30BF\u30FC +label.cluster.type=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u7A2E\u985E +label.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC label.clvm=CLVM -label.volgroup=ボリューム グループ -label.VMFS.datastore=VMFS データストア - -label.network.device=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ デãƒã‚¤ã‚¹ -label.add.network.device=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ デãƒã‚¤ã‚¹ã®è¿½åŠ  -label.network.device.type=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ デãƒã‚¤ã‚¹ã®ç¨®é¡ž -label.DHCP.server.type=DHCP サーãƒãƒ¼ã®ç¨®é¡ž -label.Pxe.server.type=PXE サーãƒãƒ¼ã®ç¨®é¡ž -label.PING.storage.IP=PING 対象ã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ IP アドレス -label.PING.dir=PING ディレクトリ -label.TFTP.dir=TFTP ディレクトリ -label.PING.CIFS.username=PING CIFS ユーザーå -label.PING.CIFS.password=PING CIFS パスワード -label.CPU.cap=CPU åˆ¶é™ - - -label.action.enable.zone=ゾーンã®æœ‰åŠ¹åŒ– -label.action.enable.zone.processing=ゾーンを有効ã«ã—ã¦ã„ã¾ã™... -message.action.enable.zone=ã“ã®ã‚¾ãƒ¼ãƒ³ã‚’有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.action.disable.zone=ゾーンã®ç„¡åŠ¹åŒ– -label.action.disable.zone.processing=ゾーンを無効ã«ã—ã¦ã„ã¾ã™... -message.action.disable.zone=ã“ã®ã‚¾ãƒ¼ãƒ³ã‚’無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? - -label.action.enable.pod=ãƒãƒƒãƒ‰ã®æœ‰åŠ¹åŒ– -label.action.enable.pod.processing=ãƒãƒƒãƒ‰ã‚’有効ã«ã—ã¦ã„ã¾ã™... -message.action.enable.pod=ã“ã®ãƒãƒƒãƒ‰ã‚’有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.action.disable.pod=ãƒãƒƒãƒ‰ã®ç„¡åŠ¹åŒ– -label.action.disable.pod.processing=ãƒãƒƒãƒ‰ã‚’無効ã«ã—ã¦ã„ã¾ã™... -message.action.disable.pod=ã“ã®ãƒãƒƒãƒ‰ã‚’無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? - -label.action.enable.cluster=クラスターã®æœ‰åŠ¹åŒ– -label.action.enable.cluster.processing=クラスターを有効ã«ã—ã¦ã„ã¾ã™... -message.action.enable.cluster=ã“ã®ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã‚’有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -label.action.disable.cluster=クラスターã®ç„¡åŠ¹åŒ– -label.action.disable.cluster.processing=クラスターを無効ã«ã—ã¦ã„ã¾ã™... -message.action.disable.cluster=ã“ã®ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã‚’無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? - -label.account.id=アカウント ID -label.account.name=アカウントå -label.account.specific=アカウント固有 -label.account=アカウント -label.accounts=アカウント -label.acquire.new.ip=æ–°ã—ã„ IP アドレスã®å–å¾— -label.show.ingress.rule=å—ä¿¡è¦å‰‡ã®è¡¨ç¤º -label.hide.ingress.rule=å—ä¿¡è¦å‰‡ã‚’éš ã™ -label.action.attach.disk.processing=ディスクをアタッãƒã—ã¦ã„ã¾ã™... -label.action.attach.disk=ディスクã®ã‚¢ã‚¿ãƒƒãƒ -label.action.attach.iso.processing=ISO をアタッãƒã—ã¦ã„ã¾ã™... -label.action.attach.iso=ISO ã®ã‚¢ã‚¿ãƒƒãƒ -label.action.cancel.maintenance.mode.processing=ä¿å®ˆãƒ¢ãƒ¼ãƒ‰ã‚’キャンセルã—ã¦ã„ã¾ã™... -label.action.cancel.maintenance.mode=ä¿å®ˆãƒ¢ãƒ¼ãƒ‰ã®ã‚­ãƒ£ãƒ³ã‚»ãƒ« -label.action.change.password=パスワードã®å¤‰æ›´ -label.action.change.service.processing=サービスを変更ã—ã¦ã„ã¾ã™... -label.action.change.service=サービスã®å¤‰æ›´ -label.action.copy.ISO.processing=ISO をコピーã—ã¦ã„ã¾ã™... -label.action.copy.ISO=ISO ã®ã‚³ãƒ”ー -label.action.copy.template.processing=テンプレートをコピーã—ã¦ã„ã¾ã™... -label.action.copy.template=テンプレートã®ã‚³ãƒ”ー -label.action.create.template.processing=テンプレートを作æˆã—ã¦ã„ã¾ã™... -label.action.create.template=テンプレートã®ä½œæˆ -label.action.create.vm.processing=VM を作æˆã—ã¦ã„ã¾ã™... -label.action.create.vm=VM ã®ä½œæˆ -label.action.create.volume.processing=ボリュームを作æˆã—ã¦ã„ã¾ã™... -label.action.create.volume=ボリュームã®ä½œæˆ -label.action.delete.IP.range.processing=IP アドレスã®ç¯„囲を削除ã—ã¦ã„ã¾ã™... -label.action.delete.IP.range=IP アドレスã®ç¯„囲ã®å‰Šé™¤ -label.action.delete.ISO.processing=ISO を削除ã—ã¦ã„ã¾ã™... -label.action.delete.ISO=ISO ã®å‰Šé™¤ -label.action.delete.account.processing=アカウントを削除ã—ã¦ã„ã¾ã™... -label.action.delete.account=アカウントã®å‰Šé™¤ -label.action.delete.cluster.processing=クラスターを削除ã—ã¦ã„ã¾ã™... -label.action.delete.cluster=クラスターã®å‰Šé™¤ -label.action.delete.disk.offering.processing=ディスク オファリングを削除ã—ã¦ã„ã¾ã™... -label.action.delete.disk.offering=ディスク オファリングã®å‰Šé™¤ - -label.action.update.resource.count=リソース数ã®æ›´æ–° -label.action.update.resource.count.processing=リソース数を更新ã—ã¦ã„ã¾ã™... - -label.action.delete.domain=ドメインã®å‰Šé™¤ -label.action.delete.domain.processing=ドメインを削除ã—ã¦ã„ã¾ã™... - -label.action.delete.firewall.processing=ファイアウォールを削除ã—ã¦ã„ã¾ã™... -label.action.delete.firewall=ファイアウォールè¦å‰‡ã®å‰Šé™¤ -label.action.delete.ingress.rule.processing=å—ä¿¡è¦å‰‡ã‚’削除ã—ã¦ã„ã¾ã™... -label.action.delete.ingress.rule=å—ä¿¡è¦å‰‡ã®å‰Šé™¤ -label.action.delete.load.balancer.processing=è² è·åˆ†æ•£è£…置を削除ã—ã¦ã„ã¾ã™... -label.action.delete.load.balancer=è² è·åˆ†æ•£è¦å‰‡ã®å‰Šé™¤ -label.action.edit.network.processing=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’編集ã—ã¦ã„ã¾ã™... -label.action.edit.network=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ç·¨é›† -label.action.delete.network.processing=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’削除ã—ã¦ã„ã¾ã™... -label.action.delete.network=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®å‰Šé™¤ -label.action.delete.pod.processing=ãƒãƒƒãƒ‰ã‚’削除ã—ã¦ã„ã¾ã™... -label.action.delete.pod=ãƒãƒƒãƒ‰ã®å‰Šé™¤ -label.action.delete.primary.storage.processing=プライマリ ストレージを削除ã—ã¦ã„ã¾ã™... -label.action.delete.primary.storage=プライマリ ストレージã®å‰Šé™¤ -label.action.delete.secondary.storage.processing=セカンダリ ストレージを削除ã—ã¦ã„ã¾ã™... -label.action.delete.secondary.storage=セカンダリ ストレージã®å‰Šé™¤ -label.action.delete.security.group.processing=セキュリティ グループを削除ã—ã¦ã„ã¾ã™... -label.action.delete.security.group=セキュリティ グループã®å‰Šé™¤ -label.action.delete.service.offering.processing=サービス オファリングを削除ã—ã¦ã„ã¾ã™... -label.action.delete.service.offering=サービス オファリングã®å‰Šé™¤ -label.action.delete.snapshot.processing=スナップショットを削除ã—ã¦ã„ã¾ã™... -label.action.delete.snapshot=スナップショットã®å‰Šé™¤ -label.action.delete.template.processing=テンプレートを削除ã—ã¦ã„ã¾ã™... -label.action.delete.template=テンプレートã®å‰Šé™¤ -label.action.delete.user.processing=ユーザーを削除ã—ã¦ã„ã¾ã™... -label.action.delete.user=ユーザーã®å‰Šé™¤ -label.action.delete.volume.processing=ボリュームを削除ã—ã¦ã„ã¾ã™... -label.action.delete.volume=ボリュームã®å‰Šé™¤ -label.action.delete.zone.processing=ゾーンを削除ã—ã¦ã„ã¾ã™... -label.action.delete.zone=ゾーンã®å‰Šé™¤ -label.action.destroy.instance.processing=インスタンスを破棄ã—ã¦ã„ã¾ã™... -label.action.destroy.instance=インスタンスã®ç ´æ£„ -label.action.destroy.systemvm.processing=システム VM を破棄ã—ã¦ã„ã¾ã™... -label.action.destroy.systemvm=システム VM ã®ç ´æ£„ -label.action.detach.disk.processing=ディスクをデタッãƒã—ã¦ã„ã¾ã™... -label.action.detach.disk=ディスクã®ãƒ‡ã‚¿ãƒƒãƒ -label.action.detach.iso.processing=ISO をデタッãƒã—ã¦ã„ã¾ã™... -label.action.detach.iso=ISO ã®ãƒ‡ã‚¿ãƒƒãƒ -label.action.disable.account.processing=アカウントを無効ã«ã—ã¦ã„ã¾ã™... -label.action.disable.account=アカウントã®ç„¡åŠ¹åŒ– -label.action.disable.static.NAT.processing=é™çš„ NAT を無効ã«ã—ã¦ã„ã¾ã™... -label.action.disable.static.NAT=é™çš„ NAT ã®ç„¡åŠ¹åŒ– -label.action.disable.user.processing=ユーザーを無効ã«ã—ã¦ã„ã¾ã™... -label.action.disable.user=ユーザーã®ç„¡åŠ¹åŒ– -label.action.download.ISO=ISO ã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ -label.action.download.template=テンプレートã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ -label.action.download.volume.processing=ボリュームをダウンロードã—ã¦ã„ã¾ã™... -label.action.download.volume=ボリュームã®ãƒ€ã‚¦ãƒ³ãƒ­ãƒ¼ãƒ‰ -label.action.edit.ISO=ISO ã®ç·¨é›† -label.action.edit.account=アカウントã®ç·¨é›† -label.action.edit.disk.offering=ディスク オファリングã®ç·¨é›† -label.action.edit.domain=ドメインã®ç·¨é›† -label.action.edit.global.setting=グローãƒãƒ«è¨­å®šã®ç·¨é›† -label.action.edit.instance=インスタンスã®ç·¨é›† -label.action.edit.network.offering=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ オファリングã®ç·¨é›† -label.action.edit.pod=ãƒãƒƒãƒ‰ã®ç·¨é›† -label.action.edit.primary.storage=プライマリ ストレージã®ç·¨é›† -label.action.edit.resource.limits=リソース制é™ã®ç·¨é›† -label.action.edit.service.offering=サービス オファリングã®ç·¨é›† -label.action.edit.template=テンプレートã®ç·¨é›† -label.action.edit.user=ユーザーã®ç·¨é›† -label.action.edit.zone=ゾーンã®ç·¨é›† -label.action.enable.account.processing=アカウントを有効ã«ã—ã¦ã„ã¾ã™... -label.action.enable.account=アカウントã®æœ‰åŠ¹åŒ– -label.action.enable.maintenance.mode.processing=ä¿å®ˆãƒ¢ãƒ¼ãƒ‰ã‚’有効ã«ã—ã¦ã„ã¾ã™... -label.action.enable.maintenance.mode=ä¿å®ˆãƒ¢ãƒ¼ãƒ‰ã®æœ‰åŠ¹åŒ– -label.action.enable.static.NAT.processing=é™çš„ NAT を有効ã«ã—ã¦ã„ã¾ã™... -label.action.enable.static.NAT=é™çš„ NAT ã®æœ‰åŠ¹åŒ– -label.action.enable.user.processing=ユーザーを有効ã«ã—ã¦ã„ã¾ã™... -label.action.enable.user=ユーザーã®æœ‰åŠ¹åŒ– -label.action.force.reconnect.processing=å†æŽ¥ç¶šã—ã¦ã„ã¾ã™... -label.action.force.reconnect=強制å†æŽ¥ç¶š -label.action.generate.keys.processing=キーを生æˆã—ã¦ã„ã¾ã™... -label.action.generate.keys=キーã®ç”Ÿæˆ -label.action.lock.account.processing=アカウントをロックã—ã¦ã„ã¾ã™... -label.action.lock.account=アカウントã®ãƒ­ãƒƒã‚¯ -label.action.migrate.instance=インスタンスã®ç§»è¡Œ -label.action.migrate.instance.processing=インスタンスを移行ã—ã¦ã„ã¾ã™... -label.action.reboot.instance.processing=インスタンスをå†èµ·å‹•ã—ã¦ã„ã¾ã™... -label.action.reboot.instance=インスタンスã®å†èµ·å‹• -label.action.reboot.router.processing=ルーターをå†èµ·å‹•ã—ã¦ã„ã¾ã™... -label.action.reboot.router=ルーターã®å†èµ·å‹• -label.action.reboot.systemvm.processing=システム VM ã‚’å†èµ·å‹•ã—ã¦ã„ã¾ã™... -label.action.reboot.systemvm=システム VM ã®å†èµ·å‹• -label.action.recurring.snapshot=定期スナップショット -label.action.release.ip.processing=IP アドレスを解放ã—ã¦ã„ã¾ã™... -label.action.release.ip=IP アドレスã®è§£æ”¾ -label.action.remove.host.processing=ホストを削除ã—ã¦ã„ã¾ã™... -label.action.remove.host=ホストã®å‰Šé™¤ -label.action.reset.password.processing=パスワードをリセットã—ã¦ã„ã¾ã™... -label.action.reset.password=パスワードã®ãƒªã‚»ãƒƒãƒˆ -label.action.resource.limits=ãƒªã‚½ãƒ¼ã‚¹åˆ¶é™ -label.action.restore.instance.processing=インスタンスを復元ã—ã¦ã„ã¾ã™... -label.action.restore.instance=インスタンスã®å¾©å…ƒ -label.action.start.instance.processing=インスタンスを起動ã—ã¦ã„ã¾ã™... -label.action.start.instance=インスタンスã®èµ·å‹• -label.action.start.router.processing=ルーターを起動ã—ã¦ã„ã¾ã™... -label.action.start.router=ルーターã®èµ·å‹• -label.action.start.systemvm.processing=システム VM ã‚’èµ·å‹•ã—ã¦ã„ã¾ã™... -label.action.start.systemvm=システム VM ã®èµ·å‹• -label.action.stop.instance.processing=インスタンスをåœæ­¢ã—ã¦ã„ã¾ã™... -label.action.stop.instance=インスタンスã®åœæ­¢ -label.action.stop.router.processing=ルーターをåœæ­¢ã—ã¦ã„ã¾ã™... -label.action.stop.router=ルーターã®åœæ­¢ -label.action.stop.systemvm.processing=システム VM ã‚’åœæ­¢ã—ã¦ã„ã¾ã™... -label.action.stop.systemvm=システム VM ã®åœæ­¢ -label.action.take.snapshot.processing=スナップショットを作æˆã—ã¦ã„ã¾ã™.... -label.action.take.snapshot=スナップショットã®ä½œæˆ -label.action.update.OS.preference.processing=OS 基本設定を更新ã—ã¦ã„ã¾ã™... -label.action.update.OS.preference=OS 基本設定ã®æ›´æ–° -label.actions=æ“作 -label.active.sessions=アクティブãªã‚»ãƒƒã‚·ãƒ§ãƒ³ -label.add.account=アカウントã®è¿½åŠ  -label.add.by.cidr=CIDR ã§è¿½åŠ  -label.add.by.group=グループã§è¿½åŠ  -label.add.cluster=クラスターã®è¿½åŠ  -label.add.direct.iprange=直接 IP アドレスã®ç¯„囲ã®è¿½åŠ  -label.add.disk.offering=ディスク オファリングã®è¿½åŠ  -label.add.domain=ドメインã®è¿½åŠ  -label.add.firewall=ファイアウォールè¦å‰‡ã®è¿½åŠ  -label.add.host=ホストã®è¿½åŠ  -label.add.ingress.rule=å—ä¿¡è¦å‰‡ã®è¿½åŠ  -label.add.ip.range=IP アドレスã®ç¯„囲ã®è¿½åŠ  -label.add.load.balancer=è² è·åˆ†æ•£è£…ç½®ã®è¿½åŠ  -label.add.more=ãã®ã»ã‹ã®é …ç›®ã®è¿½åŠ  -label.add.network=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®è¿½åŠ  -label.add.pod=ãƒãƒƒãƒ‰ã®è¿½åŠ  -label.add.primary.storage=プライマリ ストレージã®è¿½åŠ  -label.add.secondary.storage=セカンダリ ストレージã®è¿½åŠ  -label.add.security.group=セキュリティ グループã®è¿½åŠ  -label.add.service.offering=サービス オファリングã®è¿½åŠ  -label.add.template=テンプレートã®è¿½åŠ  -label.add.user=ユーザーã®è¿½åŠ  -label.add.vlan=VLAN ã®è¿½åŠ  -label.add.volume=ボリュームã®è¿½åŠ  -label.add.zone=ゾーンã®è¿½åŠ  -label.add=追加 -label.adding.cluster=クラスターを追加ã—ã¦ã„ã¾ã™ -label.adding.failed=追加ã§ãã¾ã›ã‚“ã§ã—㟠-label.adding.pod=ãƒãƒƒãƒ‰ã‚’追加ã—ã¦ã„ã¾ã™ -label.adding.processing=追加ã—ã¦ã„ã¾ã™... -label.adding.succeeded=追加ã—ã¾ã—㟠-label.adding.user=ユーザーを追加ã—ã¦ã„ã¾ã™ -label.adding.zone=ゾーンを追加ã—ã¦ã„ã¾ã™ -label.adding=追加ã—ã¦ã„ã¾ã™ -label.additional.networks=追加ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.admin.accounts=管ç†è€…アカウント -label.admin=管ç†è€… -label.advanced.mode=拡張モード -label.advanced.search=高度ãªæ¤œç´¢ -label.advanced=æ‹¡å¼µ -label.alert=アラート -label.algorithm=アルゴリズム -label.allocated=割り当ã¦æ¸ˆã¿ -label.api.key=API キー -label.assign.to.load.balancer=è² è·åˆ†æ•£è£…ç½®ã«ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’割り当ã¦ã¦ã„ã¾ã™ -label.assign=割り当㦠-label.associated.network.id=関連ã¥ã‘られãŸãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ID -label.attached.iso=アタッãƒã•ã‚ŒãŸ ISO -label.availability.zone=利用å¯èƒ½ã‚¾ãƒ¼ãƒ³ -label.availability=å¯ç”¨æ€§ -label.available.public.ips=使用ã§ãるパブリック IP アドレス -label.available=使用å¯èƒ½ -label.back=戻る -label.basic.mode=基本モード -label.bootable=èµ·å‹•å¯èƒ½ -label.broadcast.domain.type=ブロードキャスト ドメインã®ç¨®é¡ž -label.by.account=アカウント -label.by.availability=å¯ç”¨æ€§ -label.by.domain=ドメイン -label.by.end.date=終了日 -label.by.level=レベル -label.by.pod=ãƒãƒƒãƒ‰ -label.by.role=役割 -label.by.start.date=開始日 -label.by.state=状態 -label.by.traffic.type=トラフィックã®ç¨®é¡ž -label.by.type.id=種類 ID -label.by.type=種類 -label.by.zone=ゾーン -label.bytes.received=å—ä¿¡ãƒã‚¤ãƒˆ -label.bytes.sent=é€ä¿¡ãƒã‚¤ãƒˆ -label.cancel=キャンセル -label.certificate=証明書 -label.privatekey=PKC#8 秘密キー -label.domain.suffix=DNS ドメイン サフィックス (例: xyz.com) -label.character=文字 -label.cidr.account=CIDR ã¾ãŸã¯ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ/セキュリティ グループ -label.close=é–‰ã˜ã‚‹ -label.cloud.console=クラウド管ç†ã‚³ãƒ³ã‚½ãƒ¼ãƒ« -label.cloud.managed=Cloud.com ã«ã‚ˆã‚‹ç®¡ç† -label.cluster.type=クラスターã®ç¨®é¡ž -label.cluster=クラスター -label.code=コード -label.confirmation=ç¢ºèª -label.cpu.allocated.for.VMs=VM ã«å‰²ã‚Šå½“ã¦æ¸ˆã¿ã® CPU -label.cpu.allocated=割り当ã¦æ¸ˆã¿ã® CPU -label.cpu.utilized=CPU 使用率 +label.code=\u30B3\u30FC\u30C9 +label.community=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3 +label.compute.and.storage=\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0\u3068\u30B9\u30C8\u30EC\u30FC\u30B8 +label.compute.offerings=\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.compute.offering=\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.compute=\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0 +label.configuration=\u69CB\u6210 +label.configure.network.ACLs=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ACL \u306E\u69CB\u6210 +label.configure=\u69CB\u6210 +label.configure.vpc=VPC \u306E\u69CB\u6210 +label.confirmation=\u78BA\u8A8D +label.confirm.password=\u30D1\u30B9\u30EF\u30FC\u30C9\u306E\u78BA\u8A8D\u5165\u529B +label.congratulations=\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u306F\u3053\u308C\u3067\u5B8C\u4E86\u3067\u3059\u3002 +label.conserve.mode=\u7BC0\u7D04\u30E2\u30FC\u30C9 +label.console.proxy=\u30B3\u30F3\u30BD\u30FC\u30EB \u30D7\u30ED\u30AD\u30B7 +label.continue.basic.install=\u57FA\u672C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3092\u7D9A\u884C\u3059\u308B +label.continue=\u7D9A\u884C +label.corrections.saved=\u63A5\u7D9A\u304C\u4FDD\u5B58\u3055\u308C\u307E\u3057\u305F +label.cpu.allocated.for.VMs=VM \u306B\u5272\u308A\u5F53\u3066\u6E08\u307F\u306E CPU +label.cpu.allocated=\u5272\u308A\u5F53\u3066\u6E08\u307F\u306E CPU +label.CPU.cap=CPU \u5236\u9650 label.cpu=CPU -label.created=作æˆæ—¥æ™‚ -label.cross.zones=クロス ゾーン -label.custom.disk.size=カスタム ディスク サイズ -label.daily=毎日 -label.data.disk.offering=データ ディスク オファリング -label.date=日時 -label.day.of.month=毎月指定日 -label.day.of.week=毎週指定日 -label.delete=削除 -label.deleting.failed=削除ã§ãã¾ã›ã‚“ã§ã—㟠-label.deleting.processing=削除ã—ã¦ã„ã¾ã™... -label.description=説明 -label.detaching.disk=ディスクをデタッãƒã—ã¦ã„ã¾ã™ -label.details=詳細 -label.device.id=デãƒã‚¤ã‚¹ ID -label.disabled=無効 -label.disabling.vpn.access=VPN アクセスを無効ã«ã—ã¦ã„ã¾ã™ -label.disk.allocated=割り当ã¦æ¸ˆã¿ã®ãƒ‡ã‚£ã‚¹ã‚¯ -label.disk.offering=ディスク オファリング -label.disk.size.gb=ディスク サイズ (GB å˜ä½) -label.disk.size=ディスク サイズ -label.disk.total=ディスクåˆè¨ˆ -label.disk.volume=ディスク ボリューム -label.display.text=表示テキスト +label.cpu.mhz=CPU (MHz) +label.cpu.utilized=CPU \u4F7F\u7528\u7387 +label.created.by.system=\u30B7\u30B9\u30C6\u30E0\u4F5C\u6210 +label.created=\u4F5C\u6210\u65E5\u6642 +label.create.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210 +label.create.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u4F5C\u6210 +label.create.VPN.connection=VPN \u63A5\u7D9A\u306E\u4F5C\u6210 +label.cross.zones=\u30AF\u30ED\u30B9 \u30BE\u30FC\u30F3 +label.custom.disk.size=\u30AB\u30B9\u30BF\u30E0 \u30C7\u30A3\u30B9\u30AF \u30B5\u30A4\u30BA +label.daily=\u6BCE\u65E5 +label.data.disk.offering=\u30C7\u30FC\u30BF \u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.date=\u65E5\u6642 +label.day.of.month=\u6BCE\u6708\u6307\u5B9A\u65E5 +label.day.of.week=\u6BCE\u9031\u6307\u5B9A\u65E5 +label.dead.peer.detection=\u505C\u6B62\u30D4\u30A2\u306E\u691C\u51FA +label.decline.invitation=\u62DB\u5F85\u306E\u8F9E\u9000 +label.dedicated=\u5C02\u7528 +label.default=\u30C7\u30D5\u30A9\u30EB\u30C8 +label.default.use=\u30C7\u30D5\u30A9\u30EB\u30C8\u4F7F\u7528 +label.default.view=\u30C7\u30D5\u30A9\u30EB\u30C8 \u30D3\u30E5\u30FC +label.delete.F5=F5 \u306E\u524A\u9664 +label.delete.gateway=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u524A\u9664 +label.delete.NetScaler=NetScaler \u306E\u524A\u9664 +label.delete.NiciraNvp=NVP\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u524a\u9664 +label.delete.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u524A\u9664 +label.delete.SRX=SRX \u306E\u524A\u9664 +label.delete=\u524A\u9664 +label.delete.VPN.connection=VPN \u63A5\u7D9A\u306E\u524A\u9664 +label.delete.VPN.customer.gateway=VPN \u30AB\u30B9\u30BF\u30DE\u30FC \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u524A\u9664 +label.delete.VPN.gateway=VPN \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u306E\u524A\u9664 +label.delete.vpn.user=VPN \u30E6\u30FC\u30B6\u30FC\u306E\u524A\u9664 +label.deleting.failed=\u524A\u9664\u3067\u304D\u307E\u305B\u3093\u3067\u3057\u305F +label.deleting.processing=\u524A\u9664\u3057\u3066\u3044\u307E\u3059... +label.description=\u8AAC\u660E +label.destination.physical.network.id=\u30D6\u30EA\u30C3\u30B8\u5148\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ID +label.destination.zone=\u30B3\u30D4\u30FC\u5148\u30BE\u30FC\u30F3 +label.destroy.router=\u30EB\u30FC\u30BF\u30FC\u306E\u7834\u68C4 +label.destroy=\u7834\u68c4 +label.detaching.disk=\u30C7\u30A3\u30B9\u30AF\u3092\u30C7\u30BF\u30C3\u30C1\u3057\u3066\u3044\u307E\u3059 +label.details=\u8A73\u7D30 +label.device.id=\u30C7\u30D0\u30A4\u30B9 ID +label.devices=\u30C7\u30D0\u30A4\u30B9 +label.dhcp=DHCP +label.DHCP.server.type=DHCP \u30B5\u30FC\u30D0\u30FC\u306E\u7A2E\u985E +label.direct.ips=\u76F4\u63A5 IP \u30A2\u30C9\u30EC\u30B9 +label.disabled=\u7121\u52B9 +label.disable.provider=\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u306E\u7121\u52B9\u5316 +label.disable.vpn=VPN \u306E\u7121\u52B9\u5316 +label.disabling.vpn.access=VPN \u30A2\u30AF\u30BB\u30B9\u3092\u7121\u52B9\u306B\u3057\u3066\u3044\u307E\u3059 +label.disk.allocated=\u5272\u308A\u5F53\u3066\u6E08\u307F\u306E\u30C7\u30A3\u30B9\u30AF +label.disk.offering=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.disk.size.gb=\u30C7\u30A3\u30B9\u30AF \u30B5\u30A4\u30BA (GB \u5358\u4F4D) +label.disk.size=\u30C7\u30A3\u30B9\u30AF \u30B5\u30A4\u30BA +label.disk.total=\u30C7\u30A3\u30B9\u30AF\u5408\u8A08 +label.disk.volume=\u30C7\u30A3\u30B9\u30AF \u30DC\u30EA\u30E5\u30FC\u30E0 +label.display.name=\u8868\u793A\u540D +label.display.text=\u8868\u793A\u30C6\u30AD\u30B9\u30C8 label.dns.1=DNS 1 label.dns.2=DNS 2 -label.domain.admin=ドメイン管ç†è€… -label.domain.id=ドメイン ID -label.domain.name=ドメインå -label.domain=ドメイン -label.double.quotes.are.not.allowed=二é‡å¼•ç”¨ç¬¦ã¯ä½¿ç”¨ã§ãã¾ã›ã‚“ -label.download.progress=ダウンロードã®é€²æ—çŠ¶æ³ -label.edit=編集 -label.email=é›»å­ãƒ¡ãƒ¼ãƒ« -label.enabling.vpn.access=VPN アクセスを有効ã«ã—ã¦ã„ã¾ã™ -label.enabling.vpn=VPN を有効ã«ã—ã¦ã„ã¾ã™ -label.end.port=終了ãƒãƒ¼ãƒˆ -label.endpoint.or.operation=エンドãƒã‚¤ãƒ³ãƒˆã¾ãŸã¯æ“作 -label.error.code=エラー コード -label.error=エラー -label.esx.host=ESX/ESXi ホスト -label.example=例 -label.failed=失敗 -label.featured=ãŠã™ã™ã‚ -label.firewall=ファイアウォール -label.first.name=å -label.format=å½¢å¼ -label.friday=金曜日 -label.full=完全 -label.gateway=ゲートウェイ -label.general.alerts=一般アラート -label.generating.url=URL を生æˆã—ã¦ã„ã¾ã™ -label.go.step.2=手順 2 ã«é€²ã‚€ -label.go.step.3=手順 3 ã«é€²ã‚€ -label.go.step.4=手順 4 ã«é€²ã‚€ -label.go.step.5=手順 5 ã«é€²ã‚€ -label.group.optional=グループ (オプション) -label.group=グループ -label.guest.cidr=ゲスト CIDR -label.guest.gateway=ゲスト ゲートウェイ -label.guest.ip.range=ゲスト IP アドレスã®ç¯„囲 -label.guest.ip=ゲスト IP アドレス -label.guest.netmask=ゲスト ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ -label.ha.enabled=高å¯ç”¨æ€§æœ‰åŠ¹ -label.help=ヘルプ -label.host.alerts=ホスト アラート -label.host.name=ホストå -label.host=ホスト -label.hosts=ホスト -label.hourly=毎時 -label.hypervisor.type=ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã®ç¨®é¡ž -label.hypervisor=ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ +label.dns=DNS +label.DNS.domain.for.guest.networks=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E DNS \u30C9\u30E1\u30A4\u30F3 +label.domain.admin=\u30C9\u30E1\u30A4\u30F3\u7BA1\u7406\u8005 +label.domain.id=\u30C9\u30E1\u30A4\u30F3 ID +label.domain.name=\u30C9\u30E1\u30A4\u30F3\u540D +label.domain.router=\u30C9\u30E1\u30A4\u30F3 \u30EB\u30FC\u30BF\u30FC +label.domain.suffix=DNS \u30C9\u30E1\u30A4\u30F3 \u30B5\u30D5\u30A3\u30C3\u30AF\u30B9 (\u4F8B\: xyz.com) +label.domain=\u30C9\u30E1\u30A4\u30F3 +label.done=\u5B8C\u4E86 +label.double.quotes.are.not.allowed=\u4E8C\u91CD\u5F15\u7528\u7B26\u306F\u4F7F\u7528\u3067\u304D\u307E\u305B\u3093 +label.download.progress=\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u306E\u9032\u6357\u72B6\u6CC1 +label.drag.new.position=\u65B0\u3057\u3044\u4F4D\u7F6E\u306B\u30C9\u30E9\u30C3\u30B0 +label.edit.lb.rule=\u8CA0\u8377\u5206\u6563\u898F\u5247\u306E\u7DE8\u96C6 +label.edit.network.details=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8A73\u7D30\u306E\u7DE8\u96C6 +label.edit.project.details=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u8A73\u7D30\u306E\u7DE8\u96C6 +label.edit.tags=\u30BF\u30B0\u306E\u7DE8\u96C6 +label.edit.traffic.type=\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7A2E\u985E\u306E\u7DE8\u96C6 +label.edit=\u7DE8\u96C6 +label.edit.vpc=VPC \u306E\u7DE8\u96C6 +label.egress.rules=\u9001\u4fe1\u30eb\u30fc\u30eb +label.egress.rule=\u9001\u4FE1\u898F\u5247 +label.elastic.IP=\u30A8\u30E9\u30B9\u30C6\u30A3\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9 +label.elastic.LB=\u30A8\u30E9\u30B9\u30C6\u30A3\u30C3\u30AF\u8CA0\u8377\u5206\u6563 +label.elastic=\u30A8\u30E9\u30B9\u30C6\u30A3\u30C3\u30AF +label.email=\u96FB\u5B50\u30E1\u30FC\u30EB +label.enable.provider=\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u306E\u6709\u52B9\u5316 +label.enable.s3=S3\u57fa\u76e4\u30bb\u30ab\u30f3\u30c0\u30ea\u30b9\u30c8\u30ec\u30fc\u30b8\u306e\u6709\u52b9\u5316 +label.enable.swift=Swift \u306E\u6709\u52B9\u5316 +label.enable.vpn=VPN \u306E\u6709\u52B9\u5316 +label.enabling.vpn.access=VPN \u30A2\u30AF\u30BB\u30B9\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059 +label.enabling.vpn=VPN \u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059 +label.end.IP=\u7D42\u4E86 IP \u30A2\u30C9\u30EC\u30B9 +label.endpoint.or.operation=\u30A8\u30F3\u30C9\u30DD\u30A4\u30F3\u30C8\u307E\u305F\u306F\u64CD\u4F5C +label.endpoint=\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8 +label.end.port=\u7D42\u4E86\u30DD\u30FC\u30C8 +label.end.reserved.system.IP=\u4E88\u7D04\u6E08\u307F\u7D42\u4E86\u30B7\u30B9\u30C6\u30E0 IP \u30A2\u30C9\u30EC\u30B9 +label.end.vlan=\u7D42\u4E86 VLAN +label.enter.token=\u30C8\u30FC\u30AF\u30F3\u306E\u5165\u529B +label.error.code=\u30A8\u30E9\u30FC \u30B3\u30FC\u30C9 +label.error=\u30A8\u30E9\u30FC +label.ESP.encryption=ESP \u6697\u53F7\u5316 +label.ESP.hash=ESP \u30CF\u30C3\u30B7\u30E5 +label.ESP.policy=ESP \u30DD\u30EA\u30B7\u30FC +label.esx.host=ESX/ESXi \u30DB\u30B9\u30C8 +label.example=\u4F8B +label.f5=F5 +label.failed=\u5931\u6557 +label.featured=\u304A\u3059\u3059\u3081 +label.fetch.latest=\u6700\u65B0\u60C5\u5831\u306E\u53D6\u5F97 +label.filterBy=\u30D5\u30A3\u30EB\u30BF\u30FC +label.firewall=\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB +label.first.name=\u540D +label.format=\u5F62\u5F0F +label.friday=\u91D1\u66DC\u65E5 +label.full.path=\u30D5\u30EB \u30D1\u30B9 +label.full=\u5B8C\u5168 +label.gateway=\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4 +label.general.alerts=\u4E00\u822C\u30A2\u30E9\u30FC\u30C8 +label.generating.url=URL \u3092\u751F\u6210\u3057\u3066\u3044\u307E\u3059 +label.go.step.2=\u624B\u9806 2 \u306B\u9032\u3080 +label.go.step.3=\u624B\u9806 3 \u306B\u9032\u3080 +label.go.step.4=\u624B\u9806 4 \u306B\u9032\u3080 +label.go.step.5=\u624B\u9806 5 \u306B\u9032\u3080 +label.group.optional=\u30B0\u30EB\u30FC\u30D7 (\u30AA\u30D7\u30B7\u30E7\u30F3) +label.group=\u30B0\u30EB\u30FC\u30D7 +label.guest.cidr=\u30B2\u30B9\u30C8 CIDR +label.guest.end.ip=\u30B2\u30B9\u30C8\u306E\u7D42\u4E86 IP \u30A2\u30C9\u30EC\u30B9 +label.guest.gateway=\u30B2\u30B9\u30C8 \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4 +label.guest.ip.range=\u30B2\u30B9\u30C8 IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2 +label.guest.ip=\u30B2\u30B9\u30C8 IP \u30A2\u30C9\u30EC\u30B9 +label.guest.netmask=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30DE\u30B9\u30AF +label.guest.networks=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.guest.start.ip=\u30B2\u30B9\u30C8\u306E\u958B\u59CB IP \u30A2\u30C9\u30EC\u30B9 +label.guest.traffic=\u30B2\u30B9\u30C8 \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF +label.guest.type=\u30B2\u30B9\u30C8\u306E\u7A2E\u985E +label.guest=\u30B2\u30B9\u30C8 +label.ha.enabled=\u9AD8\u53EF\u7528\u6027\u6709\u52B9 +label.help=\u30D8\u30EB\u30D7 +label.hide.ingress.rule=\u53D7\u4FE1\u898F\u5247\u3092\u96A0\u3059 +label.hints=\u30D2\u30F3\u30C8 +label.host.alerts=\u30DB\u30B9\u30C8 \u30A2\u30E9\u30FC\u30C8 +label.host.MAC=\u30DB\u30B9\u30C8\u306E MAC +label.host.name=\u30DB\u30B9\u30C8\u540D +label.hosts=\u30DB\u30B9\u30C8 +label.host.tags=\u00e3\u0083\u009b\u00e3\u0082\u00b9\u00e3\u0083\u0088\u00e3\u0082\u00bf\u00e3\u0082\u00b0 +label.host=\u30DB\u30B9\u30C8 +label.hourly=\u6BCE\u6642 +label.hypervisor.capabilities=\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u306E\u6A5F\u80FD +label.hypervisor.type=\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u306E\u7A2E\u985E +label.hypervisor=\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC +label.hypervisor.version=\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u306E\u30D0\u30FC\u30B8\u30E7\u30F3 label.id=ID -label.info=情報 -label.ingress.rule=å—ä¿¡è¦å‰‡ -label.initiated.by=開始ユーザー -label.instance.limits=ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹åˆ¶é™ -label.instance.name=インスタンスå -label.instance=インスタンス -label.instances=インスタンス -label.internal.dns.1=内部 DNS 1 -label.internal.dns.2=内部 DNS 2 -label.interval.type=é–“éš”ã®ç¨®é¡ž -label.invalid.integer=無効ãªæ•´æ•° -label.invalid.number=無効ãªæ•° -label.ip.address=IP アドレス -label.ip.allocations=IP アドレスã®å‰²ã‚Šå½“㦠-label.ip.limits=パブリック IP アドレスã®åˆ¶é™ -label.ip.or.fqdn=IP アドレスã¾ãŸã¯ FQDN -label.ip.range=IP アドレスã®ç¯„囲 +label.IKE.DH=IKE DH +label.IKE.encryption=IKE \u6697\u53F7\u5316 +label.IKE.hash=IKE \u30CF\u30C3\u30B7\u30E5 +label.IKE.policy=IKE \u30DD\u30EA\u30B7\u30FC +label.info=\u60C5\u5831 +label.ingress.rule=\u53D7\u4FE1\u898F\u5247 +label.initiated.by=\u958B\u59CB\u30E6\u30FC\u30B6\u30FC +label.installWizard.addClusterIntro.subtitle=\u30AF\u30E9\u30B9\u30BF\u30FC\u306B\u3064\u3044\u3066 +label.installWizard.addClusterIntro.title=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046 +label.installWizard.addHostIntro.subtitle=\u30DB\u30B9\u30C8\u306B\u3064\u3044\u3066 +label.installWizard.addHostIntro.title=\u30DB\u30B9\u30C8\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046 +label.installWizard.addPodIntro.subtitle=\u30DD\u30C3\u30C9\u306B\u3064\u3044\u3066 +label.installWizard.addPodIntro.title=\u30DD\u30C3\u30C9\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046 +label.installWizard.addPrimaryStorageIntro.subtitle=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306B\u3064\u3044\u3066 +label.installWizard.addPrimaryStorageIntro.title=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046 +label.installWizard.addSecondaryStorageIntro.subtitle=\u30bb\u30ab\u30f3\u30c0\u30ea\u30fc\u30b9\u30c8\u30ec\u30fc\u30b8\u3068\u306f\uff1f +label.installWizard.addSecondaryStorageIntro.title=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046 +label.installWizard.addZoneIntro.subtitle=\u30BE\u30FC\u30F3\u306B\u3064\u3044\u3066 +label.installWizard.addZoneIntro.title=\u30BE\u30FC\u30F3\u3092\u8FFD\u52A0\u3057\u307E\u3057\u3087\u3046 +label.installWizard.addZone.title=\u30BE\u30FC\u30F3\u306E\u8FFD\u52A0 +label.installWizard.click.launch=[\u8D77\u52D5] \u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +label.installWizard.subtitle=\u3053\u306E\u30AC\u30A4\u30C9 \u30C4\u30A2\u30FC\u306F CloudStack&\#8482; \u74B0\u5883\u306E\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u306B\u5F79\u7ACB\u3061\u307E\u3059 +label.installWizard.title=CloudStack&\#8482; \u3078\u3088\u3046\u3053\u305D +label.instance.limits=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u5236\u9650 +label.instance.name=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u540D +label.instances=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 +label.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 +label.internal.dns.1=\u5185\u90E8 DNS 1 +label.internal.dns.2=\u5185\u90E8 DNS 2 +label.internal.name=\u5185\u90E8\u540D +label.interval.type=\u9593\u9694\u306E\u7A2E\u985E +label.introduction.to.cloudstack=CloudStack&\#8482; \u306E\u7D39\u4ECB +label.invalid.integer=\u7121\u52B9\u306A\u6574\u6570 +label.invalid.number=\u7121\u52B9\u306A\u6570 +label.invitations=\u62DB\u5F85\u72B6 +label.invited.accounts=\u62DB\u5F85\u6E08\u307F\u30A2\u30AB\u30A6\u30F3\u30C8 +label.invite.to=\u62DB\u5F85\u3059\u308B\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\: +label.invite=\u62DB\u5F85 +label.ip.address=IP \u30A2\u30C9\u30EC\u30B9 +label.ipaddress=IP \u30A2\u30C9\u30EC\u30B9 +label.ip.allocations=IP \u30A2\u30C9\u30EC\u30B9\u306E\u5272\u308A\u5F53\u3066 label.ip=IP +label.ip.limits=\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9\u306E\u5236\u9650 +label.ip.or.fqdn=IP \u30A2\u30C9\u30EC\u30B9\u307E\u305F\u306F FQDN +label.ip.range=IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2 +label.ip.ranges=IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2 +label.IPsec.preshared.key=IPsec \u4E8B\u524D\u5171\u6709\u30AD\u30FC label.ips=IP -label.is.default=デフォルト -label.is.shared=共有 -label.is.system=システム label.iscsi=iSCSI -label.iso.boot=ISO èµ·å‹• -label.iso=ISO -label.isolation.mode=分離モード -label.keep=ç¶­æŒ -label.lang.chinese=簡体字中国語 -label.lang.english=英語 -label.lang.japanese=日本語 -label.lang.korean=韓国語 -label.lang.spanish=スペイン語 -label.last.disconnected=最終切断日時 -label.last.name=姓 -label.level=レベル -label.linklocal.ip=リンク ローカル IP アドレス -label.load.balancer=è² è·åˆ†æ•£è£…ç½® -label.loading=ロードã—ã¦ã„ã¾ã™ -label.local=ローカル -label.login=ログオン -label.logout=ログオフ +label.is.default=\u30C7\u30D5\u30A9\u30EB\u30C8 +label.iso.boot=ISO \u8D77\u52D5 +label.iso=ISO +label.isolated.networks=\u5206\u96E2\u3055\u308C\u305F\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.isolation.method=\u5206\u96E2\u65B9\u6CD5 +label.isolation.mode=\u5206\u96E2\u30E2\u30FC\u30C9 +label.isolation.uri=Isolation URI +label.is.redundant.router=\u5197\u9577 +label.is.shared=\u5171\u6709 +label.is.system=\u30B7\u30B9\u30C6\u30E0 +label.item.listing=\u9805\u76EE\u4E00\u89A7 +label.keep=\u7DAD\u6301 +label.keyboard.type=\u30AD\u30FC\u30DC\u30FC\u30C9\u306E\u7A2E\u985E +label.key=\u30AD\u30FC +label.kvm.traffic.label=KVM \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u30E9\u30D9\u30EB +label.label=\u30E9\u30D9\u30EB +label.lang.brportugese=Brazilian Portugese +label.lang.chinese=\u7C21\u4F53\u5B57\u4E2D\u56FD\u8A9E +label.lang.english=\u82F1\u8A9E +label.lang.french=French +label.lang.japanese=\u65E5\u672C\u8A9E +label.lang.russian=Russian +label.lang.spanish=\u30B9\u30DA\u30A4\u30F3\u8A9E +label.last.disconnected=\u6700\u7D42\u5207\u65AD\u65E5\u6642 +label.last.name=\u59D3 +label.latest.events=\u6700\u65B0\u30A4\u30D9\u30F3\u30C8 +label.launch=\u8D77\u52D5 +label.launch.vm=VM \u306E\u8D77\u52D5 +label.LB.isolation=\u8CA0\u8377\u5206\u6563\u5206\u96E2 +label.least.connections=\u6700\u5C0F\u63A5\u7D9A +label.level=\u30EC\u30D9\u30EB +label.linklocal.ip=\u30EA\u30F3\u30AF \u30ED\u30FC\u30AB\u30EB IP \u30A2\u30C9\u30EC\u30B9 +label.load.balancer=\u8CA0\u8377\u5206\u6563\u88C5\u7F6E +label.load.balancing.policies=\u8CA0\u8377\u5206\u6563\u30DD\u30EA\u30B7\u30FC +label.load.balancing=\u8CA0\u8377\u5206\u6563 +label.loading=\u30ED\u30FC\u30C9\u3057\u3066\u3044\u307E\u3059 +label.local.storage.enabled=\u30ED\u30FC\u30AB\u30EB \u30B9\u30C8\u30EC\u30FC\u30B8\u306F\u6709\u52B9\u3067\u3059 +label.local.storage=\u30ED\u30FC\u30AB\u30EB \u30B9\u30C8\u30EC\u30FC\u30B8 +label.local=\u30ED\u30FC\u30AB\u30EB +label.login=\u30ED\u30B0\u30AA\u30F3 +label.logout=\u30ED\u30B0\u30AA\u30D5 label.lun=LUN -label.manage=ç®¡ç† -label.maximum=最大 -label.memory.allocated=割り当ã¦æ¸ˆã¿ã®ãƒ¡ãƒ¢ãƒª -label.memory.total=メモリåˆè¨ˆ -label.memory.used=ãƒ¡ãƒ¢ãƒªä½¿ç”¨é‡ -label.memory=メモリ -label.menu.accounts=アカウント -label.menu.alerts=アラート -label.menu.all.accounts=ã™ã¹ã¦ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆ -label.menu.all.instances=ã™ã¹ã¦ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ -label.menu.community.isos=コミュニティ ISO -label.menu.community.templates=コミュニティ テンプレート -label.menu.configuration=æ§‹æˆ -label.menu.dashboard=ダッシュボード -label.menu.destroyed.instances=破棄ã•ã‚ŒãŸã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ -label.menu.disk.offerings=ディスク オファリング -label.menu.domains=ドメイン -label.menu.events=イベント -label.menu.featured.isos=ãŠã™ã™ã‚ã® ISO -label.menu.featured.templates=ãŠã™ã™ã‚ã®ãƒ†ãƒ³ãƒ—レート -label.menu.global.settings=グローãƒãƒ«è¨­å®š -label.menu.instances=インスタンス -label.menu.ipaddresses=IP アドレス +label.LUN.number=LUN \u756A\u53F7 +label.make.project.owner=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u6240\u6709\u8005\u5316 +label.management.ips=\u7BA1\u7406 IP \u30A2\u30C9\u30EC\u30B9 +label.management=\u7BA1\u7406 +label.manage.resources=\u30EA\u30BD\u30FC\u30B9\u306E\u7BA1\u7406 +label.manage=\u7BA1\u7406 +label.max.guest.limit=\u6700\u5927\u30B2\u30B9\u30C8\u5236\u9650 +label.maximum=\u6700\u5927 +label.max.networks=\u6700\u5927\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u6570 +label.max.public.ips=\u6700\u5927\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9\u6570 +label.max.snapshots=\u6700\u5927\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u6570 +label.max.templates=\u6700\u5927\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u6570 +label.max.vms=\u6700\u5927\u30E6\u30FC\u30B6\u30FC VM \u6570 +label.max.volumes=\u6700\u5927\u30DC\u30EA\u30E5\u30FC\u30E0\u6570 +label.max.vpcs=Max. VPCs +label.may.continue=\u7D9A\u884C\u3067\u304D\u307E\u3059\u3002 +label.memory.allocated=\u5272\u308A\u5F53\u3066\u6E08\u307F\u306E\u30E1\u30E2\u30EA +label.memory.mb=\u30E1\u30E2\u30EA (MB) +label.memory.total=\u30E1\u30E2\u30EA\u5408\u8A08 +label.memory=\u30E1\u30E2\u30EA +label.memory.used=\u30E1\u30E2\u30EA\u4F7F\u7528\u91CF +label.menu.accounts=\u30A2\u30AB\u30A6\u30F3\u30C8 +label.menu.alerts=\u30A2\u30E9\u30FC\u30C8 +label.menu.all.accounts=\u3059\u3079\u3066\u306E\u30A2\u30AB\u30A6\u30F3\u30C8 +label.menu.all.instances=\u3059\u3079\u3066\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 +label.menu.community.isos=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3 ISO +label.menu.community.templates=\u30B3\u30DF\u30E5\u30CB\u30C6\u30A3 \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +label.menu.configuration=\u69CB\u6210 +label.menu.dashboard=\u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9 +label.menu.destroyed.instances=\u7834\u68C4\u3055\u308C\u305F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 +label.menu.disk.offerings=\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.menu.domains=\u30C9\u30E1\u30A4\u30F3 +label.menu.events=\u30A4\u30D9\u30F3\u30C8 +label.menu.featured.isos=\u304A\u3059\u3059\u3081\u306E ISO +label.menu.featured.templates=\u304A\u3059\u3059\u3081\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +label.menu.global.settings=\u30B0\u30ED\u30FC\u30D0\u30EB\u8A2D\u5B9A +label.menu.infrastructure=\u30A4\u30F3\u30D5\u30E9\u30B9\u30C8\u30E9\u30AF\u30C1\u30E3 +label.menu.instances=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 +label.menu.ipaddresses=IP \u30A2\u30C9\u30EC\u30B9 label.menu.isos=ISO -label.menu.my.accounts=マイ アカウント -label.menu.my.instances=マイ インスタンス -label.menu.my.isos=マイ ISO -label.menu.my.templates=マイ テンプレート -label.menu.network.offerings=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ オファリング -label.menu.network=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.menu.physical.resources=物ç†ãƒªã‚½ãƒ¼ã‚¹ -label.menu.running.instances=実行中ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ -label.menu.security.groups=セキュリティ グループ -label.menu.service.offerings=サービス オファリング -label.menu.snapshots=スナップショット -label.menu.stopped.instances=åœæ­¢ã•ã‚ŒãŸã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ -label.menu.storage=ストレージ -label.menu.system.vms=システム VM -label.menu.system=システム -label.menu.templates=テンプレート -label.menu.virtual.appliances=仮想アプライアンス -label.menu.virtual.resources=仮想リソース -label.menu.volumes=ボリューム -label.migrate.instance.to=インスタンスã®ç§»è¡Œå…ˆ: -label.minimum=æœ€å° -label.minute.past.hour=分 (毎時) -label.monday=月曜日 -label.monthly=毎月 -label.more.templates=ãã®ã»ã‹ã®ãƒ†ãƒ³ãƒ—レート -label.my.account=マイ アカウント -label.name.optional=åå‰ (オプション) -label.name=åå‰ -label.netmask=ãƒãƒƒãƒˆãƒžã‚¹ã‚¯ -label.network.desc=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®èª¬æ˜Ž -label.network.domain=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ドメイン -label.network.id=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ID -label.network.name=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯å -label.network.offering.display.text=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ オファリング表示テキスト -label.network.offering.id=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ オファリング ID -label.network.offering.name=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ オファリングå -label.network.offering=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ オファリング -label.network.rate=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯é€Ÿåº¦ -label.network.read=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®èª­ã¿å–ã‚Š -label.network.type=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®ç¨®é¡ž -label.network.write=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®æ›¸ã込㿠-label.network=ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.new.password=æ–°ã—ã„パスワード -label.next=次㸠-label.nfs.server=NFS サーãƒãƒ¼ -label.nfs.storage=NFS ストレージ +label.menu.my.accounts=\u30DE\u30A4 \u30A2\u30AB\u30A6\u30F3\u30C8 +label.menu.my.instances=\u30DE\u30A4 \u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 +label.menu.my.isos=\u30DE\u30A4 ISO +label.menu.my.templates=\u30DE\u30A4 \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +label.menu.network.offerings=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.menu.network=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.menu.physical.resources=\u7269\u7406\u30EA\u30BD\u30FC\u30B9 +label.menu.running.instances=\u5B9F\u884C\u4E2D\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 +label.menu.security.groups=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7 +label.menu.service.offerings=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.menu.snapshots=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8 +label.menu.stopped.instances=\u505C\u6B62\u3055\u308C\u305F\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 +label.menu.storage=\u30B9\u30C8\u30EC\u30FC\u30B8 +label.menu.system.service.offerings=\u30B7\u30B9\u30C6\u30E0 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.menu.system=\u30B7\u30B9\u30C6\u30E0 +label.menu.system.vms=\u30B7\u30B9\u30C6\u30E0 VM +label.menu.templates=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +label.menu.virtual.appliances=\u4EEE\u60F3\u30A2\u30D7\u30E9\u30A4\u30A2\u30F3\u30B9 +label.menu.virtual.resources=\u4EEE\u60F3\u30EA\u30BD\u30FC\u30B9 +label.menu.volumes=\u30DC\u30EA\u30E5\u30FC\u30E0 +label.migrate.instance.to.host=\u5225\u306E\u30DB\u30B9\u30C8\u3078\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u79FB\u884C +label.migrate.instance.to.ps=\u5225\u306E\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3078\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u79FB\u884C +label.migrate.instance.to=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u79FB\u884C\u5148\: +label.migrate.router.to=\u30EB\u30FC\u30BF\u30FC\u306E\u79FB\u884C\u5148\: +label.migrate.systemvm.to=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u79FB\u884C\u5148\: +label.migrate.to.host=\u30db\u30b9\u30c8\u3078\u79fb\u884c +label.migrate.to.storage=\u30b9\u30c8\u30ec\u30fc\u30b8\u3078\u79fb\u884c +label.migrate.volume=\u5225\u306E\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3078\u306E\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u79FB\u884C +label.minimum=\u6700\u5C0F +label.minute.past.hour=\u5206 (\u6BCE\u6642) +label.monday=\u6708\u66DC\u65E5 +label.monthly=\u6BCE\u6708 +label.more.templates=\u305D\u306E\u307B\u304B\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +label.move.down.row=1 \u884C\u4E0B\u306B\u79FB\u52D5 +label.move.to.bottom=\u6700\u4E0B\u4F4D\u306B\u79FB\u52D5 +label.move.to.top=\u6700\u4E0A\u4F4D\u306B\u79FB\u52D5 +label.move.up.row=1 \u884C\u4E0A\u306B\u79FB\u52D5 +label.my.account=\u30DE\u30A4 \u30A2\u30AB\u30A6\u30F3\u30C8 +label.my.network=\u30DE\u30A4 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.my.templates=\u30DE\u30A4 \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +label.name.optional=\u540D\u524D (\u30AA\u30D7\u30B7\u30E7\u30F3) +label.name=\u540D\u524D +label.nat.port.range=NAT \u30DD\u30FC\u30C8\u306E\u7BC4\u56F2 +label.netmask=\u30CD\u30C3\u30C8\u30DE\u30B9\u30AF +label.netScaler=NetScaler +label.network.ACLs=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ACL +label.network.ACL.total=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ACL \u5408\u8A08 +label.network.ACL=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ACL +label.network.desc=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8AAC\u660E +label.network.device.type=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30C7\u30D0\u30A4\u30B9\u306E\u7A2E\u985E +label.network.device=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30C7\u30D0\u30A4\u30B9 +label.network.domain.text=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30C9\u30E1\u30A4\u30F3 +label.network.domain=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30C9\u30E1\u30A4\u30F3 +label.network.id=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ID +label.networking.and.security=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3068\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 +label.network.label.display.for.blank.value=\u30C7\u30D5\u30A9\u30EB\u30C8 \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3092\u4F7F\u7528 +label.network.name=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u540D +label.network.offering.display.text=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u8868\u793A\u30C6\u30AD\u30B9\u30C8 +label.network.offering.id=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 ID +label.network.offering.name=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u540D +label.network.offering=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.network.rate.megabytes=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u901F\u5EA6 (MB/\u79D2) +label.network.rate=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u901F\u5EA6 +label.network.read=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8AAD\u307F\u53D6\u308A +label.network.service.providers=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30B5\u30FC\u30D3\u30B9 \u30D7\u30ED\u30D0\u30A4\u30C0\u30FC +label.networks=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.network.type=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u7A2E\u985E +label.network=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.network.write=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u66F8\u304D\u8FBC\u307F +label.new.password=\u65B0\u3057\u3044\u30D1\u30B9\u30EF\u30FC\u30C9 +label.new.project=\u65B0\u3057\u3044\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 +label.new=\u65B0\u898F +label.new.vm=\u65B0\u3057\u3044 VM +label.next=\u6B21\u3078 +label.nexusVswitch=Nexus 1000V label.nfs=NFS +label.nfs.server=NFS \u30B5\u30FC\u30D0\u30FC +label.nfs.storage=NFS \u30B9\u30C8\u30EC\u30FC\u30B8 +label.nic.adapter.type=NIC \u30A2\u30C0\u30D7\u30BF\u30FC\u306E\u7A2E\u985E +label.nicira.controller.address=\u30b3\u30f3\u30c8\u30ed\u30fc\u30e9\u30fc\u306e\u30a2\u30c9\u30ec\u30b9 +label.nicira.l3gatewayserviceuuid=L3 \u30b2\u30fc\u30c8\u30a6\u30a7\u30a4\u30b5\u30fc\u30d3\u30b9UUID +label.nicira.transportzoneuuid=Transport Zone Uuid label.nics=NIC -label.no.actions=実行ã§ãã‚‹æ“作ã¯ã‚ã‚Šã¾ã›ã‚“ -label.no.alerts=最近ã®ã‚¢ãƒ©ãƒ¼ãƒˆã¯ã‚ã‚Šã¾ã›ã‚“ -label.no.errors=最近ã®ã‚¨ãƒ©ãƒ¼ã¯ã‚ã‚Šã¾ã›ã‚“ -label.no.isos=使用ã§ãã‚‹ ISO ã¯ã‚ã‚Šã¾ã›ã‚“ -label.no.items=使用ã§ãã‚‹é …ç›®ã¯ã‚ã‚Šã¾ã›ã‚“ -label.no.security.groups=使用ã§ãるセキュリティ グループã¯ã‚ã‚Šã¾ã›ã‚“ -label.no.thanks=設定ã—ãªã„ -label.no=ã„ã„㈠-label.none=ãªã— -label.not.found=見ã¤ã‹ã‚Šã¾ã›ã‚“ -label.num.cpu.cores=CPU コア数 -label.numretries=å†è©¦è¡Œå›žæ•° -label.offer.ha=高å¯ç”¨æ€§ã®æä¾› -label.optional=オプション -label.os.preference=OS 基本設定 -label.os.type=OS ã®ç¨®é¡ž -label.owned.public.ips=所有ã™ã‚‹ãƒ‘ブリック IP アドレス -label.owner.account=所有者アカウント -label.owner.domain=所有者ドメイン -label.parent.domain=親ドメイン -label.password.enabled=パスワード管ç†æœ‰åŠ¹ -label.password=パスワード -label.path=パス -label.please.wait=ãŠå¾…ã¡ãã ã•ã„ -label.pod=ãƒãƒƒãƒ‰ -label.port.forwarding=ãƒãƒ¼ãƒˆè»¢é€ -label.port.range=ãƒãƒ¼ãƒˆã®ç¯„囲 -label.prev=戻る -label.primary.allocated=割り当ã¦æ¸ˆã¿ã®ãƒ—ライマリ ストレージ -label.primary.network=プライマリ ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.primary.storage=プライマリ ストレージ -label.primary.used=プライマリ ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ä½¿ç”¨é‡ -label.private.interface=プライベート インターフェイス -label.private.ip.range=プライベート IP アドレスã®ç¯„囲 -label.private.ip=プライベート IP アドレス -label.private.ips=プライベート IP アドレス -label.private.port=プライベート ãƒãƒ¼ãƒˆ -label.private.zone=プライベート ゾーン -label.protocol=プロトコル -label.public.interface=パブリック インターフェイス -label.public.ip=パブリック IP アドレス -label.public.ips=パブリック IP アドレス -label.public.port=パブリック ãƒãƒ¼ãƒˆ -label.public.zone=パブリック ゾーン -label.public=パブリック -label.recent.errors=最近ã®ã‚¨ãƒ©ãƒ¼ -label.refresh=æ›´æ–° -label.related=関連 -label.remove.from.load.balancer=è² è·åˆ†æ•£è£…ç½®ã‹ã‚‰ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’削除ã—ã¦ã„ã¾ã™ -label.removing.user=ユーザーを削除ã—ã¦ã„ã¾ã™ -label.required=å¿…é ˆã§ã™ -label.reserved.system.ip=予約済ã¿ã‚·ã‚¹ãƒ†ãƒ  IP アドレス -label.resource.limits=ãƒªã‚½ãƒ¼ã‚¹åˆ¶é™ -label.resource=リソース -label.resources=リソース -label.role=役割 -label.root.disk.offering=ルート ディスク オファリング -label.running.vms=実行中㮠VM -label.saturday=土曜日 -label.save=ä¿å­˜ -label.saving.processing=ä¿å­˜ã—ã¦ã„ã¾ã™... -label.scope=スコープ -label.search=検索 -label.secondary.storage=セカンダリ ストレージ -label.secondary.used=セカンダリ ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ä½¿ç”¨é‡ -label.secret.key=秘密キー -label.security.group.name=セキュリティ グループå -label.security.group=セキュリティ グループ -label.security.groups.enabled=セキュリティ グループ有効 -label.security.groups=セキュリティ グループ -label.sent=é€ä¿¡æ¸ˆã¿ -label.server=サーãƒãƒ¼ -label.service.offering=サービス オファリング -label.system.service.offering=システム サービス オファリング -label.session.expired=セッションã®æœ‰åŠ¹æœŸé™ãŒåˆ‡ã‚Œã¾ã—㟠-label.shared=共有 -label.size=サイズ -label.snapshot.limits=ã‚¹ãƒŠãƒƒãƒ—ã‚·ãƒ§ãƒƒãƒˆåˆ¶é™ -label.snapshot.name=スナップショットå -label.snapshot.s=スナップショット -label.snapshot.schedule=定期スナップショットã®ã‚»ãƒƒãƒˆã‚¢ãƒƒãƒ— -label.snapshot=スナップショット -label.snapshots=スナップショット -label.source.nat=é€ä¿¡å…ƒ NAT -label.specify.vlan=VLAN ã®æŒ‡å®š -label.start.port=開始ãƒãƒ¼ãƒˆ -label.state=状態 -label.static.nat.to=é™çš„ NAT ã®è¨­å®šå…ˆ: -label.static.nat=é™çš„ NAT -label.statistics=統計 -label.status=状態 -label.step.1.title=手順 1. テンプレートã®é¸æŠž -label.step.1=手順 1 -label.step.2.title=手順 2. サービス オファリング -label.step.2=手順 2 -label.step.3.title=手順 3. ディスク オファリングã®é¸æŠž -label.step.3=手順 3 -label.step.4.title=手順 4. ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ -label.step.4=手順 4 -label.step.5.title=手順 5. ç¢ºèª -label.step.5=手順 5 -label.stopped.vms=åœæ­¢ä¸­ã® VM -label.storage.type=ストレージã®ç¨®é¡ž -label.storage=ストレージ -label.submit=é€ä¿¡ -label.submitted.by=[é€ä¿¡ãƒ¦ãƒ¼ã‚¶ãƒ¼: ] -label.succeeded=æˆåŠŸ -label.sunday=日曜日 -label.system.capacity=システムã®å‡¦ç†èƒ½åŠ› -label.system.vm.type=システム VM ã®ç¨®é¡ž -label.system.vm=システム VM -label.system.vms=システム VM -label.tagged=ã‚¿ã‚°ã‚ã‚Š -label.tags=ã‚¿ã‚° -label.target.iqn=ターゲット IQN -label.template.limits=ãƒ†ãƒ³ãƒ—ãƒ¬ãƒ¼ãƒˆåˆ¶é™ -label.template=テンプレート -label.theme.default=デフォルト テーマ -label.theme.grey=カスタム - グレー -label.theme.lightblue=カスタム - ライト ブルー -label.thursday=木曜日 -label.time.zone=タイムゾーン -label.time=時刻 -label.timeout.in.second = タイムアウト (秒) -label.timezone=タイムゾーン -label.total.cpu=CPU åˆè¨ˆ -label.total.vms=VM åˆè¨ˆ -label.traffic.type=トラフィックã®ç¨®é¡ž -label.tuesday=ç«æ›œæ—¥ -label.type.id=種類 ID -label.type=種類 -label.unavailable=使用ä¸èƒ½ -label.unlimited=ç„¡åˆ¶é™ -label.untagged=ã‚¿ã‚°ãªã— -label.update.ssl.cert=SSL 証明書ã®æ›´æ–° -label.update.ssl=SSL 証明書ã®æ›´æ–° -label.updating=æ›´æ–°ã—ã¦ã„ã¾ã™ +label.no.actions=\u5B9F\u884C\u3067\u304D\u308B\u64CD\u4F5C\u306F\u3042\u308A\u307E\u305B\u3093 +label.no.alerts=\u6700\u8FD1\u306E\u30A2\u30E9\u30FC\u30C8\u306F\u3042\u308A\u307E\u305B\u3093 +label.no.data=\u8868\u793A\u3059\u308B\u30C7\u30FC\u30BF\u304C\u3042\u308A\u307E\u305B\u3093 +label.no.errors=\u6700\u8FD1\u306E\u30A8\u30E9\u30FC\u306F\u3042\u308A\u307E\u305B\u3093 +label.no.isos=\u4F7F\u7528\u3067\u304D\u308B ISO \u306F\u3042\u308A\u307E\u305B\u3093 +label.no.items=\u4F7F\u7528\u3067\u304D\u308B\u9805\u76EE\u306F\u3042\u308A\u307E\u305B\u3093 +label.none=\u306A\u3057 +label.no.security.groups=\u4F7F\u7528\u3067\u304D\u308B\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u306F\u3042\u308A\u307E\u305B\u3093 +label.not.found=\u898B\u3064\u304B\u308A\u307E\u305B\u3093 +label.no.thanks=\u8A2D\u5B9A\u3057\u306A\u3044 +label.notifications=\u901A\u77E5 +label.no=\u3044\u3044\u3048 +label.number.of.clusters=\u30AF\u30E9\u30B9\u30BF\u30FC\u6570 +label.number.of.hosts=\u30DB\u30B9\u30C8\u6570 +label.number.of.pods=\u30DD\u30C3\u30C9\u6570 +label.number.of.system.vms=\u30B7\u30B9\u30C6\u30E0 VM \u6570 +label.number.of.virtual.routers=\u4EEE\u60F3\u30EB\u30FC\u30BF\u30FC\u6570 +label.number.of.zones=\u30BE\u30FC\u30F3\u6570 +label.num.cpu.cores=CPU \u30B3\u30A2\u6570 +label.numretries=\u518D\u8A66\u884C\u56DE\u6570 +label.ocfs2=OCFS2 +label.offer.ha=\u9AD8\u53EF\u7528\u6027\u306E\u63D0\u4F9B +label.ok=OK +label.optional=\u30AA\u30D7\u30B7\u30E7\u30F3 +label.order=\u9806\u5E8F +label.os.preference=OS \u57FA\u672C\u8A2D\u5B9A +label.os.type=OS \u306E\u7A2E\u985E +label.owned.public.ips=\u6240\u6709\u3059\u308B\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9 +label.owner.account=\u6240\u6709\u8005\u30A2\u30AB\u30A6\u30F3\u30C8 +label.owner.domain=\u00e6\u0089\u0080\u00e6\u009c\u0089\u00e8\u0080\u0085\u00e3\u0083\u0089\u00e3\u0083\u00a1\u00e3\u0082\u00a4\u00e3\u0083\u00b3 +label.parent.domain=\u89AA\u30C9\u30E1\u30A4\u30F3 +label.password.enabled=\u30D1\u30B9\u30EF\u30FC\u30C9\u7BA1\u7406\u6709\u52B9 +label.password=\u30D1\u30B9\u30EF\u30FC\u30C9 +label.path=\u30D1\u30B9 +label.perfect.forward.secrecy=Perfect Forward Secrecy +label.physical.network.ID=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF ID +label.PING.CIFS.password=PING CIFS \u30D1\u30B9\u30EF\u30FC\u30C9 +label.PING.CIFS.username=PING CIFS \u30E6\u30FC\u30B6\u30FC\u540D +label.PING.dir=PING \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA +label.PING.storage.IP=PING \u5BFE\u8C61\u306E\u30B9\u30C8\u30EC\u30FC\u30B8 IP \u30A2\u30C9\u30EC\u30B9 +label.please.specify.netscaler.info=Netscaler \u60C5\u5831\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044 +label.please.wait=\u304A\u5F85\u3061\u304F\u3060\u3055\u3044 +label.pod.name=\u30DD\u30C3\u30C9\u540D +label.pods=\u30DD\u30C3\u30C9 +label.pod=\u30DD\u30C3\u30C9 +label.port.forwarding.policies=\u30DD\u30FC\u30C8\u8EE2\u9001\u30DD\u30EA\u30B7\u30FC +label.port.forwarding=\u30DD\u30FC\u30C8\u8EE2\u9001 +label.port.range=\u30DD\u30FC\u30C8\u306E\u7BC4\u56F2 +label.PreSetup=PreSetup +label.previous=\u623B\u308B +label.prev=\u623B\u308B +label.primary.allocated=\u5272\u308A\u5F53\u3066\u6E08\u307F\u306E\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 +label.primary.network=\u30D7\u30E9\u30A4\u30DE\u30EA \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.primary.storage.count=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 \u30D7\u30FC\u30EB +label.primary.storage=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 +label.primary.used=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u4F7F\u7528\u91CF +label.private.Gateway=\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4 +label.private.interface=\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 \u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30A4\u30B9 +label.private.ip.range=\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2 +label.private.ips=\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 IP \u30A2\u30C9\u30EC\u30B9 +label.private.ip=\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 IP \u30A2\u30C9\u30EC\u30B9 +label.privatekey=PKC\#8 \u79D8\u5BC6\u30AD\u30FC +label.private.network=\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.private.port=\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 \u30DD\u30FC\u30C8 +label.private.zone=\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 \u30BE\u30FC\u30F3 +label.project.dashboard=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 \u30C0\u30C3\u30B7\u30E5\u30DC\u30FC\u30C9 +label.project.id=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 ID +label.project.invite=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3078\u306E\u62DB\u5F85 +label.project.name=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u540D +label.projects=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 +label.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 +label.project.view=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 \u30D3\u30E5\u30FC +label.protocol=\u30D7\u30ED\u30C8\u30B3\u30EB +label.providers=\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC +label.public.interface=\u30D1\u30D6\u30EA\u30C3\u30AF \u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30A4\u30B9 +label.public.ips=\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9 +label.public.ip=\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9 +label.public.network=\u30D1\u30D6\u30EA\u30C3\u30AF \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.public.port=\u30D1\u30D6\u30EA\u30C3\u30AF \u30DD\u30FC\u30C8 +label.public=\u30D1\u30D6\u30EA\u30C3\u30AF +label.public.zone=\u30D1\u30D6\u30EA\u30C3\u30AF \u30BE\u30FC\u30F3 +label.purpose=\u76EE\u7684 +label.Pxe.server.type=PXE \u30B5\u30FC\u30D0\u30FC\u306E\u7A2E\u985E +label.quickview=\u30af\u30a4\u30c3\u30af\u30d3\u30e5\u30fc +label.reboot=\u518d\u8d77\u52d5 +label.recent.errors=\u6700\u8FD1\u306E\u30A8\u30E9\u30FC +label.redundant.router.capability=\u5197\u9577\u30EB\u30FC\u30BF\u30FC\u6A5F\u80FD +label.redundant.router=\u5197\u9577\u30EB\u30FC\u30BF\u30FC +label.redundant.state=\u5197\u9577\u72B6\u614B +label.refresh=\u66F4\u65B0 +label.related=\u95A2\u9023 +label.remind.later=\u30A2\u30E9\u30FC\u30E0\u3092\u8868\u793A\u3059\u308B +label.remove.ACL=ACL \u306E\u524A\u9664 +label.remove.egress.rule=\u9001\u4FE1\u898F\u5247\u306E\u524A\u9664 +label.remove.from.load.balancer=\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u304B\u3089\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059 +label.remove.ingress.rule=\u53D7\u4FE1\u898F\u5247\u306E\u524A\u9664 +label.remove.ip.range=IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u306E\u524A\u9664 +label.remove.pf=\u30DD\u30FC\u30C8\u8EE2\u9001\u898F\u5247\u306E\u524A\u9664 +label.remove.rule=\u898F\u5247\u306E\u524A\u9664 +label.remove.static.nat.rule=\u9759\u7684 NAT \u898F\u5247\u306E\u524A\u9664 +label.remove.static.route=\u9759\u7684\u30EB\u30FC\u30C8\u306E\u524A\u9664 +label.remove.tier=\u968E\u5C64\u306E\u524A\u9664 +label.remove.vm.from.lb=\u8CA0\u8377\u5206\u6563\u898F\u5247\u304B\u3089\u306E VM \u306E\u524A\u9664 +label.remove.vpc=VPC \u306E\u524A\u9664 +label.removing=\u524A\u9664\u3057\u3066\u3044\u307E\u3059 +label.removing.user=\u30E6\u30FC\u30B6\u30FC\u3092\u524A\u9664\u3057\u3066\u3044\u307E\u3059 +label.required=\u5FC5\u9808\u3067\u3059 +label.reserved.system.gateway=\u4E88\u7D04\u6E08\u307F\u30B7\u30B9\u30C6\u30E0 \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4 +label.reserved.system.ip=\u4E88\u7D04\u6E08\u307F\u30B7\u30B9\u30C6\u30E0 IP \u30A2\u30C9\u30EC\u30B9 +label.reserved.system.netmask=\u4E88\u7D04\u6E08\u307F\u30B7\u30B9\u30C6\u30E0 \u30CD\u30C3\u30C8\u30DE\u30B9\u30AF +label.reset.VPN.connection=VPN \u63A5\u7D9A\u306E\u30EA\u30BB\u30C3\u30C8 +label.resource.limits=\u30EA\u30BD\u30FC\u30B9\u5236\u9650 +label.resource.state=\u30EA\u30BD\u30FC\u30B9\u306E\u72B6\u614B +label.resources=\u30EA\u30BD\u30FC\u30B9 +label.resource=\u30EA\u30BD\u30FC\u30B9 +label.restart.network=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u518D\u8D77\u52D5 +label.restart.required=\u518D\u8D77\u52D5\u304C\u5FC5\u8981 +label.restart.vpc=VPC \u306E\u518D\u8D77\u52D5 +label.restore=\u30ea\u30b9\u30c8\u30a2 +label.review=\u78BA\u8A8D +label.revoke.project.invite=\u62DB\u5F85\u306E\u53D6\u308A\u6D88\u3057 +label.role=\u5F79\u5272 +label.root.disk.controller=\u30EB\u30FC\u30C8 \u30C7\u30A3\u30B9\u30AF \u30B3\u30F3\u30C8\u30ED\u30FC\u30E9\u30FC +label.root.disk.offering=\u30EB\u30FC\u30C8 \u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.round.robin=\u30E9\u30A6\u30F3\u30C9\u30ED\u30D3\u30F3 +label.rules=\u898F\u5247 +label.running.vms=\u5B9F\u884C\u4E2D\u306E VM +label.s3.access_key=\u30a2\u30af\u30bb\u30b9\u30ad\u30fc +label.s3.bucket=\u30d0\u30b1\u30c3\u30c8 +label.s3.connection_timeout=\u30b3\u30cd\u30af\u30b7\u30e7\u30f3\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8 +label.s3.endpoint=\u30a8\u30f3\u30c9\u30dd\u30a4\u30f3\u30c8 +label.s3.max_error_retry=\u30a8\u30e9\u30fc\u6642\u306e\u6700\u5927\u30ea\u30c8\u30e9\u30a4\u6570 +label.s3.secret_key=\u79d8\u5bc6\u9375 +label.s3.socket_timeout=\u30bd\u30b1\u30c3\u30c8\u30bf\u30a4\u30e0\u30a2\u30a6\u30c8 +label.s3.use_https=HTTPS\u306e\u4f7f\u7528 +label.saturday=\u571F\u66DC\u65E5 +label.save.and.continue=\u4FDD\u5B58\u3057\u3066\u7D9A\u884C +label.save=\u4FDD\u5B58 +label.saving.processing=\u4FDD\u5B58\u3057\u3066\u3044\u307E\u3059... +label.scope=\u30B9\u30B3\u30FC\u30D7 +label.search=\u691C\u7D22 +label.secondary.storage.count=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 \u30D7\u30FC\u30EB +label.secondary.storage=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 +label.secondary.storage.vm=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 VM +label.secondary.used=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u4F7F\u7528\u91CF +label.secret.key=\u79d8\u5bc6\u9375 +label.security.group.name=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u540D +label.security.groups.enabled=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u6709\u52B9 +label.security.groups=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7 +label.security.group=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7 +label.select.a.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u9078\u629E +label.select.a.zone=\u30BE\u30FC\u30F3\u306E\u9078\u629E +label.select.instance.to.attach.volume.to=\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u30A2\u30BF\u30C3\u30C1\u3059\u308B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044 +label.select.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u9078\u629E +label.select.iso.or.template=ISO \u307E\u305F\u306F\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u9078\u629E +label.select.offering=\u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u9078\u629E +label.select.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u9078\u629E +label.select.tier=\u968E\u5C64\u306E\u9078\u629E +label.select=\u9078\u629E +label.select-view=\u30D3\u30E5\u30FC\u306E\u9078\u629E +label.select.vm.for.static.nat=\u9759\u7684 NAT \u7528 VM \u306E\u9078\u629E +label.sent=\u9001\u4FE1\u6E08\u307F +label.server=\u30B5\u30FC\u30D0\u30FC +label.service.capabilities=\u30B5\u30FC\u30D3\u30B9\u306E\u6A5F\u80FD +label.service.offering=\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.session.expired=\u30BB\u30C3\u30B7\u30E7\u30F3\u306E\u6709\u52B9\u671F\u9650\u304C\u5207\u308C\u307E\u3057\u305F +label.setup.network=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7 +label.setup=\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7 +label.set.up.zone.type=\u30BE\u30FC\u30F3\u306E\u7A2E\u985E\u306E\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7 +label.setup.zone=\u30BE\u30FC\u30F3\u306E\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7 +label.SharedMountPoint=SharedMountPoint +label.shared=\u5171\u6709 +label.show.ingress.rule=\u53D7\u4FE1\u898F\u5247\u306E\u8868\u793A +label.shutdown.provider=\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u306E\u30B7\u30E3\u30C3\u30C8\u30C0\u30A6\u30F3 +label.site.to.site.VPN=\u30B5\u30A4\u30C8\u9593 VPN +label.size=\u30B5\u30A4\u30BA +label.skip.guide=CloudStack \u3092\u4F7F\u7528\u3057\u305F\u3053\u3068\u304C\u3042\u308B\u306E\u3067\u3001\u3053\u306E\u30AC\u30A4\u30C9\u3092\u30B9\u30AD\u30C3\u30D7\u3059\u308B +label.snapshot.limits=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u5236\u9650 +label.snapshot.name=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u540D +label.snapshot.schedule=\u5B9A\u671F\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306E\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7 +label.snapshot.s=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8 +label.snapshots=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8 +label.snapshot=\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8 +label.source.nat=\u9001\u4FE1\u5143 NAT +label.source=\u9001\u4FE1\u5143 +label.specify.IP.ranges=IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u306E\u6307\u5B9A +label.specify.vlan=VLAN \u306E\u6307\u5B9A +label.SR.name = SR \u540D\u30E9\u30D9\u30EB +label.srx=SRX +label.start.IP=\u958B\u59CB IP \u30A2\u30C9\u30EC\u30B9 +label.start.port=\u958B\u59CB\u30DD\u30FC\u30C8 +label.start.reserved.system.IP=\u4E88\u7D04\u6E08\u307F\u958B\u59CB\u30B7\u30B9\u30C6\u30E0 IP \u30A2\u30C9\u30EC\u30B9 +label.start.vlan=\u958B\u59CB VLAN +label.state=\u72B6\u614B +label.static.nat.enabled=\u9759\u7684 NAT \u6709\u52B9 +label.static.nat.to=\u9759\u7684 NAT \u306E\u8A2D\u5B9A\u5148\: +label.static.nat=\u9759\u7684 NAT +label.static.nat.vm.details=\u9759\u7684 NAT VM \u306E\u8A73\u7D30 +label.statistics=\u7D71\u8A08 +label.status=\u72B6\u614B +label.step.1.title=\u624B\u9806 1. \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u9078\u629E +label.step.1=\u624B\u9806 1 +label.step.2.title=\u624B\u9806 2. \u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.step.2=\u624B\u9806 2 +label.step.3.title=\u624B\u9806 3. \u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u306E\u9078\u629E +label.step.3=\u624B\u9806 3 +label.step.4.title=\u624B\u9806 4. \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.step.4=\u624B\u9806 4 +label.step.5.title=\u624B\u9806 5. \u78BA\u8A8D +label.step.5=\u624B\u9806 5 +label.stickiness=\u6301\u7D9A\u6027 +label.sticky.cookie-name=Cookie \u540D +label.sticky.domain=\u30C9\u30E1\u30A4\u30F3 +label.sticky.expire=\u5931\u52B9 +label.sticky.holdtime=\u4FDD\u6301\u6642\u9593 +label.sticky.indirect=\u9593\u63A5 +label.sticky.length=\u9577\u3055 +label.sticky.mode=\u30E2\u30FC\u30C9 +label.sticky.nocache=\u30AD\u30E3\u30C3\u30B7\u30E5\u306A\u3057 +label.sticky.postonly=\u30DD\u30B9\u30C8\u306E\u307F +label.sticky.prefix=\u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9 +label.sticky.request-learn=\u30E9\u30FC\u30CB\u30F3\u30B0\u306E\u8981\u6C42 +label.sticky.tablesize=\u30C6\u30FC\u30D6\u30EB \u30B5\u30A4\u30BA +label.stopped.vms=\u505C\u6B62\u4E2D\u306E VM +label.stop=\u505c\u6b62 +label.storage.tags=\u30B9\u30C8\u30EC\u30FC\u30B8 \u30BF\u30B0 +label.storage.traffic=\u30B9\u30C8\u30EC\u30FC\u30B8 \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF +label.storage.type=\u30B9\u30C8\u30EC\u30FC\u30B8\u306E\u7A2E\u985E +label.storage=\u30B9\u30C8\u30EC\u30FC\u30B8 +label.subdomain.access=\u30B5\u30D6\u30C9\u30E1\u30A4\u30F3 \u30A2\u30AF\u30BB\u30B9 +label.submitted.by=[\u9001\u4FE1\u30E6\u30FC\u30B6\u30FC\: ] +label.submit=\u9001\u4FE1 +label.succeeded=\u6210\u529F +label.sunday=\u65E5\u66DC\u65E5 +label.super.cidr.for.guest.networks=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u30B9\u30FC\u30D1\u30FC CIDR +label.supported.services=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u30B5\u30FC\u30D3\u30B9 +label.supported.source.NAT.type=\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u9001\u4FE1\u5143 NAT \u306E\u7A2E\u985E +label.suspend.project=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4E00\u6642\u505C\u6B62 +label.system.capacity=\u30B7\u30B9\u30C6\u30E0\u306E\u51E6\u7406\u80FD\u529B +label.system.offering=\u30B7\u30B9\u30C6\u30E0 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.system.service.offering=\u30B7\u30B9\u30C6\u30E0 \u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0 +label.system.vms=\u30B7\u30B9\u30C6\u30E0 VM +label.system.vm.type=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u7A2E\u985E +label.system.vm=\u30B7\u30B9\u30C6\u30E0 VM +label.system.wide.capacity=\u30B7\u30B9\u30C6\u30E0\u5168\u4F53\u306E\u51E6\u7406\u80FD\u529B +label.tagged=\u30BF\u30B0\u3042\u308A +label.tags=\u30BF\u30B0 +label.target.iqn=\u30BF\u30FC\u30B2\u30C3\u30C8 IQN +label.task.completed=\u30BF\u30B9\u30AF\u304C\u5B8C\u4E86\u3057\u307E\u3057\u305F +label.template.limits=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u5236\u9650 +label.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 +label.TFTP.dir=TFTP \u30C7\u30A3\u30EC\u30AF\u30C8\u30EA +label.theme.default=\u30C7\u30D5\u30A9\u30EB\u30C8 \u30C6\u30FC\u30DE +label.theme.grey=\u30AB\u30B9\u30BF\u30E0 - \u30B0\u30EC\u30FC +label.theme.lightblue=\u30AB\u30B9\u30BF\u30E0 - \u30E9\u30A4\u30C8 \u30D6\u30EB\u30FC +label.thursday=\u6728\u66DC\u65E5 +label.tier.details=\u968E\u5C64\u306E\u8A73\u7D30 +label.tier=\u968E\u5C64 +label.timeout.in.second = \u30BF\u30A4\u30E0\u30A2\u30A6\u30C8 (\u79D2) +label.timeout=\u30BF\u30A4\u30E0\u30A2\u30A6\u30C8 +label.time=\u6642\u523B +label.time.zone=\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3 +label.timezone=\u30BF\u30A4\u30E0\u30BE\u30FC\u30F3 +label.token=\u30C8\u30FC\u30AF\u30F3 +label.total.cpu=CPU \u5408\u8A08 +label.total.CPU=CPU \u5408\u8A08 +label.total.hosts=\u30DB\u30B9\u30C8\u5408\u8A08 +label.total.memory=\u30E1\u30E2\u30EA\u5408\u8A08 +label.total.of.ip=IP \u30A2\u30C9\u30EC\u30B9\u5408\u8A08 +label.total.of.vm=VM \u5408\u8A08 +label.total.storage=\u30B9\u30C8\u30EC\u30FC\u30B8\u5408\u8A08 +label.total.vms=VM \u5408\u8A08 +label.traffic.label=\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF \u30E9\u30D9\u30EB +label.traffic.types=\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7A2E\u985E +label.traffic.type=\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7A2E\u985E +label.tuesday=\u706B\u66DC\u65E5 +label.type.id=\u7A2E\u985E ID +label.type=\u7A2E\u985E +label.unavailable=\u4F7F\u7528\u4E0D\u80FD +label.unlimited=\u7121\u5236\u9650 +label.untagged=\u30BF\u30B0\u306A\u3057 +label.update.project.resources=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 \u30EA\u30BD\u30FC\u30B9\u306E\u66F4\u65B0 +label.update.ssl.cert= SSL \u8A3C\u660E\u66F8\u306E\u66F4\u65B0 +label.update.ssl= SSL \u8A3C\u660E\u66F8\u306E\u66F4\u65B0 +label.updating=\u66F4\u65B0\u3057\u3066\u3044\u307E\u3059 +label.upload=\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9 +label.upload.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u30A2\u30C3\u30D7\u30ED\u30FC\u30C9 label.url=URL -label.usage.interface=使用状æ³æ¸¬å®šã‚¤ãƒ³ã‚¿ãƒ¼ãƒ•ã‚§ã‚¤ã‚¹ -label.used=使用中 -label.user=ユーザー -label.username=ユーザーå -label.users=ユーザー -label.value=値 -label.vcenter.cluster=vCenter クラスター -label.vcenter.datacenter=vCenter データセンター -label.vcenter.datastore=vCenter データストア -label.vcenter.host=vCenter ホスト -label.vcenter.password=vCenter パスワード -label.vcenter.username=vCenter ユーザーå -label.version=ãƒãƒ¼ã‚¸ãƒ§ãƒ³ -label.virtual.appliance=仮想アプライアンス -label.virtual.appliances=仮想アプライアンス -label.virtual.network=仮想ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ +label.usage.interface=\u4F7F\u7528\u72B6\u6CC1\u6E2C\u5B9A\u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30A4\u30B9 +label.used=\u4F7F\u7528\u4E2D +label.username=\u30E6\u30FC\u30B6\u30FC\u540D +label.users=\u30E6\u30FC\u30B6\u30FC +label.user=\u30E6\u30FC\u30B6\u30FC +label.value=\u5024 +label.vcdcname=vCenter DC \u540D +label.vcenter.cluster=vCenter \u30AF\u30E9\u30B9\u30BF\u30FC +label.vcenter.datacenter=vCenter \u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC +label.vcenter.datastore=vCenter \u30C7\u30FC\u30BF\u30B9\u30C8\u30A2 +label.vcenter.host=vCenter \u30DB\u30B9\u30C8 +label.vcenter.password=vCenter \u30D1\u30B9\u30EF\u30FC\u30C9 +label.vcenter.username=vCenter \u30E6\u30FC\u30B6\u30FC\u540D +label.vcipaddress=vCenter IP \u30A2\u30C9\u30EC\u30B9 +label.version=\u30D0\u30FC\u30B8\u30E7\u30F3 +label.view.all=\u3059\u3079\u3066\u8868\u793A +label.view.console=\u30B3\u30F3\u30BD\u30FC\u30EB\u306E\u8868\u793A +label.viewing=\u8868\u793A\u9805\u76EE\: +label.view.more=\u8A73\u7D30\u8868\u793A +label.view=\u8868\u793A - +label.virtual.appliances=\u4EEE\u60F3\u30A2\u30D7\u30E9\u30A4\u30A2\u30F3\u30B9 +label.virtual.appliance=\u4EEE\u60F3\u30A2\u30D7\u30E9\u30A4\u30A2\u30F3\u30B9 +label.virtual.machines=\u4EEE\u60F3\u30DE\u30B7\u30F3 +label.virtual.network=\u4EEE\u60F3\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF +label.virtual.routers=\u4EEE\u60F3\u30EB\u30FC\u30BF\u30FC +label.virtual.router=\u4EEE\u60F3\u30EB\u30FC\u30BF\u30FC label.vlan.id=VLAN ID -label.vlan.range=VLAN ã®ç¯„囲 -label.vm.add=インスタンスã®è¿½åŠ  -label.vm.destroy=破棄 -label.vm.reboot=å†èµ·å‹• -label.vm.start=èµ·å‹• -label.vm.stop=åœæ­¢ +label.vlan.range=VLAN \u306E\u7BC4\u56F2 +label.vlan=VLAN +label.vm.add=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u8FFD\u52A0 +label.vm.destroy=\u7834\u68c4 +label.vm.display.name=VM \u8868\u793A\u540D +label.VMFS.datastore=VMFS \u30C7\u30FC\u30BF\u30B9\u30C8\u30A2 label.vmfs=VMFS +label.vm.name=VM \u540D +label.vm.reboot=\u518d\u8d77\u52d5 +label.VMs.in.tier=\u968E\u5C64\u5185\u306E VM +label.vmsnapshot.type=\u7A2E\u985E +label.vm.start=\u8D77\u52D5 +label.vm.state=VM \u306E\u72B6\u614B +label.vm.stop=\u505c\u6b62 label.vms=VM -label.volume.limits=ãƒœãƒªãƒ¥ãƒ¼ãƒ åˆ¶é™ -label.volume.name=ボリュームå -label.volume=ボリューム -label.volumes=ボリューム -label.vsphere.managed=vSphere ã«ã‚ˆã‚‹ç®¡ç† -label.waiting=å¾…æ©Ÿã—ã¦ã„ã¾ã™ -label.warn=警告 -label.wednesday=水曜日 -label.weekly=毎週 -label.welcome.cloud.console=管ç†ã‚³ãƒ³ã‚½ãƒ¼ãƒ«ã¸ã‚ˆã†ã“ã -label.welcome=よã†ã“ã -label.yes=ã¯ã„ -label.zone.id=ゾーン ID -label.zone.step.1.title=手順 1. ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã®é¸æŠž -label.zone.step.2.title=手順 2. ゾーンã®è¿½åŠ  -label.zone.step.3.title=手順 3. ãƒãƒƒãƒ‰ã®è¿½åŠ  -label.zone.step.4.title=手順 4. IP アドレス範囲ã®è¿½åŠ  -label.zone.wide=ゾーン全体 -label.zone=ゾーン - -#Messages -message.acquire.public.ip=æ–°ã—ã„ IP アドレスをå–å¾—ã™ã‚‹ã‚¾ãƒ¼ãƒ³ã‚’é¸æŠžã—ã¦ãã ã•ã„。 -message.action.cancel.maintenance.mode=ã“ã®ä¿å®ˆã‚’キャンセルã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.cancel.maintenance=ホストã®ä¿å®ˆã¯æ­£å¸¸ã«ã‚­ãƒ£ãƒ³ã‚»ãƒ«ã•ã‚Œã¾ã—ãŸã€‚ã“ã®å‡¦ç†ã«ã¯æ•°åˆ†ã‹ã‹ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ -message.action.delete.ISO.for.all.zones=ãã® ISO ã¯ã™ã¹ã¦ã®ã‚¾ãƒ¼ãƒ³ã§ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ã™ã¹ã¦ã®ã‚¾ãƒ¼ãƒ³ã‹ã‚‰å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.ISO=ã“ã® ISO を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.cluster=ã“ã®ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.disk.offering=ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ オファリングを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.domain=ã“ã®ãƒ‰ãƒ¡ã‚¤ãƒ³ã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.external.firewall=ã“ã®å¤–部ファイアウォールを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? 警告: åŒã˜å¤–部ファイアウォールをå†åº¦è¿½åŠ ã™ã‚‹äºˆå®šã§ã‚ã‚‹å ´åˆã¯ã€ãƒ‡ãƒã‚¤ã‚¹ã®ä½¿ç”¨çŠ¶æ³ãƒ‡ãƒ¼ã‚¿ã‚’リセットã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.action.delete.external.load.balancer=ã“ã®å¤–部負è·åˆ†æ•£è£…置を削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? 警告: åŒã˜å¤–部負è·åˆ†æ•£è£…置をå†åº¦è¿½åŠ ã™ã‚‹äºˆå®šã§ã‚ã‚‹å ´åˆã¯ã€ãƒ‡ãƒã‚¤ã‚¹ã®ä½¿ç”¨çŠ¶æ³ãƒ‡ãƒ¼ã‚¿ã‚’リセットã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.action.delete.ingress.rule=ã“ã®å—ä¿¡è¦å‰‡ã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.network=ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.pod=ã“ã®ãƒãƒƒãƒ‰ã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.primary.storage=ã“ã®ãƒ—ライマリ ストレージを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.secondary.storage=ã“ã®ã‚»ã‚«ãƒ³ãƒ€ãƒª ストレージを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.security.group=ã“ã®ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ グループを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.service.offering=ã“ã®ã‚µãƒ¼ãƒ“ス オファリングを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.snapshot=ã“ã®ã‚¹ãƒŠãƒƒãƒ—ショットを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.template.for.all.zones=ãã®ãƒ†ãƒ³ãƒ—レートã¯ã™ã¹ã¦ã®ã‚¾ãƒ¼ãƒ³ã§ä½¿ç”¨ã•ã‚Œã¦ã„ã¾ã™ã€‚ã™ã¹ã¦ã®ã‚¾ãƒ¼ãƒ³ã‹ã‚‰å‰Šé™¤ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.template=ã“ã®ãƒ†ãƒ³ãƒ—レートを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.volume=ã“ã®ãƒœãƒªãƒ¥ãƒ¼ãƒ ã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.delete.zone=ã“ã®ã‚¾ãƒ¼ãƒ³ã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.destroy.instance=ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’破棄ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.destroy.systemvm=ã“ã®ã‚·ã‚¹ãƒ†ãƒ  VM を破棄ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.disable.static.NAT=é™çš„ NAT を無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.enable.maintenance=ホストをä¿å®ˆã™ã‚‹æº–å‚™ãŒã§ãã¾ã—ãŸã€‚ã“ã®ãƒ›ã‚¹ãƒˆä¸Šã® VM æ•°ã«ã‚ˆã£ã¦ã¯ã€ã“ã®å‡¦ç†ã«ã¯æ•°åˆ†ä»¥ä¸Šã‹ã‹ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ -message.action.force.reconnect=ホストã¯å¼·åˆ¶çš„ã«å†æŽ¥ç¶šã—ã¾ã—ãŸã€‚ã“ã®å‡¦ç†ã«ã¯æ•°åˆ†ã‹ã‹ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ -message.action.host.enable.maintenance.mode=ä¿å®ˆãƒ¢ãƒ¼ãƒ‰ã‚’有効ã«ã™ã‚‹ã¨ã€ã“ã®ãƒ›ã‚¹ãƒˆã§å®Ÿè¡Œä¸­ã®ã™ã¹ã¦ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ãŒã»ã‹ã®ä½¿ç”¨ã§ãるホストã«ãƒ©ã‚¤ãƒ– マイグレーションã•ã‚Œã¾ã™ã€‚ -message.action.instance.reset.password=ã“ã®ä»®æƒ³ãƒžã‚·ãƒ³ã®ãƒ«ãƒ¼ãƒˆ パスワードを変更ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.primarystorage.enable.maintenance.mode=警告: プライマリ ストレージをä¿å®ˆãƒ¢ãƒ¼ãƒ‰ã«ã™ã‚‹ã¨ã€ãã®ã‚¹ãƒˆãƒ¬ãƒ¼ã‚¸ä¸Šã®ãƒœãƒªãƒ¥ãƒ¼ãƒ ã‚’使用ã™ã‚‹ã™ã¹ã¦ã® VM ãŒåœæ­¢ã—ã¾ã™ã€‚続行ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.reboot.instance=ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’å†èµ·å‹•ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.reboot.systemvm=ã“ã®ã‚·ã‚¹ãƒ†ãƒ  VM ã‚’å†èµ·å‹•ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.release.ip=ã“ã® IP アドレスを解放ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.restore.instance=ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’復元ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.start.instance=ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’èµ·å‹•ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.start.router=ã“ã®ãƒ«ãƒ¼ã‚¿ãƒ¼ã‚’èµ·å‹•ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.start.systemvm=ã“ã®ã‚·ã‚¹ãƒ†ãƒ  VM ã‚’èµ·å‹•ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.stop.instance=ã“ã®ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’åœæ­¢ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.stop.systemvm=ã“ã®ã‚·ã‚¹ãƒ†ãƒ  VM ã‚’åœæ­¢ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.action.take.snapshot=ã“ã®ãƒœãƒªãƒ¥ãƒ¼ãƒ ã®ã‚¹ãƒŠãƒƒãƒ—ショットを作æˆã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.add.cluster.zone=ゾーン ã«ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã§ç®¡ç†ã•ã‚Œã‚‹ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã‚’追加ã—ã¾ã™ -message.add.cluster=ゾーン ã®ãƒãƒƒãƒ‰ ã«ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã§ç®¡ç†ã•ã‚Œã‚‹ã‚¯ãƒ©ã‚¹ã‚¿ãƒ¼ã‚’追加ã—ã¾ã™ -message.add.disk.offering=æ–°ã—ã„ディスク オファリングを追加ã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®ãƒ‘ラメーターを指定ã—ã¦ãã ã•ã„。 -message.add.firewall=ゾーンã«ãƒ•ã‚¡ã‚¤ã‚¢ã‚¦ã‚©ãƒ¼ãƒ«ã‚’追加ã—ã¾ã™ -message.add.host=æ–°ã—ã„ホストを追加ã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®ãƒ‘ラメーターを指定ã—ã¦ãã ã•ã„。 -message.add.ip.range.direct.network=ゾーン ã®ç›´æŽ¥ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ ã« IP アドレスã®ç¯„囲を追加ã—ã¾ã™ -message.add.ip.range.to.pod=

ãƒãƒƒãƒ‰ ã« IP アドレスã®ç¯„囲を追加ã—ã¾ã™

-message.add.ip.range=ゾーンã®ãƒ‘ブリック ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã« IP アドレスã®ç¯„囲を追加ã—ã¾ã™ -message.add.load.balancer=ゾーンã«è² è·åˆ†æ•£è£…置を追加ã—ã¾ã™ -message.add.network=ゾーン ã«æ–°ã—ã„ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’追加ã—ã¾ã™ -message.add.pod=ゾーン ã«æ–°ã—ã„ãƒãƒƒãƒ‰ã‚’追加ã—ã¾ã™ -message.add.primary.storage=ゾーン ã®ãƒãƒƒãƒ‰ ã«æ–°ã—ã„プライマリ ストレージを追加ã—ã¾ã™ -message.add.primary=æ–°ã—ã„プライマリ ストレージを追加ã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®ãƒ‘ラメーターを指定ã—ã¦ãã ã•ã„。 -message.add.secondary.storage=ゾーン ã«æ–°ã—ã„ストレージを追加ã—ã¾ã™ -message.add.service.offering=æ–°ã—ã„コンピューティング オファリングを追加ã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®ãƒ‡ãƒ¼ã‚¿ã‚’入力ã—ã¦ãã ã•ã„。 -message.add.template=æ–°ã—ã„テンプレートを作æˆã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®ãƒ‡ãƒ¼ã‚¿ã‚’入力ã—ã¦ãã ã•ã„。 -message.add.volume=æ–°ã—ã„ボリュームを追加ã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®ãƒ‡ãƒ¼ã‚¿ã‚’入力ã—ã¦ãã ã•ã„。 -message.additional.networks.desc=仮想インスタンスãŒæŽ¥ç¶šã™ã‚‹è¿½åŠ ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’é¸æŠžã—ã¦ãã ã•ã„。 -message.advanced.mode.desc=VLAN サãƒãƒ¼ãƒˆã‚’有効ã«ã™ã‚‹å ´åˆã¯ã€ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ モデルをé¸æŠžã—ã¦ãã ã•ã„。ã“ã®ãƒ¢ãƒ‡ãƒ«ã§ã¯æœ€ã‚‚柔軟ã«ã‚«ã‚¹ã‚¿ãƒ  ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ オファリングをæä¾›ã§ãã€ãƒ•ã‚¡ã‚¤ã‚¢ã‚¦ã‚©ãƒ¼ãƒ«ã€VPNã€è² è·åˆ†æ•£è£…ç½®ã®ã‚µãƒãƒ¼ãƒˆã®ã»ã‹ã«ã€ç›´æŽ¥ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¨ä»®æƒ³ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚‚有効ã«ã™ã‚‹ã“ã¨ãŒã§ãã¾ã™ã€‚ -message.advanced.security.group=ゲスト VM を分離ã™ã‚‹ãŸã‚ã«ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ グループを使用ã™ã‚‹å ´åˆã¯ã€ã“ã®ã‚ªãƒ—ションをé¸æŠžã—ã¦ãã ã•ã„。 -message.advanced.virtual=ゲスト VM を分離ã™ã‚‹ãŸã‚ã«ã‚¾ãƒ¼ãƒ³å…¨ä½“ã® VLAN を使用ã™ã‚‹å ´åˆã¯ã€ã“ã®ã‚ªãƒ—ションをé¸æŠžã—ã¦ãã ã•ã„。 -message.allow.vpn.access=VPN アクセスを許å¯ã™ã‚‹ãƒ¦ãƒ¼ã‚¶ãƒ¼ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼åã¨ãƒ‘スワードを入力ã—ã¦ãã ã•ã„。 -message.attach.iso.confirm=ã“ã®ä»®æƒ³ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã« ISO ファイルをアタッãƒã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.attach.volume=æ–°ã—ã„ボリュームをアタッãƒã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®ãƒ‡ãƒ¼ã‚¿ã‚’入力ã—ã¦ãã ã•ã„。Windows ベースã®ä»®æƒ³ãƒžã‚·ãƒ³ã«ãƒ‡ã‚£ã‚¹ã‚¯ ボリュームをアタッãƒã™ã‚‹å ´åˆã¯ã€ã‚¢ã‚¿ãƒƒãƒã—ãŸãƒ‡ã‚£ã‚¹ã‚¯ã‚’èªè­˜ã™ã‚‹ãŸã‚ã«ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’å†èµ·å‹•ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.basic.mode.desc=VLAN サãƒãƒ¼ãƒˆãŒä¸è¦ã§ã‚ã‚‹å ´åˆã¯ã€ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ モデルをé¸æŠžã—ã¦ãã ã•ã„。ã“ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ モデルã§ä½œæˆã•ã‚Œã‚‹ã™ã¹ã¦ã®ä»®æƒ³ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã«ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‹ã‚‰ç›´æŽ¥ IP アドレスãŒå‰²ã‚Šå½“ã¦ã‚‰ã‚Œã€ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ グループを使用ã—ã¦ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ã¨åˆ†é›¢ãŒæä¾›ã•ã‚Œã¾ã™ã€‚ -message.change.offering.confirm=ã“ã®ä»®æƒ³ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã®ã‚µãƒ¼ãƒ“ス オファリングを変更ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.copy.iso.confirm=ISO を次ã®å ´æ‰€ã«ã‚³ãƒ”ーã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.copy.template=ゾーン ã‹ã‚‰ãƒ†ãƒ³ãƒ—レート XXX を次ã®å ´æ‰€ã«ã‚³ãƒ”ーã—ã¾ã™: -message.create.template.vm=テンプレート ã‹ã‚‰ VM を作æˆã—ã¾ã™ -message.create.template.volume=ディスク ボリューム ã®ãƒ†ãƒ³ãƒ—レートを作æˆã™ã‚‹å‰ã«ã€æ¬¡ã®æƒ…報を指定ã—ã¦ãã ã•ã„。ボリューム サイズã«ã‚ˆã£ã¦ã¯ã€ãƒ†ãƒ³ãƒ—レートã®ä½œæˆã«ã¯æ•°åˆ†ä»¥ä¸Šã‹ã‹ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ -message.delete.account=ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.detach.iso.confirm=ã“ã®ä»®æƒ³ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‹ã‚‰ ISO ファイルをデタッãƒã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.disable.account=ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒã‚¯ãƒ©ã‚¦ãƒ‰ リソースã«ã‚¢ã‚¯ã‚»ã‚¹ã§ããªããªã‚Šã¾ã™ã€‚実行中ã®ã™ã¹ã¦ã®ä»®æƒ³ãƒžã‚·ãƒ³ã¯ä»Šã™ãã«ã‚·ãƒ£ãƒƒãƒˆãƒ€ã‚¦ãƒ³ã•ã‚Œã¾ã™ã€‚ -message.disable.vpn.access=VPN アクセスを無効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.download.ISO=ISO をダウンロードã™ã‚‹ã«ã¯ 00000 をクリックã—ã¾ã™ -message.download.template=テンプレートをダウンロードã™ã‚‹ã«ã¯ 00000 をクリックã—ã¾ã™ -message.download.volume=ボリュームをダウンロードã™ã‚‹ã«ã¯ 00000 をクリックã—ã¾ã™ -message.edit.confirm=[ä¿å­˜] をクリックã™ã‚‹å‰ã«å¤‰æ›´å†…容を確èªã—ã¦ãã ã•ã„。 -message.edit.limits=次ã®ãƒªã‚½ãƒ¼ã‚¹ã«åˆ¶é™ã‚’指定ã—ã¦ãã ã•ã„。「-1ã€ã¯ã€ãƒªã‚½ãƒ¼ã‚¹ä½œæˆã«åˆ¶é™ãŒãªã„ã“ã¨ã‚’示ã—ã¾ã™ã€‚ -message.enable.account=ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.enable.vpn.access=ç¾åœ¨ã“ã® IP アドレスã«å¯¾ã™ã‚‹ VPN ã¯ç„¡åŠ¹ã§ã™ã€‚VPN アクセスを有効ã«ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.enabled.vpn.ip.sec=IPSec 事å‰å…±æœ‰ã‚­ãƒ¼: -message.enabled.vpn=ç¾åœ¨ã€VPN アクセスãŒæœ‰åŠ¹ã«ãªã£ã¦ã„ã¾ã™ã€‚次㮠IP アドレス経由ã§ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™ã€‚ -message.launch.vm.on.private.network=プライベートãªå°‚用ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã§ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’èµ·å‹•ã—ã¾ã™ã‹? -message.lock.account=ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã‚’ロックã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? ã“ã®ã‚¢ã‚«ã‚¦ãƒ³ãƒˆã®ã™ã¹ã¦ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ãŒã‚¯ãƒ©ã‚¦ãƒ‰ リソースを管ç†ã§ããªããªã‚Šã¾ã™ã€‚ãã®å¾Œã‚‚既存ã®ãƒªã‚½ãƒ¼ã‚¹ã«ã¯ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã™ã€‚ -message.migrate.instance.confirm=仮想インスタンスã®ç§»è¡Œå…ˆã¯æ¬¡ã®ãƒ›ã‚¹ãƒˆã§ã‚ˆã‚ã—ã„ã§ã™ã‹? -message.new.user=アカウントã«æ–°ã—ã„ユーザーを追加ã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®æƒ…報を指定ã—ã¦ãã ã•ã„。 -message.no.network.support.configuration.not.true=セキュリティ グループãŒæœ‰åŠ¹ãªã‚¾ãƒ¼ãƒ³ãŒç„¡ã„ãŸã‚ã€è¿½åŠ ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æ©Ÿèƒ½ã¯ã‚ã‚Šã¾ã›ã‚“。手順 5. ã«é€²ã‚“ã§ãã ã•ã„。 -message.no.network.support=ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã¨ã—㦠vSphere ã‚’é¸æŠžã—ã¾ã—ãŸãŒã€ã“ã®ãƒã‚¤ãƒ‘ーãƒã‚¤ã‚¶ãƒ¼ã«è¿½åŠ ã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯æ©Ÿèƒ½ã¯ã‚ã‚Šã¾ã›ã‚“。手順 5. ã«é€²ã‚“ã§ãã ã•ã„。 -message.number.clusters=

クラスター数

-message.number.hosts=

ホスト数

-message.number.pods=

ãƒãƒƒãƒ‰æ•°

-message.number.storage=

プライマリ ストレージ ボリューム数

-message.number.zones=

ゾーン数

-message.remove.vpn.access=次ã®ãƒ¦ãƒ¼ã‚¶ãƒ¼ã‹ã‚‰ VPN アクセスを削除ã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? -message.restart.mgmt.server=æ–°ã—ã„設定を有効ã«ã™ã‚‹ãŸã‚ã«ã€ç®¡ç†ã‚µãƒ¼ãƒãƒ¼ã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„。 -message.restart.mgmt.usage.server=æ–°ã—ã„設定を有効ã«ã™ã‚‹ãŸã‚ã«ã€ç®¡ç†ã‚µãƒ¼ãƒãƒ¼ã¨ä½¿ç”¨çŠ¶æ³æ¸¬å®šã‚µãƒ¼ãƒãƒ¼ã‚’å†èµ·å‹•ã—ã¦ãã ã•ã„。 -message.security.group.usage=(該当ã™ã‚‹ã‚»ã‚­ãƒ¥ãƒªãƒ†ã‚£ グループをã™ã¹ã¦é¸æŠžã™ã‚‹ã«ã¯ã€Ctrl キーを押ã—ãªãŒã‚‰ã‚¯ãƒªãƒƒã‚¯ã—ã¦ãã ã•ã„) -message.snapshot.schedule=次ã®ã‚ªãƒ—ションã‹ã‚‰é¸æŠžã—ã¦ãƒãƒªã‚·ãƒ¼ã®åŸºæœ¬è¨­å®šã‚’é©ç”¨ã™ã‚‹ã“ã¨ã«ã‚ˆã‚Šã€å®šæœŸã‚¹ãƒŠãƒƒãƒ—ショットã®ã‚¹ã‚±ã‚¸ãƒ¥ãƒ¼ãƒ«ã‚’セットアップã§ãã¾ã™ã€‚ -message.step.1.continue=続行ã™ã‚‹ã«ã¯ãƒ†ãƒ³ãƒ—レートã¾ãŸã¯ ISO ã‚’é¸æŠžã—ã¦ãã ã•ã„ -message.step.1.desc=æ–°ã—ã„仮想インスタンス用ã®ãƒ†ãƒ³ãƒ—レートをé¸æŠžã—ã¦ãã ã•ã„。ISO をインストールã§ãる空白ã®ãƒ†ãƒ³ãƒ—レートをé¸æŠžã™ã‚‹ã“ã¨ã‚‚ã§ãã¾ã™ã€‚ -message.step.2.continue=続行ã™ã‚‹ã«ã¯ã‚µãƒ¼ãƒ“ス オファリングをé¸æŠžã—ã¦ãã ã•ã„ +label.vmware.traffic.label=VMware \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u30E9\u30D9\u30EB +label.volgroup=\u30DC\u30EA\u30E5\u30FC\u30E0 \u30B0\u30EB\u30FC\u30D7 +label.volume.limits=\u30DC\u30EA\u30E5\u30FC\u30E0\u5236\u9650 +label.volume.name=\u30DC\u30EA\u30E5\u30FC\u30E0\u540D +label.volumes=\u30DC\u30EA\u30E5\u30FC\u30E0 +label.volume=\u30DC\u30EA\u30E5\u30FC\u30E0 +label.vpc.id=VPC ID +label.VPC.router.details=VPC \u30EB\u30FC\u30BF\u30FC\u306E\u8A73\u7D30 +label.vpc=VPC +label.VPN.connection=VPN \u63A5\u7D9A +label.vpn.customer.gateway=VPN \u30AB\u30B9\u30BF\u30DE\u30FC \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4 +label.VPN.customer.gateway=VPN \u30AB\u30B9\u30BF\u30DE\u30FC \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4 +label.VPN.gateway=VPN \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4 +label.vpn=VPN +label.vsmctrlvlanid=\u30B3\u30F3\u30C8\u30ED\u30FC\u30EB VLAN ID +label.vsmpktvlanid=\u30D1\u30B1\u30C3\u30C8 VLAN ID +label.vsmstoragevlanid=\u30B9\u30C8\u30EC\u30FC\u30B8 VLAN ID +label.vsphere.managed=vSphere \u306B\u3088\u308B\u7BA1\u7406 +label.waiting=\u5F85\u6A5F\u3057\u3066\u3044\u307E\u3059 +label.warn=\u8B66\u544A +label.wednesday=\u6C34\u66DC\u65E5 +label.weekly=\u6BCE\u9031 +label.welcome.cloud.console=\u7BA1\u7406\u30B3\u30F3\u30BD\u30FC\u30EB\u3078\u3088\u3046\u3053\u305D +label.welcome=\u3088\u3046\u3053\u305D +label.what.is.cloudstack=CloudStack&\#8482; \u306B\u3064\u3044\u3066 +label.xen.traffic.label=XenServer \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u30E9\u30D9\u30EB +label.yes=\u306F\u3044 +label.zone.details=\u30BE\u30FC\u30F3\u306E\u8A73\u7D30 +label.zone.id=\u30BE\u30FC\u30F3 ID +label.zone.name=\u30BE\u30FC\u30F3\u540D +label.zone.step.1.title=\u624B\u9806 1. \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u9078\u629E +label.zone.step.2.title=\u624B\u9806 2. \u30BE\u30FC\u30F3\u306E\u8FFD\u52A0 +label.zone.step.3.title=\u624B\u9806 3. \u30DD\u30C3\u30C9\u306E\u8FFD\u52A0 +label.zone.step.4.title=\u624B\u9806 4. IP \u30A2\u30C9\u30EC\u30B9\u7BC4\u56F2\u306E\u8FFD\u52A0 +label.zones=\u30BE\u30FC\u30F3 +label.zone.type=\u30BE\u30FC\u30F3\u306E\u7A2E\u985E +label.zone=\u30BE\u30FC\u30F3 +label.zone.wide=\u30BE\u30FC\u30F3\u5168\u4F53 +label.zoneWizard.trafficType.guest=\u30b2\u30b9\u30c8\: \u30a8\u30f3\u30c9\u30e6\u30fc\u30b6\u30fc\u4eee\u60f3\u30de\u30b7\u30f3\u9593\u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af +label.zoneWizard.trafficType.management=\u7ba1\u7406\: \u30db\u30b9\u30c8\u3084\u30b7\u30b9\u30c6\u30e0VM\u306a\u3069\u3001\u7ba1\u7406\u30b5\u30fc\u30d0\u30fc\u3068\u901a\u4fe1\u3059\u308b\u3042\u3089\u3086\u308b\u30b3\u30f3\u30dd\u30fc\u30cd\u30f3\u30c8\u3092\u542b\u3081\u305f\u3001CloudStack\u5185\u90e8\u306e\u30ea\u30bd\u30fc\u30b9\u9593\u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af +label.zoneWizard.trafficType.public=\u30d1\u30d6\u30ea\u30c3\u30af\: \u30a4\u30f3\u30bf\u30fc\u30cd\u30c3\u30c8\u3068\u30af\u30e9\u30a6\u30c9\u5185\u306e\u4eee\u60f3\u30de\u30b7\u30f3\u306e\u9593\u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af +label.zoneWizard.trafficType.storage=\u30b9\u30c8\u30ec\u30fc\u30b8\: VM\u30c6\u30f3\u30d7\u30ec\u30fc\u30c8\u3068\u30b9\u30ca\u30c3\u30d7\u30b7\u30e7\u30c3\u30c8\u306e\u3088\u3046\u306a\u3001\u30d7\u30e9\u30a4\u30de\u30ea\u3068\u30bb\u30ab\u30f3\u30c0\u30ea\u306e\u30b9\u30c8\u30ec\u30fc\u30b8\u30b5\u30fc\u30d0\u30fc\u9593\u306e\u30c8\u30e9\u30d5\u30a3\u30c3\u30af\u3002 +managed.state=\u7BA1\u7406\u5BFE\u8C61\u72B6\u614B +message.acquire.new.ip=\u3053\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u65B0\u3057\u3044 IP \u30A2\u30C9\u30EC\u30B9\u3092\u53D6\u5F97\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.acquire.new.ip.vpc=VPC\u306e\u65b0\u3057\u3044IP\u3092\u53d6\u5f97\u3059\u308b\u3053\u3068\u3092\u78ba\u8a8d\u3057\u3066\u304f\u3060\u3055\u3044\u3002 +message.acquire.public.ip=\u65B0\u3057\u3044 IP \u30A2\u30C9\u30EC\u30B9\u3092\u53D6\u5F97\u3059\u308B\u30BE\u30FC\u30F3\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.action.cancel.maintenance.mode=\u3053\u306E\u4FDD\u5B88\u3092\u30AD\u30E3\u30F3\u30BB\u30EB\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.cancel.maintenance=\u30DB\u30B9\u30C8\u306E\u4FDD\u5B88\u306F\u6B63\u5E38\u306B\u30AD\u30E3\u30F3\u30BB\u30EB\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u306E\u51E6\u7406\u306B\u306F\u6570\u5206\u304B\u304B\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 +message.action.change.service.warning.for.instance=\u73FE\u5728\u306E\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u524D\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u505C\u6B62\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.action.change.service.warning.for.router=\u73FE\u5728\u306E\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u5909\u66F4\u3059\u308B\u524D\u306B\u30EB\u30FC\u30BF\u30FC\u3092\u505C\u6B62\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.action.delete.cluster=\u3053\u306E\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.disk.offering=\u3053\u306E\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.domain=\u3053\u306E\u30C9\u30E1\u30A4\u30F3\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.external.firewall=\u3053\u306E\u5916\u90E8\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? \u8B66\u544A\: \u540C\u3058\u5916\u90E8\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u518D\u5EA6\u8FFD\u52A0\u3059\u308B\u4E88\u5B9A\u3067\u3042\u308B\u5834\u5408\u306F\u3001\u30C7\u30D0\u30A4\u30B9\u306E\u4F7F\u7528\u72B6\u6CC1\u30C7\u30FC\u30BF\u3092\u30EA\u30BB\u30C3\u30C8\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.action.delete.external.load.balancer=\u3053\u306E\u5916\u90E8\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? \u8B66\u544A\: \u540C\u3058\u5916\u90E8\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u3092\u518D\u5EA6\u8FFD\u52A0\u3059\u308B\u4E88\u5B9A\u3067\u3042\u308B\u5834\u5408\u306F\u3001\u30C7\u30D0\u30A4\u30B9\u306E\u4F7F\u7528\u72B6\u6CC1\u30C7\u30FC\u30BF\u3092\u30EA\u30BB\u30C3\u30C8\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.action.delete.ingress.rule=\u3053\u306E\u53D7\u4FE1\u898F\u5247\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.ISO.for.all.zones=\u305D\u306E ISO \u306F\u3059\u3079\u3066\u306E\u30BE\u30FC\u30F3\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30BE\u30FC\u30F3\u304B\u3089\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.ISO=\u3053\u306E ISO \u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.network=\u3053\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.nexusVswitch=\u3053\u306E Nexus 1000V \u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.physical.network=\u3053\u306E\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.pod=\u3053\u306E\u30DD\u30C3\u30C9\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.primary.storage=\u3053\u306E\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.secondary.storage=\u3053\u306E\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.security.group=\u3053\u306E\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.service.offering=\u3053\u306E\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.snapshot=\u3053\u306E\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.system.service.offering=\u3053\u306E\u30B7\u30B9\u30C6\u30E0 \u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.template.for.all.zones=\u305D\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306F\u3059\u3079\u3066\u306E\u30BE\u30FC\u30F3\u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u307E\u3059\u3002\u3059\u3079\u3066\u306E\u30BE\u30FC\u30F3\u304B\u3089\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.template=\u3053\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.volume=\u3053\u306E\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.delete.zone=\u3053\u306E\u30BE\u30FC\u30F3\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.destroy.instance=\u3053\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u7834\u68C4\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.destroy.systemvm=\u3053\u306E\u30B7\u30B9\u30C6\u30E0 VM \u3092\u7834\u68C4\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.disable.cluster=\u3053\u306E\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u7121\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.disable.nexusVswitch=\u3053\u306E Nexus 1000V \u3092\u7121\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.disable.physical.network=\u3053\u306E\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u7121\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.disable.pod=\u3053\u306E\u30DD\u30C3\u30C9\u3092\u7121\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.disable.static.NAT=\u9759\u7684 NAT \u3092\u7121\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.disable.zone=\u3053\u306E\u30BE\u30FC\u30F3\u3092\u7121\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.download.iso=\u3053\u306E ISO \u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.download.template=\u3053\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.enable.cluster=\u3053\u306E\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.enable.maintenance=\u30DB\u30B9\u30C8\u3092\u4FDD\u5B88\u3059\u308B\u6E96\u5099\u304C\u3067\u304D\u307E\u3057\u305F\u3002\u3053\u306E\u30DB\u30B9\u30C8\u4E0A\u306E VM \u6570\u306B\u3088\u3063\u3066\u306F\u3001\u3053\u306E\u51E6\u7406\u306B\u306F\u6570\u5206\u4EE5\u4E0A\u304B\u304B\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 +message.action.enable.nexusVswitch=\u3053\u306E Nexus 1000V \u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.enable.physical.network=\u3053\u306E\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.enable.pod=\u3053\u306E\u30DD\u30C3\u30C9\u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.enable.zone=\u3053\u306E\u30BE\u30FC\u30F3\u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.force.reconnect=\u30DB\u30B9\u30C8\u306F\u5F37\u5236\u7684\u306B\u518D\u63A5\u7D9A\u3057\u307E\u3057\u305F\u3002\u3053\u306E\u51E6\u7406\u306B\u306F\u6570\u5206\u304B\u304B\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 +message.action.host.enable.maintenance.mode=\u4FDD\u5B88\u30E2\u30FC\u30C9\u3092\u6709\u52B9\u306B\u3059\u308B\u3068\u3001\u3053\u306E\u30DB\u30B9\u30C8\u3067\u5B9F\u884C\u4E2D\u306E\u3059\u3079\u3066\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u307B\u304B\u306E\u4F7F\u7528\u3067\u304D\u308B\u30DB\u30B9\u30C8\u306B\u30E9\u30A4\u30D6 \u30DE\u30A4\u30B0\u30EC\u30FC\u30B7\u30E7\u30F3\u3055\u308C\u307E\u3059\u3002 +message.action.instance.reset.password=\u00e3\u0081\u0093\u00e3\u0081\u00ae\u00e4\u00bb\u00ae\u00e6\u0083\u00b3\u00e3\u0083\u009e\u00e3\u0082\u00b7\u00e3\u0083\u00b3\u00e3\u0081\u00ae\u00e3\u0083\u00ab\u00e3\u0083\u00bc\u00e3\u0083\u0088\u00e3\u0083\u0091\u00e3\u0082\u00b9\u00e3\u0083\u00af\u00e3\u0083\u00bc\u00e3\u0083\u0089\u00e3\u0082\u0092\u00e5\u00a4\u0089\u00e6\u009b\u00b4\u00e3\u0081\u0097\u00e3\u0081\u00a6\u00e3\u0082\u0082\u00e3\u0082\u0088\u00e3\u0082\u008d\u00e3\u0081\u0097\u00e3\u0081\u0084\u00e3\u0081\u00a7\u00e3\u0081\u0099\u00e3\u0081\u008b? +message.action.manage.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u7BA1\u7406\u5BFE\u8C61\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.primarystorage.enable.maintenance.mode=\u8B66\u544A\: \u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u4FDD\u5B88\u30E2\u30FC\u30C9\u306B\u3059\u308B\u3068\u3001\u305D\u306E\u30B9\u30C8\u30EC\u30FC\u30B8\u4E0A\u306E\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u4F7F\u7528\u3059\u308B\u3059\u3079\u3066\u306E VM \u304C\u505C\u6B62\u3057\u307E\u3059\u3002\u7D9A\u884C\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.reboot.instance=\u3053\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u518D\u8D77\u52D5\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.reboot.router=\u3053\u306E\u4EEE\u60F3\u30EB\u30FC\u30BF\u30FC\u3067\u63D0\u4F9B\u3059\u308B\u3059\u3079\u3066\u306E\u30B5\u30FC\u30D3\u30B9\u304C\u4E2D\u65AD\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30EB\u30FC\u30BF\u30FC\u3092\u518D\u8D77\u52D5\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.reboot.systemvm=\u3053\u306E\u30B7\u30B9\u30C6\u30E0 VM \u3092\u518D\u8D77\u52D5\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.release.ip=\u3053\u306E IP \u30A2\u30C9\u30EC\u30B9\u3092\u89E3\u653E\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.remove.host=\u3053\u306E\u30DB\u30B9\u30C8\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.reset.password.off=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306F\u73FE\u5728\u3053\u306E\u6A5F\u80FD\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u3066\u3044\u307E\u305B\u3093\u3002 +message.action.reset.password.warning=\u73FE\u5728\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3059\u308B\u524D\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u505C\u6B62\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.action.restore.instance=\u3053\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u5FA9\u5143\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.start.instance=\u3053\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u8D77\u52D5\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.start.router=\u3053\u306E\u30EB\u30FC\u30BF\u30FC\u3092\u8D77\u52D5\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.start.systemvm=\u3053\u306E\u30B7\u30B9\u30C6\u30E0 VM \u3092\u8D77\u52D5\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.stop.instance=\u3053\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u505C\u6B62\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.stop.router=\u3053\u306E\u4EEE\u60F3\u30EB\u30FC\u30BF\u30FC\u3067\u63D0\u4F9B\u3059\u308B\u3059\u3079\u3066\u306E\u30B5\u30FC\u30D3\u30B9\u304C\u4E2D\u65AD\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30EB\u30FC\u30BF\u30FC\u3092\u505C\u6B62\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.stop.systemvm=\u3053\u306E\u30B7\u30B9\u30C6\u30E0 VM \u3092\u505C\u6B62\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.take.snapshot=\u3053\u306E\u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u4F5C\u6210\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.action.unmanage.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u975E\u7BA1\u7406\u5BFE\u8C61\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.activate.project=\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u30A2\u30AF\u30C6\u30A3\u30D6\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.add.cluster=\u30BE\u30FC\u30F3 \u306E\u30DD\u30C3\u30C9 \u306B\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u3067\u7BA1\u7406\u3055\u308C\u308B\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8FFD\u52A0\u3057\u307E\u3059 +message.add.cluster.zone=\u30BE\u30FC\u30F3 \u306B\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u3067\u7BA1\u7406\u3055\u308C\u308B\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8FFD\u52A0\u3057\u307E\u3059 +message.add.disk.offering=\u65B0\u3057\u3044\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u8FFD\u52A0\u3059\u308B\u305F\u3081\u306B\u3001\u6B21\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.add.domain=\u3053\u306E\u30C9\u30E1\u30A4\u30F3\u306B\u4F5C\u6210\u3059\u308B\u30B5\u30D6\u30C9\u30E1\u30A4\u30F3\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.add.firewall=\u30BE\u30FC\u30F3\u306B\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3092\u8FFD\u52A0\u3057\u307E\u3059 +message.add.guest.network=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u8FFD\u52A0\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.add.host=\u65B0\u3057\u3044\u30DB\u30B9\u30C8\u3092\u8FFD\u52A0\u3059\u308B\u305F\u3081\u306B\u3001\u6B21\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.adding.host=\u30DB\u30B9\u30C8\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059 +message.adding.Netscaler.device=Netscaler \u30C7\u30D0\u30A4\u30B9\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059 +message.adding.Netscaler.provider=Netscaler \u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u3092\u8FFD\u52A0\u3057\u3066\u3044\u307E\u3059 +message.add.ip.range.direct.network=\u30BE\u30FC\u30F3 \u306E\u76F4\u63A5\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u306B IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3092\u8FFD\u52A0\u3057\u307E\u3059 +message.add.ip.range.to.pod=

\u30DD\u30C3\u30C9 \u306B IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3092\u8FFD\u52A0\u3057\u307E\u3059

+message.add.ip.range=\u30BE\u30FC\u30F3\u306E\u30D1\u30D6\u30EA\u30C3\u30AF \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306B IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3092\u8FFD\u52A0\u3057\u307E\u3059 +message.additional.networks.desc=\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u63A5\u7D9A\u3059\u308B\u8FFD\u52A0\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.add.load.balancer=\u30BE\u30FC\u30F3\u306B\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u3092\u8FFD\u52A0\u3057\u307E\u3059 +message.add.load.balancer.under.ip=\u8CA0\u8377\u5206\u6563\u898F\u5247\u304C\u6B21\u306E IP \u30A2\u30C9\u30EC\u30B9\u306B\u5BFE\u3057\u3066\u8FFD\u52A0\u3055\u308C\u307E\u3057\u305F\: +message.add.network=\u30BE\u30FC\u30F3 \u306B\u65B0\u3057\u3044\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u8FFD\u52A0\u3057\u307E\u3059 +message.add.new.gateway.to.vpc=\u3053\u306E VPC \u306B\u65B0\u3057\u3044\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3092\u8FFD\u52A0\u3059\u308B\u305F\u3081\u306E\u60C5\u5831\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.add.pod.during.zone.creation=\u5404\u30BE\u30FC\u30F3\u306B\u306F 1 \u3064\u4EE5\u4E0A\u306E\u30DD\u30C3\u30C9\u304C\u5FC5\u8981\u3067\u3059\u3002\u4ECA\u3053\u3053\u3067\u6700\u521D\u306E\u30DD\u30C3\u30C9\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\u30DD\u30C3\u30C9\u306F\u30DB\u30B9\u30C8\u3068\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 \u30B5\u30FC\u30D0\u30FC\u304B\u3089\u69CB\u6210\u3055\u308C\u307E\u3059\u304C\u3001\u3053\u308C\u3089\u306F\u5F8C\u306E\u624B\u9806\u3067\u8FFD\u52A0\u3057\u307E\u3059\u3002\u6700\u521D\u306B\u3001CloudStack \u306E\u5185\u90E8\u7BA1\u7406\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u305F\u3081\u306B IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3092\u4E88\u7D04\u3057\u307E\u3059\u3002IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u306F\u3001\u30AF\u30E9\u30A6\u30C9\u5185\u306E\u5404\u30BE\u30FC\u30F3\u3067\u91CD\u8907\u3057\u306A\u3044\u3088\u3046\u306B\u4E88\u7D04\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.add.pod=\u30BE\u30FC\u30F3 \u306B\u65B0\u3057\u3044\u30DD\u30C3\u30C9\u3092\u8FFD\u52A0\u3057\u307E\u3059 +message.add.primary.storage=\u30BE\u30FC\u30F3 \u306E\u30DD\u30C3\u30C9 \u306B\u65B0\u3057\u3044\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u8FFD\u52A0\u3057\u307E\u3059 +message.add.primary=\u65B0\u3057\u3044\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u8FFD\u52A0\u3059\u308B\u305F\u3081\u306B\u3001\u6B21\u306E\u30D1\u30E9\u30E1\u30FC\u30BF\u30FC\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.add.secondary.storage=\u30BE\u30FC\u30F3 \u306B\u65B0\u3057\u3044\u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u8FFD\u52A0\u3057\u307E\u3059 +message.add.service.offering=\u65B0\u3057\u3044\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u8FFD\u52A0\u3059\u308B\u305F\u3081\u306B\u3001\u6B21\u306E\u30C7\u30FC\u30BF\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.add.system.service.offering=\u65B0\u3057\u3044\u30B7\u30B9\u30C6\u30E0 \u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u8FFD\u52A0\u3059\u308B\u305F\u3081\u306B\u3001\u6B21\u306E\u30C7\u30FC\u30BF\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.add.template=\u65B0\u3057\u3044\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u4F5C\u6210\u3059\u308B\u305F\u3081\u306B\u3001\u6B21\u306E\u30C7\u30FC\u30BF\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.add.volume=\u65B0\u3057\u3044\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u8FFD\u52A0\u3059\u308B\u305F\u3081\u306B\u3001\u6B21\u306E\u30C7\u30FC\u30BF\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.add.VPN.gateway=VPN \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3092\u8FFD\u52A0\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.advanced.mode.desc=VLAN \u30B5\u30DD\u30FC\u30C8\u3092\u6709\u52B9\u306B\u3059\u308B\u5834\u5408\u306F\u3001\u3053\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30E2\u30C7\u30EB\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u3053\u306E\u30E2\u30C7\u30EB\u3067\u306F\u6700\u3082\u67D4\u8EDF\u306B\u30AB\u30B9\u30BF\u30E0 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u63D0\u4F9B\u3067\u304D\u3001\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3001VPN\u3001\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u306E\u30B5\u30DD\u30FC\u30C8\u306E\u307B\u304B\u306B\u3001\u76F4\u63A5\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3068\u4EEE\u60F3\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3082\u6709\u52B9\u306B\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002 +message.advanced.security.group=\u30B2\u30B9\u30C8 VM \u3092\u5206\u96E2\u3059\u308B\u305F\u3081\u306B\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u3092\u4F7F\u7528\u3059\u308B\u5834\u5408\u306F\u3001\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.advanced.virtual=\u30B2\u30B9\u30C8 VM \u3092\u5206\u96E2\u3059\u308B\u305F\u3081\u306B\u30BE\u30FC\u30F3\u5168\u4F53\u306E VLAN \u3092\u4F7F\u7528\u3059\u308B\u5834\u5408\u306F\u3001\u3053\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.after.enable.s3=S3\u57fa\u76e4\u30bb\u30ab\u30f3\u30c0\u30ea\u30b9\u30c8\u30ec\u30fc\u30b8\u304c\u8a2d\u5b9a\u3055\u308c\u307e\u3057\u305f\u3002 \u30ce\u30fc\u30c8\:\u3053\u306e\u30da\u30fc\u30b8\u3092\u9589\u3058\u308b\u3068S3\u3092\u518d\u8a2d\u5b9a\u3067\u304d\u307e\u305b\u3093\u3002 +message.after.enable.swift=Swift \u304C\u69CB\u6210\u3055\u308C\u307E\u3057\u305F\u3002\u6CE8\: \u3053\u306E\u30DA\u30FC\u30B8\u3092\u9589\u3058\u308B\u3068\u3001Swift \u3092\u518D\u69CB\u6210\u3059\u308B\u3053\u3068\u306F\u3067\u304D\u307E\u305B\u3093\u3002 +message.alert.state.detected=\u30A2\u30E9\u30FC\u30C8\u72B6\u614B\u304C\u691C\u51FA\u3055\u308C\u307E\u3057\u305F +message.allow.vpn.access=VPN \u30A2\u30AF\u30BB\u30B9\u3092\u8A31\u53EF\u3059\u308B\u30E6\u30FC\u30B6\u30FC\u306E\u30E6\u30FC\u30B6\u30FC\u540D\u3068\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.apply.snapshot.policy=\u73FE\u5728\u306E\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8 \u30DD\u30EA\u30B7\u30FC\u3092\u66F4\u65B0\u3057\u307E\u3057\u305F\u3002 +message.attach.iso.confirm=\u3053\u306E\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306B ISO \u30D5\u30A1\u30A4\u30EB\u3092\u30A2\u30BF\u30C3\u30C1\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.attach.volume=\u65B0\u3057\u3044\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u30A2\u30BF\u30C3\u30C1\u3059\u308B\u305F\u3081\u306B\u3001\u6B21\u306E\u30C7\u30FC\u30BF\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002Windows \u30D9\u30FC\u30B9\u306E\u4EEE\u60F3\u30DE\u30B7\u30F3\u306B\u30C7\u30A3\u30B9\u30AF \u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u30A2\u30BF\u30C3\u30C1\u3059\u308B\u5834\u5408\u306F\u3001\u30A2\u30BF\u30C3\u30C1\u3057\u305F\u30C7\u30A3\u30B9\u30AF\u3092\u8A8D\u8B58\u3059\u308B\u305F\u3081\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u518D\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.basic.mode.desc=VLAN \u30B5\u30DD\u30FC\u30C8\u304C\u4E0D\u8981\u3067\u3042\u308B\u5834\u5408\u306F\u3001\u3053\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30E2\u30C7\u30EB\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u3053\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30E2\u30C7\u30EB\u3067\u4F5C\u6210\u3055\u308C\u308B\u3059\u3079\u3066\u306E\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306B\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u304B\u3089\u76F4\u63A5 IP \u30A2\u30C9\u30EC\u30B9\u304C\u5272\u308A\u5F53\u3066\u3089\u308C\u3001\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u3092\u4F7F\u7528\u3057\u3066\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3\u3068\u5206\u96E2\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002 +message.change.offering.confirm=\u3053\u306E\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u5909\u66F4\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.change.password=\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.configure.all.traffic.types=\u8907\u6570\u306E\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u304C\u3042\u308A\u307E\u3059\u3002[\u7DE8\u96C6] \u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7A2E\u985E\u3054\u3068\u306B\u30E9\u30D9\u30EB\u3092\u69CB\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.configuring.guest.traffic=\u30B2\u30B9\u30C8 \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u3092\u69CB\u6210\u3057\u3066\u3044\u307E\u3059 +message.configuring.physical.networks=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u69CB\u6210\u3057\u3066\u3044\u307E\u3059 +message.configuring.public.traffic=\u30D1\u30D6\u30EA\u30C3\u30AF \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u3092\u69CB\u6210\u3057\u3066\u3044\u307E\u3059 +message.configuring.storage.traffic=\u30B9\u30C8\u30EC\u30FC\u30B8 \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u3092\u69CB\u6210\u3057\u3066\u3044\u307E\u3059 +message.confirm.action.force.reconnect=\u3053\u306E\u30DB\u30B9\u30C8\u3092\u5F37\u5236\u518D\u63A5\u7D9A\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.confirm.delete.F5=F5 \u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.confirm.delete.NetScaler=NetScaler \u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.confirm.delete.SRX=SRX \u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.confirm.destroy.router=\u3053\u306E\u30EB\u30FC\u30BF\u30FC\u3092\u7834\u68C4\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.confirm.disable.provider=\u3053\u306E\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u3092\u7121\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.confirm.enable.provider=\u3053\u306E\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.confirm.join.project=\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u53C2\u52A0\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.confirm.remove.IP.range=\u3053\u306E IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.confirm.shutdown.provider=\u3053\u306E\u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u3092\u30B7\u30E3\u30C3\u30C8\u30C0\u30A6\u30F3\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.copy.iso.confirm=ISO \u3092\u6B21\u306E\u5834\u6240\u306B\u30B3\u30D4\u30FC\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.copy.template=\u30BE\u30FC\u30F3 \u304B\u3089\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 XXX \u3092\u6B21\u306E\u5834\u6240\u306B\u30B3\u30D4\u30FC\u3057\u307E\u3059\: +message.create.template=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u4F5C\u6210\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.create.template.vm=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 \u304B\u3089 VM \u3092\u4F5C\u6210\u3057\u307E\u3059 +message.create.template.volume=\u30C7\u30A3\u30B9\u30AF \u30DC\u30EA\u30E5\u30FC\u30E0 \u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u4F5C\u6210\u3059\u308B\u524D\u306B\u3001\u6B21\u306E\u60C5\u5831\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u30DC\u30EA\u30E5\u30FC\u30E0 \u30B5\u30A4\u30BA\u306B\u3088\u3063\u3066\u306F\u3001\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u4F5C\u6210\u306B\u306F\u6570\u5206\u4EE5\u4E0A\u304B\u304B\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 +message.creating.cluster=\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059 +message.creating.guest.network=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059 +message.creating.physical.networks=\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059 +message.creating.pod=\u30DD\u30C3\u30C9\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059 +message.creating.primary.storage=\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059 +message.creating.secondary.storage=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059 +message.creating.zone=\u30BE\u30FC\u30F3\u3092\u4F5C\u6210\u3057\u3066\u3044\u307E\u3059 +message.decline.invitation=\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3078\u306E\u62DB\u5F85\u3092\u8F9E\u9000\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.delete.account=\u3053\u306E\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.delete.gateway=\u3053\u306E\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.delete.project=\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.delete.user=\u3053\u306E\u30E6\u30FC\u30B6\u30FC\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.delete.VPN.connection=VPN \u63A5\u7D9A\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.delete.VPN.customer.gateway=\u3053\u306E VPN \u30AB\u30B9\u30BF\u30DE\u30FC \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.delete.VPN.gateway=\u3053\u306E VPN \u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.desc.advanced.zone=\u3088\u308A\u6D17\u7DF4\u3055\u308C\u305F\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u6280\u8853\u3092\u30B5\u30DD\u30FC\u30C8\u3057\u307E\u3059\u3002\u3053\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30E2\u30C7\u30EB\u3092\u9078\u629E\u3059\u308B\u3068\u3001\u3088\u308A\u67D4\u8EDF\u306B\u30B2\u30B9\u30C8\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u5B9A\u7FA9\u3057\u3001\u30D5\u30A1\u30A4\u30A2\u30A6\u30A9\u30FC\u30EB\u3001VPN\u3001\u8CA0\u8377\u5206\u6563\u88C5\u7F6E\u306E\u30B5\u30DD\u30FC\u30C8\u306E\u3088\u3046\u306A\u30AB\u30B9\u30BF\u30DE\u30A4\u30BA\u3057\u305F\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u63D0\u4F9B\u3067\u304D\u307E\u3059\u3002 +message.desc.basic.zone=\u5404 VM \u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306B IP \u30A2\u30C9\u30EC\u30B9\u304C\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u304B\u3089\u76F4\u63A5\u5272\u308A\u5F53\u3066\u3089\u308C\u308B\u3001\u5358\u4E00\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u63D0\u4F9B\u3057\u307E\u3059\u3002\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7 (\u9001\u4FE1\u5143 IP \u30A2\u30C9\u30EC\u30B9\u306E\u30D5\u30A3\u30EB\u30BF\u30FC) \u306E\u3088\u3046\u306A\u30EC\u30A4\u30E4\u30FC 3 \u30EC\u30D9\u30EB\u306E\u65B9\u6CD5\u3067\u30B2\u30B9\u30C8\u3092\u5206\u96E2\u3067\u304D\u307E\u3059\u3002 +message.desc.cluster=\u5404\u30DD\u30C3\u30C9\u306B\u306F 1 \u3064\u4EE5\u4E0A\u306E\u30AF\u30E9\u30B9\u30BF\u30FC\u304C\u5FC5\u8981\u3067\u3059\u3002\u4ECA\u3053\u3053\u3067\u6700\u521D\u306E\u30AF\u30E9\u30B9\u30BF\u30FC\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\u30AF\u30E9\u30B9\u30BF\u30FC\u306F\u30DB\u30B9\u30C8\u3092\u30B0\u30EB\u30FC\u30D7\u5316\u3059\u308B\u65B9\u6CD5\u3067\u3059\u30021 \u3064\u306E\u30AF\u30E9\u30B9\u30BF\u30FC\u5185\u306E\u30DB\u30B9\u30C8\u306F\u3059\u3079\u3066\u540C\u4E00\u306E\u30CF\u30FC\u30C9\u30A6\u30A7\u30A2\u304B\u3089\u69CB\u6210\u3055\u308C\u3001\u540C\u3058\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u3092\u5B9F\u884C\u3057\u3001\u540C\u3058\u30B5\u30D6\u30CD\u30C3\u30C8\u4E0A\u306B\u3042\u308A\u3001\u540C\u3058\u5171\u6709\u30B9\u30C8\u30EC\u30FC\u30B8\u306B\u30A2\u30AF\u30BB\u30B9\u3057\u307E\u3059\u3002\u5404\u30AF\u30E9\u30B9\u30BF\u30FC\u306F 1 \u3064\u4EE5\u4E0A\u306E\u30DB\u30B9\u30C8\u3068 1 \u3064\u4EE5\u4E0A\u306E\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 \u30B5\u30FC\u30D0\u30FC\u304B\u3089\u69CB\u6210\u3055\u308C\u307E\u3059\u3002 +message.desc.host=\u5404\u30AF\u30E9\u30B9\u30BF\u30FC\u306B\u306F\u5C11\u306A\u304F\u3068\u3082 1 \u3064\u3001\u30B2\u30B9\u30C8 VM \u3092\u5B9F\u884C\u3059\u308B\u305F\u3081\u306E\u30DB\u30B9\u30C8 (\u30B3\u30F3\u30D4\u30E5\u30FC\u30BF\u30FC) \u304C\u5FC5\u8981\u3067\u3059\u3002\u4ECA\u3053\u3053\u3067\u6700\u521D\u306E\u30DB\u30B9\u30C8\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002CloudStack \u3067\u30DB\u30B9\u30C8\u3092\u6A5F\u80FD\u3055\u305B\u308B\u306B\u306F\u3001\u30DB\u30B9\u30C8\u306B\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3057\u3066 IP \u30A2\u30C9\u30EC\u30B9\u3092\u5272\u308A\u5F53\u3066\u3001\u30DB\u30B9\u30C8\u304C CloudStack \u7BA1\u7406\u30B5\u30FC\u30D0\u30FC\u306B\u63A5\u7D9A\u3057\u3066\u3044\u308B\u3053\u3068\u3092\u78BA\u8A8D\u3057\u307E\u3059\u3002

\u30DB\u30B9\u30C8\u306E DNS \u540D\u307E\u305F\u306F IP \u30A2\u30C9\u30EC\u30B9\u3001\u30E6\u30FC\u30B6\u30FC\u540D (\u901A\u5E38\u306F root) \u3068\u30D1\u30B9\u30EF\u30FC\u30C9\u3001\u304A\u3088\u3073\u30DB\u30B9\u30C8\u306E\u5206\u985E\u306B\u4F7F\u7528\u3059\u308B\u30E9\u30D9\u30EB\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.desc.primary.storage=\u5404\u30AF\u30E9\u30B9\u30BF\u30FC\u306B\u306F\u5C11\u306A\u304F\u3068\u3082 1 \u3064\u3001\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 \u30B5\u30FC\u30D0\u30FC\u304C\u5FC5\u8981\u3067\u3059\u3002\u4ECA\u3053\u3053\u3067\u6700\u521D\u306E\u30B5\u30FC\u30D0\u30FC\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306F\u3001\u30AF\u30E9\u30B9\u30BF\u30FC\u5185\u306E\u30DB\u30B9\u30C8\u4E0A\u3067\u52D5\u4F5C\u3059\u308B\u3059\u3079\u3066\u306E VM \u306E\u30C7\u30A3\u30B9\u30AF \u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u683C\u7D0D\u3057\u307E\u3059\u3002\u57FA\u790E\u3068\u306A\u308B\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u3067\u30B5\u30DD\u30FC\u30C8\u3055\u308C\u308B\u3001\u6A19\u6E96\u306B\u6E96\u62E0\u3057\u305F\u30D7\u30ED\u30C8\u30B3\u30EB\u3092\u4F7F\u7528\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.desc.secondary.storage=\u5404\u30BE\u30FC\u30F3\u306B\u306F\u5C11\u306A\u304F\u3068\u3082 1 \u3064\u3001NFS \u3064\u307E\u308A\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 \u30B5\u30FC\u30D0\u30FC\u304C\u5FC5\u8981\u3067\u3059\u3002\u4ECA\u3053\u3053\u3067\u6700\u521D\u306E\u30B5\u30FC\u30D0\u30FC\u3092\u8FFD\u52A0\u3057\u307E\u3059\u3002\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306F VM \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3001ISO \u30A4\u30E1\u30FC\u30B8\u3001\u304A\u3088\u3073VM \u30C7\u30A3\u30B9\u30AF \u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u3092\u683C\u7D0D\u3057\u307E\u3059\u3002\u3053\u306E\u30B5\u30FC\u30D0\u30FC\u306F\u30BE\u30FC\u30F3\u5185\u306E\u3059\u3079\u3066\u306E\u30DB\u30B9\u30C8\u3067\u4F7F\u7528\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002

IP \u30A2\u30C9\u30EC\u30B9\u3068\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D1\u30B9\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.desc.zone=\u30BE\u30FC\u30F3\u306F CloudStack \u74B0\u5883\u5185\u306E\u6700\u5927\u306E\u7D44\u7E54\u5358\u4F4D\u3067\u3001\u901A\u5E38\u3001\u5358\u4E00\u306E\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u306B\u76F8\u5F53\u3057\u307E\u3059\u3002\u30BE\u30FC\u30F3\u306B\u3088\u3063\u3066\u7269\u7406\u7684\u306A\u5206\u96E2\u3068\u5197\u9577\u6027\u304C\u63D0\u4F9B\u3055\u308C\u307E\u3059\u3002\u30BE\u30FC\u30F3\u306F 1 \u3064\u4EE5\u4E0A\u306E\u30DD\u30C3\u30C9 (\u5404\u30DD\u30C3\u30C9\u306F\u30DB\u30B9\u30C8\u3068\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 \u30B5\u30FC\u30D0\u30FC\u304B\u3089\u69CB\u6210\u3055\u308C\u307E\u3059) \u3068\u3001\u30BE\u30FC\u30F3\u5185\u306E\u3059\u3079\u3066\u306E\u30DD\u30C3\u30C9\u3067\u5171\u6709\u3055\u308C\u308B\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 \u30B5\u30FC\u30D0\u30FC\u304B\u3089\u69CB\u6210\u3055\u308C\u307E\u3059\u3002 +message.detach.disk=\u3053\u306E\u30C7\u30A3\u30B9\u30AF\u3092\u30C7\u30BF\u30C3\u30C1\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.detach.iso.confirm=\u3053\u306E\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304B\u3089 ISO \u30D5\u30A1\u30A4\u30EB\u3092\u30C7\u30BF\u30C3\u30C1\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.disable.account=\u00e3\u0081\u0093\u00e3\u0081\u00ae\u00e3\u0082\u00a2\u00e3\u0082\u00ab\u00e3\u0082\u00a6\u00e3\u0083\u00b3\u00e3\u0083\u0088\u00e3\u0082\u0092\u00e7\u0084\u00a1\u00e5\u008a\u00b9\u00e3\u0081\u00ab\u00e3\u0081\u0097\u00e3\u0081\u00a6\u00e3\u0082\u0082\u00e3\u0082\u0088\u00e3\u0082\u008d\u00e3\u0081\u0097\u00e3\u0081\u0084\u00e3\u0081\u00a7\u00e3\u0081\u0099\u00e3\u0081\u008b? \u00e3\u0082\u00a2\u00e3\u0082\u00ab\u00e3\u0082\u00a6\u00e3\u0083\u00b3\u00e3\u0083\u0088\u00e3\u0082\u0092\u00e7\u0084\u00a1\u00e5\u008a\u00b9\u00e3\u0081\u00ab\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u0093\u00e3\u0081\u00a8\u00e3\u0081\u00ab\u00e3\u0082\u0088\u00e3\u0082\u008a\u00e3\u0080\u0081\u00e3\u0081\u0093\u00e3\u0081\u00ae\u00e3\u0082\u00a2\u00e3\u0082\u00ab\u00e3\u0082\u00a6\u00e3\u0083\u00b3\u00e3\u0083\u0088\u00e3\u0081\u00ae\u00e3\u0081\u0099\u00e3\u0081\u00b9\u00e3\u0081\u00a6\u00e3\u0081\u00ae\u00e3\u0083\u00a6\u00e3\u0083\u00bc\u00e3\u0082\u00b6\u00e3\u0083\u00bc\u00e3\u0081\u00af\u00e3\u0082\u00af\u00e3\u0083\u00a9\u00e3\u0082\u00a6\u00e3\u0083\u0089\u00e3\u0083\u00aa\u00e3\u0082\u00bd\u00e3\u0083\u00bc\u00e3\u0082\u00b9\u00e3\u0081\u00ab\u00e3\u0082\u00a2\u00e3\u0082\u00af\u00e3\u0082\u00bb\u00e3\u0082\u00b9\u00e3\u0081\u00a7\u00e3\u0081\u008d\u00e3\u0081\u00aa\u00e3\u0081\u008f\u00e3\u0081\u00aa\u00e3\u0082\u008a\u00e3\u0081\u00be\u00e3\u0081\u0099\u00e3\u0080\u0082\u00e5\u00ae\u009f\u00e8\u00a1\u008c\u00e4\u00b8\u00ad\u00e3\u0081\u00ae\u00e3\u0081\u0099\u00e3\u0081\u00b9\u00e3\u0081\u00a6\u00e3\u0081\u00ae\u00e4\u00bb\u00ae\u00e6\u0083\u00b3\u00e3\u0083\u009e\u00e3\u0082\u00b7\u00e3\u0083\u00b3\u00e3\u0081\u00af\u00e3\u0081\u0099\u00e3\u0081\u0090\u00e3\u0081\u00ab\u00e3\u0082\u00b7\u00e3\u0083\u00a3\u00e3\u0083\u0083\u00e3\u0083\u0088\u00e3\u0083\u0080\u00e3\u0082\u00a6\u00e3\u0083\u00b3\u00e3\u0081\u0095\u00e3\u0082\u008c\u00e3\u0081\u00be\u00e3\u0081\u0099\u00e3\u0080\u0082 +message.disable.snapshot.policy=\u73FE\u5728\u306E\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8 \u30DD\u30EA\u30B7\u30FC\u3092\u7121\u52B9\u306B\u3057\u307E\u3057\u305F\u3002 +message.disable.user=\u3053\u306E\u30E6\u30FC\u30B6\u30FC\u3092\u7121\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.disable.vpn.access=VPN \u30A2\u30AF\u30BB\u30B9\u3092\u7121\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.disable.vpn=VPN \u3092\u7121\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.download.ISO=ISO\u00e3\u0082\u0092\u00e3\u0083\u0080\u00e3\u0082\u00a6\u00e3\u0083\u00b3\u00e3\u0083\u00ad\u00e3\u0083\u00bc\u00e3\u0083\u0089\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab00000\u00e3\u0082\u0092\u00e3\u0082\u00af\u00e3\u0083\u00aa\u00e3\u0083\u0083\u00e3\u0082\u00af\u00e3\u0081\u0097\u00e3\u0081\u00a6\u00e3\u0081\u008f\u00e3\u0081\u00a0\u00e3\u0081\u0095\u00e3\u0081\u0084\u00e3\u0080\u0082 +message.download.template=\u00e3\u0083\u0086\u00e3\u0083\u00b3\u00e3\u0083\u0097\u00e3\u0083\u00ac\u00e3\u0083\u00bc\u00e3\u0083\u0088\u00e3\u0082\u0092\u00e3\u0083\u0080\u00e3\u0082\u00a6\u00e3\u0083\u00b3\u00e3\u0083\u00ad\u00e3\u0083\u00bc\u00e3\u0083\u0089\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab00000\u00e3\u0082\u0092\u00e3\u0082\u00af\u00e3\u0083\u00aa\u00e3\u0083\u0083\u00e3\u0082\u00af\u00e3\u0081\u0097\u00e3\u0081\u00a6\u00e3\u0081\u008f\u00e3\u0081\u00a0\u00e3\u0081\u0095\u00e3\u0081\u0084\u00e3\u0080\u0082 +message.download.volume.confirm=\u3053\u306E\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.download.volume=\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u30C0\u30A6\u30F3\u30ED\u30FC\u30C9\u3059\u308B\u306B\u306F 00000 \u3092\u30AF\u30EA\u30C3\u30AF\u3057\u307E\u3059 +message.edit.account=\u7DE8\u96C6 ("-1" \u306F\u3001\u30EA\u30BD\u30FC\u30B9\u4F5C\u6210\u306E\u91CF\u306B\u5236\u9650\u304C\u306A\u3044\u3053\u3068\u3092\u793A\u3057\u307E\u3059) +message.edit.confirm=[\u4FDD\u5B58] \u3092\u30AF\u30EA\u30C3\u30AF\u3059\u308B\u524D\u306B\u5909\u66F4\u5185\u5BB9\u3092\u78BA\u8A8D\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.edit.limits=\u6B21\u306E\u30EA\u30BD\u30FC\u30B9\u306B\u5236\u9650\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u300C-1\u300D\u306F\u3001\u30EA\u30BD\u30FC\u30B9\u4F5C\u6210\u306B\u5236\u9650\u304C\u306A\u3044\u3053\u3068\u3092\u793A\u3057\u307E\u3059\u3002 +message.edit.traffic.type=\u3053\u306E\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7A2E\u985E\u306B\u95A2\u9023\u4ED8\u3051\u308B\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF \u30E9\u30D9\u30EB\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.enable.account=\u3053\u306E\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.enabled.vpn.ip.sec=IPSec \u4E8B\u524D\u5171\u6709\u30AD\u30FC\: +message.enabled.vpn=\u73FE\u5728\u3001VPN \u30A2\u30AF\u30BB\u30B9\u304C\u6709\u52B9\u306B\u306A\u3063\u3066\u3044\u307E\u3059\u3002\u6B21\u306E IP \u30A2\u30C9\u30EC\u30B9\u7D4C\u7531\u3067\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u3059\u3002 +message.enable.user=\u3053\u306E\u30E6\u30FC\u30B6\u30FC\u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.enable.vpn.access=\u73FE\u5728\u3053\u306E IP \u30A2\u30C9\u30EC\u30B9\u306B\u5BFE\u3059\u308B VPN \u306F\u7121\u52B9\u3067\u3059\u3002VPN \u30A2\u30AF\u30BB\u30B9\u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.enable.vpn=\u3053\u306E IP \u30A2\u30C9\u30EC\u30B9\u306B\u5BFE\u3059\u308B VPN \u30A2\u30AF\u30BB\u30B9\u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.enabling.security.group.provider=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7 \u30D7\u30ED\u30D0\u30A4\u30C0\u30FC\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059 +message.enabling.zone=\u30BE\u30FC\u30F3\u3092\u6709\u52B9\u306B\u3057\u3066\u3044\u307E\u3059 +message.enter.token=\u96FB\u5B50\u30E1\u30FC\u30EB\u306E\u62DB\u5F85\u72B6\u306B\u8A18\u8F09\u3055\u308C\u3066\u3044\u308B\u30C8\u30FC\u30AF\u30F3\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.generate.keys=\u3053\u306E\u30E6\u30FC\u30B6\u30FC\u306B\u65B0\u3057\u3044\u30AD\u30FC\u3092\u751F\u6210\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.guest.traffic.in.advanced.zone=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306F\u3001\u30A8\u30F3\u30C9 \u30E6\u30FC\u30B6\u30FC\u306E\u4EEE\u60F3\u30DE\u30B7\u30F3\u9593\u306E\u901A\u4FE1\u3067\u3059\u3002\u5404\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u30B2\u30B9\u30C8 \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u3092\u901A\u4FE1\u3059\u308B\u305F\u3081\u306E VLAN ID \u306E\u7BC4\u56F2\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.guest.traffic.in.basic.zone=\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306F\u3001\u30A8\u30F3\u30C9 \u30E6\u30FC\u30B6\u30FC\u306E\u4EEE\u60F3\u30DE\u30B7\u30F3\u9593\u306E\u901A\u4FE1\u3067\u3059\u3002CloudStack \u3067\u30B2\u30B9\u30C8 VM \u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u308B IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u3053\u306E\u7BC4\u56F2\u304C\u4E88\u7D04\u6E08\u307F\u306E\u30B7\u30B9\u30C6\u30E0 IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3068\u91CD\u8907\u3057\u306A\u3044\u3088\u3046\u306B\u6CE8\u610F\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.installWizard.click.retry=\u8D77\u52D5\u3092\u518D\u8A66\u884C\u3059\u308B\u306B\u306F\u30DC\u30BF\u30F3\u3092\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.installWizard.copy.whatIsAPod=\u901A\u5E38\u30011 \u3064\u306E\u30DD\u30C3\u30C9\u306F\u5358\u4E00\u306E\u30E9\u30C3\u30AF\u3092\u8868\u3057\u307E\u3059\u3002\u540C\u3058\u30DD\u30C3\u30C9\u5185\u306E\u30DB\u30B9\u30C8\u306F\u540C\u3058\u30B5\u30D6\u30CD\u30C3\u30C8\u306B\u542B\u307E\u308C\u307E\u3059\u3002

\u30DD\u30C3\u30C9\u306F CloudStack&\#8482; \u74B0\u5883\u5185\u306E 2 \u756A\u76EE\u306B\u5927\u304D\u306A\u7D44\u7E54\u5358\u4F4D\u3067\u3059\u3002\u30DD\u30C3\u30C9\u306F\u30BE\u30FC\u30F3\u306B\u542B\u307E\u308C\u307E\u3059\u3002\u5404\u30BE\u30FC\u30F3\u306F 1 \u3064\u4EE5\u4E0A\u306E\u30DD\u30C3\u30C9\u3092\u542B\u3080\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u57FA\u672C\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3067\u306F\u3001\u30BE\u30FC\u30F3\u5185\u306E\u30DD\u30C3\u30C9\u306F 1 \u3064\u3067\u3059\u3002 +message.installWizard.copy.whatIsAZone=\u30BE\u30FC\u30F3\u306F CloudStack&\#8482; \u74B0\u5883\u5185\u306E\u6700\u5927\u306E\u7D44\u7E54\u5358\u4F4D\u3067\u3059\u30021 \u3064\u306E\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u5185\u306B\u8907\u6570\u306E\u30BE\u30FC\u30F3\u3092\u8A2D\u5B9A\u3067\u304D\u307E\u3059\u304C\u3001\u901A\u5E38\u3001\u30BE\u30FC\u30F3\u306F\u5358\u4E00\u306E\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u306B\u76F8\u5F53\u3057\u307E\u3059\u3002\u30A4\u30F3\u30D5\u30E9\u30B9\u30C8\u30E9\u30AF\u30C1\u30E3\u3092\u30BE\u30FC\u30F3\u306B\u7D44\u7E54\u5316\u3059\u308B\u3068\u3001\u30BE\u30FC\u30F3\u3092\u7269\u7406\u7684\u306B\u5206\u96E2\u3057\u3066\u5197\u9577\u5316\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002\u305F\u3068\u3048\u3070\u3001\u5404\u30BE\u30FC\u30F3\u306B\u96FB\u6E90\u3068\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30A2\u30C3\u30D7\u30EA\u30F3\u30AF\u3092\u914D\u5099\u3057\u307E\u3059\u3002\u5FC5\u9808\u3067\u306F\u3042\u308A\u307E\u305B\u3093\u304C\u3001\u30BE\u30FC\u30F3\u306F\u9060\u9694\u5730\u306B\u5206\u6563\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002 +message.installWizard.copy.whatIsSecondaryStorage=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306F\u30BE\u30FC\u30F3\u3068\u95A2\u9023\u4ED8\u3051\u3089\u308C\u3001\u6B21\u306E\u9805\u76EE\u3092\u683C\u7D0D\u3057\u307E\u3059\u3002
  • \u30C6\u30F3\u30D7\u30EC\u30FC\u30C8 - VM \u306E\u8D77\u52D5\u306B\u4F7F\u7528\u3067\u304D\u308B OS \u30A4\u30E1\u30FC\u30B8\u3067\u3001\u30A2\u30D7\u30EA\u30B1\u30FC\u30B7\u30E7\u30F3\u306E\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u306A\u3069\u8FFD\u52A0\u306E\u69CB\u6210\u3092\u542B\u3081\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002
  • ISO \u30A4\u30E1\u30FC\u30B8 - \u8D77\u52D5\u53EF\u80FD\u307E\u305F\u306F\u8D77\u52D5\u4E0D\u53EF\u306E OS \u30A4\u30E1\u30FC\u30B8\u3067\u3059\u3002
  • \u30C7\u30A3\u30B9\u30AF \u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8 - VM \u30C7\u30FC\u30BF\u306E\u4FDD\u5B58\u30B3\u30D4\u30FC\u3067\u3059\u3002\u30C7\u30FC\u30BF\u306E\u5FA9\u5143\u307E\u305F\u306F\u65B0\u3057\u3044\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u4F5C\u6210\u306B\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002
+message.installWizard.tooltip.addCluster.name=\u30AF\u30E9\u30B9\u30BF\u30FC\u306E\u540D\u524D\u3067\u3059\u3002CloudStack \u3067\u4F7F\u7528\u3055\u308C\u3066\u3044\u306A\u3044\u3001\u4EFB\u610F\u306E\u30C6\u30AD\u30B9\u30C8\u3092\u6307\u5B9A\u3067\u304D\u307E\u3059\u3002 +message.installWizard.tooltip.addHost.hostname=\u30DB\u30B9\u30C8\u306E DNS \u540D\u307E\u305F\u306F IP \u30A2\u30C9\u30EC\u30B9\u3067\u3059\u3002 +message.installWizard.tooltip.addHost.password=XenServer \u5074\u3067\u6307\u5B9A\u3057\u305F\u3001\u4E0A\u306E\u30E6\u30FC\u30B6\u30FC\u540D\u306B\u5BFE\u3059\u308B\u30D1\u30B9\u30EF\u30FC\u30C9\u3067\u3059\u3002 +message.installWizard.tooltip.addHost.username=\u901A\u5E38\u306F root \u3067\u3059\u3002 +message.installWizard.tooltip.addPod.name=\u30DD\u30C3\u30C9\u306E\u540D\u524D\u3067\u3059\u3002 +message.installWizard.tooltip.addPod.reservedSystemEndIp=\u3053\u308C\u306F\u3001\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 VM \u304A\u3088\u3073\u30B3\u30F3\u30BD\u30FC\u30EB \u30D7\u30ED\u30AD\u30B7 VM \u3092\u7BA1\u7406\u3059\u308B\u305F\u3081\u306B CloudStack \u3067\u4F7F\u7528\u3059\u308B\u3001\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u5185\u306E IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3067\u3059\u3002\u3053\u308C\u3089\u306E IP \u30A2\u30C9\u30EC\u30B9\u306F\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0 \u30B5\u30FC\u30D0\u30FC\u3068\u540C\u3058\u30B5\u30D6\u30CD\u30C3\u30C8\u304B\u3089\u5272\u308A\u5F53\u3066\u307E\u3059\u3002 +message.installWizard.tooltip.addPod.reservedSystemGateway=\u3053\u306E\u30DD\u30C3\u30C9\u5185\u306E\u30DB\u30B9\u30C8\u306E\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3067\u3059\u3002 +message.installWizard.tooltip.addPod.reservedSystemNetmask=\u30B2\u30B9\u30C8\u306E\u4F7F\u7528\u3059\u308B\u30B5\u30D6\u30CD\u30C3\u30C8\u4E0A\u3067\u4F7F\u7528\u3055\u308C\u308B\u30CD\u30C3\u30C8\u30DE\u30B9\u30AF\u3067\u3059\u3002 +message.installWizard.tooltip.addPod.reservedSystemStartIp=\u3053\u308C\u306F\u3001\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 VM \u304A\u3088\u3073\u30B3\u30F3\u30BD\u30FC\u30EB \u30D7\u30ED\u30AD\u30B7 VM \u3092\u7BA1\u7406\u3059\u308B\u305F\u3081\u306B CloudStack \u3067\u4F7F\u7528\u3059\u308B\u3001\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u5185\u306E IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3067\u3059\u3002\u3053\u308C\u3089\u306E IP \u30A2\u30C9\u30EC\u30B9\u306F\u30B3\u30F3\u30D4\u30E5\u30FC\u30C6\u30A3\u30F3\u30B0 \u30B5\u30FC\u30D0\u30FC\u3068\u540C\u3058\u30B5\u30D6\u30CD\u30C3\u30C8\u304B\u3089\u5272\u308A\u5F53\u3066\u307E\u3059\u3002 +message.installWizard.tooltip.addPrimaryStorage.name=\u30B9\u30C8\u30EC\u30FC\u30B8 \u30C7\u30D0\u30A4\u30B9\u306E\u540D\u524D\u3067\u3059\u3002 +message.installWizard.tooltip.addPrimaryStorage.path=(NFS \u306E\u5834\u5408) \u30B5\u30FC\u30D0\u30FC\u304B\u3089\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D1\u30B9\u3067\u3059\u3002(SharedMountPoint \u306E\u5834\u5408) \u30D1\u30B9\u3067\u3059\u3002KVM \u3067\u306F\u3053\u306E\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u304C\u30DE\u30A6\u30F3\u30C8\u3055\u308C\u308B\u5404\u30DB\u30B9\u30C8\u4E0A\u306E\u30D1\u30B9\u3067\u3059\u3002\u305F\u3068\u3048\u3070\u3001/mnt/primary \u3067\u3059\u3002 +message.installWizard.tooltip.addPrimaryStorage.server=(NFS\u3001iSCSI\u3001\u307E\u305F\u306F PreSetup \u306E\u5834\u5408) \u30B9\u30C8\u30EC\u30FC\u30B8 \u30C7\u30D0\u30A4\u30B9\u306E IP \u30A2\u30C9\u30EC\u30B9\u307E\u305F\u306F DNS \u540D\u3067\u3059\u3002 +message.installWizard.tooltip.addSecondaryStorage.nfsServer=\u30BB\u30AB\u30F3\u30C0\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u30DB\u30B9\u30C8\u3059\u308B NFS \u30B5\u30FC\u30D0\u30FC\u306E IP \u30A2\u30C9\u30EC\u30B9\u3067\u3059\u3002 +message.installWizard.tooltip.addSecondaryStorage.path=\u4E0A\u306B\u6307\u5B9A\u3057\u305F\u30B5\u30FC\u30D0\u30FC\u306B\u5B58\u5728\u3059\u308B\u3001\u30A8\u30AF\u30B9\u30DD\u30FC\u30C8\u3055\u308C\u305F\u30D1\u30B9\u3067\u3059\u3002 +message.installWizard.tooltip.addZone.dns1=\u30BE\u30FC\u30F3\u5185\u306E\u30B2\u30B9\u30C8 VM \u3067\u4F7F\u7528\u3059\u308B DNS \u30B5\u30FC\u30D0\u30FC\u3067\u3059\u3002\u3053\u308C\u3089\u306E DNS \u30B5\u30FC\u30D0\u30FC\u306B\u306F\u3001\u5F8C\u3067\u8FFD\u52A0\u3059\u308B\u30D1\u30D6\u30EA\u30C3\u30AF \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u7D4C\u7531\u3067\u30A2\u30AF\u30BB\u30B9\u3057\u307E\u3059\u3002\u30BE\u30FC\u30F3\u306E\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9\u304B\u3089\u3001\u3053\u3053\u3067\u6307\u5B9A\u3059\u308B\u30D1\u30D6\u30EA\u30C3\u30AF DNS \u30B5\u30FC\u30D0\u30FC\u306B\u901A\u4FE1\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.installWizard.tooltip.addZone.dns2=\u30BE\u30FC\u30F3\u5185\u306E\u30B2\u30B9\u30C8 VM \u3067\u4F7F\u7528\u3059\u308B DNS \u30B5\u30FC\u30D0\u30FC\u3067\u3059\u3002\u3053\u308C\u3089\u306E DNS \u30B5\u30FC\u30D0\u30FC\u306B\u306F\u3001\u5F8C\u3067\u8FFD\u52A0\u3059\u308B\u30D1\u30D6\u30EA\u30C3\u30AF \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u7D4C\u7531\u3067\u30A2\u30AF\u30BB\u30B9\u3057\u307E\u3059\u3002\u30BE\u30FC\u30F3\u306E\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9\u304B\u3089\u3001\u3053\u3053\u3067\u6307\u5B9A\u3059\u308B\u30D1\u30D6\u30EA\u30C3\u30AF DNS \u30B5\u30FC\u30D0\u30FC\u306B\u901A\u4FE1\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.installWizard.tooltip.addZone.internaldns1=\u30BE\u30FC\u30F3\u5185\u306E\u30B7\u30B9\u30C6\u30E0 VM \u3067\u4F7F\u7528\u3059\u308B DNS \u30B5\u30FC\u30D0\u30FC\u3067\u3059\u3002\u3053\u308C\u3089\u306E DNS \u30B5\u30FC\u30D0\u30FC\u306F\u3001\u30B7\u30B9\u30C6\u30E0 VM \u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30A4\u30B9\u3092\u4ECB\u3057\u3066\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u307E\u3059\u3002\u30DD\u30C3\u30C9\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 IP \u30A2\u30C9\u30EC\u30B9\u304B\u3089\u3001\u3053\u3053\u3067\u6307\u5B9A\u3059\u308B DNS \u30B5\u30FC\u30D0\u30FC\u306B\u901A\u4FE1\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.installWizard.tooltip.addZone.internaldns2=\u30BE\u30FC\u30F3\u5185\u306E\u30B7\u30B9\u30C6\u30E0 VM \u3067\u4F7F\u7528\u3059\u308B DNS \u30B5\u30FC\u30D0\u30FC\u3067\u3059\u3002\u3053\u308C\u3089\u306E DNS \u30B5\u30FC\u30D0\u30FC\u306F\u3001\u30B7\u30B9\u30C6\u30E0 VM \u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30A4\u30B9\u3092\u4ECB\u3057\u3066\u30A2\u30AF\u30BB\u30B9\u3055\u308C\u307E\u3059\u3002\u30DD\u30C3\u30C9\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 IP \u30A2\u30C9\u30EC\u30B9\u304B\u3089\u3001\u3053\u3053\u3067\u6307\u5B9A\u3059\u308B DNS \u30B5\u30FC\u30D0\u30FC\u306B\u901A\u4FE1\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.installWizard.tooltip.addZone.name=\u30BE\u30FC\u30F3\u306E\u540D\u524D\u3067\u3059\u3002 +message.installWizard.tooltip.configureGuestTraffic.description=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u8AAC\u660E\u3067\u3059\u3002 +message.installWizard.tooltip.configureGuestTraffic.guestEndIp=\u3053\u306E\u30BE\u30FC\u30F3\u306E\u30B2\u30B9\u30C8\u306B\u5272\u308A\u5F53\u3066\u308B\u3053\u3068\u304C\u3067\u304D\u308B IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3067\u3059\u3002\u4F7F\u7528\u3059\u308B NIC \u304C 1 \u3064\u306E\u5834\u5408\u306F\u3001\u3053\u308C\u3089\u306E IP \u30A2\u30C9\u30EC\u30B9\u306F\u30DD\u30C3\u30C9\u306E CIDR \u3068\u540C\u3058 CIDR \u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.installWizard.tooltip.configureGuestTraffic.guestGateway=\u30B2\u30B9\u30C8\u306E\u4F7F\u7528\u3059\u308B\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3067\u3059\u3002 +message.installWizard.tooltip.configureGuestTraffic.guestNetmask=\u30B2\u30B9\u30C8\u306E\u4F7F\u7528\u3059\u308B\u30B5\u30D6\u30CD\u30C3\u30C8\u4E0A\u3067\u4F7F\u7528\u3055\u308C\u308B\u30CD\u30C3\u30C8\u30DE\u30B9\u30AF\u3067\u3059\u3002 +message.installWizard.tooltip.configureGuestTraffic.guestStartIp=\u3053\u306E\u30BE\u30FC\u30F3\u306E\u30B2\u30B9\u30C8\u306B\u5272\u308A\u5F53\u3066\u308B\u3053\u3068\u304C\u3067\u304D\u308B IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3067\u3059\u3002\u4F7F\u7528\u3059\u308B NIC \u304C 1 \u3064\u306E\u5834\u5408\u306F\u3001\u3053\u308C\u3089\u306E IP \u30A2\u30C9\u30EC\u30B9\u306F\u30DD\u30C3\u30C9\u306E CIDR \u3068\u540C\u3058 CIDR \u306B\u542B\u307E\u308C\u3066\u3044\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.installWizard.tooltip.configureGuestTraffic.name=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u540D\u524D\u3067\u3059\u3002 +message.instanceWizard.noTemplates=\u4F7F\u7528\u53EF\u80FD\u306A\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002\u4E92\u63DB\u6027\u306E\u3042\u308B\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u8FFD\u52A0\u3057\u3066\u3001\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9 \u30A6\u30A3\u30B6\u30FC\u30C9\u3092\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.ip.address.changed=\u304A\u4F7F\u3044\u306E IP \u30A2\u30C9\u30EC\u30B9\u304C\u5909\u66F4\u3055\u308C\u3066\u3044\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002\u4E00\u89A7\u3092\u66F4\u65B0\u3057\u307E\u3059\u304B? \u305D\u306E\u5834\u5408\u306F\u3001\u8A73\u7D30\u30DA\u30A4\u30F3\u304C\u9589\u3058\u308B\u3053\u3068\u306B\u6CE8\u610F\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.iso.desc=\u30C7\u30FC\u30BF\u307E\u305F\u306F OS \u8D77\u52D5\u53EF\u80FD\u30E1\u30C7\u30A3\u30A2\u3092\u542B\u3080\u30C7\u30A3\u30B9\u30AF \u30A4\u30E1\u30FC\u30B8 +message.join.project=\u3053\u308C\u3067\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u53C2\u52A0\u3057\u307E\u3057\u305F\u3002\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u53C2\u7167\u3059\u308B\u306B\u306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 \u30D3\u30E5\u30FC\u306B\u5207\u308A\u66FF\u3048\u3066\u304F\u3060\u3055\u3044\u3002 +message.launch.zone=\u30BE\u30FC\u30F3\u3092\u8D77\u52D5\u3059\u308B\u6E96\u5099\u304C\u3067\u304D\u307E\u3057\u305F\u3002\u6B21\u306E\u624B\u9806\u306B\u9032\u3093\u3067\u304F\u3060\u3055\u3044\u3002 +message.lock.account=\u3053\u306E\u30A2\u30AB\u30A6\u30F3\u30C8\u3092\u30ED\u30C3\u30AF\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? \u3053\u306E\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u3059\u3079\u3066\u306E\u30E6\u30FC\u30B6\u30FC\u304C\u30AF\u30E9\u30A6\u30C9 \u30EA\u30BD\u30FC\u30B9\u3092\u7BA1\u7406\u3067\u304D\u306A\u304F\u306A\u308A\u307E\u3059\u3002\u305D\u306E\u5F8C\u3082\u65E2\u5B58\u306E\u30EA\u30BD\u30FC\u30B9\u306B\u306F\u30A2\u30AF\u30BB\u30B9\u3067\u304D\u307E\u3059\u3002 +message.migrate.instance.confirm=\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u79FB\u884C\u5148\u306F\u6B21\u306E\u30DB\u30B9\u30C8\u3067\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.migrate.instance.to.host=\u5225\u306E\u30DB\u30B9\u30C8\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u79FB\u884C\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.migrate.instance.to.ps=\u5225\u306E\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u79FB\u884C\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.migrate.router.confirm=\u30EB\u30FC\u30BF\u30FC\u306E\u79FB\u884C\u5148\u306F\u6B21\u306E\u30DB\u30B9\u30C8\u3067\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.migrate.systemvm.confirm=\u30B7\u30B9\u30C6\u30E0 VM \u306E\u79FB\u884C\u5148\u306F\u6B21\u306E\u30DB\u30B9\u30C8\u3067\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.migrate.volume=\u5225\u306E\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u306B\u30DC\u30EA\u30E5\u30FC\u30E0\u3092\u79FB\u884C\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.new.user=\u00e3\u0082\u00a2\u00e3\u0082\u00ab\u00e3\u0082\u00a6\u00e3\u0083\u00b3\u00e3\u0083\u0088\u00e3\u0081\u00ab\u00e6\u0096\u00b0\u00e3\u0081\u0097\u00e3\u0081\u0084\u00e3\u0083\u00a6\u00e3\u0083\u00bc\u00e3\u0082\u00b6\u00e3\u0083\u00bc\u00e3\u0082\u0092\u00e8\u00bf\u00bd\u00e5\u008a\u00a0\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab\u00e3\u0080\u0081\u00e6\u00ac\u00a1\u00e3\u0081\u00ae\u00e6\u0083\u0085\u00e5\u00a0\u00b1\u00e3\u0082\u0092\u00e8\u00a8\u00ad\u00e5\u00ae\u009a\u00e3\u0081\u0097\u00e3\u0081\u00a6\u00e3\u0081\u008f\u00e3\u0081\u00a0\u00e3\u0081\u0095\u00e3\u0081\u0084 +message.no.network.support.configuration.not.true=\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u304C\u6709\u52B9\u306A\u30BE\u30FC\u30F3\u304C\u7121\u3044\u305F\u3081\u3001\u8FFD\u52A0\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u6A5F\u80FD\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u624B\u9806 5. \u306B\u9032\u3093\u3067\u304F\u3060\u3055\u3044\u3002 +message.no.network.support=\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u3068\u3057\u3066 vSphere \u3092\u9078\u629E\u3057\u307E\u3057\u305F\u304C\u3001\u3053\u306E\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u306B\u8FFD\u52A0\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u6A5F\u80FD\u306F\u3042\u308A\u307E\u305B\u3093\u3002\u624B\u9806 5. \u306B\u9032\u3093\u3067\u304F\u3060\u3055\u3044\u3002 +message.no.projects.adminOnly=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002
\u7BA1\u7406\u8005\u306B\u65B0\u3057\u3044\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306E\u4F5C\u6210\u3092\u4F9D\u983C\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.no.projects=\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u304C\u3042\u308A\u307E\u305B\u3093\u3002
\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 \u30BB\u30AF\u30B7\u30E7\u30F3\u304B\u3089\u65B0\u3057\u3044\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u4F5C\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.number.clusters=

\u30AF\u30E9\u30B9\u30BF\u30FC\u6570

+message.number.hosts=

\u30DB\u30B9\u30C8\u6570

+message.number.pods=

\u30DD\u30C3\u30C9\u6570

+message.number.storage=

\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8 \u30DC\u30EA\u30E5\u30FC\u30E0\u6570

+message.number.zones=

\u30BE\u30FC\u30F3\u6570

+message.pending.projects.1=\u4FDD\u7559\u4E2D\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u62DB\u5F85\u72B6\u304C\u3042\u308A\u307E\u3059\u3002 +message.pending.projects.2=\u8868\u793A\u3059\u308B\u306B\u306F\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8 \u30BB\u30AF\u30B7\u30E7\u30F3\u306B\u79FB\u52D5\u3057\u3066\u3001\u4E00\u89A7\u304B\u3089\u62DB\u5F85\u72B6\u3092\u9078\u629E\u3057\u307E\u3059\u3002 +message.please.add.at.lease.one.traffic.range=\u5C11\u306A\u304F\u3068\u3082 1 \u3064\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7BC4\u56F2\u3092\u8FFD\u52A0\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.please.proceed=\u6B21\u306E\u624B\u9806\u306B\u9032\u3093\u3067\u304F\u3060\u3055\u3044\u3002 +message.please.select.a.configuration.for.your.zone=\u30BE\u30FC\u30F3\u306E\u69CB\u6210\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.please.select.a.different.public.and.management.network.before.removing=\u524A\u9664\u306E\u524D\u306B\u7570\u306A\u308B\u30D1\u30D6\u30EA\u30C3\u30AF\u304A\u3088\u3073\u7BA1\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.please.select.networks=\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.please.wait.while.zone.is.being.created=\u30BE\u30FC\u30F3\u304C\u4F5C\u6210\u3055\u308C\u308B\u307E\u3067\u3057\u3070\u3089\u304F\u304A\u5F85\u3061\u304F\u3060\u3055\u3044... +message.project.invite.sent=\u30E6\u30FC\u30B6\u30FC\u306B\u62DB\u5F85\u72B6\u304C\u9001\u4FE1\u3055\u308C\u307E\u3057\u305F\u3002\u30E6\u30FC\u30B6\u30FC\u304C\u62DB\u5F85\u3092\u627F\u8AFE\u3059\u308B\u3068\u3001\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u306B\u8FFD\u52A0\u3055\u308C\u307E\u3059\u3002 +message.public.traffic.in.advanced.zone=\u30AF\u30E9\u30A6\u30C9\u5185\u306E VM \u304C\u30A4\u30F3\u30BF\u30FC\u30CD\u30C3\u30C8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u3068\u3001\u30D1\u30D6\u30EA\u30C3\u30AF \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u304C\u751F\u6210\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u305F\u3081\u306B\u3001\u4E00\u822C\u306B\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306A IP \u30A2\u30C9\u30EC\u30B9\u3092\u5272\u308A\u5F53\u3066\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30A8\u30F3\u30C9 \u30E6\u30FC\u30B6\u30FC\u306F CloudStack \u306E\u30E6\u30FC\u30B6\u30FC \u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30A4\u30B9\u3092\u4F7F\u7528\u3057\u3066\u3053\u308C\u3089\u306E IP \u30A2\u30C9\u30EC\u30B9\u3092\u53D6\u5F97\u3057\u3001\u30B2\u30B9\u30C8 \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3068\u30D1\u30D6\u30EA\u30C3\u30AF \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u9593\u306B NAT \u3092\u5B9F\u88C5\u3059\u308B\u3053\u3068\u304C\u3067\u304D\u307E\u3059\u3002

\u30A4\u30F3\u30BF\u30FC\u30CD\u30C3\u30C8 \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u305F\u3081\u306B\u3001\u5C11\u306A\u304F\u3068\u3082 1 \u3064 IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u3092\u5165\u529B\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.public.traffic.in.basic.zone=\u30AF\u30E9\u30A6\u30C9\u5185\u306E VM \u304C\u30A4\u30F3\u30BF\u30FC\u30CD\u30C3\u30C8\u306B\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u304B\u30A4\u30F3\u30BF\u30FC\u30CD\u30C3\u30C8\u7D4C\u7531\u3067\u30AF\u30E9\u30A4\u30A2\u30F3\u30C8\u306B\u30B5\u30FC\u30D3\u30B9\u3092\u63D0\u4F9B\u3059\u308B\u3068\u3001\u30D1\u30D6\u30EA\u30C3\u30AF \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u304C\u751F\u6210\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u305F\u3081\u306B\u3001\u4E00\u822C\u306B\u30A2\u30AF\u30BB\u30B9\u53EF\u80FD\u306A IP \u30A2\u30C9\u30EC\u30B9\u3092\u5272\u308A\u5F53\u3066\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u4F5C\u6210\u3059\u308B\u3068\u3001\u30B2\u30B9\u30C8 IP \u30A2\u30C9\u30EC\u30B9\u306E\u307B\u304B\u306B\u3053\u306E\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9\u306E\u7BC4\u56F2\u304B\u3089\u30A2\u30C9\u30EC\u30B9\u304C 1 \u3064\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u307E\u3059\u3002\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9\u3068\u30B2\u30B9\u30C8 IP \u30A2\u30C9\u30EC\u30B9\u306E\u9593\u306B\u3001\u9759\u7684\u306A 1 \u5BFE 1 \u306E NAT \u304C\u81EA\u52D5\u7684\u306B\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3059\u3002\u30A8\u30F3\u30C9 \u30E6\u30FC\u30B6\u30FC\u306F CloudStack \u306E\u30E6\u30FC\u30B6\u30FC \u30A4\u30F3\u30BF\u30FC\u30D5\u30A7\u30A4\u30B9\u3092\u4F7F\u7528\u3057\u3066\u8FFD\u52A0\u306E IP \u30A2\u30C9\u30EC\u30B9\u3092\u53D6\u5F97\u3057\u3001\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3068\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9\u306E\u9593\u306B\u9759\u7684 NAT \u3092\u5B9F\u88C5\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002 +message.remove.vpc=VPC \u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.remove.vpn.access=\u6B21\u306E\u30E6\u30FC\u30B6\u30FC\u304B\u3089 VPN \u30A2\u30AF\u30BB\u30B9\u3092\u524A\u9664\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.reset.password.warning.notPasswordEnabled=\u3053\u306E\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306F\u3001\u30D1\u30B9\u30EF\u30FC\u30C9\u7BA1\u7406\u3092\u6709\u52B9\u306B\u305B\u305A\u306B\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F\u3002 +message.reset.password.warning.notStopped=\u73FE\u5728\u306E\u30D1\u30B9\u30EF\u30FC\u30C9\u3092\u5909\u66F4\u3059\u308B\u524D\u306B\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u505C\u6B62\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.reset.VPN.connection=VPN \u63A5\u7D9A\u3092\u30EA\u30BB\u30C3\u30C8\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.restart.mgmt.server=\u65B0\u3057\u3044\u8A2D\u5B9A\u3092\u6709\u52B9\u306B\u3059\u308B\u305F\u3081\u306B\u3001\u7BA1\u7406\u30B5\u30FC\u30D0\u30FC\u3092\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.restart.mgmt.usage.server=\u65B0\u3057\u3044\u8A2D\u5B9A\u3092\u6709\u52B9\u306B\u3059\u308B\u305F\u3081\u306B\u3001\u7BA1\u7406\u30B5\u30FC\u30D0\u30FC\u3068\u4F7F\u7528\u72B6\u6CC1\u6E2C\u5B9A\u30B5\u30FC\u30D0\u30FC\u3092\u518D\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.restart.network=\u3053\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3067\u63D0\u4F9B\u3059\u308B\u3059\u3079\u3066\u306E\u30B5\u30FC\u30D3\u30B9\u304C\u4E2D\u65AD\u3055\u308C\u307E\u3059\u3002\u3053\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u518D\u8D77\u52D5\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.restart.vpc=VPC \u3092\u518D\u8D77\u52D5\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.security.group.usage=(\u8A72\u5F53\u3059\u308B\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u3092\u3059\u3079\u3066\u9078\u629E\u3059\u308B\u306B\u306F\u3001Ctrl \u30AD\u30FC\u3092\u62BC\u3057\u306A\u304C\u3089\u30AF\u30EA\u30C3\u30AF\u3057\u3066\u304F\u3060\u3055\u3044) +message.select.a.zone=\u30BE\u30FC\u30F3\u306F\u901A\u5E38\u3001\u5358\u4E00\u306E\u30C7\u30FC\u30BF\u30BB\u30F3\u30BF\u30FC\u306B\u76F8\u5F53\u3057\u307E\u3059\u3002\u8907\u6570\u306E\u30BE\u30FC\u30F3\u3092\u8A2D\u5B9A\u3057\u3001\u7269\u7406\u7684\u306B\u5206\u96E2\u3057\u3066\u5197\u9577\u6027\u3092\u6301\u305F\u305B\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u30AF\u30E9\u30A6\u30C9\u306E\u4FE1\u983C\u6027\u3092\u9AD8\u3081\u307E\u3059\u3002 +message.select.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.select.iso=\u65B0\u3057\u3044\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E ISO \u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.select.item=\u9805\u76EE\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.select.security.groups=\u65B0\u3057\u3044\u4EEE\u60F3\u30DE\u30B7\u30F3\u306E\u30BB\u30AD\u30E5\u30EA\u30C6\u30A3 \u30B0\u30EB\u30FC\u30D7\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.select.template=\u65B0\u3057\u3044\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.setup.physical.network.during.zone.creation.basic=\u57FA\u672C\u30BE\u30FC\u30F3\u3092\u8FFD\u52A0\u3059\u308B\u3068\u304D\u306F\u3001\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u4E0A\u306E NIC \u306B\u5BFE\u5FDC\u3059\u308B 1 \u3064\u306E\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3067\u304D\u307E\u3059\u3002\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306F\u3044\u304F\u3064\u304B\u306E\u7A2E\u985E\u306E\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u3092\u4F1D\u9001\u3057\u307E\u3059\u3002

\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306B\u307B\u304B\u306E\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7A2E\u985E\u3092\u30C9\u30E9\u30C3\u30B0 \u30A2\u30F3\u30C9 \u30C9\u30ED\u30C3\u30D7\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002 +message.setup.physical.network.during.zone.creation=\u62E1\u5F35\u30BE\u30FC\u30F3\u3092\u8FFD\u52A0\u3059\u308B\u3068\u304D\u306F\u30011 \u3064\u4EE5\u4E0A\u306E\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u5404\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306F\u30CF\u30A4\u30D1\u30FC\u30D0\u30A4\u30B6\u30FC\u4E0A\u306E 1 \u3064\u306E NIC \u306B\u5BFE\u5FDC\u3057\u307E\u3059\u3002\u5404\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3067\u306F\u3001\u7D44\u307F\u5408\u308F\u305B\u306B\u5236\u9650\u304C\u3042\u308A\u307E\u3059\u304C\u30011 \u3064\u4EE5\u4E0A\u306E\u7A2E\u985E\u306E\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u3092\u901A\u4FE1\u3067\u304D\u307E\u3059\u3002

\u5404\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306B\u5BFE\u3057\u3066\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u306E\u7A2E\u985E\u3092\u30C9\u30E9\u30C3\u30B0 \u30A2\u30F3\u30C9 \u30C9\u30ED\u30C3\u30D7\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.setup.successful=\u30AF\u30E9\u30A6\u30C9\u304C\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3055\u308C\u307E\u3057\u305F\u3002 +message.snapshot.schedule=\u6B21\u306E\u30AA\u30D7\u30B7\u30E7\u30F3\u304B\u3089\u9078\u629E\u3057\u3066\u30DD\u30EA\u30B7\u30FC\u306E\u57FA\u672C\u8A2D\u5B9A\u3092\u9069\u7528\u3059\u308B\u3053\u3068\u306B\u3088\u308A\u3001\u5B9A\u671F\u30B9\u30CA\u30C3\u30D7\u30B7\u30E7\u30C3\u30C8\u306E\u30B9\u30B1\u30B8\u30E5\u30FC\u30EB\u3092\u30BB\u30C3\u30C8\u30A2\u30C3\u30D7\u3067\u304D\u307E\u3059\u3002 +message.specify.url=URL \u3092\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044 +message.step.1.continue=\u7D9A\u884C\u3059\u308B\u306B\u306F\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u307E\u305F\u306F ISO \u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044 +message.step.1.desc=\u65B0\u3057\u3044\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u7528\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002ISO \u3092\u30A4\u30F3\u30B9\u30C8\u30FC\u30EB\u3067\u304D\u308B\u7A7A\u767D\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u9078\u629E\u3059\u308B\u3053\u3068\u3082\u3067\u304D\u307E\u3059\u3002 +message.step.2.continue=\u7D9A\u884C\u3059\u308B\u306B\u306F\u30B5\u30FC\u30D3\u30B9 \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044 message.step.2.desc= -message.step.3.continue=続行ã™ã‚‹ã«ã¯ãƒ‡ã‚£ã‚¹ã‚¯ オファリングをé¸æŠžã—ã¦ãã ã•ã„ +message.step.3.continue=\u7D9A\u884C\u3059\u308B\u306B\u306F\u30C7\u30A3\u30B9\u30AF \u30AA\u30D5\u30A1\u30EA\u30F3\u30B0\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044 message.step.3.desc= -message.step.4.continue=続行ã™ã‚‹ã«ã¯ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’å°‘ãªãã¨ã‚‚ 1 ã¤é¸æŠžã—ã¦ãã ã•ã„ -message.step.4.desc=仮想インスタンスãŒæŽ¥ç¶šã™ã‚‹ãƒ—ライマリ ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã‚’é¸æŠžã—ã¦ãã ã•ã„。 -message.update.os.preference=ã“ã®ãƒ›ã‚¹ãƒˆã® OS 基本設定をé¸æŠžã—ã¦ãã ã•ã„。åŒæ§˜ã®åŸºæœ¬è¨­å®šã‚’æŒã¤ã™ã¹ã¦ã®ä»®æƒ³ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã¯ã€åˆ¥ã®ãƒ›ã‚¹ãƒˆã‚’é¸æŠžã™ã‚‹å‰ã«ã¾ãšã“ã®ãƒ›ã‚¹ãƒˆã«å‰²ã‚Šå½“ã¦ã‚‰ã‚Œã¾ã™ã€‚ -message.update.ssl=å„コンソール プロキシã®ä»®æƒ³ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã§æ›´æ–°ã™ã‚‹ã€X.509 準拠ã®æ–°ã—ã„ SSL 証明書をé€ä¿¡ã—ã¦ãã ã•ã„: -message.virtual.network.desc=アカウントã®å°‚用仮想ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã§ã™ã€‚ブロードキャスト ドメイン㯠VLAN 内ã«é…ç½®ã•ã‚Œã€ãƒ‘ブリック ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ã¸ã®ã‚¢ã‚¯ã‚»ã‚¹ã¯ã™ã¹ã¦ä»®æƒ³ãƒ«ãƒ¼ã‚¿ãƒ¼ã«ã‚ˆã£ã¦ãƒ«ãƒ¼ãƒ†ã‚£ãƒ³ã‚°ã•ã‚Œã¾ã™ã€‚ -message.volume.create.template.confirm=ã“ã®ãƒ‡ã‚£ã‚¹ã‚¯ ボリュームã®ãƒ†ãƒ³ãƒ—レートを作æˆã—ã¦ã‚‚よã‚ã—ã„ã§ã™ã‹? ボリューム サイズã«ã‚ˆã£ã¦ã¯ã€ãƒ†ãƒ³ãƒ—レートã®ä½œæˆã«ã¯æ•°åˆ†ä»¥ä¸Šã‹ã‹ã‚‹å¯èƒ½æ€§ãŒã‚ã‚Šã¾ã™ã€‚ -message.zone.step.1.desc=ゾーンã®ãƒãƒƒãƒˆãƒ¯ãƒ¼ã‚¯ モデルをé¸æŠžã—ã¦ãã ã•ã„。 -message.zone.step.2.desc=æ–°ã—ã„ゾーンを追加ã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®æƒ…報を入力ã—ã¦ãã ã•ã„。 -message.zone.step.3.desc=æ–°ã—ã„ãƒãƒƒãƒ‰ã‚’追加ã™ã‚‹ãŸã‚ã«ã€æ¬¡ã®æƒ…報を入力ã—ã¦ãã ã•ã„。 -message.apply.snapshot.policy=ç¾åœ¨ã®ã‚¹ãƒŠãƒƒãƒ—ショット ãƒãƒªã‚·ãƒ¼ã‚’æ›´æ–°ã—ã¾ã—ãŸã€‚ -message.disable.snapshot.policy=ç¾åœ¨ã®ã‚¹ãƒŠãƒƒãƒ—ショット ãƒãƒªã‚·ãƒ¼ã‚’無効ã«ã—ã¾ã—ãŸã€‚ -message.action.change.service.warning.for.instance=ç¾åœ¨ã®ã‚µãƒ¼ãƒ“ス オファリングを変更ã™ã‚‹å‰ã«ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’åœæ­¢ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.action.change.service.warning.for.router=ç¾åœ¨ã®ã‚µãƒ¼ãƒ“ス オファリングを変更ã™ã‚‹å‰ã«ãƒ«ãƒ¼ã‚¿ãƒ¼ã‚’åœæ­¢ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.action.reset.password.warning=ç¾åœ¨ã®ãƒ‘スワードを変更ã™ã‚‹å‰ã«ã‚¤ãƒ³ã‚¹ã‚¿ãƒ³ã‚¹ã‚’åœæ­¢ã™ã‚‹å¿…è¦ãŒã‚ã‚Šã¾ã™ã€‚ -message.action.reset.password.off=インスタンスã¯ç¾åœ¨ã“ã®æ©Ÿèƒ½ã‚’サãƒãƒ¼ãƒˆã—ã¦ã„ã¾ã›ã‚“。 - -#Errors -error.login=ユーザーå/パスワードãŒè¨˜éŒ²ã¨ä¸€è‡´ã—ã¾ã›ã‚“。 -error.menu.select=é …ç›®ãŒé¸æŠžã•ã‚Œã¦ã„ãªã„ãŸã‚æ“作を実行ã§ãã¾ã›ã‚“。 -error.mgmt.server.inaccessible=管ç†ã‚µãƒ¼ãƒãƒ¼ã«ã‚¢ã‚¯ã‚»ã‚¹ã§ãã¾ã›ã‚“。後ã§å†å®Ÿè¡Œã—ã¦ãã ã•ã„。 -error.session.expired=セッションã®æœ‰åŠ¹æœŸé™ãŒåˆ‡ã‚Œã¾ã—ãŸã€‚ - -#resizeVolumes -label.resize.new.size=New Size(GB) -label.action.resize.volume=Resize Volume -label.action.resize.volume.processing=Resizing Volume.... -label.resize.new.offering.id=New Offering -label.resize.shrink.ok=Shrink OK +message.step.4.continue=\u7D9A\u884C\u3059\u308B\u306B\u306F\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u5C11\u306A\u304F\u3068\u3082 1 \u3064\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044 +message.step.4.desc=\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u304C\u63A5\u7D9A\u3059\u308B\u30D7\u30E9\u30A4\u30DE\u30EA \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.storage.traffic=\u30DB\u30B9\u30C8\u3084 CloudStack \u30B7\u30B9\u30C6\u30E0 VM \u306A\u3069\u3001\u7BA1\u7406\u30B5\u30FC\u30D0\u30FC\u3068\u901A\u4FE1\u3059\u308B CloudStack \u306E\u5185\u90E8\u30EA\u30BD\u30FC\u30B9\u9593\u306E\u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u3067\u3059\u3002\u3053\u3053\u3067\u30B9\u30C8\u30EC\u30FC\u30B8 \u30C8\u30E9\u30D5\u30A3\u30C3\u30AF\u3092\u69CB\u6210\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.suspend.project=\u3053\u306E\u30D7\u30ED\u30B8\u30A7\u30AF\u30C8\u3092\u4E00\u6642\u505C\u6B62\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.template.desc=VM \u306E\u8D77\u52D5\u306B\u4F7F\u7528\u3067\u304D\u308B OS \u30A4\u30E1\u30FC\u30B8 +message.tooltip.dns.1=\u30BE\u30FC\u30F3\u5185\u306E VM \u3067\u4F7F\u7528\u3059\u308B DNS \u30B5\u30FC\u30D0\u30FC\u306E\u540D\u524D\u3067\u3059\u3002\u30BE\u30FC\u30F3\u306E\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9\u304B\u3089\u3001\u3053\u306E\u30B5\u30FC\u30D0\u30FC\u306B\u901A\u4FE1\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.tooltip.dns.2=\u30BE\u30FC\u30F3\u5185\u306E VM \u3067\u4F7F\u7528\u3059\u308B 2 \u756A\u76EE\u306E DNS \u30B5\u30FC\u30D0\u30FC\u306E\u540D\u524D\u3067\u3059\u3002\u30BE\u30FC\u30F3\u306E\u30D1\u30D6\u30EA\u30C3\u30AF IP \u30A2\u30C9\u30EC\u30B9\u304B\u3089\u3001\u3053\u306E\u30B5\u30FC\u30D0\u30FC\u306B\u901A\u4FE1\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.tooltip.internal.dns.1=\u30BE\u30FC\u30F3\u5185\u306E CloudStack \u5185\u90E8\u30B7\u30B9\u30C6\u30E0 VM \u3067\u4F7F\u7528\u3059\u308B DNS \u30B5\u30FC\u30D0\u30FC\u306E\u540D\u524D\u3067\u3059\u3002\u30DD\u30C3\u30C9\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 IP \u30A2\u30C9\u30EC\u30B9\u304B\u3089\u3001\u3053\u306E\u30B5\u30FC\u30D0\u30FC\u306B\u901A\u4FE1\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.tooltip.internal.dns.2=\u30BE\u30FC\u30F3\u5185\u306E CloudStack \u5185\u90E8\u30B7\u30B9\u30C6\u30E0 VM \u3067\u4F7F\u7528\u3059\u308B DNS \u30B5\u30FC\u30D0\u30FC\u306E\u540D\u524D\u3067\u3059\u3002\u30DD\u30C3\u30C9\u306E\u30D7\u30E9\u30A4\u30D9\u30FC\u30C8 IP \u30A2\u30C9\u30EC\u30B9\u304B\u3089\u3001\u3053\u306E\u30B5\u30FC\u30D0\u30FC\u306B\u901A\u4FE1\u3067\u304D\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.tooltip.network.domain=DNS \u30B5\u30D5\u30A3\u30C3\u30AF\u30B9\u3067\u3059\u3002\u3053\u306E\u30B5\u30D5\u30A3\u30C3\u30AF\u30B9\u304B\u3089\u30B2\u30B9\u30C8 VM \u3067\u30A2\u30AF\u30BB\u30B9\u3059\u308B\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u306E\u30AB\u30B9\u30BF\u30E0 \u30C9\u30E1\u30A4\u30F3\u540D\u304C\u4F5C\u6210\u3055\u308C\u307E\u3059\u3002 +message.tooltip.pod.name=\u3053\u306E\u30DD\u30C3\u30C9\u306E\u540D\u524D\u3067\u3059\u3002 +message.tooltip.reserved.system.gateway=\u30DD\u30C3\u30C9\u5185\u306E\u30DB\u30B9\u30C8\u306E\u30B2\u30FC\u30C8\u30A6\u30A7\u30A4\u3067\u3059\u3002 +message.tooltip.reserved.system.netmask=\u30DD\u30C3\u30C9\u306E\u30B5\u30D6\u30CD\u30C3\u30C8\u3092\u5B9A\u7FA9\u3059\u308B\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30D7\u30EC\u30D5\u30A3\u30C3\u30AF\u30B9\u3067\u3059\u3002CIDR \u8868\u8A18\u3092\u4F7F\u7528\u3057\u307E\u3059\u3002 +message.tooltip.zone.name=\u30BE\u30FC\u30F3\u306E\u540D\u524D\u3067\u3059\u3002 +message.update.os.preference=\u3053\u306E\u30DB\u30B9\u30C8\u306E OS \u57FA\u672C\u8A2D\u5B9A\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002\u540C\u69D8\u306E\u57FA\u672C\u8A2D\u5B9A\u3092\u6301\u3064\u3059\u3079\u3066\u306E\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306F\u3001\u5225\u306E\u30DB\u30B9\u30C8\u3092\u9078\u629E\u3059\u308B\u524D\u306B\u307E\u305A\u3053\u306E\u30DB\u30B9\u30C8\u306B\u5272\u308A\u5F53\u3066\u3089\u308C\u307E\u3059\u3002 +message.update.resource.count=\u3053\u306E\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u30EA\u30BD\u30FC\u30B9\u6570\u3092\u66F4\u65B0\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.update.ssl=\u5404\u30B3\u30F3\u30BD\u30FC\u30EB \u30D7\u30ED\u30AD\u30B7\u306E\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3067\u66F4\u65B0\u3059\u308B\u3001X.509 \u6E96\u62E0\u306E\u65B0\u3057\u3044 SSL \u8A3C\u660E\u66F8\u3092\u9001\u4FE1\u3057\u3066\u304F\u3060\u3055\u3044\: +message.validate.instance.name=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u540D\u306F 63 \u6587\u5B57\u4EE5\u5185\u3067\u6307\u5B9A\u3057\u3066\u304F\u3060\u3055\u3044\u3002ASCII \u6587\u5B57\u306E a\uFF5Ez\u3001A\uFF5EZ\u3001\u6570\u5B57\u306E 0\uFF5E9\u3001\u304A\u3088\u3073\u30CF\u30A4\u30D5\u30F3\u306E\u307F\u3092\u4F7F\u7528\u3067\u304D\u307E\u3059\u3002\u6587\u5B57\u3067\u59CB\u307E\u308A\u3001\u6587\u5B57\u307E\u305F\u306F\u6570\u5B57\u3067\u7D42\u308F\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002 +message.virtual.network.desc=\u30A2\u30AB\u30A6\u30F3\u30C8\u306E\u5C02\u7528\u4EEE\u60F3\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3067\u3059\u3002\u30D6\u30ED\u30FC\u30C9\u30AD\u30E3\u30B9\u30C8 \u30C9\u30E1\u30A4\u30F3\u306F VLAN \u5185\u306B\u914D\u7F6E\u3055\u308C\u3001\u30D1\u30D6\u30EA\u30C3\u30AF \u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3078\u306E\u30A2\u30AF\u30BB\u30B9\u306F\u3059\u3079\u3066\u4EEE\u60F3\u30EB\u30FC\u30BF\u30FC\u306B\u3088\u3063\u3066\u30EB\u30FC\u30C6\u30A3\u30F3\u30B0\u3055\u308C\u307E\u3059\u3002 +message.vm.create.template.confirm=\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u4F5C\u6210\u3059\u308B\u3068 VM \u304C\u81EA\u52D5\u7684\u306B\u518D\u8D77\u52D5\u3055\u308C\u307E\u3059\u3002 +message.vm.review.launch=\u6B21\u306E\u60C5\u5831\u3092\u53C2\u7167\u3057\u3066\u3001\u4EEE\u60F3\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u3092\u6B63\u3057\u304F\u8A2D\u5B9A\u3057\u305F\u3053\u3068\u3092\u78BA\u8A8D\u3057\u3066\u304B\u3089\u8D77\u52D5\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.volume.create.template.confirm=\u3053\u306E\u30C7\u30A3\u30B9\u30AF \u30DC\u30EA\u30E5\u30FC\u30E0\u306E\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u3092\u4F5C\u6210\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? \u30DC\u30EA\u30E5\u30FC\u30E0 \u30B5\u30A4\u30BA\u306B\u3088\u3063\u3066\u306F\u3001\u30C6\u30F3\u30D7\u30EC\u30FC\u30C8\u306E\u4F5C\u6210\u306B\u306F\u6570\u5206\u4EE5\u4E0A\u304B\u304B\u308B\u53EF\u80FD\u6027\u304C\u3042\u308A\u307E\u3059\u3002 +message.you.must.have.at.least.one.physical.network=\u5C11\u306A\u304F\u3068\u3082 1 \u3064\u7269\u7406\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u304C\u5FC5\u8981\u3067\u3059 +message.Zone.creation.complete=\u30BE\u30FC\u30F3\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F +message.zone.creation.complete.would.you.like.to.enable.this.zone=\u30BE\u30FC\u30F3\u304C\u4F5C\u6210\u3055\u308C\u307E\u3057\u305F\u3002\u3053\u306E\u30BE\u30FC\u30F3\u3092\u6709\u52B9\u306B\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +message.zone.no.network.selection=\u9078\u629E\u3057\u305F\u30BE\u30FC\u30F3\u3067\u306F\u3001\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u3092\u9078\u629E\u3067\u304D\u307E\u305B\u3093\u3002 +message.zone.step.1.desc=\u30BE\u30FC\u30F3\u306E\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF \u30E2\u30C7\u30EB\u3092\u9078\u629E\u3057\u3066\u304F\u3060\u3055\u3044\u3002 +message.zone.step.2.desc=\u00e6\u0096\u00b0\u00e3\u0081\u0097\u00e3\u0081\u0084Zone\u00e3\u0082\u0092\u00e8\u00bf\u00bd\u00e5\u008a\u00a0\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab\u00e3\u0080\u0081\u00e6\u00ac\u00a1\u00e3\u0081\u00ae\u00e6\u0083\u0085\u00e5\u00a0\u00b1\u00e3\u0082\u0092\u00e5\u0085\u00a5\u00e5\u008a\u009b\u00e3\u0081\u0097\u00e3\u0081\u00a6\u00e3\u0081\u008f\u00e3\u0081\u00a0\u00e3\u0081\u0095\u00e3\u0081\u0084\u00e3\u0080\u0082 +message.zone.step.3.desc=\u00e6\u0096\u00b0\u00e3\u0081\u0097\u00e3\u0081\u0084Pod\u00e3\u0082\u0092\u00e8\u00bf\u00bd\u00e5\u008a\u00a0\u00e3\u0081\u0099\u00e3\u0082\u008b\u00e3\u0081\u009f\u00e3\u0082\u0081\u00e3\u0081\u00ab\u00e3\u0080\u0081\u00e6\u00ac\u00a1\u00e3\u0081\u00ae\u00e6\u0083\u0085\u00e5\u00a0\u00b1\u00e3\u0082\u0092\u00e5\u0085\u00a5\u00e5\u008a\u009b\u00e3\u0081\u0097\u00e3\u0081\u00a6\u00e3\u0081\u008f\u00e3\u0081\u00a0\u00e3\u0081\u0095\u00e3\u0081\u0084\u00e3\u0080\u0082 +message.zoneWizard.enable.local.storage=\u8B66\u544A\: \u3053\u306E\u30BE\u30FC\u30F3\u306E\u30ED\u30FC\u30AB\u30EB \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u6709\u52B9\u306B\u3059\u308B\u5834\u5408\u306F\u3001\u30B7\u30B9\u30C6\u30E0 VM \u306E\u8D77\u52D5\u5834\u6240\u306B\u5FDC\u3058\u3066\u6B21\u306E\u64CD\u4F5C\u304C\u5FC5\u8981\u3067\u3059\u3002

1. \u30B7\u30B9\u30C6\u30E0 VM \u3092\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3067\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u5834\u5408\u306F\u3001\u30D7\u30E9\u30A4\u30DE\u30EA \u30B9\u30C8\u30EC\u30FC\u30B8\u3092\u4F5C\u6210\u3057\u305F\u5F8C\u3067\u30BE\u30FC\u30F3\u306B\u8FFD\u52A0\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002\u307E\u305F\u3001\u7121\u52B9\u72B6\u614B\u306E\u30BE\u30FC\u30F3\u3092\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u3082\u3042\u308A\u307E\u3059\u3002

2. \u30B7\u30B9\u30C6\u30E0 VM \u3092\u30ED\u30FC\u30AB\u30EB \u30B9\u30C8\u30EC\u30FC\u30B8\u3067\u8D77\u52D5\u3059\u308B\u5FC5\u8981\u304C\u3042\u308B\u5834\u5408\u306F\u3001system.vm.use.local.storage \u3092 true \u306B\u8A2D\u5B9A\u3057\u3066\u304B\u3089\u30BE\u30FC\u30F3\u3092\u6709\u52B9\u306B\u3059\u308B\u5FC5\u8981\u304C\u3042\u308A\u307E\u3059\u3002


\u7D9A\u884C\u3057\u3066\u3082\u3088\u308D\u3057\u3044\u3067\u3059\u304B? +mode=\u30E2\u30FC\u30C9 +network.rate=\u30CD\u30C3\u30C8\u30EF\u30FC\u30AF\u901F\u5EA6 +notification.reboot.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u518D\u8D77\u52D5 +notification.start.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u8D77\u52D5 +notification.stop.instance=\u30A4\u30F3\u30B9\u30BF\u30F3\u30B9\u306E\u505C\u6B62 +side.by.side=\u4E26\u5217 +state.Accepted=\u627F\u8AFE\u6E08\u307F +state.Active=\u30A2\u30AF\u30C6\u30A3\u30D6 +state.Allocated=\u5272\u308A\u5F53\u3066\u6E08\u307F +state.Allocating=\u5272\u308A\u5F53\u3066\u4E2D +state.BackedUp=\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u6E08\u307F +state.BackingUp=\u30D0\u30C3\u30AF\u30A2\u30C3\u30D7\u4E2D +state.Completed=\u5B8C\u4E86 +state.Creating=\u4F5C\u6210\u4E2D +state.Declined=\u8F9E\u9000 +state.Destroyed=\u7834\u68C4\u6E08\u307F +state.Disabled=\u7121\u52B9 +state.enabled=\u6709\u52B9 +state.Enabled=\u6709\u52B9 +state.Error=\u30A8\u30E9\u30FC +state.Expunging=\u62B9\u6D88\u4E2D +state.Migrating=\u79FB\u884C\u4E2D +state.Pending=\u4FDD\u7559 +state.ready=\u6E96\u5099\u5B8C\u4E86 +state.Ready=\u6E96\u5099\u5B8C\u4E86 +state.Running=\u5B9F\u884C\u4E2D +state.Starting=\u958B\u59CB\u4E2D +state.Stopped=\u505C\u6B62\u6E08\u307F +state.Stopping=\u505C\u6B62\u3057\u3066\u3044\u307E\u3059 +state.Suspended=\u4E00\u6642\u505C\u6B62 +ui.listView.filters.all=\u3059\u3079\u3066 +ui.listView.filters.mine=\u81EA\u5206\u306E\u3082\u306E diff --git a/client/WEB-INF/classes/resources/messages_ko_KR.properties b/client/WEB-INF/classes/resources/messages_ko_KR.properties index a7b534aa3cd..757871acde0 100644 --- a/client/WEB-INF/classes/resources/messages_ko_KR.properties +++ b/client/WEB-INF/classes/resources/messages_ko_KR.properties @@ -1,1514 +1,1443 @@ # Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file +# or more contributor license agreements. See the NOTICE file # distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file +# regarding copyright ownership. The ASF licenses this file # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at +# with the License. You may obtain a copy of the License at # -# http://www.apache.org/licenses/LICENSE-2.0 +# http://www.apache.org/licenses/LICENSE-2.0 # # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the +# KIND, either express or implied. See the License for the # specific language governing permissions and limitations # under the License. -#new labels (begin) ********************************************************************************************** - - -#new labels (end) ************************************************************************************************ - - -#modified labels (begin) ***************************************************************************************** - - -#modified labels (end) ******************************************************************************************* - -label.configure.network.ACLs=ë„¤íŠ¸ì›Œí¬ ê¶Œí•œ 관리(ACL) 구성 -label.network.ACLs=ë„¤íŠ¸ì›Œí¬ ê¶Œí•œ 관리(ACL) -label.add.network.ACL=ë„¤íŠ¸ì›Œí¬ ê¶Œí•œ 관리(ACL) 추가 -label.private.Gateway=사설 게ì´íŠ¸ì›¨ì´ -label.VPC.router.details=VPC ë¼ìš°í„° ìƒì„¸ -label.VMs.in.tier=계층 내부 ê°€ìƒë¨¸ì‹  - -message.zoneWizard.enable.local.storage=경고:현재 Zoneì˜ ë¡œì»¬ 스토리지를 사용 하는 경우는 시스템 VMì˜ ì‹œìž‘ ìž¥ì†Œì— ë”°ë¼ ë‹¤ìŒ ìž‘ì—…ì´ í•„ìš”í•©ë‹ˆë‹¤.

1. 시스템 VMì„ ê¸°ë³¸ 스토리지로 시작해야 하는 경우 기본 스토리지를 만들기한 다ìŒì— Zoneì— ì¶”ê°€í•´ì•¼ 합니다. ë˜í•œ, 유효하지 ì•Šì€ ìƒíƒœì˜ Zoneì„ ì‹œìž‘í•´ì•¼ 합니다.

2. 시스템 VM를 로컬 스토리지로 시작할 필요가 있는 경우 system.vm.use.local.storage를 true ë¡œ 설정하고 나서 Zoneì„ ì‚¬ìš©í•´ì•¼ 합니다.


진행 하시겠습니까? -label.local.storage.enabled=로컬 스토리지는 유효 -label.tier.details=계층 ìƒì„¸ 장버 -label.edit.tags=태그 편집 -label.network.rate.megabytes=ë„¤íŠ¸ì›Œí¬ ì†ë„ (MB/ì´ˆ) -label.action.enable.physical.network=물리 ë„¤íŠ¸ì›Œí¬ ì‚¬ìš©í•¨ -label.action.disable.physical.network=물리 ë„¤íŠ¸ì›Œí¬ ì‚¬ìš© 안 함 -message.action.enable.physical.network=현재 물리 네트워í¬ë¥¼ 사용하시겠습니까? -message.action.disable.physical.network=현재 물리 네트워í¬ë¥¼ 사용 안 함으로 하시겠습니까? - -label.select.tier=계층 ì„ íƒ -label.add.ACL=권한 관리(ACL) 추가 -label.remove.ACL=권한 관리(ACL) ì‚­ì œ -label.tier=계층 -label.network.ACL=ë„¤íŠ¸ì›Œí¬ ê¶Œí•œ 관리(ACL) -label.network.ACL.total=ë„¤íŠ¸ì›Œí¬ ê¶Œí•œ 관리(ACL) 합계 -label.add.new.gateway=새 게ì´íŠ¸ì›¨ì´ 추가하기 -message.add.new.gateway.to.vpc=현재 VPCì— ìƒˆë¡œìš´ 게ì´íŠ¸ì›¨ì´ë¥¼ 추가하기 위한 정보를 지정해 주십시오. -label.delete.gateway=게ì´íŠ¸ì›¨ì´ ì‚­ì œ -message.delete.gateway=현재 게ì´íŠ¸ì›¨ì´ë¥¼ 삭제하시겠습니까? -label.CIDR.of.destination.network=ëŒ€ìƒ ë„¤íŠ¸ì›Œí¬ CIDR -label.add.route=ë¼ìš°íŠ¸ 추가 -label.add.static.route=ì •ì  ë¼ìš°íŠ¸ 추가 -label.remove.static.route=ì •ì  ë¼ìš°íŠ¸ ì‚­ì œ -label.site.to.site.VPN=사ì´íŠ¸ê°„ 사설네트워í¬(VPN) -label.add.VPN.gateway=VPN 게ì´íŠ¸ì›¨ì´ 추가 -message.add.VPN.gateway=VPN 게ì´íŠ¸ì›¨ì´ë¥¼ 추가하시겠습니까? -label.VPN.gateway=VPN 게ì´íŠ¸ì›¨ì´ -label.delete.VPN.gateway=VPN 게ì´íŠ¸ì›¨ì´ì‚­ì œ -message.delete.VPN.gateway=현재 VPN 게ì´íŠ¸ì›¨ì´ë¥¼ 삭제하시겠습니까? -label.VPN.connection=VPN ì ‘ì† -label.IPsec.preshared.key=IPsec 사전 공유 키 -label.IKE.policy=IKE ì •ì±… -label.ESP.policy=ESP ì •ì±… -label.create.VPN.connection=VPN ì ‘ì† ë§Œë“¤ê¸° -label.VPN.customer.gateway=VPN ê³ ê° ê²Œì´íŠ¸ì›¨ì´ -label.CIDR.list=CIDR ëª©ë¡ -label.IKE.lifetime=IKE 유효기간(ì´ˆ) -label.ESP.lifetime=ESP 유효기간(ì´ˆ) -label.dead.peer.detection=정지 피어 ê°ì§€ -label.reset.VPN.connection=VPN ì ‘ì† ìž¬ì„¤ì • -message.reset.VPN.connection=VPN ì ‘ì†ì„ 재설정 하시겠습니까? -label.delete.VPN.connection=VPN ì ‘ì† ì‚­ì œ -message.delete.VPN.connection=VPN ì ‘ì†ì„ 삭제하시겠습니까? -label.add.new.tier=새 계층 추가 -label.add.VM.to.tier=ê³„ì¸µì— VM 추가 -label.remove.tier=계층 ì‚­ì œ - -label.local.storage.enabled=로컬 스토리지 사용함 -label.associated.network=관련 ë„¤íŠ¸ì›Œí¬ -label.add.port.forwarding.rule=í¬í†  전송 ê·œì¹™ì˜ ì¶”ê°€ -label.dns=DNS - -label.vpc=VPC -label.vpc.id=VPC ID -label.tier=계층 -label.add.vpc=VPC 추가 -label.super.cidr.for.guest.networks=ì†ë‹˜ ë„¤íŠ¸ì›Œí¬ ìŠˆí¼ CIDR -label.DNS.domain.for.guest.networks=ì†ë‹˜ ë„¤íŠ¸ì›Œí¬ DNS ë„ë©”ì¸ -label.configure.vpc=VPC 구성 -label.edit.vpc=VPC 편집 -label.restart.vpc=VPC 재시작 -message.restart.vpc=VPC를 재시작하시겠습니까? -label.remove.vpc=VPC ì‚­ì œ -message.remove.vpc=VPC를 삭제하시겠습니까? -label.vpn.customer.gateway=VPN ê³ ê° ê²Œì´íŠ¸ì›¨ì´ -label.add.vpn.customer.gateway=VPN ê³ ê° ê²Œì´íŠ¸ì›¨ì´ 추가 -label.IKE.encryption=IKE 암호화 -label.IKE.hash=IKE í•´ì‹œ -label.IKE.DH=IKE DH -label.ESP.encryption=ESP 암호화 -label.ESP.hash=ESP í•´ì‹œ -label.perfect.forward.secrecy=Perfect Forward Secrecy -label.IKE.lifetime=IKE 유효기간(ì´ˆ) -label.ESP.lifetime=ESP 유효기간(ì´ˆ) -label.dead.peer.detection=정지 피어 ê°ì§€ -label.delete.VPN.customer.gateway=VPN ê³ ê° ê²Œì´íŠ¸ì›¨ì´ ì‚­ì œ -message.delete.VPN.customer.gateway=현재 VPN ê³ ê° ê²Œì´íŠ¸ì›¨ì´ë¥¼ 삭제하시겠습니까? - -label.network.domain.text=ë„¤íŠ¸ì›Œí¬ ë„ë©”ì¸ -label.memory.mb=메모리 (MB) -label.cpu.mhz=CPU (MHz) -message.action.remove.host=현재 호스트를 삭제하시겠습니까? - -message.action.reboot.router=현재 ê°€ìƒ ë¼ìš°í„°ë¡œ 제공하는 모든 서비스가 중단ë©ë‹ˆë‹¤. ì´ ë¼ìš°í„°ë¥¼ 재시작하시겠습니까? -message.action.stop.router=현재 ê°€ìƒ ë¼ìš°í„°ë¡œ 제공하는 모든 서비스가 중단ë©ë‹ˆë‹¤. ì´ ë¼ìš°í„°ë¥¼ 정지하시겠습니까? -message.restart.network=현재 네트워í¬ë¡œ 제공하는 모든 서비스가 중단ë©ë‹ˆë‹¤. ì´ ë„¤íŠ¸ì›Œí¬ë¥¼ 재시작하시겠습니까? - - -label.ipaddress=IP 주소 -label.vcdcname=vCenter DC 명 -label.vcipaddress=vCenter IP 주소 -label.vsmctrlvlanid=제어 VLAN ID -label.vsmpktvlanid=패킷 VLAN ID -label.vsmstoragevlanid=스토리지 VLAN ID -label.nexusVswitch=Nexus 1000V -label.action.delete.nexusVswitch=Nexus 1000V ì‚­ì œ -label.action.enable.nexusVswitch=Nexus 1000V 사용함 -label.action.disable.nexusVswitch=Nexus 1000V 사용 안 함 -label.action.list.nexusVswitch=Nexus 1000V ëª©ë¡ í‘œì‹œ -message.action.delete.nexusVswitch=현재 Nexus 1000V를 삭제하시겠습니까? -message.action.enable.nexusVswitch=현재 Nexus 1000V를 사용 하시겠습니까? -message.action.disable.nexusVswitch=현재 Nexus 1000V를 사용 안 함으로 하시겠습니까? -message.specify.url=URL를 지정해 주십시오 -label.select.instance.to.attach.volume.to=ë³¼ë¥¨ì„ ì—°ê²°í•˜ëŠ” ì¸ìŠ¤í„´ìŠ¤ë¥¼ ì„ íƒí•´ 주십시오 -label.upload=업로드 -label.upload.volume=ë³¼ë¥¨ì˜ ì—…ë¡œë“œ -label.virtual.routers=ê°€ìƒ ë¼ìš°í„° -label.primary.storage.count=기본 스토리지 그룹 -label.secondary.storage.count=2ì°¨ 스토리지 그룹 -label.number.of.system.vms=시스템 VM 수 -label.number.of.virtual.routers=ê°€ìƒ ë¼ìš°í„°ìˆ˜ -label.action.register.iso=ISO ë“±ë¡ -label.isolation.method=분리 방법 -label.action.register.template=템플릿 ë“±ë¡ -label.checksum=MD5 ì²´í¬ì„¬ -label.vpn=ê°€ìƒ ì‚¬ì„¤ë§(VPN) -label.vlan=ê°€ìƒ ë„¤íŠ¸ì›Œí¬(VLAN) - - -label.management.ips=관리 IP 주소 -label.devices=기기 -label.rules=규칙 -label.traffic.label=트래픽 ë¼ë²¨ -label.vm.state=VM ìƒíƒœ -message.setup.physical.network.during.zone.creation.basic=기본 Zoneì„ ì¶”ê°€í•  때는 하ì´í¼ ë°”ì´ì €ìƒì˜ 네트ì›ì¹´ë“œ(NIC)ì— ëŒ€ì‘하는 í•œ 가지 물리 네트워í¬ë¥¼ 설정 í•  수 있습니다. 네트워í¬ëŠ” 몇 가지 ì¢…ë¥˜ì˜ íŠ¸ëž˜í”½ì„ ì „ì†¡í•©ë‹ˆë‹¤.

물리 네트워í¬ì— 다른 íŠ¸ëž˜í”½ì˜ ì¢…ë¥˜ë¥¼ë“œëž˜ê·¸ 앤 드롭 í•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. -label.domain.router=ë„ë©”ì¸ ë¼ìš°í„° -label.console.proxy=콘솔 프ë¡ì‹œ -label.secondary.storage.vm=2ì°¨ 스토리지 VM -label.add.netScaler.device=Netscaler 기기 추가 -label.add.F5.device=F5 기기 추가 -label.add.SRX.device=SRX 기기 추가 -label.account.and.security.group=계정 ì •ë³´, 보안 그룹 -label.fetch.latest=최신 ì •ë³´ ì·¨ë“ -label.system.offering=시스템 제공 -message.validate.instance.name=ì¸ìŠ¤í„´ìŠ¤ëª…ì€ 63 ë¬¸ìž ì´ë‚´ì—ì„œ 지정해 주십시오. ASCII 문ìžì˜ a-z, A-Z, 숫ìžì˜ 0-9 ë° í•˜ì´í”ˆë§Œì„ 사용할 수 있습니다. 문ìžë¡œ 시작하여 ë¬¸ìž ë˜ëŠ” 숫ìžë¡œ ë내야 합니다. - - -label.isolated.networks=분리 ë„¤íŠ¸ì›Œí¬ -label.latest.events=최신 ì´ë²¤íŠ¸ -state.Enabled=사용함 -label.system.wide.capacity=시스템 ì „ì²´ 처리 능력 -label.network.service.providers=ë„¤íŠ¸ì›Œí¬ ì„œë¹„ìŠ¤ ì œê³µìž -message.launch.zone=Zoneì„ ì‹œìž‘í•  준비가 ë˜ì—ˆìŠµë‹ˆë‹¤. ë‹¤ìŒ ìˆœì„œì— ë”°ë¼ ì§„í–‰í•´ 주십시오. -error.unable.to.reach.management.server=관리 서버와 통신할 수 없습니다. -label.internal.name=내부명 -message.configure.all.traffic.types=ë³µìˆ˜ì˜ ë¬¼ë¦¬ 네트워í¬ê°€ 있습니다. [편집]ì„ í´ë¦­í•´ íŠ¸ëž˜í”½ì˜ ì¢…ë¥˜ 마다 ë¼ë²¨ì„ 구성해 주십시오. -message.edit.traffic.type=현재 íŠ¸ëž˜í”½ì˜ ì¢…ë¥˜ì— ê´€ë ¨ 트래픽 ë¼ë²¨ì„ 지정해 주십시오. -label.edit.traffic.type=트래픽 종류 편집 -label.label=ë¼ë²¨ -label.max.networks=최대 네트워í¬ìˆ˜ -error.invalid.username.password=유효하지 ì•Šì€ ì‚¬ìš©ìžëª… ë˜ëŠ” 암호 -message.enabling.security.group.provider=보안 그룹 제공ìžë¥¼ 사용 하고 있습니다. -message.adding.Netscaler.provider=Netscaler 제공ìžë¥¼ 추가하고 있습니다. -message.creating.guest.network=ì†ë‹˜ 네트워í¬ë¥¼ 만듭니다. -label.action.delete.physical.network=물리 ë„¤íŠ¸ì›Œí¬ ì‚­ì œ -message.action.delete.physical.network=현재 물리 네트워í¬ë¥¼ 삭제하시겠습니까? -message.installWizard.copy.whatIsAHost=호스트는 ë‹¨ì¼ ì»´í“¨í„°ë¡œ ì†ë‹˜ ê°€ìƒ ë¨¸ì‹ ì„ ì‹¤í–‰í•˜ëŠ” 컴퓨팅 ìžì›ì„ 제공합니다. ë² ì–´ 메탈 호스트를 제외하고, ê° í˜¸ìŠ¤íŠ¸ëŠ” 게스트 ê°€ìƒ ë¨¸ì‹ ì„ ê´€ë¦¬í•˜ê¸° 위한 하ì´í¼ ë°”ì´ì € 소프트웨어를 설치합니다. ë² ì–´ 메탈 í˜¸ìŠ¤íŠ¸ì— ëŒ€í•´ì„œëŠ” 설치 ê°€ì´ë“œ 고급편 특수 사례로서 설명합니다. 예를 들어, KVMì€ ìœ íš¨í•œ Linux 서버, Citrix XenServerê°€ ë™ìž‘하는 서버 ë° ESXi 서버가 호스트입니다. 기본 설치ì—서는 XenServer ë˜ëŠ” KVM를 실행하는 ë‹¨ì¼ í˜¸ìŠ¤íŠ¸ë¥¼ 사용합니다.

호스트는 CloudStackâ„¢ í™˜ê²½ë‚´ì˜ ìµœì†Œì˜ ì¡°ì§ ë‹¨ìœ„ìž…ë‹ˆë‹¤. 호스트는 í´ëŸ¬ìŠ¤í„°ì— í¬í•¨ë˜ì–´ í´ëŸ¬ìŠ¤í„°ëŠ” Podì— í¬í•¨ë˜ì–´ Pod는 Zoneì— í¬í•¨ë©ë‹ˆë‹¤. - - -label.add.compute.offering=컴퓨팅 ìžì› 추가 -label.compute.offering=컴퓨팅 ìžì› 제공 -label.compute.offerings=컴퓨팅 ìžì› 제공 -label.select.offering=제공 ì„ íƒ -label.menu.infrastructure=ì¸í”„ë¼ìŠ¤íŠ¸ëŸ­ì³ -label.sticky.tablesize=í…Œì´ë¸” í¬ê¸° -label.sticky.expire=만료시간 -label.sticky.cookie-name=Cookie 명 -label.sticky.mode=모드 -label.sticky.length=ê¸¸ì´ -label.sticky.holdtime=ë³´ê´€ 유지 시간 -label.sticky.request-learn=ëŸ¬ë‹ ìš”êµ¬ -label.sticky.prefix=프레픽스 -label.sticky.nocache=ìºì‹œ ì—†ìŒ -label.sticky.indirect=ê°„ì ‘ -label.sticky.postonly=í¬ìŠ¤íŠ¸ë§Œ -label.sticky.domain=ë„ë©”ì¸ -state.Allocating=할당 중 -state.Migrating=ì´ì „ 중 -error.please.specify.physical.network.tags=현재 물리 ë„¤íŠ¸ì›Œí¬ íƒœê·¸ë¥¼ 지정하지 않으면, ë„¤íŠ¸ì›Œí¬ ì œê³µì€ ì‚¬ìš©í•  수 없습니다. - - -state.Stopping=정지하고 있는 중 -message.add.load.balancer.under.ip=ë‹¤ìŒ IP ì£¼ì†Œì— ëŒ€í•´ì„œ ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 ê·œì¹™ì„ ì¶”ê°€í•©ë‹ˆë‹¤: -message.select.instance=ì¸ìŠ¤í„´ìŠ¤ë¥¼ ì„ íƒí•´ 주십시오. -label.select=ì„ íƒ -label.select.vm.for.static.nat=ì •ì  NATìš© VM ì„ íƒ -label.select.instance=ì¸ìŠ¤í„´ìŠ¤ ì„ íƒ -label.nat.port.range=NAT í¬í†  범위 -label.static.nat.vm.details=ì •ì  NAT VM ìƒì„¸ ì •ë³´ -label.edit.lb.rule=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 규칙 편집 -message.migrate.instance.to.host=다른 호스트ì—게 ì¸ìŠ¤í„´ìŠ¤ë¥¼ ì´ì „하시겠습니까? -label.migrate.instance.to.host=다른 호스트ì—게 ì¸ìŠ¤í„´ìŠ¤ ì´ì „ -message.migrate.instance.to.ps=다른 기본 ìŠ¤í† ë¦¬ì§€ì— ì¸ìŠ¤í„´ìŠ¤ë¥¼ ì´ì „하시겠습니까? -label.migrate.instance.to.ps=다른 기본 ìŠ¤í† ë¦¬ì§€ì— ì¸ìŠ¤í„´ìŠ¤ ì´ì „ -label.corrections.saved=ì ‘ì† ì •ë³´ 저장 -message.installWizard.copy.whatIsSecondaryStorage=2ì°¨ 스토리지는 Zoneê³¼ ê´€ë ¨ë¤ ì•„ëž˜ì˜ í•­ëª©ì„ í¬í•¨í•©ë‹ˆë‹¤.
  • 템플릿 - VM 시작 ì‹œ 사용할 수 있는 OS ì´ë¯¸ì§€ë¡œ 애플리케ì´ì…˜ì˜ 설치 등 추가 êµ¬ì„±ì„ í¬í•¨í•  수 있습니다.
  • ISO ì´ë¯¸ì§€ - 바로 시작 가능 ë˜ëŠ” 시작 ë¶ˆê°€ì˜ OS ì´ë¯¸ì§€ìž…니다.
  • ë””ìŠ¤í¬ ë³¼ë¥¨ 스냅샷 - VM ë°ì´í„° 저장 복사본입니다. ë°ì´í„°ì˜ ë³µì› ë˜ëŠ” 새로운 템플릿 ë§Œë“¤ê¸°ì— ì‚¬ìš©í•  수 있습니다.
-message.installWizard.copy.whatIsPrimaryStorage=CloudStackâ„¢ í´ë¼ìš°ë“œ ì¸í”„ë¼ìŠ¤íŠ¸ëŸ­ì³ì—서는 기본 스토리지와 2ì°¨ 스토리지 ë‘ ì¢…ë¥˜ì˜ ìŠ¤í† ë¦¬ì§€ë¥¼ 사용합니다. 양쪽 스토리지ì—ì„œ iSCSI, NFS 서버, ë˜ëŠ” 로컬 디스í¬ë¥¼ 사용할 수 있습니다.

기본 스토리지는 í´ëŸ¬ìŠ¤í„°ì— 관련ë˜ì–´ê·¸ í´ëŸ¬ìŠ¤í„°ë‚´ì˜ 호스트로 ë™ìž‘하는 모든 VM 중 ê° ê²ŒìŠ¤íŠ¸ VMì˜ ë””ìŠ¤í¬ ë³¼ë¥¨ì„ í¬í•¨í•©ë‹ˆë‹¤. ì›ëž˜, 기본 스토리지 서버는 호스트 ê·¼ì²˜ì— ì„¤ì¹˜í•©ë‹ˆë‹¤. -message.installWizard.copy.whatIsACluster=í´ëŸ¬ìŠ¤í„°ëŠ” 호스트를 그룹화 하는 방법입니다. í•œ 가지 í´ëŸ¬ìŠ¤í„°ë‚´ 호스트는 ëª¨ë‘ ë™ì¼í•œ 하드웨어ì—ì„œ 구성ë˜ì–´ ê°™ì€ í•˜ì´í¼ ë°”ì´ì €ë¥¼ 실행하고 ê°™ì€ ì„œë¸Œ 네트워í¬ìƒì— 있어서 ê°™ì€ ê³µìœ  ìŠ¤í† ë¦¬ì§€ì— ì ‘ê·¼ 합니다. ê°™ì€ í´ëŸ¬ìŠ¤í„°ë‚´ì˜ 호스트 사ì´ì—서는 사용ìžì—게 서비스를 중단하지 ì•Šê³  ê°€ìƒ ë¨¸ì‹  ì¸ìŠ¤í„´ìŠ¤ë¥¼ 실시간 ì´ì „ í•  수 있습니다. í´ëŸ¬ìŠ¤í„°ëŠ” CloudStackâ„¢ í™˜ê²½ë‚´ì˜ ì„¸ 번째로 í° ì¡°ì§ ë‹¨ìœ„ìž…ë‹ˆë‹¤. í´ëŸ¬ìŠ¤í„°ëŠ” Podì— í¬í•¨ë˜ì–´ Pod는 Zoneì— í¬í•¨ë©ë‹ˆë‹¤.

CloudStackâ„¢ ì—서는 í•œ 가지 í´ë¼ìš°ë“œ í™˜ê²½ì— ë³µìˆ˜ í´ëŸ¬ìŠ¤í„°ë¥¼ 설정할 수 있으나 기본 설치ì—서는 í´ëŸ¬ìŠ¤í„°ëŠ” í•œ 개입니다. -message.installWizard.copy.whatIsAPod=ì›ëž˜ í•œ 가지 Pod는 ë‹¨ì¼ ìž ê¸ˆì„ ë‚˜íƒ€ëƒ…ë‹ˆë‹¤. ê°™ì€ Podë‚´ 호스트는 ê°™ì€ ì„œë¸Œ 네트워í¬ì— í¬í•¨ë©ë‹ˆë‹¤.

Pod는 CloudStackâ„¢ í™˜ê²½ë‚´ì˜ ë‘ ë²ˆì§¸ë¡œ í° ì¡°ì§ ë‹¨ìœ„ìž…ë‹ˆë‹¤. Pod는 Zoneì— í¬í•¨ë©ë‹ˆë‹¤. ê° Zoneì€ í•œ ê°œ ì´ìƒì˜ Pod를 í¬í•¨í•  수 있습니다. 기본 설치ì—서는 Zoneë‚´ Pod는 í•œ 개입니다. -message.installWizard.copy.whatIsAZone=Zoneì€ CloudStackâ„¢ 환경내 최대 ì¡°ì§ ë‹¨ìœ„ìž…ë‹ˆë‹¤. í•œ 가지 ë°ì´í„° ì„¼í„°ë‚´ì— ë³µìˆ˜ Zoneì„ ì„¤ì •í•  수 있으나 ì›ëž˜ Zoneì€ ë‹¨ì¼ì˜ ë°ì´í„° ì„¼í„°ì— í• ë‹¹í•©ë‹ˆë‹¤. ì¸í”„ë¼ìŠ¤íŠ¸ëŸ­ì³ë¥¼ Zoneì— ì¡°ì§í™”하면, Zoneì„ ë¬¼ë¦¬ì ìš°ë¡œ 분리해 설정할 수 있습니다. 예를 들어, ê° Zoneì— ì „ì›ê³¼ ë„¤íŠ¸ì›Œí¬ ì—…ë§í¬ë¥¼ 배치합니다. 필수가 아니지만 ì›ê²©ì§€ì— 분산할 수 있습니다. -message.installWizard.copy.whatIsCloudStack=CloudStack™는 컴퓨팅 ìžì›ì„ í¬í•¨í•˜ëŠ” 소프트웨어 플랫웹 ì–‘ì‹ì—ì„œ 공개, 사설, ë° í•˜ì´ë¸Œë¦¬ë“œì˜ Infrastructure as a Service (IaaS) í´ë¼ìš°ë“œë¥¼ 구축할 수 있습니다. CloudStack™를 사용하고, í´ë¼ìš°ë“œ ì¸í”„ë¼ìŠ¤íŠ¸ëŸ­ì³ë¥¼ 구성하는 네트워í¬, 스토리지 ë° ì»´í“¨íŒ… 노드를 관리하고 í´ë¼ìš°ë“œ 컴퓨팅 í™˜ê²½ì„ ì„¤ì •, 관리 ë° êµ¬ì„±í•©ë‹ˆë‹¤.

CloudStackâ„¢ì€ í•˜ë“œì›¨ì–´ìƒì—ì„œ ë™ìž‘하는 개별 ê°€ìƒ ë¨¸ì‹  ì´ë¯¸ì§€ë¥¼ 넘어 확장할 수 있기 ë•Œë¬¸ì— ê°„ë‹¨í•œ 설정으로 ë™ìž‘하는 í´ë¼ìš°ë“œ ì¸í”„ë¼ìŠ¤íŠ¸ëŸ­ì³ 소프트웨어 스íƒì— ì˜í•´ ê°€ìƒ ë°ì´í„° 센터 즉 여러 층형 멀티 ì„¸ìž…ìž í´ë¼ìš°ë“œ 애플리케ì´ì…˜ì„ 서비스로서 구축하고 설정하고 관리하기 위해서 불가결한 í•­ëª©ì„ ëª¨ë‘ ì œê³µí•©ë‹ˆë‹¤. 오픈 소스 버전과 프리미엄 버전 양쪽 모ë‘ì— ì œê³µí•˜ë©° 오픈 소스 버전ì—ì„œë„ ëŒ€ë¶€ë¶„ ê¸°ëŠ¥ì„ ì‚¬ìš©í•  수 있습니다. -message.installWizard.tooltip.addSecondaryStorage.path=위ì—ì„œ 지정한 ì„œë²„ì— ì¡´ìž¬í•˜ëŠ” 내보내기 경로입니다. -message.installWizard.tooltip.addSecondaryStorage.nfsServer=2ì°¨ 스토리지를 호스트 하는 NFS 서버 IP 주소입니다. -message.installWizard.tooltip.addPrimaryStorage.path=(NFSì˜ ê²½ìš°) 서버ì—ì„œ 내보내기 경로입니다. (SharedMountPointì˜ ê²½ìš°) ì¼ë°˜ 경로입니다. KVMì—서는 기본 스토리지가 마운트ë˜ëŠ” ê° í˜¸ìŠ¤íŠ¸ìƒì˜ 경로입니다. 예를 들어, /mnt/primary 입니다. -message.installWizard.tooltip.addPrimaryStorage.server=(NFS, iSCSI ë˜ëŠ” PreSetupì˜ ê²½ìš°) 스토리지 ê¸°ê¸°ì˜ IP 주소 ë˜ëŠ” DNS 명입니다. -message.installWizard.tooltip.addPrimaryStorage.name=스토리지 ê¸°ê¸°ì˜ ì´ë¦„입니다. -message.installWizard.tooltip.addHost.password=XenServer 측ì—ì„œ 지정한 ìœ„ì˜ ì‚¬ìš©ìžëª…ì— ëŒ€í•œ 암호입니다. -message.installWizard.tooltip.addHost.username=ì›ëž˜ root 입니다. -message.installWizard.tooltip.addHost.hostname=호스트 DNS 명 ë˜ëŠ” IP 주소입니다. -message.installWizard.tooltip.addCluster.name=í´ëŸ¬ìŠ¤í„° ì´ë¦„입니다. CloudStackì—ì„œ 예약하지 ì•Šì€ ìž„ì˜ í…스트를 지정할 수 있습니다. -message.installWizard.tooltip.addPod.reservedSystemEndIp=ì´ê²ƒì€ 2ì°¨ 스토리지 VM ë° ì½˜ì†” 프ë¡ì‹œ VM를 관리하기 위해서 CloudStackì—ì„œ 사용하는 사설 네트워í¬ë‚´ IP 주소 범위입니다. ì´ëŸ¬í•œ IP 주소는 컴퓨팅 서버와 ê°™ì€ ì„œë¸Œë„¤íŠ¸ì›Œí¬ì—ì„œ 할당합니다. -message.installWizard.tooltip.addPod.reservedSystemStartIp=ì´ê²ƒì€ 2ì°¨ 스토리지 VM ë° ì½˜ì†” 프ë¡ì‹œ VM를 관리하기 위해서 CloudStackì—ì„œ 사용하는 사설 네트워í¬ë‚´ì˜ IP 주소 범위입니다. ì´ëŸ¬í•œ IP 주소는 컴퓨팅 서버와 ê°™ì€ ì„œë¸Œë„¤íŠ¸ì›Œí¬ì—ì„œ 할당합니다. -message.installWizard.tooltip.addPod.reservedSystemNetmask=게스트가 사용하는 서브네트워í¬ìƒì—ì„œ 지정한 ë„· 마스í¬ìž…니다. -message.installWizard.tooltip.addPod.reservedSystemGateway=현재 Podë‚´ 호스트 게ì´íŠ¸ì›¨ì´ìž…니다. -message.installWizard.tooltip.addPod.name=Pod ì´ë¦„입니다. -message.installWizard.tooltip.configureGuestTraffic.guestEndIp=현재 Zoneì˜ ê²ŒìŠ¤íŠ¸ì—게 할당할 수 있는 IP 주소 범위입니다. 사용하는 NICê°€ í•œ ê°€ì§€ì¸ ê²½ìš°ëŠ” ì´ëŸ¬í•œ IP 주소는 Podì˜ CIDR와 ê°™ì€ CIDRì— í¬í•¨ë˜ì–´ 있어야 합니다. -message.installWizard.tooltip.configureGuestTraffic.guestStartIp=현재 Zoneì˜ ê²ŒìŠ¤íŠ¸ì—게 할당할 수 있는 IP 주소 범위입니다. 사용하는 NICê°€ í•œ 가지 경우는 ì´ëŸ¬í•œ IP 주소는 Podì˜ CIDR와 ê°™ì€ CIDRì— í¬í•¨ë˜ì–´ 있어야 합니다. -message.installWizard.tooltip.configureGuestTraffic.guestNetmask=게스트ì—ì„œ 사용하는 서브네트워í¬ìƒì—ì„œ 사용ë˜ëŠ” ë„· 마스í¬ìž…니다. -message.installWizard.tooltip.configureGuestTraffic.guestGateway=게스트ì—ì„œ 사용하는 게ì´íŠ¸ì›¨ì´ìž…니다. -message.installWizard.tooltip.configureGuestTraffic.description=ë„¤íŠ¸ì›Œí¬ ì„¤ëª…ìž…ë‹ˆë‹¤. -message.installWizard.tooltip.configureGuestTraffic.name=ë„¤íŠ¸ì›Œí¬ ì´ë¦„입니다. -message.installWizard.tooltip.addZone.internaldns2=Zoneë‚´ 시스템 VM으로 사용하는 DNS 서버입니다. 현재 DNS 서버는 시스템 VMì˜ ì‚¬ì„¤ ë„¤íŠ¸ì›Œí¬ ì¸í„°íŽ˜ì´ìŠ¤ë¥¼ 개입시켜 접근합니다. Podì˜ ì‚¬ì„¤ IP 주소ì—ì„œ 여기서 지정하는 DNS ì„œë²„ì— í†µì‹ í•  수 있어야 합니다. -message.installWizard.tooltip.addZone.internaldns1=Zoneë‚´ì˜ ì‹œìŠ¤í…œ VM ë¡œ 사용하는 DNS 서버입니다. 현재 DNS 서버는 시스템 VMì˜ ì‚¬ì„¤ ë„¤íŠ¸ì›Œí¬ ì¸í„°íŽ˜ì´ìŠ¤ë¥¼ 개입시켜 접근합니다. Podì˜ ì‚¬ì„¤ IP 주소ì—ì„œ 여기서 지정하는 DNS ì„œë²„ì— í†µì‹ í•  수 있어야 합니다. -message.installWizard.tooltip.addZone.dns2=Zoneë‚´ 게스트 VM ë¡œ 사용하는 DNS 서버입니다. 현재 DNS 서버ì—는 다ìŒì— 추가하는 공개 ë„¤íŠ¸ì›Œí¬ ê²½ìœ ë¡œ 접근합니다. Zoneì˜ ê³µê°œ IP 주소ì—ì„œ 여기서 지정하는 공개 DNS ì„œë²„ì— í†µì‹ í•  수 있어야 합니다. -message.installWizard.tooltip.addZone.name=Zoneì˜ ì´ë¦„입니다. -message.installWizard.tooltip.addZone.dns1=Zoneë‚´ì˜ ê²ŒìŠ¤íŠ¸ VM으로 사용하는 DNS 서버입니다. ì´ëŸ¬í•œ DNS 서버ì—는 다ìŒì— 추가하는 공개 ë„¤íŠ¸ì›Œí¬ ê²½ìœ ë¡œ ì ‘ê·¼ 합니다. Zoneì˜ ê³µê°œ IP 주소ì—ì„œ 여기서 지정하는 공개 DNS ì„œë²„ì— í†µì‹ í•  수 있어야 합니다. -message.setup.successful=í´ë¼ìš°ë“œê°€ 설정 ë˜ì—ˆìŠµë‹ˆë‹¤. -label.may.continue=실행 í•  수 ìžˆìŒ -error.installWizard.message=문제가 ë°œìƒí–ˆìŠµë‹ˆë‹¤. 다시 오류를 수정할 수 있습니다. -message.installWizard.now.building=í´ë¼ìš°ë“œë¥¼ 구축하고 있는 중... -message.installWizard.click.retry=ì‹œìž‘ì„ ìž¬ì‹œí–‰í•˜ë ¤ë©´ ë²„íŠ¼ì„ í´ë¦­í•´ 주십시오. -label.launch=시작 -label.installWizard.click.launch=[시작]ì„ í´ë¦­í•´ 주십시오. -label.congratulations=ì„¤ì •ì´ ê³§ 완료입니다. -label.installWizard.addSecondaryStorageIntro.subtitle=2ì°¨ ìŠ¤í† ë¦¬ì§€ì— ëŒ€í•´ -label.installWizard.addSecondaryStorageIntro.title=2ì°¨ 스토리지 추가 -label.installWizard.addPrimaryStorageIntro.subtitle=기본 ìŠ¤í† ë¦¬ì§€ì— ëŒ€í•´ -label.installWizard.addPrimaryStorageIntro.title=기본 스토리지 추가 -label.installWizard.addHostIntro.subtitle=í˜¸ìŠ¤íŠ¸ì— ëŒ€í•´ -label.installWizard.addHostIntro.title=호스트 추가 -label.installWizard.addClusterIntro.subtitle=í´ëŸ¬ìŠ¤í„° 대한 ì •ë³´ -label.installWizard.addClusterIntro.title=í´ëŸ¬ìŠ¤í„° 추가 -label.installWizard.addPodIntro.subtitle=Podì— ëŒ€í•œ ì •ë³´ -label.installWizard.addPodIntro.title=Pod 추가 -label.installWizard.addZone.title=Zone 추가 -label.installWizard.addZoneIntro.subtitle=Zoneì— ëŒ€í•œ ì •ë³´ -label.installWizard.addZoneIntro.title=Zone 추가 -error.password.not.match=암호가 ì¼ì¹˜í•˜ì§€ ì•ŠìŒ -label.confirm.password=암호 í™•ì¸ ìž…ë ¥ -message.change.password=암호를 변경해 주십시오. -label.save.and.continue=저장하기 -label.skip.guide=CloudStack 사용 ê°€ì´ë“œ 건너뛰기 -label.continue.basic.install=기본 설치 실행 -label.introduction.to.cloudstack=CloudStackâ„¢ 소개 -label.what.is.cloudstack=CloudStackâ„¢ ì •ë³´ -label.hints=ì •ë³´ -label.installWizard.subtitle=현재 ê°€ì´ë“œ 투어는 CloudStackâ„¢ 환경 ì„¤ì •ì— ë„ì›€ì´ ë©ë‹ˆë‹¤ -label.continue=실행 -label.installWizard.title=CloudStackâ„¢ 마법사 -label.agree=ë™ì˜ -label.manage.resources=ìžì› 관리 -label.port.forwarding.policies=í¬í†  전송 ì •ì±… -label.load.balancing.policies=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 ì •ì±… -label.networking.and.security=네트워í¬ì™€ 보안 -label.bandwidth=ëŒ€ì—­í­ -label.virtual.machines=ê°€ìƒ ë¨¸ì‹  -label.compute.and.storage=컴퓨팅과 스토리지 -label.task.completed=ìž‘ì—… 완료 -label.update.project.resources=프로ì íŠ¸ ìžì› ì—…ë°ì´íŠ¸ -label.remove.project.account=프로ì íŠ¸ 계정 ì •ë³´ ì‚­ì œ -label.item.listing=항목 ëª©ë¡ -message.select.item=í•­ëª©ì„ ì„ íƒí•´ 주십시오. -label.removing=삭제하는 중 -label.invite=초대 -label.add.by=추가 단위 -label.max.vms=최대 ì‚¬ìš©ìž VM수 -label.max.public.ips=최대 공개 IP 주소수 -label.max.volumes=최대 볼륨수 -label.max.snapshots=최대 스냅샷수 -label.max.templates=최대 템플릿수 -label.project.dashboard=프로ì íŠ¸ 대시 ë³´ë“œ -label.remind.later=알림 표시 -label.invited.accounts=초대가 ëë‚œ 계정 ì •ë³´ -label.invite.to=초대 프로ì íŠ¸: -label.add.accounts.to=계정 ì •ë³´ 추가: -label.add.accounts=계정 ì •ë³´ 추가 -label.project.name=프로ì íŠ¸ëª… -label.create.project=프로ì íŠ¸ 만들기 -label.networks=ë„¤íŠ¸ì›Œí¬ -label.launch.vm=VM 시작 -label.new.vm=새 VM -label.previous=뒤로 -label.add.to.group=ê·¸ë£¹ì— ì¶”ê°€ -message.vm.review.launch=다ìŒì˜ 정보를 참조하고 ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ë¥¼ 올바르게 설정한 ê²ƒì„ í™•ì¸í•˜ê³  나서 시작해 주십시오. -message.select.security.groups=새로운 ê°€ìƒ ë¨¸ì‹  보안 ê·¸ë£¹ì„ ì„ íƒí•´ 주십시오. -label.new=ì‹ ê·œ -message.please.select.networks=ê°€ìƒ ë¨¸ì‹  네트워í¬ë¥¼ ì„ íƒí•´ 주십시오. -message.please.proceed=다ìŒì˜ ìˆœì„œì— ì§„í–‰í•´ 주십시오. -message.zone.no.network.selection=ì„ íƒí•œ Zoneì—서는 네트워í¬ë¥¼ ì„ íƒí•  수 없습니다. -label.no.thanks=설정 안함 -label.my.templates=ë‚˜ì˜ í…œí”Œë¦¿ -message.select.template=새로운 ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ í…œí”Œë¦¿ì„ ì„ íƒí•´ 주십시오. -message.select.iso=새로운 ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ ISO를 ì„ íƒí•´ 주십시오. -message.template.desc=VMì˜ ì‹œìž‘ì— ì‚¬ìš©í•  수 있는 OS ì´ë¯¸ì§€ -message.iso.desc=ë°ì´í„° ë˜ëŠ” OS 시작 가능 미디어를 í¬í•¨í•œ ë””ìŠ¤í¬ ì´ë¯¸ì§€ -label.select.iso.or.template=ISO ë˜ëŠ” 템플릿 ì„ íƒ -message.select.a.zone=Zoneì€ ì›ëž˜ ë‹¨ì¼ ë°ì´í„° ì„¼í„°ì— í•´ë‹¹í•©ë‹ˆë‹¤. 복수 Zoneì„ ì„¤ì •í•˜ê³  물리ì ìœ¼ë¡œ 분리하는 방법으로 í´ë¼ìš°ë“œì˜ ì‹ ë¢°ì„±ì„ ë†’ì¼ ìˆ˜ 있습니다. -label.select.a.zone=Zone ì„ íƒ -label.review=í™•ì¸ -label.select.a.template=템플릿 ì„ íƒ -label.setup=설정 -state.Allocated=할당 ëë‚œ ìƒíƒœ -changed.item.properties=항목 ì†ì„± 변경 -label.apply=ì ìš© -label.default=기본 -label.viewing=표시 항목: -label.move.to.top=처ìŒìœ¼ë¡œ ì´ë™ -label.move.up.row=위로 ì´ë™ -label.move.down.row=아래로 ì´ë™ -label.move.to.bottom=마지막으로 ì´ë™ -label.drag.new.position=새로운 ìœ„ì¹˜ì— ëŒì–´ì˜¤ê¸° -label.order=순서 -label.no.data=표시할 ë°ì´í„°ê°€ ì—†ìŒ -label.change.value=ê°’ 변경 -label.clear.list=ëª©ë¡ ì‚­ì œ -label.full.path=ì „ì²´ 경로 -message.add.domain=현재 ë„ë©”ì¸ì— ë§Œë“¤ê³ ìž í•˜ëŠ” 서브 ë„ë©”ì¸ì„ 지정해 주십시오. -message.delete.user=현재 사용ìžë¥¼ 삭제하시겠습니까? -message.enable.user=현재 사용ìžë¥¼ 사용 하시겠습니까? -message.disable.user=현재 사용ìžë¥¼ 사용 안 함으로 하시겠습니까? -message.generate.keys=현재 사용ìžì—게 새로운 키를 ìƒì„±í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.update.resource.count=현재 계정 ì •ë³´ ìžì›ìˆ˜ë¥¼ ì—…ë°ì´íŠ¸í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.edit.account=편집 ("-1"는 ìžì› 만들기 숫ìžì— ì œí•œì´ ì—†ëŠ” 값입니다.) -label.total.of.vm=VM 합계 -label.total.of.ip=IP 주소 합계 -state.enabled=유효함 -message.action.download.iso=현재 ISO를 다운로드하시겠습니까? -message.action.download.template=현재 í…œí”Œë¦¿ì„ ë‹¤ìš´ë¡œë“œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? -label.destination.zone=복사할 Zone -label.keyboard.type=키보드 종류 -label.nic.adapter.type=NIC 아답터 종류 -label.root.disk.controller=루트 ë””ìŠ¤í¬ ì½˜íŠ¸ë¡¤ëŸ¬ -label.community=커뮤니티 -label.remove.egress.rule=전송 규칙 ì‚­ì œ -label.add.egress.rule=전송 규칙 추가 -label.egress.rule=전송 규칙 -label.remove.ingress.rule=수신 규칙 ì‚­ì œ -label.delete.vpn.user=VPN ì‚¬ìš©ìž ì‚­ì œ -label.add.vpn.user=VPN ì‚¬ìš©ìž ì¶”ê°€ -label.remove.pf=í¬í†  전송 규칙 ì‚­ì œ -label.remove.vm.from.lb=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 ê·œì¹™ì— VM ì‚­ì œ -label.add.vms.to.lb=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 ê·œì¹™ì— VM 추가 -label.add.vm=VM 추가 -label.remove.static.nat.rule=ì •ì  NAT 규칙 ì‚­ì œ -label.remove.rule=규칙 ì‚­ì œ -label.add.static.nat.rule=ì •ì  NAT 규칙 추가 -label.add.rule=규칙 추가 -label.configuration=구성 -message.disable.vpn=VPN를 사용 안 함으로 하시겠습니까? -label.disable.vpn=VPN 사용 안 함 -message.enable.vpn=현재 IP ì£¼ì†Œì— ëŒ€í•œ VPN 접근를 사용 하시겠습니까? -label.enable.vpn=VPN 사용함 -message.acquire.new.ip=현재 네트워í¬ê°€ 새로운 IP 주소를 ì·¨ë“하시겠습니까? -label.elastic=오류 스틱 -label.my.network=ë‚´ ë„¤íŠ¸ì›Œí¬ -label.add.vms=VM 추가 -label.configure=구성 -label.stickiness=지ì†ì„± -label.source=시작 위치 -label.least.connections=최소 ì ‘ì† -label.round.robin=ë¼ìš´ë“œ 로빈 -label.restart.required=재시작 í•„ìš” -label.clean.up=삭제하기 -label.restart.network=ë„¤íŠ¸ì›Œí¬ ìž¬ì‹œìž‘ -label.edit.network.details=ë„¤íŠ¸ì›Œí¬ ìƒì„¸í•œ 편집 -label.add.guest.network=ì†ë‹˜ ë„¤íŠ¸ì›Œí¬ ì¶”ê°€ -label.guest.networks=ì†ë‹˜ ë„¤íŠ¸ì›Œí¬ -message.ip.address.changed=사용 IP 주소가 ë³€ê²½ëœ ê°€ëŠ¥ì„±ì´ ìžˆìŠµë‹ˆë‹¤. 목ë¡ì„ ì—…ë°ì´íŠ¸í•©ë‹ˆê¹Œ? ê·¸ 경우는 ìƒì„¸ ì„¤ì •ì°½ì´ ë‹«ëŠ” ê²ƒì— ì£¼ì˜í•´ 주십시오. -state.BackingUp=백업 중 -state.BackedUp=백업 완료 -label.done=완료 -label.vm.name=VM 명 -message.migrate.volume=다른 기본 ìŠ¤í† ë¦¬ì§€ì— ë³¼ë¥¨ì„ ì´ì „하시겠습니까? -label.migrate.volume=다른 기본 ìŠ¤í† ë¦¬ì§€ì— ë³¼ë¥¨ ì´ì „ -message.create.template=í…œí”Œë¦¿ì„ ë§Œë“¤ê¸°í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -label.create.template=템플릿 만들기 -message.download.volume.confirm=현재 ë³¼ë¥¨ì„ ë‹¤ìš´ë¡œë“œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.detach.disk=현재 디스í¬ë¥¼ 분리 하시겠습니까? -state.ready=준비 완료 -state.Ready=준비 완료 -label.vm.display.name=VM 표시명 -label.select-view=표시 방법 ì„ íƒ -label.local.storage=로컬 스토리지 -label.direct.ips=ì§ì ‘ IP 주소 -label.view.all=ëª¨ë‘ í‘œì‹œ -label.zone.details=Zone ìƒì„¸ -message.alert.state.detected=경계체제 ìƒíƒœê°€ ê°ì§€ë˜ì—ˆìŠµë‹ˆë‹¤ -state.Starting=시작 중 -state.Expunging=제거 중 -state.Creating=ìƒì„± 중 -message.decline.invitation=현재 프로ì íŠ¸ì— 초대를 거절하시겠습니까? -label.decline.invitation=초대 ê±°ì ˆ -message.confirm.join.project=현재 프로ì íŠ¸ì— 참여하시겠습니까? -message.join.project=ì´ê²ƒìœ¼ë¡œ, 프로ì íŠ¸ì— 참여했습니다. 프로ì íŠ¸ë¥¼ 참조하려면 프로ì íŠ¸ 보기로 전환해 주십시오. -label.accept.project.invitation=프로ì íŠ¸ 초대 ìŠ¹ì¸ -label.token=í† í° -label.project.id=프로ì íŠ¸ ID -message.enter.token=ì „ìž ë©”ì¼ ì´ˆëŒ€ìž¥ì— ì„¤ëª…ë˜ì–´ 있는 토í°ì„ 입력해 주십시오. -label.enter.token=í† í° ìž…ë ¥ -state.Accepted=ìŠ¹ì¸ ì™„ë£Œ -state.Pending=보류 -state.Completed=완료 -state.Declined=ê±°ì ˆ -label.project=프로ì íŠ¸ -label.invitations=초대장 -label.delete.project=프로ì íŠ¸ ì‚­ì œ -message.delete.project=현재 프로ì íŠ¸ë¥¼ 삭제하시겠습니까? -message.activate.project=현재 프로ì íŠ¸ë¥¼ 활성화 하시겠습니까? -label.activate.project=프로ì íŠ¸ 활성화 -label.suspend.project=프로ì íŠ¸ ì¼ì‹œì •ì§€ -message.suspend.project=현재 프로ì íŠ¸ë¥¼ ì¼ì‹œì •ì§€í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -state.Suspended=ì¼ì‹œì •ì§€ -label.edit.project.details=프로ì íŠ¸ ìƒì„¸ 편집 -label.new.project=새 프로ì íŠ¸ -state.Active=활성 -state.Disabled=유효하지 ì•Šì€ -label.projects=프로ì íŠ¸ -label.make.project.owner=계정 ì •ë³´ 프로ì íŠ¸ ì†Œìœ ìž -label.remove.project.account=계정 ì •ë³´ 프로ì íŠ¸ì—ì„œ ì‚­ì œ -message.project.invite.sent=사용ìžì—게 ì´ˆëŒ€ìž¥ì´ ì „ì†¡ë˜ì—ˆìŠµë‹ˆë‹¤. 사용ìžê°€ 초대를 승ì¸í•˜ë©´, 프로ì íŠ¸ì— 추가ë©ë‹ˆë‹¤. -label.add.account.to.project=계정 ì •ë³´ 프로ì íŠ¸ì— 추가 -label.revoke.project.invite=초대 취소 -label.project.invite=프로ì íŠ¸ì— 초대 -label.select.project=프로ì íŠ¸ ì„ íƒ -message.no.projects=프로ì íŠ¸ê°€ 없습니다.
프로ì íŠ¸ 섹션ì—ì„œ 새로운 프로ì íŠ¸ë¥¼ 만들어 주십시오. -message.no.projects.adminOnly=프로ì íŠ¸ê°€ 없습니다.
관리ìžì—게 새로운 프로ì íŠ¸ ìƒì„±ì„ ì˜ë¢°í•˜ì‹­ì‹œì˜¤. -message.pending.projects.1=ë³´ë¥˜ì¤‘ì¸ í”„ë¡œì íŠ¸ ì´ˆëŒ€ìž¥ì´ ìžˆìŠµë‹ˆë‹¤. -message.pending.projects.2=표시하려면 프로ì íŠ¸ 섹션으로 ì´ë™í•˜ê³  목ë¡ì—ì„œ ì´ˆëŒ€ìž¥ì„ ì„ íƒí•©ë‹ˆë‹¤. -message.instanceWizard.noTemplates=사용 가능한 í…œí”Œë¦¿ì´ ì—†ìŠµë‹ˆë‹¤. í˜¸í™˜ì„±ì´ ìžˆëŠ” í…œí”Œë¦¿ì„ ì¶”ê°€í•˜ê³ , ì¸ìŠ¤í„´ìŠ¤ 위저드를 재시작해 주십시오. -label.view=표시 - -instances.actions.reboot.label=ì¸ìŠ¤í„´ìŠ¤ 재시작 -label.filterBy=í•„í„° -label.ok=í™•ì¸ -notification.reboot.instance=ì¸ìŠ¤í„´ìŠ¤ 재시작 -notification.start.instance=ì¸ìŠ¤í„´ìŠ¤ 시작 -notification.stop.instance=ì¸ìŠ¤í„´ìŠ¤ 정지 -label.display.name=표시명 -label.zone.name=Zone ì´ë¦„ -ui.listView.filters.all=ëª¨ë‘ -ui.listView.filters.mine=ë‚´ 정보만 -state.Running=실행 중 -state.Stopped=ì •ì§€ëœ ìƒíƒœ -state.Destroyed=íŒŒê¸°ëœ ìƒíƒœ -state.Error=오류 -message.reset.password.warning.notPasswordEnabled=현재 ì¸ìŠ¤í„´ìŠ¤ í…œí”Œë¦¿ì€ ì•”í˜¸ 관리를 사용 하지 ì•Šê³  ìƒì„±ë˜ì—ˆìŠµë‹ˆë‹¤. -message.reset.password.warning.notStopped=현재 암호를 변경하기 ì „ì— ì¸ìŠ¤í„´ìŠ¤ë¥¼ 정지해야 합니다. -label.notifications=알림 -label.default.view=기본 보기 -label.project.view=프로ì íŠ¸ 보기 - -message.add.system.service.offering=새로운 시스템 서비스 ì œê³µì„ ì¶”ê°€í•˜ê¸° 위해 ë‹¤ìŒ ë°ì´í„°ë¥¼ 입력해 주십시오. -message.action.delete.system.service.offering=현재 시스템 서비스 ì œê³µì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? -label.action.delete.system.service.offering=시스템 서비스 제공 ì‚­ì œ -label.hypervisor.capabilities=하ì´í¼ ë°”ì´ì € 기능 -label.hypervisor.version=하ì´í¼ ë°”ì´ì € 버전 -label.max.guest.limit=최대 게스트 제한 -label.add.network.offering=ë„¤íŠ¸ì›Œí¬ ì œê³µ 추가 -label.supported.services=기술 지ì›ë˜ëŠ” 서비스 -label.service.capabilities=서비스 기능 -label.guest.type=게스트 종류 -label.specify.IP.ranges=IP 주소 범위 지정 -label.conserve.mode=절약 모드 -label.created.by.system=시스템 만들기 -label.menu.system.service.offerings=시스템 제공 -label.add.system.service.offering=시스템 서비스 제공 추가 -label.redundant.router.capability=중복 ë¼ìš°í„° 기능 -label.supported.source.NAT.type=기술 지ì›ë˜ëŠ” 전송 NAT 종류 -label.elastic.LB=íƒ„ë ¥ì  ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 -label.LB.isolation=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 분리 -label.elastic.IP=íƒ„ë ¥ì  IP 주소 -label.network.label.display.for.blank.value=기본 게ì´íŠ¸ì›¨ì´ë¥¼ 사용 -label.xen.traffic.label=XenServer 트래픽 ë¼ë²¨ -label.kvm.traffic.label=KVM 트래픽 ë¼ë²¨ -label.vmware.traffic.label=VMware 트래픽 ë¼ë²¨ -label.start.IP=시작 IP 주소 -label.end.IP=종료 IP 주소 -label.remove.ip.range=IP 주소 범위 ì‚­ì œ -label.ip.ranges=IP 주소 범위 -label.start.vlan=시작 VLAN -label.end.vlan=종료 VLAN -label.broadcast.domain.range=브로드ìºìŠ¤íŠ¸ ë„ë©”ì¸ ë²”ìœ„ -label.compute=컴퓨팅 -message.add.guest.network=ì†ë‹˜ 네트워í¬ë¥¼ 추가하시겠습니까? -label.subdomain.access=서브 ë„ë©”ì¸ ì ‘ê·¼ -label.guest.start.ip=게스트 시작 IP 주소 -label.guest.end.ip=게스트 종료 IP 주소 -label.virtual.router=ê°€ìƒ ë¼ìš°í„° -label.physical.network.ID=물리 ë„¤íŠ¸ì›Œí¬ ID -label.destination.physical.network.id=ëª©ì  ë¬¼ë¦¬ ë„¤íŠ¸ì›Œí¬ ID -label.dhcp=DHCP -label.destroy.router=ë¼ìš°í„° 파기 -message.confirm.destroy.router=현재 ë¼ìš°í„°ë¥¼ 파기하시겠습니까? -label.change.service.offering=서비스 제공 변경 -label.view.console=콘솔 표시 -label.redundant.state=중복 ìƒíƒœ -label.enable.provider=ì œê³µìž ì‚¬ìš©í•¨ -message.confirm.enable.provider=현재 제공ìžë¥¼ 사용하시겠습니까? -label.disable.provider=ì œê³µìž ì‚¬ìš© 안 함 -message.confirm.disable.provider=현재 제공ìžë¥¼ 사용 안 함으로 하시겠습니까? -label.shutdown.provider=ì œê³µìž ì¢…ë£Œ -message.confirm.shutdown.provider=현재 제공ìžë¥¼ 종료하시겠습니까? -label.netScaler=NetScaler -label.add.new.NetScaler=새로운 NetScaler 추가 -label.capacity=처리 능력 -label.dedicated=ì „ìš© -label.f5=F5 -label.add.new.F5=새로운 F5 추가 -label.srx=SRX -label.providers=ì œê³µìž -label.add.new.SRX=새로운 SRX 추가 -label.timeout=시간 초과 -label.public.network=공개 ë„¤íŠ¸ì›Œí¬ -label.private.network=사설 ë„¤íŠ¸ì›Œí¬ -label.enable.swift=Swift 사용함 -confirm.enable.swift=Swift 기술 지ì›ë¥¼ 사용 하려면 ë‹¤ìŒ ì •ë³´ë¥¼ 입력해 주십시오. -message.after.enable.swift=Swiftê°€ 구성ë˜ì—ˆìŠµë‹ˆë‹¤. 주ì˜:ì´ íŽ˜ì´ì§€ë¥¼ 닫으면 Swift를 재구성할 수 없습니다. -label.key=키 -label.delete.NetScaler=NetScaler ì‚­ì œ -message.confirm.delete.NetScaler=NetScaler를 삭제하시겠습니까? -label.delete.F5=F5 ì‚­ì œ -message.confirm.delete.F5=F5를 삭제하시겠습니까? -label.delete.SRX=SRX ì‚­ì œ -message.confirm.delete.SRX=SRX를 삭제하시겠습니까? -label.pods=Pod -label.pod.name=Pod명 -label.reserved.system.gateway=ì˜ˆì•½ëœ ì‹œìŠ¤í…œ 게ì´íŠ¸ì›¨ì´ -label.reserved.system.netmask=ì˜ˆì•½ëœ ì‹œìŠ¤í…œ ë„· ë§ˆìŠ¤í¬ -label.start.reserved.system.IP=ì˜ˆì•½ëœ ì‹œìž‘ 시스템 IP 주소 -label.end.reserved.system.IP=ì˜ˆì•½ëœ ì¢…ë£Œ 시스템 IP 주소 -label.clusters=í´ëŸ¬ìŠ¤í„° -label.cluster.name=í´ëŸ¬ìŠ¤í„°ëª… -label.host.MAC=호스트 MAC -label.agent.username=ì—ì´ì „트 사용ìžëª… -label.agent.password=ì—ì´ì „트 암호 -message.confirm.action.force.reconnect=현재 호스트를 ê°•ì œ 재접ì†í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -label.resource.state=ìžì› ìƒíƒœ -label.LUN.number=LUN 번호 -message.confirm.remove.IP.range=현재 IP 주소 범위를 삭제하시겠습니까? -message.tooltip.zone.name=Zone ì´ë¦„입니다. -message.tooltip.dns.1=Zoneë‚´ VM ë¡œ 사용하는 DNS 서버 ì´ë¦„입니다. Zone 공개 IP 주소ì—ì„œ ì´ ì„œë²„ì— í†µì‹ í•  수 있어야 합니다. -message.tooltip.dns.2=Zoneë‚´ VM ë¡œ 사용하는 ë‘번째 DNS 서버 ì´ë¦„입니다. Zone 공개 IP 주소ì—ì„œ ì´ ì„œë²„ì— í†µì‹ í•  수 있어야 합니다. -message.tooltip.internal.dns.1=Zoneë‚´ CloudStack 내부 시스템 VM ë¡œ 사용하는 DNS 서버 ì´ë¦„입니다. Pod 사설 IP 주소ì—ì„œ ì´ ì„œë²„ì— í†µì‹ í•  수 있어야 합니다. -message.tooltip.internal.dns.2=Zoneë‚´ CloudStack 내부 시스템 VM ë¡œ 사용하는 DNS 서버 ì´ë¦„입니다. Pod 사설 IP 주소ì—ì„œ ì´ ì„œë²„ì— í†µì‹ í•  수 있어야 합니다. -message.tooltip.network.domain=DNS 서픽스입니다. ì´ ì„œí”½ìŠ¤ì—ì„œ 게스트 VM ë¡œ ì ‘ê·¼ 하는 ë„¤íŠ¸ì›Œí¬ ë§žì¶¤í˜• ë„ë©”ì¸ëª…ì„ ë§Œë“­ë‹ˆë‹¤. -message.tooltip.pod.name=현재 Pod ì´ë¦„입니다. -message.tooltip.reserved.system.gateway=Podë‚´ 호스트 게ì´íŠ¸ì›¨ì´ìž…니다. -message.tooltip.reserved.system.netmask=Pod 서브네트워í¬ë¥¼ 정하는 ë„¤íŠ¸ì›Œí¬ í”„ë ˆí”½ìŠ¤ìž…ë‹ˆë‹¤. CIDR 표기를 사용합니다. -message.creating.zone=Zoneì„ ë§Œë“¤ì—ˆìŠµë‹ˆë‹¤. -message.creating.physical.networks=물리 네트워í¬ë¥¼ 만들었습니다. -message.configuring.physical.networks=물리 네트워í¬ë¥¼ 구성해 있습니다 -message.adding.Netscaler.device=Netscaler 기기를 추가하고 있습니다 -message.creating.pod=Pod를 만들었습니다. -message.configuring.public.traffic=공개 íŠ¸ëž˜í”½ì„ êµ¬ì„±í•´ 있습니다 -message.configuring.storage.traffic=스토리지 íŠ¸ëž˜í”½ì„ êµ¬ì„±í•´ 있습니다 -message.configuring.guest.traffic=게스트 íŠ¸ëž˜í”½ì„ êµ¬ì„±í•´ 있습니다 -message.creating.cluster=í´ëŸ¬ìŠ¤í„°ë¥¼ 만들었습니다. -message.adding.host=호스트를 추가하고 있습니다 -message.creating.primary.storage=기본 스토리지를 만들었습니다. -message.creating.secondary.storage=2ì°¨ 스토리지를 만들었습니다. -message.Zone.creation.complete=Zoneì„ ë§Œë“¤ì—ˆìŠµë‹ˆë‹¤. -message.enabling.zone=Zoneì„ ì‚¬ìš©í•˜ê³  있습니다 -error.something.went.wrong.please.correct.the.following=문제가 ë°œìƒí–ˆìŠµë‹ˆë‹¤. ë‹¤ìŒ ë‚´ìš©ì„ ìˆ˜ì •í•´ 주십시오 -error.could.not.enable.zone=Zoneì„ ì‚¬ìš© í•  수 없습니다. -message.zone.creation.complete.would.you.like.to.enable.this.zone=Zoneì„ ë§Œë“¤ì—ˆìŠµë‹ˆë‹¤. ì´ Zoneì„ ì‚¬ìš© 하시겠습니까? -message.please.add.at.lease.one.traffic.range=ì ì–´ë„ í•œ ê°œ ì´ìƒ 트래픽 범위를 추가해 주십시오. -message.you.must.have.at.least.one.physical.network=ì ì–´ë„ í•œ ê°œ ì´ìƒ 물리 네트워í¬ê°€ 필요합니다 -message.please.select.a.different.public.and.management.network.before.removing=ì‚­ì œ ì „ì— ë‹¤ë¥¸ 공개 ë° ê´€ë¦¬ 네트워í¬ë¥¼ ì„ íƒí•´ 주십시오. - -label.zone.type=Zone 종류 -label.setup.zone=Zone 설정 -label.setup.network=ë„¤íŠ¸ì›Œí¬ ì„¤ì • -label.add.resources=ìžì› 추가 -label.launch=시작 -label.set.up.zone.type=Zone 종류 설정 -message.please.select.a.configuration.for.your.zone=Zone êµ¬ì„±ì„ ì„ íƒí•´ 주십시오. -message.desc.basic.zone= ê° VM ì¸ìŠ¤í„´ìŠ¤ì— IP 주소가 네트워í¬ì—ì„œ ì§ì ‘ 할당할 수 있는 ë‹¨ì¼ ë„¤íŠ¸ì›Œí¬ë¥¼ 제공합니다. 보안 그룹 (ì „ì†¡ì› IP 주소 í•„í„°)ê³¼ ê°™ì€ ì¸µ 세 가지 레벨 방법으로 게스트를 분리할 수 있습니다. -label.basic=기본 -message.desc.advanced.zone=보다 ì„¸ë ¨ëœ ë„¤íŠ¸ì›Œí¬ ê¸°ìˆ ì„ ì§€ì›í•©ë‹ˆë‹¤. ì´ ë„¤íŠ¸ì›Œí¬ ëª¨ë¸ì„ ì„ íƒí•˜ë©´, 보다 유연하게 게스트 네트워í¬ë¥¼ 정하고 방화벽(fire wall), VPN, ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 장치 기술 지ì›ì™€ ê°™ì€ ì‚¬ìš©ìž ì§€ì • í•œ ë„¤íŠ¸ì›Œí¬ ì œê³µì„ ì œê³µí•  수 있습니다. -label.advanced=확장 -message.desc.zone=Zoneì€ CloudStack 환경내 최대 ì¡°ì§ ë‹¨ìœ„ë¡œ ì›ëž˜ ë‹¨ì¼ ë°ì´í„° ì„¼í„°ì— í•´ë‹¹í•©ë‹ˆë‹¤. Zoneì— í•´ì„œ 물리ì ì¸ 분리와 ì¤‘ë³µì„±ì´ ì œê³µë©ë‹ˆë‹¤. Zoneì€ í•œ ê°œ ì´ìƒ Pod( ê° Pod는 호스트와 기본 스토리지 서버ì—ì„œ 구성)와 Zoneë‚´ 모든 Podë¡œ 공유ë˜ëŠ” 2ì°¨ 스토리지 서버로 구성ë©ë‹ˆë‹¤. -label.physical.network=물리 ë„¤íŠ¸ì›Œí¬ -label.public.traffic=공개 트래픽 -label.guest.traffic=게스트 트래픽 -label.storage.traffic=스토리지 트래픽 -message.setup.physical.network.during.zone.creation=확장 Zoneì„ ì¶”ê°€í•  때는 í•œ ê°œ ì´ìƒ 물리 네트워í¬ë¥¼ 설정해야 합니다. ê° ë„¤íŠ¸ì›Œí¬ëŠ” 하ì´í¼ ë°”ì´ì €ìƒ í•œ 가지 ë„¤íŠ¸ì›Œí¬ ì¹´ë“œ(NIC)ì— ëŒ€ì‘합니다. ê° ë¬¼ë¦¬ 네트워í¬ì—서는 êµ¬ì„±ì— ì œí•œì´ ìžˆìœ¼ë‚˜, í•œ 가지 종류 ì´ìƒ íŠ¸ëž˜í”½ì„ í†µì‹ í•  수 있습니다.

ê° ë¬¼ë¦¬ 네트워í¬ì— 대해서트래픽 종류를 드래그 앤 드롭해 주십시오. -label.add.physical.network=물리 ë„¤íŠ¸ì›Œí¬ ì¶”ê°€ -label.traffic.types=트래픽 종류 -label.management=관리 -label.guest=게스트 -label.please.specify.netscaler.info=Netscaler 정보를 지정해 주십시오 -message.public.traffic.in.advanced.zone=í´ë¼ìš°ë“œ 내부 VMì´ ì¸í„°ë„·ì— ì ‘ê·¼ 하면, 공개 íŠ¸ëž˜í”½ì´ ìƒì„±ë©ë‹ˆë‹¤. ì´ ë•Œë¬¸ì— ì¼ë°˜ì ìœ¼ë¡œ ì ‘ê·¼ 가능한 IP 주소를 할당할 필요가 있습니다. 최종 사용ìžëŠ” CloudStack ì‚¬ìš©ìž ì¸í„°íŽ˜ì´ìŠ¤ë¥¼ 사용해 ì´ëŸ¬í•œ IP 주소를 ì·¨ë“하고 ì†ë‹˜ 네트워í¬ì™€ 공개 ë„¤íŠ¸ì›Œí¬ ì‚¬ì´ì— NAT를 구현할 수 있습니다.

ì¸í„°ë„· íŠ¸ëž˜í”½ì„ ìœ„í•´ ì ì–´ë„ í•œ ê°œ ì´ìƒ IP 주소 범위를 입력해 주십시오. -message.public.traffic.in.basic.zone=í´ë¼ìš°ë“œ 내부 VMì´ ì¸í„°ë„·ì— ì ‘ê·¼ í•  ë•Œ ì¸í„°ë„· 경유로 í´ë¼ì´ì–¸íŠ¸ì— 서비스를 제공하면, 공개 íŠ¸ëž˜í”½ì´ ìƒì„±ë©ë‹ˆë‹¤. ì´ ë•Œë¬¸ì— ì¼ë°˜ì ìœ¼ë¡œ ì ‘ê·¼ 가능한 IP 주소를 할당할 필요가 있습니다. ì¸ìŠ¤í„´ìŠ¤ë¥¼ 만들기하면, 게스트 IP 주소 외ì—ì´ ê³µê°œ IP 주소 범위ì—ì„œ 주소가 í•˜ë‚˜ì˜ ì¸ìŠ¤í„´ìŠ¤ì— 할당할 수 있습니다. 공개 IP 주소와 게스트 IP 주소 사ì´ì— ì •ì ì¸ 1대 1 NATê°€ ìžë™ìœ¼ë¡œ 설정 ë©ë‹ˆë‹¤. 최종 사용ìžëŠ” CloudStack ì‚¬ìš©ìž ì¸í„°íŽ˜ì´ìŠ¤ë¥¼ 사용해 추가 IP 주소를 ì·¨ë“하고 ì¸ìŠ¤í„´ìŠ¤ì™€ 공개 IP 주소 사ì´ì— ì •ì  NAT를 구현할 ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. -message.add.pod.during.zone.creation= ê° Zoneì—는 í•œ ê°œ ì´ìƒ Podê°€ 필요합니다. 지금 여기서 첫번째 Pod를 추가합니다. Pod는 호스트와 기본 스토리지 서버ì—ì„œ 구성합니다만 ì´ëŠ” ë‹¤ìŒ ìˆœì„œë¡œ 추가합니다. 맨 ì²˜ìŒ CloudStack 내부 관리 íŠ¸ëž˜í”½ì„ ìœ„í•´ì„œ IP 주소 범위를 예약합니다. IP 주소 범위는 í´ë¼ìš°ë“œ 내부 ê° Zoneì—ì„œ 중복 하지 않게 예약할 필요가 있습니다. -message.guest.traffic.in.advanced.zone=ì†ë‹˜ ë„¤íŠ¸ì›Œí¬ íŠ¸ëž˜í”½ì€ ìµœì¢… ì‚¬ìš©ìž ê°€ìƒ ë¨¸ì‹ ê°„ 통신입니다. ê° ë¬¼ë¦¬ ë„¤íŠ¸ì›Œí¬ ê²ŒìŠ¤íŠ¸ íŠ¸ëž˜í”½ì„ í†µì‹ í•˜ê¸° 위한 VLAN ID 범위를 지정해 주십시오. -message.guest.traffic.in.basic.zone=ì†ë‹˜ ë„¤íŠ¸ì›Œí¬ íŠ¸ëž˜í”½ì€ ìµœì¢… 사용ìžì˜ ê°€ìƒ ë¨¸ì‹ ê°„ 통신입니다. CloudStackì— ê²ŒìŠ¤íŠ¸ VMì— í• ë‹¹í•  수 있는 IP 주소 범위를 지정해 주십시오.ì´ ë²”ìœ„ê°€ 예약 ëë‚œ 시스템 IP 주소 범위와 중복 하지 않게 주ì˜í•´ 주십시오. -message.storage.traffic=호스트나 CloudStack 시스템 VM 등 관리 서버와 통신하는 CloudStack 내부 ìžì›ê°„ 트래픽입니다. 여기서 스토리지 íŠ¸ëž˜í”½ì„ êµ¬ì„±í•´ 주십시오. -message.desc.cluster= ê° Podì—는 í•œ ê°œ ì´ìƒ í´ëŸ¬ìŠ¤í„°ê°€ 필요합니다. 지금 여기서 최초 í´ëŸ¬ìŠ¤í„°ë¥¼ 추가합니다. í´ëŸ¬ìŠ¤í„°ëŠ” 호스트를 그룹화 하는 방법입니다. í•œ í´ëŸ¬ìŠ¤í„° 내부 호스트는 ëª¨ë‘ ë™ì¼í•œ 하드웨어ì—ì„œ 구성ë˜ì–´ ê°™ì€ í•˜ì´í¼ ë°”ì´ì €ë¥¼ 실행하고 ê°™ì€ ì„œë¸Œ 네트워í¬ìƒì— 있어 ê°™ì€ ê³µìœ  ìŠ¤í† ë¦¬ì§€ì— ì ‘ê·¼ 합니다. ê° í´ëŸ¬ìŠ¤í„°ëŠ” í•œ ê°œ ì´ìƒ 호스트와 í•œ ê°œ ì´ìƒ 기본 스토리지 서버ì—ì„œ 구성ë©ë‹ˆë‹¤. -message.desc.host= ê° í´ëŸ¬ìŠ¤í„°ì—는 ì ì–´ë„ í•œ ê°œ ì´ìƒ 게스트 VM를 실행하기 위한 호스트 (컴퓨터)ê°€ 필요합니다. 지금 여기서 첫번째 호스트를 추가합니다. CloudStack으로 호스트를 ë™ìž‘하려면 호스트ì—게 하ì´í¼ ë°”ì´ì €ë¥¼ 설치하고 IP 주소를 할당해 호스트가 CloudStack 관리 ì„œë²„ì— ì ‘ì†í•˜ë„ë¡ í•©ë‹ˆë‹¤.

호스트 DNS 명 ë˜ëŠ” IP 주소, 사용ìžëª…(ì›ëž˜ root)ê³¼ 암호 ë° í˜¸ìŠ¤íŠ¸ ë¶„ë¥˜ì— ì‚¬ìš©í•˜ëŠ” ë¼ë²¨ì„ 입력해 주십시오. -message.desc.primary.storage= ê° í´ëŸ¬ìŠ¤í„°ì—는 ì ì–´ë„ í•œ ê°œ ì´ìƒì˜ 기본 스토리지 서버가 필요합니다. 지금 여기서 첫번째 서버를 추가합니다. 기본 스토리지는 í´ëŸ¬ìŠ¤í„° ë‚´ 부 호스트ìƒì—ì„œ ë™ìž‘하는 모든 VM ë””ìŠ¤í¬ ë³¼ë¥¨ì„ í¬í•¨í•©ë‹ˆë‹¤. 기본ì ìœ¼ë¡œ 하ì´í¼ ë°”ì´ì €ì—ì„œ 기술 지ì›ë˜ëŠ” í‘œì¤€ì— ì¤€ê±°í•œ í”„ë¡œí† ì½œì„ ì‚¬ìš©í•´ 주십시오. -message.desc.secondary.storage= ê° Zoneì—는 ì ì–´ë„ í•œ ê°œ ì´ìƒì˜ NFS 즉 2ì°¨ 스토리지 서버가 필요합니다. 지금 여기서 첫번째 서버를 추가합니다. 2ì°¨ 스토리지는 VM 템플릿, ISO ì´ë¯¸ì§€ ë° VM ë””ìŠ¤í¬ ë³¼ë¥¨ ìŠ¤ëƒ…ìƒ·ì„ í¬í•¨í•©ë‹ˆë‹¤. ì´ ì„œë²„ëŠ” Zoneë‚´ 모든 호스트ì—ì„œ 사용할 수 있어야 합니다.

IP 주소와 내보내낼 경로를 입력해 주십시오. -label.launch.zone=Zone 시작 -message.please.wait.while.zone.is.being.created=Zoneì´ ë§Œë“¤ê¸°ë  ë•Œê¹Œì§€ ìž ê¹ ê¸°ë‹¤ë ¤ 주십시오... - -label.load.balancing=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 -label.static.nat.enabled=ì •ì  NAT 유효 -label.zones=Zone -label.view.more=ìƒì„¸ 표시 -label.number.of.zones=Zone수 -label.number.of.pods=Pod수 -label.number.of.clusters=í´ëŸ¬ìŠ¤í„°ìˆ˜ -label.number.of.hosts=호스트수 -label.total.hosts=호스트 합계 -label.total.CPU=CPU 합계 -label.total.memory=메모리 합계 -label.total.storage=스토리지 합계 -label.purpose=ëª©ì  - -label.action.migrate.router=ë¼ìš°í„° ì´ì „ -label.action.migrate.router.processing=ë¼ìš°í„°ë¥¼ ì´ì „하는 중... -message.migrate.router.confirm=ë¼ìš°í„° ì´ì „ 위치로 호스트를 ì„ íƒì‹­ì‹œì˜¤. -label.migrate.router.to=ë¼ìš°í„° ì´ì „ 위치: - -label.action.migrate.systemvm=시스템 VM ì´ì „ -label.action.migrate.systemvm.processing=시스템 VM를 ì´ì „하는 중 -message.migrate.systemvm.confirm=시스템 VM ì´ì „ ì´ì „ 위치로 호스트를 ì„ íƒì‹­ì‹œì˜¤. -label.migrate.systemvm.to=시스템 VM ì´ì „ 위치: - -mode=모드 -side.by.side=병렬 -inline=ì§ë ¬ - -extractable=추출 가능 - -label.ocfs2=OCFS2 - -label.action.edit.host=호스트 편집 - -network.rate=ë„¤íŠ¸ì›Œí¬ ì†ë„ - -ICMP.type=ICMP 종류 -ICMP.code=ICMP 코드 - -image.directory=ì´ë¯¸ì§€ 디렉토리 - -label.action.create.template.from.vm=VMì—ì„œ 템플릿 만들기 -label.action.create.template.from.volume=볼륨ì—ì„œ 템플릿 만들기 - -message.vm.create.template.confirm=템플릿 만들기하면 VMì´ ìžë™ìœ¼ë¡œ 재시작ë©ë‹ˆë‹¤. - -label.action.manage.cluster=í´ëŸ¬ìŠ¤í„° 관리 ë™ìž‘ -message.action.manage.cluster=í´ëŸ¬ìŠ¤í„°ë¥¼ 관리 대ìƒìœ¼ë¡œ 하시겠습니까? -label.action.manage.cluster.processing=í´ëŸ¬ìŠ¤í„°ë¥¼ 관리 대ìƒìœ¼ë¡œ 하는 중... - -label.action.unmanage.cluster=í´ëŸ¬ìŠ¤í„° 비관리 ë™ìž‘ -message.action.unmanage.cluster=í´ëŸ¬ìŠ¤í„°ë¥¼ 비관리 대ìƒìœ¼ë¡œ 하시겠습니까? -label.action.unmanage.cluster.processing=í´ëŸ¬ìŠ¤í„°ë¥¼ 비관리 대ìƒìœ¼ë¡œ 하는 중... - -label.allocation.state=할당 ìƒíƒœ -managed.state=관리 ëŒ€ìƒ ìƒíƒœ - -label.default.use=기본 사용 -label.host.tags=호스트 태그 - -label.cidr=CIDR -label.cidr.list=ì „ì†¡ì› CIDR - -label.storage.tags=스토리지 태그 - -label.redundant.router=중복 ë¼ìš°í„° -label.is.redundant.router=중복 - -force.delete=ê°•ì œ ì‚­ì œ -force.delete.domain.warning=경고:ì´ ì˜µì…˜ì„ ì„ íƒí•˜ë©´, 모든 내부 ë„ë©”ì¸ ë° ê´€ë ¨í•˜ëŠ” 모든 계정 정보와 ê·¸ ìžì›ì´ ì‚­ì œë©ë‹ˆë‹¤. - -force.remove=ê°•ì œ í•´ì œ -force.remove.host.warning=경고:ì´ ì˜µì…˜ì„ ì„ íƒí•˜ë©´, 실행중 모든 ê°€ìƒ ë¨¸ì‹ ì´ ê°•ì œì ìœ¼ë¡œ 정지ë˜ì–´ í´ëŸ¬ìŠ¤í„°ì—ì„œ 호스트가 ê°•ì œì ìœ¼ë¡œ í•´ì œë©ë‹ˆë‹¤. - -force.stop=ê°•ì œ 정지 -force.stop.instance.warning=경고: ì¸ìŠ¤í„´ìŠ¤ ê°•ì œ 정지는 최종 수단으로 í•´ 주십시오. ë°ì´í„°ê°€ ì†ì‹¤ë  ë¿ë§Œ ì•„ë‹ˆë¼ ê°€ìƒ ë¨¸ì‹  ë™ìž‘ì´ ì¼ê´€í•˜ì§€ 않게 ë  ê°€ëŠ¥ì„±ì´ ìžˆìŠµë‹ˆë‹¤. - -label.PreSetup=PreSetup -label.SR.name = SR 명 ë¼ë²¨ -label.SharedMountPoint=SharedMountPoint -label.clvm=CLVM -label.volgroup=볼륨 그룹 -label.VMFS.datastore=VMFS ë°ì´í„° 스토어 - -label.network.device=ë„¤íŠ¸ì›Œí¬ ê¸°ê¸° -label.add.network.device=ë„¤íŠ¸ì›Œí¬ ê¸°ê¸° 추가 -label.network.device.type=ë„¤íŠ¸ì›Œí¬ ê¸°ê¸° 종류 -label.DHCP.server.type=DHCP 서버 종류 -label.Pxe.server.type=PXE 서버 종류 -label.PING.storage.IP=PING ëŒ€ìƒ ìŠ¤í† ë¦¬ì§€ IP 주소 -label.PING.dir=PING 디렉토리 -label.TFTP.dir=TFTP 디렉토리 -label.PING.CIFS.username=PING CIFS 사용ìžëª… -label.PING.CIFS.password=PING CIFS 암호 -label.CPU.cap=CPU 제한 - - -label.action.enable.zone=Zone 사용함 -label.action.enable.zone.processing=Zoneì„ ì‚¬ìš© 설정 중... -message.action.enable.zone=현재 Zoneì„ ì‚¬ìš© 하시겠습니까? -label.action.disable.zone=Zone 사용 안 함 -label.action.disable.zone.processing=Zoneì„ ì‚¬ìš© 안 함으로 설정 중... -message.action.disable.zone=현재 Zoneì„ ì‚¬ìš© 안 함으로 하시겠습니까? - -label.action.enable.pod=Pod 사용함 -label.action.enable.pod.processing=Pod를 사용 설정 중... -message.action.enable.pod=현재 Pod를 사용 하시겠습니까? -label.action.disable.pod=Pod 사용 안 함 -label.action.disable.pod.processing=Pod를 사용 안 함으로 설정 중... -message.action.disable.pod=현재 Pod를 사용 안 함으로 하시겠습니까? - -label.action.enable.cluster=í´ëŸ¬ìŠ¤í„° 사용함 -label.action.enable.cluster.processing=í´ëŸ¬ìŠ¤í„°ë¥¼ 사용 설정 중... -message.action.enable.cluster=현재 í´ëŸ¬ìŠ¤í„°ë¥¼ 사용 하시겠습니까? -label.action.disable.cluster=í´ëŸ¬ìŠ¤í„° 사용 안 함 -label.action.disable.cluster.processing=í´ëŸ¬ìŠ¤í„°ë¥¼ 사용 안 함으로 설정 중... -message.action.disable.cluster=현재 í´ëŸ¬ìŠ¤í„°ë¥¼ 사용 안 함으로 하시겠습니까? - -label.account.id=계정 ì •ë³´ ID -label.account.name=계정 정보명 -label.account.specific=계정 ì •ë³´ 고유 -label.account=계정 ì •ë³´ -label.accounts=계정 ì •ë³´ -label.acquire.new.ip=새로운 IP 주소 ì·¨ë“ -label.show.ingress.rule=수신 규칙 표시 -label.hide.ingress.rule=수신 ê·œì¹™ì„ ìˆ¨ê¸°ê¸° -label.action.attach.disk.processing=디스í¬ë¥¼ 연결하는 중... -label.action.attach.disk=ë””ìŠ¤í¬ ì—°ê²° -label.action.attach.iso.processing=ISO를 연결하는 중... -label.action.attach.iso=ISO ì—°ê²° -label.action.cancel.maintenance.mode.processing=유지 보수 모드를 취소하는 중... -label.action.cancel.maintenance.mode=유지 보수 모드 취소 -label.action.change.password=암호 변경 -label.action.change.service.processing=서비스를 변경하는 중... -label.action.change.service=서비스 변경 -label.action.copy.ISO.processing=ISO를 복사하는 중... -label.action.copy.ISO=ISO 복사 -label.action.copy.template.processing=í…œí”Œë¦¿ì„ ë³µì‚¬í•˜ëŠ” 중... -label.action.copy.template=템플릿 복사 -label.action.create.template.processing=í…œí”Œë¦¿ì„ ë§Œë“œëŠ” 중... -label.action.create.template=템플릿 만들기 -label.action.create.vm.processing=VM를 만드는 중... -label.action.create.vm=VM 만들기 -label.action.create.volume.processing=ë³¼ë¥¨ì„ ë§Œë“œëŠ” 중... -label.action.create.volume=볼륨 만들기 -label.action.delete.IP.range.processing=IP 주소 범위를 삭제하는 중... -label.action.delete.IP.range=IP 주소 범위 ì‚­ì œ -label.action.delete.ISO.processing=ISO를 삭제하는 중... -label.action.delete.ISO=ISO ì‚­ì œ -label.action.delete.account.processing=계정 정보를 삭제하는 중... -label.action.delete.account=계정 ì •ë³´ ì‚­ì œ -label.action.delete.cluster.processing=í´ëŸ¬ìŠ¤í„°ë¥¼ 삭제하는 중... -label.action.delete.cluster=í´ëŸ¬ìŠ¤í„° ì‚­ì œ -label.action.delete.disk.offering.processing=ë””ìŠ¤í¬ ì œê³µì„ ì‚­ì œí•˜ëŠ” 중... -label.action.delete.disk.offering=ë””ìŠ¤í¬ ì œê³µ ì‚­ì œ - -label.action.update.resource.count=ìžì› 수 ì—…ë°ì´íŠ¸ -label.action.update.resource.count.processing=ìžì› 수를 ì—…ë°ì´íŠ¸í•˜ëŠ” 중... - -label.action.delete.domain=ë„ë©”ì¸ ì‚­ì œ -label.action.delete.domain.processing=ë„ë©”ì¸ì„ 삭제하는 중... - -label.action.delete.firewall.processing=방화벽(fire wall)를 삭제하는 중... -label.action.delete.firewall=방화벽(fire wall) 규칙 ì‚­ì œ -label.action.delete.ingress.rule.processing=수신 ê·œì¹™ì„ ì‚­ì œí•˜ëŠ” 중... -label.action.delete.ingress.rule=수신 규칙 ì‚­ì œ -label.action.delete.load.balancer.processing=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 장치를 삭제하는 중... -label.action.delete.load.balancer=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 규칙 ì‚­ì œ -label.action.edit.network.processing=네트워í¬ë¥¼ 편집하는 중... -label.action.edit.network=ë„¤íŠ¸ì›Œí¬ íŽ¸ì§‘ -label.action.delete.network.processing=네트워í¬ë¥¼ 삭제하는 중... -label.action.delete.network=ë„¤íŠ¸ì›Œí¬ ì‚­ì œ -label.action.delete.pod.processing=Pod를 삭제하는 중... -label.action.delete.pod=Pod ì‚­ì œ -label.action.delete.primary.storage.processing=기본 스토리지를 삭제하는 중... -label.action.delete.primary.storage=기본 스토리지 ì‚­ì œ -label.action.delete.secondary.storage.processing=2ì°¨ 스토리지를 삭제하는 중... -label.action.delete.secondary.storage=2ì°¨ 스토리지 ì‚­ì œ -label.action.delete.security.group.processing=보안 ê·¸ë£¹ì„ ì‚­ì œí•˜ëŠ” 중... -label.action.delete.security.group=보안 그룹 ì‚­ì œ -label.action.delete.service.offering.processing=ì„œë¹„ìŠ¤ì œê³µì„ ì‚­ì œí•˜ëŠ” 중... -label.action.delete.service.offering=서비스제공 ì‚­ì œ -label.action.delete.snapshot.processing=ìŠ¤ëƒ…ìƒ·ì„ ì‚­ì œí•˜ëŠ” 중... -label.action.delete.snapshot=스냅샷 ì‚­ì œ -label.action.delete.template.processing=í…œí”Œë¦¿ì„ ì‚­ì œí•˜ëŠ” 중... -label.action.delete.template=템플릿 ì‚­ì œ -label.action.delete.user.processing=사용ìžë¥¼ 삭제하는 중... -label.action.delete.user=ì‚¬ìš©ìž ì‚­ì œ -label.action.delete.volume.processing=ë³¼ë¥¨ì„ ì‚­ì œí•˜ëŠ” 중... -label.action.delete.volume=볼륨 ì‚­ì œ -label.action.delete.zone.processing=Zoneì„ ì‚­ì œí•˜ëŠ” 중... -label.action.delete.zone=Zone ì‚­ì œ -label.action.destroy.instance.processing=ì¸ìŠ¤í„´ìŠ¤ë¥¼ 파기하는 중... -label.action.destroy.instance=ì¸ìŠ¤í„´ìŠ¤ 파기 -label.action.destroy.systemvm.processing=시스템 VM를 파기하는 중... -label.action.destroy.systemvm=시스템 VM 파기 -label.action.detach.disk.processing=디스í¬ë¥¼ 분리 하는 중... -label.action.detach.disk=ë””ìŠ¤í¬ ë¶„ë¦¬ -label.action.detach.iso.processing=ISO를 분리 하는 중... -label.action.detach.iso=ISO 분리 -label.action.disable.account.processing=계정 정보를 중지하는 중... -label.action.disable.account=계정 ì •ë³´ 중지 -label.action.disable.static.NAT.processing=ì •ì  NAT를 중지하는 중... -label.action.disable.static.NAT=ì •ì  NAT 사용 안 함 -label.action.disable.user.processing=사용ìžë¥¼ 중지하는 중... -label.action.disable.user=ì‚¬ìš©ìž ì¤‘ì§€ -label.action.download.ISO=ISO 다운로드 -label.action.download.template=템플릿 다운로드 -label.action.download.volume.processing=ë³¼ë¥¨ì„ ë‹¤ìš´ë¡œë“œí•˜ëŠ” 중... -label.action.download.volume=볼륨 다운로드 -label.action.edit.ISO=ISO 편집 -label.action.edit.account=계정 ì •ë³´ 편집 -label.action.edit.disk.offering=ë””ìŠ¤í¬ ì œê³µ 편집 -label.action.edit.domain=ë„ë©”ì¸ íŽ¸ì§‘ -label.action.edit.global.setting=글로벌 설정 편집 -label.action.edit.instance=ì¸ìŠ¤í„´ìŠ¤ 편집 -label.action.edit.network.offering=ë„¤íŠ¸ì›Œí¬ ì œê³µ 편집 -label.action.edit.pod=Pod 편집 -label.action.edit.primary.storage=기본 스토리지 편집 -label.action.edit.resource.limits=ìžì› 제한 편집 -label.action.edit.service.offering=서비스 제공 편집 -label.action.edit.template=템플릿 편집 -label.action.edit.user=ì‚¬ìš©ìž íŽ¸ì§‘ -label.action.edit.zone=Zone 편집 -label.action.enable.account.processing=계정 정보를 사용 설정 중... -label.action.enable.account=계정 ì •ë³´ 사용함 -label.action.enable.maintenance.mode.processing=유지 보수 모드를 사용 설정 중... -label.action.enable.maintenance.mode=유지 보수 모드 사용함 -label.action.enable.static.NAT.processing=ì •ì  NAT를 사용 설정 중... -label.action.enable.static.NAT=ì •ì  NAT 사용함 -label.action.enable.user.processing=사용ìžë¥¼ 사용 설정 중... -label.action.enable.user=ì‚¬ìš©ìž ì‚¬ìš©í•¨ -label.action.force.reconnect.processing=재접ì†í•˜ëŠ” 중... -label.action.force.reconnect=ê°•ì œìž¬ì ‘ì† -label.action.generate.keys.processing=키를 ìƒì„±í•˜ëŠ” 중... -label.action.generate.keys=키 ìƒì„± -label.action.lock.account.processing=계정 정보를 잠그는 중... -label.action.lock.account=계정 ì •ë³´ 잠금 -label.action.migrate.instance=ì¸ìŠ¤í„´ìŠ¤ ì´ì „ -label.action.migrate.instance.processing=ì¸ìŠ¤í„´ìŠ¤ë¥¼ ì´ì „하는 중... -label.action.reboot.instance.processing=ì¸ìŠ¤í„´ìŠ¤ë¥¼ 재시작하는 중... -label.action.reboot.instance=ì¸ìŠ¤í„´ìŠ¤ 재시작 -label.action.reboot.router.processing=ë¼ìš°í„°ë¥¼ 재시작하는 중... -label.action.reboot.router=ë¼ìš°í„° 재시작 -label.action.reboot.systemvm.processing=시스템 VM를 재시작하는 중... -label.action.reboot.systemvm=시스템 VM 재시작 -label.action.recurring.snapshot=정기 스냅샷 -label.action.release.ip.processing=IP 주소를 해제하는 중... -label.action.release.ip=IP 주소 í•´ì œ -label.action.remove.host.processing=호스트를 삭제하는 중... -label.action.remove.host=호스트 ì‚­ì œ -label.action.reset.password.processing=암호를 재설정 하는 중... -label.action.reset.password=암호 재설정 -label.action.resource.limits=ìžì› 제한 -label.action.restore.instance.processing=ì¸ìŠ¤í„´ìŠ¤ë¥¼ ë³µì›í•˜ëŠ” 중... -label.action.restore.instance=ì¸ìŠ¤í„´ìŠ¤ ë³µì› -label.action.start.instance.processing=ì¸ìŠ¤í„´ìŠ¤ë¥¼ 시작하는 중... -label.action.start.instance=ì¸ìŠ¤í„´ìŠ¤ 시작 -label.action.start.router.processing=ë¼ìš°í„°ë¥¼ 시작하는 중... -label.action.start.router=ë¼ìš°í„° 시작 -label.action.start.systemvm.processing=시스템 VM를 시작하는 중... -label.action.start.systemvm=시스템 VM 시작 -label.action.stop.instance.processing=ì¸ìŠ¤í„´ìŠ¤ë¥¼ 정지하는 중... -label.action.stop.instance=ì¸ìŠ¤í„´ìŠ¤ 정지 -label.action.stop.router.processing=ë¼ìš°í„°ë¥¼ 정지하는 중... -label.action.stop.router=ë¼ìš°í„° 정지 -label.action.stop.systemvm.processing=시스템 VM를 정지하는 중... -label.action.stop.systemvm=시스템 VM 정지 -label.action.take.snapshot.processing=ìŠ¤ëƒ…ìƒ·ì„ ë§Œë“œëŠ” 중.... -label.action.take.snapshot=스냅샷 만들기 -label.action.update.OS.preference.processing=OS 기본 ì„¤ì •ì„ ì—…ë°ì´íŠ¸í•˜ëŠ” 중... -label.action.update.OS.preference=OS 기본 설정 ì—…ë°ì´íŠ¸ -label.actions=ìž‘ì—… -label.active.sessions=활성 세션 -label.add.account=계정 ì •ë³´ 추가 -label.add.by.cidr=CIDR ë¡œ 추가 -label.add.by.group=그룹ì—ì„œ 추가 -label.add.cluster=í´ëŸ¬ìŠ¤í„° 추가 -label.add.direct.iprange=ì§ì ‘ IP 주소 범위 추가 -label.add.disk.offering=ë””ìŠ¤í¬ ì œê³µ 추가 -label.add.domain=ë„ë©”ì¸ ì¶”ê°€ -label.add.firewall=방화벽(fire wall) 규칙 추가 -label.add.host=호스트 추가 -label.add.ingress.rule=수신 규칙 추가 -label.add.ip.range=IP 주소 범위 추가 -label.add.load.balancer=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 장치 추가 -label.add.more=다른 항목 추가 -label.add.network=ë„¤íŠ¸ì›Œí¬ ì¶”ê°€ -label.add.pod=Pod 추가 -label.add.primary.storage=기본 스토리지 추가 -label.add.secondary.storage=2ì°¨ 스토리지 추가 -label.add.security.group=보안 그룹 추가 -label.add.service.offering=서비스제공 추가 -label.add.template=템플릿 추가 -label.add.user=ì‚¬ìš©ìž ì¶”ê°€ -label.add.vlan=VLAN 추가 -label.add.volume=볼륨 추가 -label.add.zone=Zone 추가 -label.add=추가 -label.adding.cluster=í´ëŸ¬ìŠ¤í„°ë¥¼ 추가중... -label.adding.failed=추가할 수 ì—†ìŒ -label.adding.pod=Pod를 추가 가능 -label.adding.processing=추가하는 중... -label.adding.succeeded=추가 완료 -label.adding.user=ì‚¬ìš©ìž ì¶”ê°€ -label.adding.zone=Zone 추가 -label.adding=ì •ë³´ 추가 -label.additional.networks=추가 ë„¤íŠ¸ì›Œí¬ -label.admin.accounts=ê´€ë¦¬ìž ê³„ì • ì •ë³´ -label.admin=ê´€ë¦¬ìž -label.advanced.mode=확장 모드 -label.advanced.search=ê³ ë„ ê²€ìƒ‰ -label.advanced=확장 -label.alert=알림 ì²´ì œ -label.algorithm=알고리즘 -label.allocated=할당 완료 ìƒíƒœ -label.api.key=API 키 -label.assign.to.load.balancer=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 ìž¥ì¹˜ì— ì¸ìŠ¤í„´ìŠ¤ë¥¼ 할당 -label.assign=할당 -label.associated.network.id=관련 ë„¤íŠ¸ì›Œí¬ ID -label.attached.iso=ì—°ê²° ISO -label.availability.zone=ì´ìš© 가능 Zone -label.availability=가용성 -label.available.public.ips=사용 가능 공개 IP 주소 -label.available=사용 가능 -label.back=뒤로 -label.basic.mode=기본 모드 -label.bootable=부팅 가능 -label.broadcast.domain.type=브로드ìºìŠ¤íŠ¸ ë„ë©”ì¸ ì¢…ë¥˜ -label.by.account=계정 ì •ë³´ -label.by.availability=가용성 -label.by.domain=ë„ë©”ì¸ -label.by.end.date=ì¢…ë£Œì¼ -label.by.level=레벨 +changed.item.properties=\ud56d\ubaa9 \uc18d\uc131 \ubcc0\uacbd +confirm.enable.swift=Swift \uae30\uc220 \uc9c0\uc6d0\ub97c \uc0ac\uc6a9 \ud558\ub824\uba74 \ub2e4\uc74c \uc815\ubcf4\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +error.could.not.enable.zone=Zone\uc744 \uc0ac\uc6a9 \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. +error.installWizard.message=\ubb38\uc81c\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \ub2e4\uc2dc \uc624\ub958\ub97c \uc218\uc815\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +error.invalid.username.password=\uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc0ac\uc6a9\uc790\uba85 \ub610\ub294 \uc554\ud638 +error.login=\uc0ac\uc6a9\uc790\uba85/\uc554\ud638\uac00 \uae30\ub85d\uacfc \uc77c\uce58\ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. +error.menu.select=\ud56d\ubaa9\uc774 \uc120\ud0dd\ub418\uc5b4 \uc788\uc9c0 \uc54a\uae30 \ub54c\ubb38\uc5d0 \uc791\uc5c5\uc744 \uc2e4\ud589\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. +error.mgmt.server.inaccessible=\uad00\ub9ac \uc11c\ubc84\uc5d0 \uc811\uadfc \ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. \ub2e4\uc74c\uc5d0 \uc7ac\uc2e4\ud589\ud574 \uc8fc\uc2ed\uc2dc\uc624. +error.password.not.match=\uc554\ud638\uac00 \uc77c\uce58\ud558\uc9c0 \uc54a\uc74c +error.please.specify.physical.network.tags=\ud604\uc7ac \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c \ud0dc\uadf8\ub97c \uc9c0\uc815\ud558\uc9c0 \uc54a\uc73c\uba74, \ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5\uc740 \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. +error.session.expired=\uc138\uc158 \uc720\ud6a8\uae30\uac04\uc774 \ub04a\uc5b4\uc84c\uc2b5\ub2c8\ub2e4. +error.something.went.wrong.please.correct.the.following=\ubb38\uc81c\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4. \ub2e4\uc74c \ub0b4\uc6a9\uc744 \uc218\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624 +error.unable.to.reach.management.server=\uad00\ub9ac \uc11c\ubc84\uc640 \ud1b5\uc2e0\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. +extractable=\ucd94\ucd9c \uac00\ub2a5 +force.delete.domain.warning=\uacbd\uace0\:\uc774 \uc635\uc158\uc744 \uc120\ud0dd\ud558\uba74, \ubaa8\ub4e0 \ub0b4\ubd80 \ub3c4\uba54\uc778 \ubc0f \uad00\ub828\ud558\ub294 \ubaa8\ub4e0 \uacc4\uc815 \uc815\ubcf4\uc640 \uadf8 \uc790\uc6d0\uc774 \uc0ad\uc81c\ub429\ub2c8\ub2e4. +force.delete=\uac15\uc81c \uc0ad\uc81c +force.remove.host.warning=\uacbd\uace0\:\uc774 \uc635\uc158\uc744 \uc120\ud0dd\ud558\uba74, \uc2e4\ud589\uc911 \ubaa8\ub4e0 \uac00\uc0c1 \uba38\uc2e0\uc774 \uac15\uc81c\uc801\uc73c\ub85c \uc815\uc9c0\ub418\uc5b4 \ud074\ub7ec\uc2a4\ud130\uc5d0\uc11c \ud638\uc2a4\ud2b8\uac00 \uac15\uc81c\uc801\uc73c\ub85c \ud574\uc81c\ub429\ub2c8\ub2e4. +force.remove=\uac15\uc81c \ud574\uc81c +force.stop.instance.warning=\uacbd\uace0\: \uc778\uc2a4\ud134\uc2a4 \uac15\uc81c \uc815\uc9c0\ub294 \ucd5c\uc885 \uc218\ub2e8\uc73c\ub85c \ud574 \uc8fc\uc2ed\uc2dc\uc624. \ub370\uc774\ud130\uac00 \uc190\uc2e4\ub420 \ubfd0\ub9cc \uc544\ub2c8\ub77c \uac00\uc0c1 \uba38\uc2e0 \ub3d9\uc791\uc774 \uc77c\uad00\ud558\uc9c0 \uc54a\uac8c \ub420 \uac00\ub2a5\uc131\uc774 \uc788\uc2b5\ub2c8\ub2e4. +force.stop=\uac15\uc81c \uc815\uc9c0 +ICMP.code=ICMP \ucf54\ub4dc +ICMP.type=ICMP \uc885\ub958 +image.directory=\uc774\ubbf8\uc9c0 \ub514\ub809\ud1a0\ub9ac +inline=\uc9c1\ub82c +instances.actions.reboot.label=\uc778\uc2a4\ud134\uc2a4 \uc7ac\uc2dc\uc791 +label.accept.project.invitation=\ud504\ub85c\uc81d\ud2b8 \ucd08\ub300 \uc2b9\uc778 +label.account.and.security.group=\uacc4\uc815 \uc815\ubcf4, \ubcf4\uc548 \uadf8\ub8f9 +label.account.id=\uacc4\uc815 \uc815\ubcf4 ID +label.account.name=\uacc4\uc815 \uc815\ubcf4\uba85 +label.account.specific=\uacc4\uc815 \uc815\ubcf4 \uace0\uc720 +label.accounts=\uacc4\uc815 \uc815\ubcf4 +label.account=\uacc4\uc815 \uc815\ubcf4 +label.acquire.new.ip=\uc0c8\ub85c\uc6b4 IP \uc8fc\uc18c \ucde8\ub4dd +label.action.attach.disk.processing=\ub514\uc2a4\ud06c\ub97c \uc5f0\uacb0\ud558\ub294 \uc911... +label.action.attach.disk=\ub514\uc2a4\ud06c \uc5f0\uacb0 +label.action.attach.iso=ISO \uc5f0\uacb0 +label.action.attach.iso.processing=ISO\ub97c \uc5f0\uacb0\ud558\ub294 \uc911... +label.action.cancel.maintenance.mode.processing=\uc720\uc9c0 \ubcf4\uc218 \ubaa8\ub4dc\ub97c \ucde8\uc18c\ud558\ub294 \uc911... +label.action.cancel.maintenance.mode=\uc720\uc9c0 \ubcf4\uc218 \ubaa8\ub4dc \ucde8\uc18c +label.action.change.password=\uc554\ud638 \ubcc0\uacbd +label.action.change.service.processing=\uc11c\ube44\uc2a4\ub97c \ubcc0\uacbd\ud558\ub294 \uc911... +label.action.change.service=\uc11c\ube44\uc2a4 \ubcc0\uacbd +label.action.copy.ISO=ISO \ubcf5\uc0ac +label.action.copy.ISO.processing=ISO\ub97c \ubcf5\uc0ac\ud558\ub294 \uc911... +label.action.copy.template.processing=\ud15c\ud50c\ub9bf\uc744 \ubcf5\uc0ac\ud558\ub294 \uc911... +label.action.copy.template=\ud15c\ud50c\ub9bf \ubcf5\uc0ac +label.action.create.template.from.vm=VM\uc5d0\uc11c \ud15c\ud50c\ub9bf \ub9cc\ub4e4\uae30 +label.action.create.template.from.volume=\ubcfc\ub968\uc5d0\uc11c \ud15c\ud50c\ub9bf \ub9cc\ub4e4\uae30 +label.action.create.template.processing=\ud15c\ud50c\ub9bf\uc744 \ub9cc\ub4dc\ub294 \uc911... +label.action.create.template=\ud15c\ud50c\ub9bf \ub9cc\ub4e4\uae30 +label.action.create.vm.processing=VM\ub97c \ub9cc\ub4dc\ub294 \uc911... +label.action.create.vm=VM \ub9cc\ub4e4\uae30 +label.action.create.volume.processing=\ubcfc\ub968\uc744 \ub9cc\ub4dc\ub294 \uc911... +label.action.create.volume=\ubcfc\ub968 \ub9cc\ub4e4\uae30 +label.action.delete.account.processing=\uacc4\uc815 \uc815\ubcf4\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.account=\uacc4\uc815 \uc815\ubcf4 \uc0ad\uc81c +label.action.delete.cluster.processing=\ud074\ub7ec\uc2a4\ud130\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.cluster=\ud074\ub7ec\uc2a4\ud130 \uc0ad\uc81c +label.action.delete.disk.offering.processing=\ub514\uc2a4\ud06c \uc81c\uacf5\uc744 \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.disk.offering=\ub514\uc2a4\ud06c \uc81c\uacf5 \uc0ad\uc81c +label.action.delete.domain.processing=\ub3c4\uba54\uc778\uc744 \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.domain=\ub3c4\uba54\uc778 \uc0ad\uc81c +label.action.delete.firewall.processing=\ubc29\ud654\ubcbd(fire wall)\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.firewall=\ubc29\ud654\ubcbd(fire wall) \uaddc\uce59 \uc0ad\uc81c +label.action.delete.ingress.rule.processing=\uc218\uc2e0 \uaddc\uce59\uc744 \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.ingress.rule=\uc218\uc2e0 \uaddc\uce59 \uc0ad\uc81c +label.action.delete.IP.range=IP \uc8fc\uc18c \ubc94\uc704 \uc0ad\uc81c +label.action.delete.IP.range.processing=IP \uc8fc\uc18c \ubc94\uc704\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.ISO=ISO \uc0ad\uc81c +label.action.delete.ISO.processing=ISO\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.load.balancer.processing=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.load.balancer=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uaddc\uce59 \uc0ad\uc81c +label.action.delete.network.processing=\ub124\ud2b8\uc6cc\ud06c\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.network=\ub124\ud2b8\uc6cc\ud06c \uc0ad\uc81c +label.action.delete.nexusVswitch=Nexus 1000V \uc0ad\uc81c +label.action.delete.physical.network=\ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c \uc0ad\uc81c +label.action.delete.pod=Pod \uc0ad\uc81c +label.action.delete.pod.processing=Pod\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.primary.storage.processing=\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.primary.storage=\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc0ad\uc81c +label.action.delete.secondary.storage=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 \uc0ad\uc81c +label.action.delete.secondary.storage.processing=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.security.group.processing=\ubcf4\uc548 \uadf8\ub8f9\uc744 \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.security.group=\ubcf4\uc548 \uadf8\ub8f9 \uc0ad\uc81c +label.action.delete.service.offering.processing=\uc11c\ube44\uc2a4\uc81c\uacf5\uc744 \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.service.offering=\uc11c\ube44\uc2a4\uc81c\uacf5 \uc0ad\uc81c +label.action.delete.snapshot.processing=\uc2a4\ub0c5\uc0f7\uc744 \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.snapshot=\uc2a4\ub0c5\uc0f7 \uc0ad\uc81c +label.action.delete.system.service.offering=\uc2dc\uc2a4\ud15c \uc11c\ube44\uc2a4 \uc81c\uacf5 \uc0ad\uc81c +label.action.delete.template.processing=\ud15c\ud50c\ub9bf\uc744 \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.template=\ud15c\ud50c\ub9bf \uc0ad\uc81c +label.action.delete.user.processing=\uc0ac\uc6a9\uc790\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.user=\uc0ac\uc6a9\uc790 \uc0ad\uc81c +label.action.delete.volume.processing=\ubcfc\ub968\uc744 \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.volume=\ubcfc\ub968 \uc0ad\uc81c +label.action.delete.zone.processing=Zone\uc744 \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.delete.zone=Zone \uc0ad\uc81c +label.action.destroy.instance.processing=\uc778\uc2a4\ud134\uc2a4\ub97c \ud30c\uae30\ud558\ub294 \uc911... +label.action.destroy.instance=\uc778\uc2a4\ud134\uc2a4 \ud30c\uae30 +label.action.destroy.systemvm.processing=\uc2dc\uc2a4\ud15c VM\ub97c \ud30c\uae30\ud558\ub294 \uc911... +label.action.destroy.systemvm=\uc2dc\uc2a4\ud15c VM \ud30c\uae30 +label.action.detach.disk.processing=\ub514\uc2a4\ud06c\ub97c \ubd84\ub9ac \ud558\ub294 \uc911... +label.action.detach.disk=\ub514\uc2a4\ud06c \ubd84\ub9ac +label.action.detach.iso=ISO \ubd84\ub9ac +label.action.detach.iso.processing=ISO\ub97c \ubd84\ub9ac \ud558\ub294 \uc911... +label.action.disable.account.processing=\uacc4\uc815 \uc815\ubcf4\ub97c \uc911\uc9c0\ud558\ub294 \uc911... +label.action.disable.account=\uacc4\uc815 \uc815\ubcf4 \uc911\uc9c0 +label.action.disable.cluster.processing=\ud074\ub7ec\uc2a4\ud130\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \uc124\uc815 \uc911... +label.action.disable.cluster=\ud074\ub7ec\uc2a4\ud130 \uc0ac\uc6a9 \uc548 \ud568 +label.action.disable.nexusVswitch=Nexus 1000V \uc0ac\uc6a9 \uc548 \ud568 +label.action.disable.physical.network=\ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c \uc0ac\uc6a9 \uc548 \ud568 +label.action.disable.pod=Pod \uc0ac\uc6a9 \uc548 \ud568 +label.action.disable.pod.processing=Pod\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \uc124\uc815 \uc911... +label.action.disable.static.NAT.processing=\uc815\uc801 NAT\ub97c \uc911\uc9c0\ud558\ub294 \uc911... +label.action.disable.static.NAT=\uc815\uc801 NAT \uc0ac\uc6a9 \uc548 \ud568 +label.action.disable.user.processing=\uc0ac\uc6a9\uc790\ub97c \uc911\uc9c0\ud558\ub294 \uc911... +label.action.disable.user=\uc0ac\uc6a9\uc790 \uc911\uc9c0 +label.action.disable.zone.processing=Zone\uc744 \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \uc124\uc815 \uc911... +label.action.disable.zone=Zone \uc0ac\uc6a9 \uc548 \ud568 +label.action.download.ISO=ISO \ub2e4\uc6b4\ub85c\ub4dc +label.action.download.template=\ud15c\ud50c\ub9bf \ub2e4\uc6b4\ub85c\ub4dc +label.action.download.volume.processing=\ubcfc\ub968\uc744 \ub2e4\uc6b4\ub85c\ub4dc\ud558\ub294 \uc911... +label.action.download.volume=\ubcfc\ub968 \ub2e4\uc6b4\ub85c\ub4dc +label.action.edit.account=\uacc4\uc815 \uc815\ubcf4 \ud3b8\uc9d1 +label.action.edit.disk.offering=\ub514\uc2a4\ud06c \uc81c\uacf5 \ud3b8\uc9d1 +label.action.edit.domain=\ub3c4\uba54\uc778 \ud3b8\uc9d1 +label.action.edit.global.setting=\uae00\ub85c\ubc8c \uc124\uc815 \ud3b8\uc9d1 +label.action.edit.host=\ud638\uc2a4\ud2b8 \ud3b8\uc9d1 +label.action.edit.instance=\uc778\uc2a4\ud134\uc2a4 \ud3b8\uc9d1 +label.action.edit.ISO=ISO \ud3b8\uc9d1 +label.action.edit.network.offering=\ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5 \ud3b8\uc9d1 +label.action.edit.network.processing=\ub124\ud2b8\uc6cc\ud06c\ub97c \ud3b8\uc9d1\ud558\ub294 \uc911... +label.action.edit.network=\ub124\ud2b8\uc6cc\ud06c \ud3b8\uc9d1 +label.action.edit.pod=Pod \ud3b8\uc9d1 +label.action.edit.primary.storage=\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \ud3b8\uc9d1 +label.action.edit.resource.limits=\uc790\uc6d0 \uc81c\ud55c \ud3b8\uc9d1 +label.action.edit.service.offering=\uc11c\ube44\uc2a4 \uc81c\uacf5 \ud3b8\uc9d1 +label.action.edit.template=\ud15c\ud50c\ub9bf \ud3b8\uc9d1 +label.action.edit.user=\uc0ac\uc6a9\uc790 \ud3b8\uc9d1 +label.action.edit.zone=Zone \ud3b8\uc9d1 +label.action.enable.account.processing=\uacc4\uc815 \uc815\ubcf4\ub97c \uc0ac\uc6a9 \uc124\uc815 \uc911... +label.action.enable.account=\uacc4\uc815 \uc815\ubcf4 \uc0ac\uc6a9\ud568 +label.action.enable.cluster.processing=\ud074\ub7ec\uc2a4\ud130\ub97c \uc0ac\uc6a9 \uc124\uc815 \uc911... +label.action.enable.cluster=\ud074\ub7ec\uc2a4\ud130 \uc0ac\uc6a9\ud568 +label.action.enable.maintenance.mode.processing=\uc720\uc9c0 \ubcf4\uc218 \ubaa8\ub4dc\ub97c \uc0ac\uc6a9 \uc124\uc815 \uc911... +label.action.enable.maintenance.mode=\uc720\uc9c0 \ubcf4\uc218 \ubaa8\ub4dc \uc0ac\uc6a9\ud568 +label.action.enable.nexusVswitch=Nexus 1000V \uc0ac\uc6a9\ud568 +label.action.enable.physical.network=\ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c \uc0ac\uc6a9\ud568 +label.action.enable.pod=Pod \uc0ac\uc6a9\ud568 +label.action.enable.pod.processing=Pod\ub97c \uc0ac\uc6a9 \uc124\uc815 \uc911... +label.action.enable.static.NAT.processing=\uc815\uc801 NAT\ub97c \uc0ac\uc6a9 \uc124\uc815 \uc911... +label.action.enable.static.NAT=\uc815\uc801 NAT \uc0ac\uc6a9\ud568 +label.action.enable.user.processing=\uc0ac\uc6a9\uc790\ub97c \uc0ac\uc6a9 \uc124\uc815 \uc911... +label.action.enable.user=\uc0ac\uc6a9\uc790 \uc0ac\uc6a9\ud568 +label.action.enable.zone.processing=Zone\uc744 \uc0ac\uc6a9 \uc124\uc815 \uc911... +label.action.enable.zone=Zone \uc0ac\uc6a9\ud568 +label.action.force.reconnect.processing=\uc7ac\uc811\uc18d\ud558\ub294 \uc911... +label.action.force.reconnect=\uac15\uc81c\uc7ac\uc811\uc18d +label.action.generate.keys.processing=\ud0a4\ub97c \uc0dd\uc131\ud558\ub294 \uc911... +label.action.generate.keys=\ud0a4 \uc0dd\uc131 +label.action.list.nexusVswitch=Nexus 1000V \ubaa9\ub85d \ud45c\uc2dc +label.action.lock.account.processing=\uacc4\uc815 \uc815\ubcf4\ub97c \uc7a0\uadf8\ub294 \uc911... +label.action.lock.account=\uacc4\uc815 \uc815\ubcf4 \uc7a0\uae08 +label.action.manage.cluster.processing=\ud074\ub7ec\uc2a4\ud130\ub97c \uad00\ub9ac \ub300\uc0c1\uc73c\ub85c \ud558\ub294 \uc911... +label.action.manage.cluster=\ud074\ub7ec\uc2a4\ud130 \uad00\ub9ac \ub3d9\uc791 +label.action.migrate.instance.processing=\uc778\uc2a4\ud134\uc2a4\ub97c \uc774\uc804\ud558\ub294 \uc911... +label.action.migrate.instance=\uc778\uc2a4\ud134\uc2a4 \uc774\uc804 +label.action.migrate.router.processing=\ub77c\uc6b0\ud130\ub97c \uc774\uc804\ud558\ub294 \uc911... +label.action.migrate.router=\ub77c\uc6b0\ud130 \uc774\uc804 +label.action.migrate.systemvm.processing=\uc2dc\uc2a4\ud15c VM\ub97c \uc774\uc804\ud558\ub294 \uc911 +label.action.migrate.systemvm=\uc2dc\uc2a4\ud15c VM \uc774\uc804 +label.action.reboot.instance.processing=\uc778\uc2a4\ud134\uc2a4\ub97c \uc7ac\uc2dc\uc791\ud558\ub294 \uc911... +label.action.reboot.instance=\uc778\uc2a4\ud134\uc2a4 \uc7ac\uc2dc\uc791 +label.action.reboot.router.processing=\ub77c\uc6b0\ud130\ub97c \uc7ac\uc2dc\uc791\ud558\ub294 \uc911... +label.action.reboot.router=\ub77c\uc6b0\ud130 \uc7ac\uc2dc\uc791 +label.action.reboot.systemvm.processing=\uc2dc\uc2a4\ud15c VM\ub97c \uc7ac\uc2dc\uc791\ud558\ub294 \uc911... +label.action.reboot.systemvm=\uc2dc\uc2a4\ud15c VM \uc7ac\uc2dc\uc791 +label.action.recurring.snapshot=\uc815\uae30 \uc2a4\ub0c5\uc0f7 +label.action.register.iso=ISO \ub4f1\ub85d +label.action.register.template=\ud15c\ud50c\ub9bf \ub4f1\ub85d +label.action.release.ip=IP \uc8fc\uc18c \ud574\uc81c +label.action.release.ip.processing=IP \uc8fc\uc18c\ub97c \ud574\uc81c\ud558\ub294 \uc911... +label.action.remove.host.processing=\ud638\uc2a4\ud2b8\ub97c \uc0ad\uc81c\ud558\ub294 \uc911... +label.action.remove.host=\ud638\uc2a4\ud2b8 \uc0ad\uc81c +label.action.reset.password.processing=\uc554\ud638\ub97c \uc7ac\uc124\uc815 \ud558\ub294 \uc911... +label.action.reset.password=\uc554\ud638 \uc7ac\uc124\uc815 +label.action.resize.volume.processing=\ubcfc\ub968 \ud06c\uae30 \ubcc0\uacbd \uc911... +label.action.resize.volume=\ubcfc\ub968 \ud06c\uae30 \ubcc0\uacbd +label.action.resource.limits=\uc790\uc6d0 \uc81c\ud55c +label.action.restore.instance.processing=\uc778\uc2a4\ud134\uc2a4\ub97c \ubcf5\uc6d0\ud558\ub294 \uc911... +label.action.restore.instance=\uc778\uc2a4\ud134\uc2a4 \ubcf5\uc6d0 +label.action.start.instance.processing=\uc778\uc2a4\ud134\uc2a4\ub97c \uc2dc\uc791\ud558\ub294 \uc911... +label.action.start.instance=\uc778\uc2a4\ud134\uc2a4 \uc2dc\uc791 +label.action.start.router.processing=\ub77c\uc6b0\ud130\ub97c \uc2dc\uc791\ud558\ub294 \uc911... +label.action.start.router=\ub77c\uc6b0\ud130 \uc2dc\uc791 +label.action.start.systemvm.processing=\uc2dc\uc2a4\ud15c VM\ub97c \uc2dc\uc791\ud558\ub294 \uc911... +label.action.start.systemvm=\uc2dc\uc2a4\ud15c VM \uc2dc\uc791 +label.action.stop.instance.processing=\uc778\uc2a4\ud134\uc2a4\ub97c \uc815\uc9c0\ud558\ub294 \uc911... +label.action.stop.instance=\uc778\uc2a4\ud134\uc2a4 \uc815\uc9c0 +label.action.stop.router.processing=\ub77c\uc6b0\ud130\ub97c \uc815\uc9c0\ud558\ub294 \uc911... +label.action.stop.router=\ub77c\uc6b0\ud130 \uc815\uc9c0 +label.action.stop.systemvm.processing=\uc2dc\uc2a4\ud15c VM\ub97c \uc815\uc9c0\ud558\ub294 \uc911... +label.action.stop.systemvm=\uc2dc\uc2a4\ud15c VM \uc815\uc9c0 +label.actions=\uc791\uc5c5 +label.action.take.snapshot.processing=\uc2a4\ub0c5\uc0f7\uc744 \ub9cc\ub4dc\ub294 \uc911.... +label.action.take.snapshot=\uc2a4\ub0c5\uc0f7 \ub9cc\ub4e4\uae30 +label.action.unmanage.cluster.processing=\ud074\ub7ec\uc2a4\ud130\ub97c \ube44\uad00\ub9ac \ub300\uc0c1\uc73c\ub85c \ud558\ub294 \uc911... +label.action.unmanage.cluster=\ud074\ub7ec\uc2a4\ud130 \ube44\uad00\ub9ac \ub3d9\uc791 +label.action.update.OS.preference=OS \uae30\ubcf8 \uc124\uc815 \uc5c5\ub370\uc774\ud2b8 +label.action.update.OS.preference.processing=OS \uae30\ubcf8 \uc124\uc815\uc744 \uc5c5\ub370\uc774\ud2b8\ud558\ub294 \uc911... +label.action.update.resource.count.processing=\uc790\uc6d0 \uc218\ub97c \uc5c5\ub370\uc774\ud2b8\ud558\ub294 \uc911... +label.action.update.resource.count=\uc790\uc6d0 \uc218 \uc5c5\ub370\uc774\ud2b8 +label.activate.project=\ud504\ub85c\uc81d\ud2b8 \ud65c\uc131\ud654 +label.active.sessions=\ud65c\uc131 \uc138\uc158 +label.add.accounts.to=\uacc4\uc815 \uc815\ubcf4 \ucd94\uac00\: +label.add.accounts=\uacc4\uc815 \uc815\ubcf4 \ucd94\uac00 +label.add.account.to.project=\uacc4\uc815 \uc815\ubcf4 \ud504\ub85c\uc81d\ud2b8\uc5d0 \ucd94\uac00 +label.add.account=\uacc4\uc815 \uc815\ubcf4 \ucd94\uac00 +label.add.ACL=\uad8c\ud55c \uad00\ub9ac(ACL) \ucd94\uac00 +label.add.by.cidr=CIDR \ub85c \ucd94\uac00 +label.add.by.group=\uadf8\ub8f9\uc5d0\uc11c \ucd94\uac00 +label.add.by=\ucd94\uac00 \ub2e8\uc704 +label.add.cluster=\ud074\ub7ec\uc2a4\ud130 \ucd94\uac00 +label.add.compute.offering=\ucef4\ud4e8\ud305 \uc790\uc6d0 \ucd94\uac00 +label.add.direct.iprange=\uc9c1\uc811 IP \uc8fc\uc18c \ubc94\uc704 \ucd94\uac00 +label.add.disk.offering=\ub514\uc2a4\ud06c \uc81c\uacf5 \ucd94\uac00 +label.add.domain=\ub3c4\uba54\uc778 \ucd94\uac00 +label.add.egress.rule=\uc804\uc1a1 \uaddc\uce59 \ucd94\uac00 +label.add.F5.device=F5 \uae30\uae30 \ucd94\uac00 +label.add.firewall=\ubc29\ud654\ubcbd(fire wall) \uaddc\uce59 \ucd94\uac00 +label.add.guest.network=\uc190\ub2d8 \ub124\ud2b8\uc6cc\ud06c \ucd94\uac00 +label.add.host=\ud638\uc2a4\ud2b8 \ucd94\uac00 +label.adding.cluster=\ud074\ub7ec\uc2a4\ud130\ub97c \ucd94\uac00\uc911... +label.adding.failed=\ucd94\uac00\ud560 \uc218 \uc5c6\uc74c +label.adding.pod=Pod\ub97c \ucd94\uac00 \uac00\ub2a5 +label.adding.processing=\ucd94\uac00\ud558\ub294 \uc911... +label.add.ingress.rule=\uc218\uc2e0 \uaddc\uce59 \ucd94\uac00 +label.adding.succeeded=\ucd94\uac00 \uc644\ub8cc +label.adding=\uc815\ubcf4 \ucd94\uac00 +label.adding.user=\uc0ac\uc6a9\uc790 \ucd94\uac00 +label.adding.zone=Zone \ucd94\uac00 +label.add.ip.range=IP \uc8fc\uc18c \ubc94\uc704 \ucd94\uac00 +label.additional.networks=\ucd94\uac00 \ub124\ud2b8\uc6cc\ud06c +label.add.load.balancer=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58 \ucd94\uac00 +label.add.more=\ub2e4\ub978 \ud56d\ubaa9 \ucd94\uac00 +label.add.netScaler.device=Netscaler \uae30\uae30 \ucd94\uac00 +label.add.network.ACL=\ub124\ud2b8\uc6cc\ud06c \uad8c\ud55c \uad00\ub9ac(ACL) \ucd94\uac00 +label.add.network.device=\ub124\ud2b8\uc6cc\ud06c \uae30\uae30 \ucd94\uac00 +label.add.network.offering=\ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5 \ucd94\uac00 +label.add.network=\ub124\ud2b8\uc6cc\ud06c \ucd94\uac00 +label.add.new.F5=\uc0c8\ub85c\uc6b4 F5 \ucd94\uac00 +label.add.new.gateway=\uc0c8 \uac8c\uc774\ud2b8\uc6e8\uc774 \ucd94\uac00\ud558\uae30 +label.add.new.NetScaler=\uc0c8\ub85c\uc6b4 NetScaler \ucd94\uac00 +label.add.new.SRX=\uc0c8\ub85c\uc6b4 SRX \ucd94\uac00 +label.add.new.tier=\uc0c8 \uacc4\uce35 \ucd94\uac00 +label.add.physical.network=\ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c \ucd94\uac00 +label.add.pod=Pod \ucd94\uac00 +label.add.port.forwarding.rule=\ud3ec\ud1a0 \uc804\uc1a1 \uaddc\uce59\uc758 \ucd94\uac00 +label.add.primary.storage=\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \ucd94\uac00 +label.add.resources=\uc790\uc6d0 \ucd94\uac00 +label.add.route=\ub77c\uc6b0\ud2b8 \ucd94\uac00 +label.add.rule=\uaddc\uce59 \ucd94\uac00 +label.add.secondary.storage=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 \ucd94\uac00 +label.add.security.group=\ubcf4\uc548 \uadf8\ub8f9 \ucd94\uac00 +label.add.service.offering=\uc11c\ube44\uc2a4\uc81c\uacf5 \ucd94\uac00 +label.add.SRX.device=SRX \uae30\uae30 \ucd94\uac00 +label.add.static.nat.rule=\uc815\uc801 NAT \uaddc\uce59 \ucd94\uac00 +label.add.static.route=\uc815\uc801 \ub77c\uc6b0\ud2b8 \ucd94\uac00 +label.add.system.service.offering=\uc2dc\uc2a4\ud15c \uc11c\ube44\uc2a4 \uc81c\uacf5 \ucd94\uac00 +label.add.template=\ud15c\ud50c\ub9bf \ucd94\uac00 +label.add.to.group=\uadf8\ub8f9\uc5d0 \ucd94\uac00 +label.add=\ucd94\uac00 +label.add.user=\uc0ac\uc6a9\uc790 \ucd94\uac00 +label.add.vlan=VLAN \ucd94\uac00 +label.add.vms.to.lb=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uaddc\uce59\uc5d0 VM \ucd94\uac00 +label.add.vms=VM \ucd94\uac00 +label.add.VM.to.tier=\uacc4\uce35\uc5d0 VM \ucd94\uac00 +label.add.vm=VM \ucd94\uac00 +label.add.volume=\ubcfc\ub968 \ucd94\uac00 +label.add.vpc=VPC \ucd94\uac00 +label.add.vpn.customer.gateway=VPN \uace0\uac1d \uac8c\uc774\ud2b8\uc6e8\uc774 \ucd94\uac00 +label.add.VPN.gateway=VPN \uac8c\uc774\ud2b8\uc6e8\uc774 \ucd94\uac00 +label.add.vpn.user=VPN \uc0ac\uc6a9\uc790 \ucd94\uac00 +label.add.zone=Zone \ucd94\uac00 +label.admin.accounts=\uad00\ub9ac\uc790 \uacc4\uc815 \uc815\ubcf4 +label.admin=\uad00\ub9ac\uc790 +label.advanced.mode=\ud655\uc7a5 \ubaa8\ub4dc +label.advanced.search=\uace0\ub3c4 \uac80\uc0c9 +label.advanced=\ud655\uc7a5 +label.agent.password=\uc5d0\uc774\uc804\ud2b8 \uc554\ud638 +label.agent.username=\uc5d0\uc774\uc804\ud2b8 \uc0ac\uc6a9\uc790\uba85 +label.agree=\ub3d9\uc758 +label.alert=\uc54c\ub9bc \uccb4\uc81c +label.algorithm=\uc54c\uace0\ub9ac\uc998 +label.allocated=\ud560\ub2f9 \uc644\ub8cc \uc0c1\ud0dc +label.allocation.state=\ud560\ub2f9 \uc0c1\ud0dc +label.api.key=API \ud0a4 +label.apply=\uc801\uc6a9 +label.assign.to.load.balancer=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58\uc5d0 \uc778\uc2a4\ud134\uc2a4\ub97c \ud560\ub2f9 +label.assign=\ud560\ub2f9 +label.associated.network.id=\uad00\ub828 \ub124\ud2b8\uc6cc\ud06c ID +label.associated.network=\uad00\ub828 \ub124\ud2b8\uc6cc\ud06c +label.attached.iso=\uc5f0\uacb0 ISO +label.availability=\uac00\uc6a9\uc131 +label.availability.zone=\uc774\uc6a9 \uac00\ub2a5 Zone +label.available.public.ips=\uc0ac\uc6a9 \uac00\ub2a5 \uacf5\uac1c IP \uc8fc\uc18c +label.available=\uc0ac\uc6a9 \uac00\ub2a5 +label.back=\ub4a4\ub85c +label.bandwidth=\ub300\uc5ed\ud3ed +label.basic.mode=\uae30\ubcf8 \ubaa8\ub4dc +label.basic=\uae30\ubcf8 +label.bootable=\ubd80\ud305 \uac00\ub2a5 +label.broadcast.domain.range=\ube0c\ub85c\ub4dc\uce90\uc2a4\ud2b8 \ub3c4\uba54\uc778 \ubc94\uc704 +label.broadcast.domain.type=\ube0c\ub85c\ub4dc\uce90\uc2a4\ud2b8 \ub3c4\uba54\uc778 \uc885\ub958 +label.by.account=\uacc4\uc815 \uc815\ubcf4 +label.by.availability=\uac00\uc6a9\uc131 +label.by.domain=\ub3c4\uba54\uc778 +label.by.end.date=\uc885\ub8cc\uc77c +label.by.level=\ub808\ubca8 label.by.pod=Pod -label.by.role=ì—­í•  -label.by.start.date=ì‹œìž‘ì¼ -label.by.state=ìƒíƒœ -label.by.traffic.type=트래픽 종류 -label.by.type.id=종류 ID -label.by.type=종류 +label.by.role=\uc5ed\ud560 +label.by.start.date=\uc2dc\uc791\uc77c +label.by.state=\uc0c1\ud0dc +label.bytes.received=\uc218\uc2e0 \ubc14\uc774\ud2b8 +label.bytes.sent=\uc804\uc1a1 \ubc14\uc774\ud2b8 +label.by.traffic.type=\ud2b8\ub798\ud53d \uc885\ub958 +label.by.type.id=\uc885\ub958 ID +label.by.type=\uc885\ub958 label.by.zone=Zone -label.bytes.received=수신 ë°”ì´íŠ¸ -label.bytes.sent=전송 ë°”ì´íŠ¸ -label.cancel=취소 -label.certificate=ì¸ì¦ì„œ -label.privatekey=PKC#8 비밀 키 -label.domain.suffix=DNS ë„ë©”ì¸ (예: xyz.com) -label.character=ë¬¸ìž -label.cidr.account=CIDR ë˜ëŠ” 계정 ì •ë³´/보안 그룹 -label.close=닫기 -label.cloud.console=í´ë¼ìš°ë“œ 관리 콘솔 -label.cloud.managed=Cloud.com 관리 -label.cluster.type=í´ëŸ¬ìŠ¤í„° 종류 -label.cluster=í´ëŸ¬ìŠ¤í„° -label.code=코드 -label.confirmation=í™•ì¸ -label.cpu.allocated.for.VMs=VMì— í• ë‹¹ 완료 CPU -label.cpu.allocated=할당 완료 CPU -label.cpu.utilized=CPU 사용율 +label.cancel=\ucde8\uc18c +label.capacity=\ucc98\ub9ac \ub2a5\ub825 +label.certificate=\uc778\uc99d\uc11c +label.change.service.offering=\uc11c\ube44\uc2a4 \uc81c\uacf5 \ubcc0\uacbd +label.change.value=\uac12 \ubcc0\uacbd +label.character=\ubb38\uc790 +label.checksum=MD5 \uccb4\ud06c\uc12c +label.cidr.account=CIDR \ub610\ub294 \uacc4\uc815 \uc815\ubcf4/\ubcf4\uc548 \uadf8\ub8f9 +label.cidr=CIDR +label.CIDR.list=CIDR \ubaa9\ub85d +label.cidr.list=\uc804\uc1a1\uc6d0 CIDR +label.CIDR.of.destination.network=\ub300\uc0c1 \ub124\ud2b8\uc6cc\ud06c CIDR +label.clean.up=\uc0ad\uc81c\ud558\uae30 +label.clear.list=\ubaa9\ub85d \uc0ad\uc81c +label.close=\ub2eb\uae30 +label.cloud.console=\ud074\ub77c\uc6b0\ub4dc \uad00\ub9ac \ucf58\uc194 +label.cloud.managed=Cloud.com \uad00\ub9ac +label.cluster.name=\ud074\ub7ec\uc2a4\ud130\uba85 +label.clusters=\ud074\ub7ec\uc2a4\ud130 +label.cluster.type=\ud074\ub7ec\uc2a4\ud130 \uc885\ub958 +label.cluster=\ud074\ub7ec\uc2a4\ud130 +label.clvm=CLVM +label.code=\ucf54\ub4dc +label.community=\ucee4\ubba4\ub2c8\ud2f0 +label.compute.and.storage=\ucef4\ud4e8\ud305\uacfc \uc2a4\ud1a0\ub9ac\uc9c0 +label.compute.offerings=\ucef4\ud4e8\ud305 \uc790\uc6d0 \uc81c\uacf5 +label.compute.offering=\ucef4\ud4e8\ud305 \uc790\uc6d0 \uc81c\uacf5 +label.compute=\ucef4\ud4e8\ud305 +label.configuration=\uad6c\uc131 +label.configure.network.ACLs=\ub124\ud2b8\uc6cc\ud06c \uad8c\ud55c \uad00\ub9ac(ACL) \uad6c\uc131 +label.configure=\uad6c\uc131 +label.configure.vpc=VPC \uad6c\uc131 +label.confirmation=\ud655\uc778 +label.confirm.password=\uc554\ud638 \ud655\uc778 \uc785\ub825 +label.congratulations=\uc124\uc815\uc774 \uace7 \uc644\ub8cc\uc785\ub2c8\ub2e4. +label.conserve.mode=\uc808\uc57d \ubaa8\ub4dc +label.console.proxy=\ucf58\uc194 \ud504\ub85d\uc2dc +label.continue.basic.install=\uae30\ubcf8 \uc124\uce58 \uc2e4\ud589 +label.continue=\uc2e4\ud589 +label.corrections.saved=\uc811\uc18d \uc815\ubcf4 \uc800\uc7a5 +label.cpu.allocated.for.VMs=VM\uc5d0 \ud560\ub2f9 \uc644\ub8cc CPU +label.cpu.allocated=\ud560\ub2f9 \uc644\ub8cc CPU +label.CPU.cap=CPU \uc81c\ud55c label.cpu=CPU -label.created=ì¼ì‹œ 만들기 -label.cross.zones=í¬ë¡œìŠ¤ ì¡´ -label.custom.disk.size=맞춤 ë””ìŠ¤í¬ í¬ê¸° -label.daily=ë§¤ì¼ -label.data.disk.offering=ë°ì´íƒ€ ë””ìŠ¤í¬ ì œê³µ -label.date=날짜 -label.day.of.month=매월 ì§€ì •ì¼ -label.day.of.week=매주 ì§€ì •ì¼ -label.delete=ì‚­ì œ -label.deleting.failed=삭제할 수 ì—†ìŒ -label.deleting.processing=삭제하는 중... -label.description=설명 -label.detaching.disk=디스í¬ë¥¼ 분리함 -label.details=ìƒì„¸ -label.device.id=기기 ID -label.disabled=사용 안함 -label.disabling.vpn.access=VPN 접근를 사용 안 함으로 설정 중 -label.disk.allocated=할당 완료 ë””ìŠ¤í¬ -label.disk.offering=ë””ìŠ¤í¬ ì œê³µ -label.disk.size.gb=ë””ìŠ¤í¬ í¬ê¸°(GB 단위) -label.disk.size=ë””ìŠ¤í¬ í¬ê¸° -label.disk.total=ë””ìŠ¤í¬ í•©ê³„ -label.disk.volume=ë””ìŠ¤í¬ ë³¼ë¥¨ -label.display.text=표시 í…스트 +label.cpu.mhz=CPU (MHz) +label.cpu.utilized=CPU \uc0ac\uc6a9\uc728 +label.created.by.system=\uc2dc\uc2a4\ud15c \ub9cc\ub4e4\uae30 +label.created=\uc77c\uc2dc \ub9cc\ub4e4\uae30 +label.create.project=\ud504\ub85c\uc81d\ud2b8 \ub9cc\ub4e4\uae30 +label.create.template=\ud15c\ud50c\ub9bf \ub9cc\ub4e4\uae30 +label.create.VPN.connection=VPN \uc811\uc18d \ub9cc\ub4e4\uae30 +label.cross.zones=\ud06c\ub85c\uc2a4 \uc874 +label.custom.disk.size=\ub9de\ucda4 \ub514\uc2a4\ud06c \ud06c\uae30 +label.daily=\ub9e4\uc77c +label.data.disk.offering=\ub370\uc774\ud0c0 \ub514\uc2a4\ud06c \uc81c\uacf5 +label.date=\ub0a0\uc9dc +label.day.of.month=\ub9e4\uc6d4 \uc9c0\uc815\uc77c +label.day.of.week=\ub9e4\uc8fc \uc9c0\uc815\uc77c +label.dead.peer.detection=\uc815\uc9c0 \ud53c\uc5b4 \uac10\uc9c0 +label.decline.invitation=\ucd08\ub300 \uac70\uc808 +label.dedicated=\uc804\uc6a9 +label.default=\uae30\ubcf8 +label.default.use=\uae30\ubcf8 \uc0ac\uc6a9 +label.default.view=\uae30\ubcf8 \ubcf4\uae30 +label.delete.F5=F5 \uc0ad\uc81c +label.delete.gateway=\uac8c\uc774\ud2b8\uc6e8\uc774 \uc0ad\uc81c +label.delete.NetScaler=NetScaler \uc0ad\uc81c +label.delete.project=\ud504\ub85c\uc81d\ud2b8 \uc0ad\uc81c +label.delete.SRX=SRX \uc0ad\uc81c +label.delete=\uc0ad\uc81c +label.delete.VPN.connection=VPN \uc811\uc18d \uc0ad\uc81c +label.delete.VPN.customer.gateway=VPN \uace0\uac1d \uac8c\uc774\ud2b8\uc6e8\uc774 \uc0ad\uc81c +label.delete.VPN.gateway=VPN \uac8c\uc774\ud2b8\uc6e8\uc774\uc0ad\uc81c +label.delete.vpn.user=VPN \uc0ac\uc6a9\uc790 \uc0ad\uc81c +label.deleting.failed=\uc0ad\uc81c\ud560 \uc218 \uc5c6\uc74c +label.deleting.processing=\uc0ad\uc81c\ud558\ub294 \uc911... +label.description=\uc124\uba85 +label.destination.physical.network.id=\ubaa9\uc801 \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c ID +label.destination.zone=\ubcf5\uc0ac\ud560 Zone +label.destroy.router=\ub77c\uc6b0\ud130 \ud30c\uae30 +label.destroy=\ud30c\uae30 +label.detaching.disk=\ub514\uc2a4\ud06c\ub97c \ubd84\ub9ac\ud568 +label.details=\uc0c1\uc138 +label.device.id=\uae30\uae30 ID +label.devices=\uae30\uae30 +label.dhcp=DHCP +label.DHCP.server.type=DHCP \uc11c\ubc84 \uc885\ub958 +label.direct.ips=\uc9c1\uc811 IP \uc8fc\uc18c +label.disabled=\uc0ac\uc6a9 \uc548\ud568 +label.disable.provider=\uc81c\uacf5\uc790 \uc0ac\uc6a9 \uc548 \ud568 +label.disable.vpn=VPN \uc0ac\uc6a9 \uc548 \ud568 +label.disabling.vpn.access=VPN \uc811\uadfc\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \uc124\uc815 \uc911 +label.disk.allocated=\ud560\ub2f9 \uc644\ub8cc \ub514\uc2a4\ud06c +label.disk.offering=\ub514\uc2a4\ud06c \uc81c\uacf5 +label.disk.size.gb=\ub514\uc2a4\ud06c \ud06c\uae30(GB \ub2e8\uc704) +label.disk.size=\ub514\uc2a4\ud06c \ud06c\uae30 +label.disk.total=\ub514\uc2a4\ud06c \ud569\uacc4 +label.disk.volume=\ub514\uc2a4\ud06c \ubcfc\ub968 +label.display.name=\ud45c\uc2dc\uba85 +label.display.text=\ud45c\uc2dc \ud14d\uc2a4\ud2b8 label.dns.1=DNS 1 label.dns.2=DNS 2 -label.domain.admin=ë„ë©”ì¸ ê´€ë¦¬ìž -label.domain.id=ë„ë©”ì¸ ID -label.domain.name=ë„ë©”ì¸ëª… -label.domain=ë„ë©”ì¸ -label.double.quotes.are.not.allowed=í° ë”°ì˜´í‘œ 사용할 수 ì—†ìŒ -label.download.progress=다운로드 진행 사항 -label.edit=편집 -label.email=ì „ìž ë©”ì¼ -label.enabling.vpn.access=VPN 접근를 사용 하고 ìžˆìŒ -label.enabling.vpn=VPN를 사용 하고 ìžˆìŒ -label.end.port=종료 í¬í†  -label.endpoint.or.operation=엔드 í¬ì¸íŠ¸ ë˜ëŠ” ìž‘ì—… -label.error.code=오류 코드 -label.error=오류 -label.esx.host=ESX/ESXi 호스트 -label.example=예 -label.failed=실패 -label.featured=추천 -label.firewall=방화벽(fire wall) -label.first.name=ì´ë¦„ -label.format=í˜•ì‹ -label.friday=ê¸ˆìš”ì¼ -label.full=ì „ì²´ -label.gateway=게ì´íŠ¸ì›¨ì´ -label.general.alerts=ì¼ë°˜ 알림 ì²´ì œ -label.generating.url=URL를 ìƒì„±í•˜ê³  ìžˆìŒ -label.go.step.2=단계 2으로 -label.go.step.3=단계 3으로 -label.go.step.4=단계 4으로 -label.go.step.5=단계 5으로 -label.group.optional=그룹(옵션) -label.group=그룹 -label.guest.cidr=게스트 CIDR -label.guest.gateway=게스트 게ì´íŠ¸ì›¨ì´ -label.guest.ip.range=게스트 IP 주소 범위 -label.guest.ip=게스트 IP 주소 -label.guest.netmask=게스트 ë„· ë§ˆìŠ¤í¬ -label.ha.enabled=고가용성 사용함 -label.help=ë„ì›€ë§ -label.host.alerts=호스트 알림 체계 -label.host.name=호스트명 -label.host=호스트 -label.hosts=호스트 -label.hourly=매시간 -label.hypervisor.type=하ì´í¼ ë°”ì´ì € 종류 -label.hypervisor=하ì´í¼ ë°”ì´ì € +label.dns=DNS +label.DNS.domain.for.guest.networks=\uc190\ub2d8 \ub124\ud2b8\uc6cc\ud06c DNS \ub3c4\uba54\uc778 +label.domain.admin=\ub3c4\uba54\uc778 \uad00\ub9ac\uc790 +label.domain.id=\ub3c4\uba54\uc778 ID +label.domain.name=\ub3c4\uba54\uc778\uba85 +label.domain.router=\ub3c4\uba54\uc778 \ub77c\uc6b0\ud130 +label.domain.suffix=DNS \ub3c4\uba54\uc778 (\uc608\: xyz.com) +label.domain=\ub3c4\uba54\uc778 +label.done=\uc644\ub8cc +label.double.quotes.are.not.allowed=\ud070 \ub530\uc634\ud45c \uc0ac\uc6a9\ud560 \uc218 \uc5c6\uc74c +label.download.progress=\ub2e4\uc6b4\ub85c\ub4dc \uc9c4\ud589 \uc0ac\ud56d +label.drag.new.position=\uc0c8\ub85c\uc6b4 \uc704\uce58\uc5d0 \ub04c\uc5b4\uc624\uae30 +label.edit.lb.rule=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uaddc\uce59 \ud3b8\uc9d1 +label.edit.network.details=\ub124\ud2b8\uc6cc\ud06c \uc0c1\uc138\ud55c \ud3b8\uc9d1 +label.edit.project.details=\ud504\ub85c\uc81d\ud2b8 \uc0c1\uc138 \ud3b8\uc9d1 +label.edit.tags=\ud0dc\uadf8 \ud3b8\uc9d1 +label.edit.traffic.type=\ud2b8\ub798\ud53d \uc885\ub958 \ud3b8\uc9d1 +label.edit=\ud3b8\uc9d1 +label.edit.vpc=VPC \ud3b8\uc9d1 +label.egress.rule=\uc804\uc1a1 \uaddc\uce59 +label.elastic.IP=\ud0c4\ub825\uc801 IP \uc8fc\uc18c +label.elastic.LB=\ud0c4\ub825\uc801 \ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 +label.elastic=\uc624\ub958 \uc2a4\ud2f1 +label.email=\uc804\uc790 \uba54\uc77c +label.enable.provider=\uc81c\uacf5\uc790 \uc0ac\uc6a9\ud568 +label.enable.swift=Swift \uc0ac\uc6a9\ud568 +label.enable.vpn=VPN \uc0ac\uc6a9\ud568 +label.enabling.vpn.access=VPN \uc811\uadfc\ub97c \uc0ac\uc6a9 \ud558\uace0 \uc788\uc74c +label.enabling.vpn=VPN\ub97c \uc0ac\uc6a9 \ud558\uace0 \uc788\uc74c +label.end.IP=\uc885\ub8cc IP \uc8fc\uc18c +label.endpoint.or.operation=\uc5d4\ub4dc \ud3ec\uc778\ud2b8 \ub610\ub294 \uc791\uc5c5 +label.end.port=\uc885\ub8cc \ud3ec\ud1a0 +label.end.reserved.system.IP=\uc608\uc57d\ub41c \uc885\ub8cc \uc2dc\uc2a4\ud15c IP \uc8fc\uc18c +label.end.vlan=\uc885\ub8cc VLAN +label.enter.token=\ud1a0\ud070 \uc785\ub825 +label.error.code=\uc624\ub958 \ucf54\ub4dc +label.error=\uc624\ub958 +label.ESP.encryption=ESP \uc554\ud638\ud654 +label.ESP.hash=ESP \ud574\uc2dc +label.ESP.lifetime=ESP \uc720\ud6a8\uae30\uac04(\ucd08) +label.ESP.policy=ESP \uc815\ucc45 +label.esx.host=ESX/ESXi \ud638\uc2a4\ud2b8 +label.example=\uc608 +label.f5=F5 +label.failed=\uc2e4\ud328 +label.featured=\ucd94\ucc9c +label.fetch.latest=\ucd5c\uc2e0 \uc815\ubcf4 \ucde8\ub4dd +label.filterBy=\ud544\ud130 +label.firewall=\ubc29\ud654\ubcbd(fire wall) +label.first.name=\uc774\ub984 +label.format=\ud615\uc2dd +label.friday=\uae08\uc694\uc77c +label.full.path=\uc804\uccb4 \uacbd\ub85c +label.full=\uc804\uccb4 +label.gateway=\uac8c\uc774\ud2b8\uc6e8\uc774 +label.general.alerts=\uc77c\ubc18 \uc54c\ub9bc \uccb4\uc81c +label.generating.url=URL\ub97c \uc0dd\uc131\ud558\uace0 \uc788\uc74c +label.go.step.2=\ub2e8\uacc4 2\uc73c\ub85c +label.go.step.3=\ub2e8\uacc4 3\uc73c\ub85c +label.go.step.4=\ub2e8\uacc4 4\uc73c\ub85c +label.go.step.5=\ub2e8\uacc4 5\uc73c\ub85c +label.group.optional=\uadf8\ub8f9(\uc635\uc158) +label.group=\uadf8\ub8f9 +label.guest.cidr=\uac8c\uc2a4\ud2b8 CIDR +label.guest.end.ip=\uac8c\uc2a4\ud2b8 \uc885\ub8cc IP \uc8fc\uc18c +label.guest.gateway=\uac8c\uc2a4\ud2b8 \uac8c\uc774\ud2b8\uc6e8\uc774 +label.guest.ip.range=\uac8c\uc2a4\ud2b8 IP \uc8fc\uc18c \ubc94\uc704 +label.guest.ip=\uac8c\uc2a4\ud2b8 IP \uc8fc\uc18c +label.guest.netmask=\uac8c\uc2a4\ud2b8 \ub137 \ub9c8\uc2a4\ud06c +label.guest.networks=\uc190\ub2d8 \ub124\ud2b8\uc6cc\ud06c +label.guest.start.ip=\uac8c\uc2a4\ud2b8 \uc2dc\uc791 IP \uc8fc\uc18c +label.guest.traffic=\uac8c\uc2a4\ud2b8 \ud2b8\ub798\ud53d +label.guest.type=\uac8c\uc2a4\ud2b8 \uc885\ub958 +label.guest=\uac8c\uc2a4\ud2b8 +label.ha.enabled=\uace0\uac00\uc6a9\uc131 \uc0ac\uc6a9\ud568 +label.help=\ub3c4\uc6c0\ub9d0 +label.hide.ingress.rule=\uc218\uc2e0 \uaddc\uce59\uc744 \uc228\uae30\uae30 +label.hints=\uc815\ubcf4 +label.host.alerts=\ud638\uc2a4\ud2b8 \uc54c\ub9bc \uccb4\uacc4 +label.host.MAC=\ud638\uc2a4\ud2b8 MAC +label.host.name=\ud638\uc2a4\ud2b8\uba85 +label.hosts=\ud638\uc2a4\ud2b8 +label.host.tags=\ud638\uc2a4\ud2b8 \ud0dc\uadf8 +label.host=\ud638\uc2a4\ud2b8 +label.hourly=\ub9e4\uc2dc\uac04 +label.hypervisor.capabilities=\ud558\uc774\ud37c \ubc14\uc774\uc800 \uae30\ub2a5 +label.hypervisor.type=\ud558\uc774\ud37c \ubc14\uc774\uc800 \uc885\ub958 +label.hypervisor=\ud558\uc774\ud37c \ubc14\uc774\uc800 +label.hypervisor.version=\ud558\uc774\ud37c \ubc14\uc774\uc800 \ubc84\uc804 label.id=ID -label.info=ì •ë³´ -label.ingress.rule=수신 규칙 -label.initiated.by=시작 ì‚¬ìš©ìž -label.instance.limits=ì¸ìŠ¤í„´ìŠ¤ 제한 -label.instance.name=ì¸ìŠ¤í„´ìŠ¤ëª… -label.instance=ì¸ìŠ¤í„´ìŠ¤ -label.instances=ì¸ìŠ¤í„´ìŠ¤ -label.internal.dns.1=내부 DNS 1 -label.internal.dns.2=내부 DNS 2 -label.interval.type=간격 종류 -label.invalid.integer=유효하지 ì•Šì€ ì •ìˆ˜ê°’ -label.invalid.number=유효하지 ì•Šì€ ìˆ«ìžê°’ -label.ip.address=IP 주소 -label.ip.allocations=IP 주소 할당 -label.ip.limits=공개 IP 주소 제한 -label.ip.or.fqdn=IP 주소 ë˜ëŠ” FQDN -label.ip.range=IP 주소 범위 +label.IKE.DH=IKE DH +label.IKE.encryption=IKE \uc554\ud638\ud654 +label.IKE.hash=IKE \ud574\uc2dc +label.IKE.lifetime=IKE \uc720\ud6a8\uae30\uac04(\ucd08) +label.IKE.policy=IKE \uc815\ucc45 +label.info=\uc815\ubcf4 +label.ingress.rule=\uc218\uc2e0 \uaddc\uce59 +label.initiated.by=\uc2dc\uc791 \uc0ac\uc6a9\uc790 +label.installWizard.addClusterIntro.subtitle=\ud074\ub7ec\uc2a4\ud130 \ub300\ud55c \uc815\ubcf4 +label.installWizard.addClusterIntro.title=\ud074\ub7ec\uc2a4\ud130 \ucd94\uac00 +label.installWizard.addHostIntro.subtitle=\ud638\uc2a4\ud2b8\uc5d0 \ub300\ud574 +label.installWizard.addHostIntro.title=\ud638\uc2a4\ud2b8 \ucd94\uac00 +label.installWizard.addPodIntro.subtitle=Pod\uc5d0 \ub300\ud55c \uc815\ubcf4 +label.installWizard.addPodIntro.title=Pod \ucd94\uac00 +label.installWizard.addPrimaryStorageIntro.subtitle=\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \ub300\ud574 +label.installWizard.addPrimaryStorageIntro.title=\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \ucd94\uac00 +label.installWizard.addSecondaryStorageIntro.subtitle=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \ub300\ud574 +label.installWizard.addSecondaryStorageIntro.title=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 \ucd94\uac00 +label.installWizard.addZoneIntro.subtitle=Zone\uc5d0 \ub300\ud55c \uc815\ubcf4 +label.installWizard.addZoneIntro.title=Zone \ucd94\uac00 +label.installWizard.addZone.title=Zone \ucd94\uac00 +label.installWizard.click.launch=[\uc2dc\uc791]\uc744 \ud074\ub9ad\ud574 \uc8fc\uc2ed\uc2dc\uc624. +label.installWizard.subtitle=\ud604\uc7ac \uac00\uc774\ub4dc \ud22c\uc5b4\ub294 CloudStack\u2122 \ud658\uacbd \uc124\uc815\uc5d0 \ub3c4\uc6c0\uc774 \ub429\ub2c8\ub2e4 +label.installWizard.title=CloudStack\u2122 \ub9c8\ubc95\uc0ac +label.instance.limits=\uc778\uc2a4\ud134\uc2a4 \uc81c\ud55c +label.instance.name=\uc778\uc2a4\ud134\uc2a4\uba85 +label.instances=\uc778\uc2a4\ud134\uc2a4 +label.instance=\uc778\uc2a4\ud134\uc2a4 +label.internal.dns.1=\ub0b4\ubd80 DNS 1 +label.internal.dns.2=\ub0b4\ubd80 DNS 2 +label.internal.name=\ub0b4\ubd80\uba85 +label.interval.type=\uac04\uaca9 \uc885\ub958 +label.introduction.to.cloudstack=CloudStack\u2122 \uc18c\uac1c +label.invalid.integer=\uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc815\uc218\uac12 +label.invalid.number=\uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc22b\uc790\uac12 +label.invitations=\ucd08\ub300\uc7a5 +label.invited.accounts=\ucd08\ub300\uac00 \ub05d\ub09c \uacc4\uc815 \uc815\ubcf4 +label.invite.to=\ucd08\ub300 \ud504\ub85c\uc81d\ud2b8\: +label.invite=\ucd08\ub300 +label.ip.address=IP \uc8fc\uc18c +label.ipaddress=IP \uc8fc\uc18c +label.ip.allocations=IP \uc8fc\uc18c \ud560\ub2f9 label.ip=IP +label.ip.limits=\uacf5\uac1c IP \uc8fc\uc18c \uc81c\ud55c +label.ip.or.fqdn=IP \uc8fc\uc18c \ub610\ub294 FQDN +label.ip.range=IP \uc8fc\uc18c \ubc94\uc704 +label.ip.ranges=IP \uc8fc\uc18c \ubc94\uc704 +label.IPsec.preshared.key=IPsec \uc0ac\uc804 \uacf5\uc720 \ud0a4 label.ips=IP -label.is.default=기본 -label.is.shared=공유 -label.is.system=시스템 label.iscsi=iSCSI -label.iso.boot=ISO 시작 +label.is.default=\uae30\ubcf8 +label.iso.boot=ISO \uc2dc\uc791 label.iso=ISO -label.isolation.mode=분리 모드 -label.keep=유지 -label.lang.chinese=중국어(ê°„ì²´) -label.lang.english=ì˜ì–´ -label.lang.japanese=ì¼ë³¸ì–´ -label.lang.korean=한국어 -label.lang.spanish=스페ì¸ì–´ -label.last.disconnected=마지막 종료 ì‹œì  -label.last.name=성 -label.level=레벨 -label.linklocal.ip=ë§í¬ 로컬 IP 주소 -label.load.balancer=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 장치 -label.loading=로드 하는 중 -label.local=로컬 -label.login=ë¡œê·¸ì¸ -label.logout=로그아웃 +label.isolated.networks=\ubd84\ub9ac \ub124\ud2b8\uc6cc\ud06c +label.isolation.method=\ubd84\ub9ac \ubc29\ubc95 +label.isolation.mode=\ubd84\ub9ac \ubaa8\ub4dc +label.is.redundant.router=\uc911\ubcf5 +label.is.shared=\uacf5\uc720 +label.is.system=\uc2dc\uc2a4\ud15c +label.item.listing=\ud56d\ubaa9 \ubaa9\ub85d +label.keep=\uc720\uc9c0 +label.keyboard.type=\ud0a4\ubcf4\ub4dc \uc885\ub958 +label.key=\ud0a4 +label.kvm.traffic.label=KVM \ud2b8\ub798\ud53d \ub77c\ubca8 +label.label=\ub77c\ubca8 +label.lang.chinese=\uc911\uad6d\uc5b4(\uac04\uccb4) +label.lang.english=\uc601\uc5b4 +label.lang.japanese=\uc77c\ubcf8\uc5b4 +label.lang.korean=\ud55c\uad6d\uc5b4 +label.lang.spanish=\uc2a4\ud398\uc778\uc5b4 +label.last.disconnected=\ub9c8\uc9c0\ub9c9 \uc885\ub8cc \uc2dc\uc810 +label.last.name=\uc131 +label.latest.events=\ucd5c\uc2e0 \uc774\ubca4\ud2b8 +label.launch=\uc2dc\uc791 +label.launch.vm=VM \uc2dc\uc791 +label.launch.zone=Zone \uc2dc\uc791 +label.LB.isolation=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \ubd84\ub9ac +label.least.connections=\ucd5c\uc18c \uc811\uc18d +label.level=\ub808\ubca8 +label.linklocal.ip=\ub9c1\ud06c \ub85c\uceec IP \uc8fc\uc18c +label.load.balancer=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58 +label.load.balancing.policies=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc815\ucc45 +label.load.balancing=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 +label.loading=\ub85c\ub4dc \ud558\ub294 \uc911 +label.local.storage.enabled=\ub85c\uceec \uc2a4\ud1a0\ub9ac\uc9c0\ub294 \uc720\ud6a8 +label.local.storage=\ub85c\uceec \uc2a4\ud1a0\ub9ac\uc9c0 +label.local=\ub85c\uceec +label.login=\ub85c\uadf8\uc778 +label.logout=\ub85c\uadf8\uc544\uc6c3 label.lun=LUN -label.manage=관리 -label.maximum=최대 -label.memory.allocated=할당완료 메모리 -label.memory.total=메모리 합계 -label.memory.used=메모리 사용량 -label.memory=메모리 -label.menu.accounts=계정 ì •ë³´ -label.menu.alerts=알림 체계 -label.menu.all.accounts=모든 계정 ì •ë³´ -label.menu.all.instances=모든 ì¸ìŠ¤í„´ìŠ¤ -label.menu.community.isos=커뮤니티 ISO -label.menu.community.templates=커뮤니티 템플릿 -label.menu.configuration=구성 -label.menu.dashboard=대시 ë³´ë“œ -label.menu.destroyed.instances=íŒŒê¸°ëœ ì¸ìŠ¤í„´ìŠ¤ -label.menu.disk.offerings=디스í¬ì œê³µ -label.menu.domains=ë„ë©”ì¸ -label.menu.events=ì´ë²¤íŠ¸ -label.menu.featured.isos=추천 ISO -label.menu.featured.templates=추천 템플릿 -label.menu.global.settings=글로벌 설정 -label.menu.instances=ì¸ìŠ¤í„´ìŠ¤ -label.menu.ipaddresses=IP 주소 +label.LUN.number=LUN \ubc88\ud638 +label.make.project.owner=\uacc4\uc815 \uc815\ubcf4 \ud504\ub85c\uc81d\ud2b8 \uc18c\uc720\uc790 +label.management.ips=\uad00\ub9ac IP \uc8fc\uc18c +label.management=\uad00\ub9ac +label.manage.resources=\uc790\uc6d0 \uad00\ub9ac +label.manage=\uad00\ub9ac +label.max.guest.limit=\ucd5c\ub300 \uac8c\uc2a4\ud2b8 \uc81c\ud55c +label.maximum=\ucd5c\ub300 +label.max.networks=\ucd5c\ub300 \ub124\ud2b8\uc6cc\ud06c\uc218 +label.max.public.ips=\ucd5c\ub300 \uacf5\uac1c IP \uc8fc\uc18c\uc218 +label.max.snapshots=\ucd5c\ub300 \uc2a4\ub0c5\uc0f7\uc218 +label.max.templates=\ucd5c\ub300 \ud15c\ud50c\ub9bf\uc218 +label.max.vms=\ucd5c\ub300 \uc0ac\uc6a9\uc790 VM\uc218 +label.max.volumes=\ucd5c\ub300 \ubcfc\ub968\uc218 +label.may.continue=\uc2e4\ud589 \ud560 \uc218 \uc788\uc74c +label.memory.allocated=\ud560\ub2f9\uc644\ub8cc \uba54\ubaa8\ub9ac +label.memory.mb=\uba54\ubaa8\ub9ac (MB) +label.memory.total=\uba54\ubaa8\ub9ac \ud569\uacc4 +label.memory=\uba54\ubaa8\ub9ac +label.memory.used=\uba54\ubaa8\ub9ac \uc0ac\uc6a9\ub7c9 +label.menu.accounts=\uacc4\uc815 \uc815\ubcf4 +label.menu.alerts=\uc54c\ub9bc \uccb4\uacc4 +label.menu.all.accounts=\ubaa8\ub4e0 \uacc4\uc815 \uc815\ubcf4 +label.menu.all.instances=\ubaa8\ub4e0 \uc778\uc2a4\ud134\uc2a4 +label.menu.community.isos=\ucee4\ubba4\ub2c8\ud2f0 ISO +label.menu.community.templates=\ucee4\ubba4\ub2c8\ud2f0 \ud15c\ud50c\ub9bf +label.menu.configuration=\uad6c\uc131 +label.menu.dashboard=\ub300\uc2dc \ubcf4\ub4dc +label.menu.destroyed.instances=\ud30c\uae30\ub41c \uc778\uc2a4\ud134\uc2a4 +label.menu.disk.offerings=\ub514\uc2a4\ud06c\uc81c\uacf5 +label.menu.domains=\ub3c4\uba54\uc778 +label.menu.events=\uc774\ubca4\ud2b8 +label.menu.featured.isos=\ucd94\ucc9c ISO +label.menu.featured.templates=\ucd94\ucc9c \ud15c\ud50c\ub9bf +label.menu.global.settings=\uae00\ub85c\ubc8c \uc124\uc815 +label.menu.infrastructure=\uc778\ud504\ub77c\uc2a4\ud2b8\ub7ed\uccd0 +label.menu.instances=\uc778\uc2a4\ud134\uc2a4 +label.menu.ipaddresses=IP \uc8fc\uc18c label.menu.isos=ISO -label.menu.my.accounts=ë‚˜ì˜ ê³„ì • ì •ë³´ -label.menu.my.instances=ë‚˜ì˜ ì¸ìŠ¤í„´ìŠ¤ -label.menu.my.isos=ë‚˜ì˜ ISO -label.menu.my.templates=ë‚˜ì˜ í…œí”Œë¦¿ -label.menu.network.offerings=ë„¤íŠ¸ì›Œí¬ ì œê³µ -label.menu.network=ë„¤íŠ¸ì›Œí¬ -label.menu.physical.resources=물리 ìžì› -label.menu.running.instances=실행 중 ì¸ìŠ¤í„´ìŠ¤ -label.menu.security.groups=보안 그룹 -label.menu.service.offerings=서비스제공 -label.menu.snapshots=스냅샷 -label.menu.stopped.instances=ì •ì§€ëœ ì¸ìŠ¤í„´ìŠ¤ -label.menu.storage=스토리지 -label.menu.system.vms=시스템 VM -label.menu.system=시스템 -label.menu.templates=템플릿 -label.menu.virtual.appliances=ê°€ìƒ ì•„í”„ë¼ì´ì•ˆìŠ¤ -label.menu.virtual.resources=ê°€ìƒ ìžì› -label.menu.volumes=볼륨 -label.migrate.instance.to=ì¸ìŠ¤í„´ìŠ¤ ì´ì „ 위치: -label.minimum=최소 -label.minute.past.hour=분(매시) -label.monday=ì›”ìš”ì¼ -label.monthly=매월 -label.more.templates=다른 템플릿 -label.my.account=ë‚˜ì˜ ê³„ì • ì •ë³´ -label.name.optional=ì´ë¦„(옵션) -label.name=ì´ë¦„ -label.netmask=ë„· ë§ˆìŠ¤í¬ -label.network.desc=ë„¤íŠ¸ì›Œí¬ ì„¤ëª… -label.network.domain=ë„¤íŠ¸ì›Œí¬ ë„ë©”ì¸ -label.network.id=ë„¤íŠ¸ì›Œí¬ ID -label.network.name=네트워í¬ëª… -label.network.offering.display.text=ë„¤íŠ¸ì›Œí¬ ì œê³µ 표시 í…스트 -label.network.offering.id=ë„¤íŠ¸ì›Œí¬ ì œê³µ ID -label.network.offering.name=ë„¤íŠ¸ì›Œí¬ ì œê³µëª… -label.network.offering=ë„¤íŠ¸ì›Œí¬ ì œê³µ -label.network.rate=ë„¤íŠ¸ì›Œí¬ ì†ë„ -label.network.read=ë„¤íŠ¸ì›Œí¬ ì½ê¸° -label.network.type=ë„¤íŠ¸ì›Œí¬ ì¢…ë¥˜ -label.network.write=ë„¤íŠ¸ì›Œí¬ ê¸°ìž… -label.network=ë„¤íŠ¸ì›Œí¬ -label.new.password=새로운 암호 -label.next=ë‹¤ìŒ -label.nfs.server=NFS 서버 -label.nfs.storage=NFS 스토리지 +label.menu.my.accounts=\ub098\uc758 \uacc4\uc815 \uc815\ubcf4 +label.menu.my.instances=\ub098\uc758 \uc778\uc2a4\ud134\uc2a4 +label.menu.my.isos=\ub098\uc758 ISO +label.menu.my.templates=\ub098\uc758 \ud15c\ud50c\ub9bf +label.menu.network.offerings=\ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5 +label.menu.network=\ub124\ud2b8\uc6cc\ud06c +label.menu.physical.resources=\ubb3c\ub9ac \uc790\uc6d0 +label.menu.running.instances=\uc2e4\ud589 \uc911 \uc778\uc2a4\ud134\uc2a4 +label.menu.security.groups=\ubcf4\uc548 \uadf8\ub8f9 +label.menu.service.offerings=\uc11c\ube44\uc2a4\uc81c\uacf5 +label.menu.snapshots=\uc2a4\ub0c5\uc0f7 +label.menu.stopped.instances=\uc815\uc9c0\ub41c \uc778\uc2a4\ud134\uc2a4 +label.menu.storage=\uc2a4\ud1a0\ub9ac\uc9c0 +label.menu.system.service.offerings=\uc2dc\uc2a4\ud15c \uc81c\uacf5 +label.menu.system=\uc2dc\uc2a4\ud15c +label.menu.system.vms=\uc2dc\uc2a4\ud15c VM +label.menu.templates=\ud15c\ud50c\ub9bf +label.menu.virtual.appliances=\uac00\uc0c1 \uc544\ud504\ub77c\uc774\uc548\uc2a4 +label.menu.virtual.resources=\uac00\uc0c1 \uc790\uc6d0 +label.menu.volumes=\ubcfc\ub968 +label.migrate.instance.to.host=\ub2e4\ub978 \ud638\uc2a4\ud2b8\uc5d0\uac8c \uc778\uc2a4\ud134\uc2a4 \uc774\uc804 +label.migrate.instance.to.ps=\ub2e4\ub978 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \uc778\uc2a4\ud134\uc2a4 \uc774\uc804 +label.migrate.instance.to=\uc778\uc2a4\ud134\uc2a4 \uc774\uc804 \uc704\uce58\: +label.migrate.router.to=\ub77c\uc6b0\ud130 \uc774\uc804 \uc704\uce58\: +label.migrate.systemvm.to=\uc2dc\uc2a4\ud15c VM \uc774\uc804 \uc704\uce58\: +label.migrate.volume=\ub2e4\ub978 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \ubcfc\ub968 \uc774\uc804 +label.minimum=\ucd5c\uc18c +label.minute.past.hour=\ubd84(\ub9e4\uc2dc) +label.monday=\uc6d4\uc694\uc77c +label.monthly=\ub9e4\uc6d4 +label.more.templates=\ub2e4\ub978 \ud15c\ud50c\ub9bf +label.move.down.row=\uc544\ub798\ub85c \uc774\ub3d9 +label.move.to.bottom=\ub9c8\uc9c0\ub9c9\uc73c\ub85c \uc774\ub3d9 +label.move.to.top=\ucc98\uc74c\uc73c\ub85c \uc774\ub3d9 +label.move.up.row=\uc704\ub85c \uc774\ub3d9 +label.my.account=\ub098\uc758 \uacc4\uc815 \uc815\ubcf4 +label.my.network=\ub0b4 \ub124\ud2b8\uc6cc\ud06c +label.my.templates=\ub098\uc758 \ud15c\ud50c\ub9bf +label.name.optional=\uc774\ub984(\uc635\uc158) +label.name=\uc774\ub984 +label.nat.port.range=NAT \ud3ec\ud1a0 \ubc94\uc704 +label.netmask=\ub137 \ub9c8\uc2a4\ud06c +label.netScaler=NetScaler +label.network.ACLs=\ub124\ud2b8\uc6cc\ud06c \uad8c\ud55c \uad00\ub9ac(ACL) +label.network.ACL.total=\ub124\ud2b8\uc6cc\ud06c \uad8c\ud55c \uad00\ub9ac(ACL) \ud569\uacc4 +label.network.ACL=\ub124\ud2b8\uc6cc\ud06c \uad8c\ud55c \uad00\ub9ac(ACL) +label.network.desc=\ub124\ud2b8\uc6cc\ud06c \uc124\uba85 +label.network.device.type=\ub124\ud2b8\uc6cc\ud06c \uae30\uae30 \uc885\ub958 +label.network.device=\ub124\ud2b8\uc6cc\ud06c \uae30\uae30 +label.network.domain.text=\ub124\ud2b8\uc6cc\ud06c \ub3c4\uba54\uc778 +label.network.domain=\ub124\ud2b8\uc6cc\ud06c \ub3c4\uba54\uc778 +label.network.id=\ub124\ud2b8\uc6cc\ud06c ID +label.networking.and.security=\ub124\ud2b8\uc6cc\ud06c\uc640 \ubcf4\uc548 +label.network.label.display.for.blank.value=\uae30\ubcf8 \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \uc0ac\uc6a9 +label.network.name=\ub124\ud2b8\uc6cc\ud06c\uba85 +label.network.offering.display.text=\ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5 \ud45c\uc2dc \ud14d\uc2a4\ud2b8 +label.network.offering.id=\ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5 ID +label.network.offering.name=\ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5\uba85 +label.network.offering=\ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5 +label.network.rate.megabytes=\ub124\ud2b8\uc6cc\ud06c \uc18d\ub3c4 (MB/\ucd08) +label.network.rate=\ub124\ud2b8\uc6cc\ud06c \uc18d\ub3c4 +label.network.read=\ub124\ud2b8\uc6cc\ud06c \uc77d\uae30 +label.network.service.providers=\ub124\ud2b8\uc6cc\ud06c \uc11c\ube44\uc2a4 \uc81c\uacf5\uc790 +label.networks=\ub124\ud2b8\uc6cc\ud06c +label.network.type=\ub124\ud2b8\uc6cc\ud06c \uc885\ub958 +label.network=\ub124\ud2b8\uc6cc\ud06c +label.network.write=\ub124\ud2b8\uc6cc\ud06c \uae30\uc785 +label.new.password=\uc0c8\ub85c\uc6b4 \uc554\ud638 +label.new.project=\uc0c8 \ud504\ub85c\uc81d\ud2b8 +label.new=\uc2e0\uaddc +label.new.vm=\uc0c8 VM +label.next=\ub2e4\uc74c +label.nexusVswitch=Nexus 1000V label.nfs=NFS +label.nfs.server=NFS \uc11c\ubc84 +label.nfs.storage=NFS \uc2a4\ud1a0\ub9ac\uc9c0 +label.nic.adapter.type=NIC \uc544\ub2f5\ud130 \uc885\ub958 label.nics=NIC -label.no.actions=실행할 수 있는 ìž‘ì—… ì—†ìŒ -label.no.alerts=최근 알림 체계 ì—†ìŒ -label.no.errors=최근 오류는 ì—†ìŒ -label.no.isos=사용할 수 있는 ISO ì—†ìŒ -label.no.items=사용할 수 있는 항목 ì—†ìŒ -label.no.security.groups=사용할 수 있는 보안 그룹 ì—†ìŒ -label.no.thanks=설정 안 함 -label.no=아니오 -label.none=ì—†ìŒ -label.not.found=검색 ê²°ê³¼ ì—†ìŒ -label.num.cpu.cores=CPU 코어수 -label.numretries=재시행 회수 -label.offer.ha=고가용성 제공 -label.optional=옵션 -label.os.preference=OS 기본 설정 -label.os.type=OS 종류 -label.owned.public.ips=소유 공개 IP 주소 -label.owner.account=ì†Œìœ ìž ê³„ì • ì •ë³´ -label.owner.domain=ì†Œìœ ìž ë„ë©”ì¸ -label.parent.domain=부모 ë„ë©”ì¸ -label.password.enabled=암호 관리 사용 -label.password=암호 -label.path=경로 -label.please.wait=기다려 주십시오... +label.no.actions=\uc2e4\ud589\ud560 \uc218 \uc788\ub294 \uc791\uc5c5 \uc5c6\uc74c +label.no.alerts=\ucd5c\uadfc \uc54c\ub9bc \uccb4\uacc4 \uc5c6\uc74c +label.no.data=\ud45c\uc2dc\ud560 \ub370\uc774\ud130\uac00 \uc5c6\uc74c +label.no.errors=\ucd5c\uadfc \uc624\ub958\ub294 \uc5c6\uc74c +label.no.isos=\uc0ac\uc6a9\ud560 \uc218 \uc788\ub294 ISO \uc5c6\uc74c +label.no.items=\uc0ac\uc6a9\ud560 \uc218 \uc788\ub294 \ud56d\ubaa9 \uc5c6\uc74c +label.none=\uc5c6\uc74c +label.no.security.groups=\uc0ac\uc6a9\ud560 \uc218 \uc788\ub294 \ubcf4\uc548 \uadf8\ub8f9 \uc5c6\uc74c +label.not.found=\uac80\uc0c9 \uacb0\uacfc \uc5c6\uc74c +label.no.thanks=\uc124\uc815 \uc548\ud568 +label.notifications=\uc54c\ub9bc +label.no=\uc544\ub2c8\uc624 +label.number.of.clusters=\ud074\ub7ec\uc2a4\ud130\uc218 +label.number.of.hosts=\ud638\uc2a4\ud2b8\uc218 +label.number.of.pods=Pod\uc218 +label.number.of.system.vms=\uc2dc\uc2a4\ud15c VM \uc218 +label.number.of.virtual.routers=\uac00\uc0c1 \ub77c\uc6b0\ud130\uc218 +label.number.of.zones=Zone\uc218 +label.num.cpu.cores=CPU \ucf54\uc5b4\uc218 +label.numretries=\uc7ac\uc2dc\ud589 \ud68c\uc218 +label.ocfs2=OCFS2 +label.offer.ha=\uace0\uac00\uc6a9\uc131 \uc81c\uacf5 +label.ok=\ud655\uc778 +label.optional=\uc635\uc158 +label.order=\uc21c\uc11c +label.os.preference=OS \uae30\ubcf8 \uc124\uc815 +label.os.type=OS \uc885\ub958 +label.owned.public.ips=\uc18c\uc720 \uacf5\uac1c IP \uc8fc\uc18c +label.owner.account=\uc18c\uc720\uc790 \uacc4\uc815 \uc815\ubcf4 +label.owner.domain=\uc18c\uc720\uc790 \ub3c4\uba54\uc778 +label.parent.domain=\ubd80\ubaa8 \ub3c4\uba54\uc778 +label.password.enabled=\uc554\ud638 \uad00\ub9ac \uc0ac\uc6a9 +label.password=\uc554\ud638 +label.path=\uacbd\ub85c +label.perfect.forward.secrecy=Perfect Forward Secrecy +label.physical.network.ID=\ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c ID +label.physical.network=\ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c +label.PING.CIFS.password=PING CIFS \uc554\ud638 +label.PING.CIFS.username=PING CIFS \uc0ac\uc6a9\uc790\uba85 +label.PING.dir=PING \ub514\ub809\ud1a0\ub9ac +label.PING.storage.IP=PING \ub300\uc0c1 \uc2a4\ud1a0\ub9ac\uc9c0 IP \uc8fc\uc18c +label.please.specify.netscaler.info=Netscaler \uc815\ubcf4\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624 +label.please.wait=\uae30\ub2e4\ub824 \uc8fc\uc2ed\uc2dc\uc624... +label.pod.name=Pod\uba85 label.pod=Pod -label.port.forwarding=í¬í†  전송 -label.port.range=í¬í†  범위 -label.prev=뒤로 -label.primary.allocated=할당 완료 기본 스토리지 -label.primary.network=기본 ë„¤íŠ¸ì›Œí¬ -label.primary.storage=기본 스토리지 -label.primary.used=기본 스토리지 사용량 -label.private.interface=사설 ì¸í„°íŽ˜ì´ìŠ¤ -label.private.ip.range=사설 IP 주소 범위 -label.private.ip=사설 IP 주소 -label.private.ips=사설 IP 주소 -label.private.port=사설 í¬íŠ¸ -label.private.zone=사설 Zone -label.protocol=프로토콜 -label.public.interface=공개 ì¸í„°íŽ˜ì´ìŠ¤ -label.public.ip=공개 IP 주소 -label.public.ips=공개 IP 주소 -label.public.port=공개 í¬íŠ¸ -label.public.zone=공개 Zone -label.public=공개 -label.recent.errors=최근 오류 -label.refresh=ì—…ë°ì´íŠ¸ -label.related=관련 -label.remove.from.load.balancer=ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 장치ì—ì„œ ì¸ìŠ¤í„´ìŠ¤ë¥¼ 삭제하는 중 -label.removing.user=사용ìžë¥¼ 삭제하는 중 -label.required=필수 사항 -label.reserved.system.ip=ì˜ˆì•½ëœ ì‹œìŠ¤í…œ IP 주소 -label.resource.limits=ìžì› 제한 -label.resource=ìžì› -label.resources=ìžì› -label.role=ì—­í•  -label.root.disk.offering=루트 디스í¬ì œê³µ -label.running.vms=실행중 VM -label.saturday=í† ìš”ì¼ -label.save=저장 -label.saving.processing=저장하는 중... -label.scope=범위 -label.search=검색 -label.secondary.storage=2ì°¨ 스토리지 -label.secondary.used=2ì°¨ 스토리지 사용량 -label.secret.key=비밀 키 -label.security.group.name=보안 그룹명 -label.security.group=보안 그룹 -label.security.groups.enabled=보안 그룹 유효 -label.security.groups=보안 그룹 -label.sent=ì „ì†¡ëœ ìƒíƒœ -label.server=서버 -label.service.offering=서비스제공 -label.system.service.offering=시스템 서비스 제공 -label.session.expired=세션 ìœ íš¨ê¸°ê°„ì´ ëŠì–´ì§ -label.shared=공유 -label.size=í¬ê¸° -label.snapshot.limits=스냅샷 제한 -label.snapshot.name=스냅샷 ì´ë¦„ -label.snapshot.s=스냅샷 -label.snapshot.schedule=정기 스냅샷 설정 -label.snapshot=스냅샷 -label.snapshots=스냅샷 -label.source.nat=ì „ì†¡ì› NAT -label.specify.vlan=VLAN 지정 -label.start.port=시작 í¬í†  -label.state=ìƒíƒœ -label.static.nat.to=ì •ì  NAT 설정 위치: -label.static.nat=ì •ì  NAT -label.statistics=통계 -label.status=ìƒíƒœ -label.step.1.title=단계 1. 템플릿 ì„ íƒ -label.step.1=단계 1 -label.step.2.title=단계 2. 서비스 제공 -label.step.2=단계 2 -label.step.3.title=단계 3. ë””ìŠ¤í¬ ì œê³µ ì„ íƒ -label.step.3=단계 3 -label.step.4.title=단계 4. ë„¤íŠ¸ì›Œí¬ -label.step.4=단계 4 -label.step.5.title=단계 5. 최종 í™•ì¸ -label.step.5=단계 5 -label.stopped.vms=정지 중 VM -label.storage.type=스토리지 종류 -label.storage=스토리지 -label.submit=보내기 -label.submitted.by=[사용ìž: ] -label.succeeded=완료 -label.sunday=ì¼ìš”ì¼ -label.system.capacity=시스템 처리 능력 -label.system.vm.type=시스템 VM 종류 -label.system.vm=시스템 VM -label.system.vms=시스템 VM -label.tagged=태그 -label.tags=태그 -label.target.iqn=타겟 IQN -label.template.limits=템플릿 제한 -label.template=템플릿 -label.theme.default=기본 테마 -label.theme.grey=맞춤- 회색조 -label.theme.lightblue=맞춤 - ë¼ì´íŠ¸ 블루 -label.thursday=ëª©ìš”ì¼ -label.time.zone=시간대 -label.time=ì‹œê° -label.timeout.in.second = 시간 초과 (ì´ˆ) -label.timezone=시간대 -label.total.cpu=CPU 합계 -label.total.vms=VM 합계 -label.traffic.type=트래픽 종류 -label.tuesday=í™”ìš”ì¼ -label.type.id=종류 ID -label.type=종류 -label.unavailable=사용 불가 -label.unlimited=무제한 -label.untagged=태그 ì—†ìŒ -label.update.ssl.cert=SSL ì¸ì¦ì„œ ì—…ë°ì´íŠ¸ -label.update.ssl=SSL ì¸ì¦ì„œ ì—…ë°ì´íŠ¸ -label.updating=ì—…ë°ì´íŠ¸í•˜ê³  있는 중 +label.pods=Pod +label.port.forwarding.policies=\ud3ec\ud1a0 \uc804\uc1a1 \uc815\ucc45 +label.port.forwarding=\ud3ec\ud1a0 \uc804\uc1a1 +label.port.range=\ud3ec\ud1a0 \ubc94\uc704 +label.PreSetup=PreSetup +label.previous=\ub4a4\ub85c +label.prev=\ub4a4\ub85c +label.primary.allocated=\ud560\ub2f9 \uc644\ub8cc \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 +label.primary.network=\uae30\ubcf8 \ub124\ud2b8\uc6cc\ud06c +label.primary.storage.count=\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uadf8\ub8f9 +label.primary.storage=\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 +label.primary.used=\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc0ac\uc6a9\ub7c9 +label.private.Gateway=\uc0ac\uc124 \uac8c\uc774\ud2b8\uc6e8\uc774 +label.private.interface=\uc0ac\uc124 \uc778\ud130\ud398\uc774\uc2a4 +label.private.ip.range=\uc0ac\uc124 IP \uc8fc\uc18c \ubc94\uc704 +label.private.ips=\uc0ac\uc124 IP \uc8fc\uc18c +label.private.ip=\uc0ac\uc124 IP \uc8fc\uc18c +label.privatekey=PKC\#8 \ube44\ubc00 \ud0a4 +label.private.network=\uc0ac\uc124 \ub124\ud2b8\uc6cc\ud06c +label.private.port=\uc0ac\uc124 \ud3ec\ud2b8 +label.private.zone=\uc0ac\uc124 Zone +label.project.dashboard=\ud504\ub85c\uc81d\ud2b8 \ub300\uc2dc \ubcf4\ub4dc +label.project.id=\ud504\ub85c\uc81d\ud2b8 ID +label.project.invite=\ud504\ub85c\uc81d\ud2b8\uc5d0 \ucd08\ub300 +label.project.name=\ud504\ub85c\uc81d\ud2b8\uba85 +label.projects=\ud504\ub85c\uc81d\ud2b8 +label.project=\ud504\ub85c\uc81d\ud2b8 +label.project.view=\ud504\ub85c\uc81d\ud2b8 \ubcf4\uae30 +label.protocol=\ud504\ub85c\ud1a0\ucf5c +label.providers=\uc81c\uacf5\uc790 +label.public.interface=\uacf5\uac1c \uc778\ud130\ud398\uc774\uc2a4 +label.public.ips=\uacf5\uac1c IP \uc8fc\uc18c +label.public.ip=\uacf5\uac1c IP \uc8fc\uc18c +label.public.network=\uacf5\uac1c \ub124\ud2b8\uc6cc\ud06c +label.public.port=\uacf5\uac1c \ud3ec\ud2b8 +label.public.traffic=\uacf5\uac1c \ud2b8\ub798\ud53d +label.public=\uacf5\uac1c +label.public.zone=\uacf5\uac1c Zone +label.purpose=\ubaa9\uc801 +label.Pxe.server.type=PXE \uc11c\ubc84 \uc885\ub958 +label.reboot=\uc7ac\uc2dc\uc791 +label.recent.errors=\ucd5c\uadfc \uc624\ub958 +label.redundant.router.capability=\uc911\ubcf5 \ub77c\uc6b0\ud130 \uae30\ub2a5 +label.redundant.router=\uc911\ubcf5 \ub77c\uc6b0\ud130 +label.redundant.state=\uc911\ubcf5 \uc0c1\ud0dc +label.refresh=\uc5c5\ub370\uc774\ud2b8 +label.related=\uad00\ub828 +label.remind.later=\uc54c\ub9bc \ud45c\uc2dc +label.remove.ACL=\uad8c\ud55c \uad00\ub9ac(ACL) \uc0ad\uc81c +label.remove.egress.rule=\uc804\uc1a1 \uaddc\uce59 \uc0ad\uc81c +label.remove.from.load.balancer=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58\uc5d0\uc11c \uc778\uc2a4\ud134\uc2a4\ub97c \uc0ad\uc81c\ud558\ub294 \uc911 +label.remove.ingress.rule=\uc218\uc2e0 \uaddc\uce59 \uc0ad\uc81c +label.remove.ip.range=IP \uc8fc\uc18c \ubc94\uc704 \uc0ad\uc81c +label.remove.pf=\ud3ec\ud1a0 \uc804\uc1a1 \uaddc\uce59 \uc0ad\uc81c +label.remove.project.account=\ud504\ub85c\uc81d\ud2b8 \uacc4\uc815 \uc815\ubcf4 \uc0ad\uc81c +label.remove.rule=\uaddc\uce59 \uc0ad\uc81c +label.remove.static.nat.rule=\uc815\uc801 NAT \uaddc\uce59 \uc0ad\uc81c +label.remove.static.route=\uc815\uc801 \ub77c\uc6b0\ud2b8 \uc0ad\uc81c +label.remove.tier=\uacc4\uce35 \uc0ad\uc81c +label.remove.vm.from.lb=\ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uaddc\uce59\uc5d0 VM \uc0ad\uc81c +label.remove.vpc=VPC \uc0ad\uc81c +label.removing=\uc0ad\uc81c\ud558\ub294 \uc911 +label.removing.user=\uc0ac\uc6a9\uc790\ub97c \uc0ad\uc81c\ud558\ub294 \uc911 +label.required=\ud544\uc218 \uc0ac\ud56d +label.reserved.system.gateway=\uc608\uc57d\ub41c \uc2dc\uc2a4\ud15c \uac8c\uc774\ud2b8\uc6e8\uc774 +label.reserved.system.ip=\uc608\uc57d\ub41c \uc2dc\uc2a4\ud15c IP \uc8fc\uc18c +label.reserved.system.netmask=\uc608\uc57d\ub41c \uc2dc\uc2a4\ud15c \ub137 \ub9c8\uc2a4\ud06c +label.reset.VPN.connection=VPN \uc811\uc18d \uc7ac\uc124\uc815 +label.resize.new.offering.id=\uc0c8\ub85c \uc81c\uacf5 +label.resize.new.size=\uc0c8 \ud06c\uae30(GB) +label.resize.shrink.ok=\ubcc0\uacbd \uc644\ub8cc +label.resource.limits=\uc790\uc6d0 \uc81c\ud55c +label.resource.state=\uc790\uc6d0 \uc0c1\ud0dc +label.resources=\uc790\uc6d0 +label.resource=\uc790\uc6d0 +label.restart.network=\ub124\ud2b8\uc6cc\ud06c \uc7ac\uc2dc\uc791 +label.restart.required=\uc7ac\uc2dc\uc791 \ud544\uc694 +label.restart.vpc=VPC \uc7ac\uc2dc\uc791 +label.review=\ud655\uc778 +label.revoke.project.invite=\ucd08\ub300 \ucde8\uc18c +label.role=\uc5ed\ud560 +label.root.disk.controller=\ub8e8\ud2b8 \ub514\uc2a4\ud06c \ucf58\ud2b8\ub864\ub7ec +label.root.disk.offering=\ub8e8\ud2b8 \ub514\uc2a4\ud06c\uc81c\uacf5 +label.round.robin=\ub77c\uc6b4\ub4dc \ub85c\ube48 +label.rules=\uaddc\uce59 +label.running.vms=\uc2e4\ud589\uc911 VM +label.s3.secret_key=\ube44\ubc00 \ud0a4 +label.saturday=\ud1a0\uc694\uc77c +label.save.and.continue=\uc800\uc7a5\ud558\uae30 +label.save=\uc800\uc7a5 +label.saving.processing=\uc800\uc7a5\ud558\ub294 \uc911... +label.scope=\ubc94\uc704 +label.search=\uac80\uc0c9 +label.secondary.storage=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 +label.secondary.storage.count=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 \uadf8\ub8f9 +label.secondary.storage.vm=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 VM +label.secondary.used=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 \uc0ac\uc6a9\ub7c9 +label.secret.key=\ube44\ubc00 \ud0a4 +label.security.group.name=\ubcf4\uc548 \uadf8\ub8f9\uba85 +label.security.groups.enabled=\ubcf4\uc548 \uadf8\ub8f9 \uc720\ud6a8 +label.security.groups=\ubcf4\uc548 \uadf8\ub8f9 +label.security.group=\ubcf4\uc548 \uadf8\ub8f9 +label.select.a.template=\ud15c\ud50c\ub9bf \uc120\ud0dd +label.select.a.zone=Zone \uc120\ud0dd +label.select.instance.to.attach.volume.to=\ubcfc\ub968\uc744 \uc5f0\uacb0\ud558\ub294 \uc778\uc2a4\ud134\uc2a4\ub97c \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624 +label.select.instance=\uc778\uc2a4\ud134\uc2a4 \uc120\ud0dd +label.select.iso.or.template=ISO \ub610\ub294 \ud15c\ud50c\ub9bf \uc120\ud0dd +label.select.offering=\uc81c\uacf5 \uc120\ud0dd +label.select.project=\ud504\ub85c\uc81d\ud2b8 \uc120\ud0dd +label.select.tier=\uacc4\uce35 \uc120\ud0dd +label.select=\uc120\ud0dd +label.select-view=\ud45c\uc2dc \ubc29\ubc95 \uc120\ud0dd +label.select.vm.for.static.nat=\uc815\uc801 NAT\uc6a9 VM \uc120\ud0dd +label.sent=\uc804\uc1a1\ub41c \uc0c1\ud0dc +label.server=\uc11c\ubc84 +label.service.capabilities=\uc11c\ube44\uc2a4 \uae30\ub2a5 +label.service.offering=\uc11c\ube44\uc2a4\uc81c\uacf5 +label.session.expired=\uc138\uc158 \uc720\ud6a8\uae30\uac04\uc774 \ub04a\uc5b4\uc9d0 +label.setup.network=\ub124\ud2b8\uc6cc\ud06c \uc124\uc815 +label.setup=\uc124\uc815 +label.set.up.zone.type=Zone \uc885\ub958 \uc124\uc815 +label.setup.zone=Zone \uc124\uc815 +label.SharedMountPoint=SharedMountPoint +label.shared=\uacf5\uc720 +label.show.ingress.rule=\uc218\uc2e0 \uaddc\uce59 \ud45c\uc2dc +label.shutdown.provider=\uc81c\uacf5\uc790 \uc885\ub8cc +label.site.to.site.VPN=\uc0ac\uc774\ud2b8\uac04 \uc0ac\uc124\ub124\ud2b8\uc6cc\ud06c(VPN) +label.size=\ud06c\uae30 +label.skip.guide=CloudStack \uc0ac\uc6a9 \uac00\uc774\ub4dc \uac74\ub108\ub6f0\uae30 +label.snapshot.limits=\uc2a4\ub0c5\uc0f7 \uc81c\ud55c +label.snapshot.name=\uc2a4\ub0c5\uc0f7 \uc774\ub984 +label.snapshot.schedule=\uc815\uae30 \uc2a4\ub0c5\uc0f7 \uc124\uc815 +label.snapshot.s=\uc2a4\ub0c5\uc0f7 +label.snapshots=\uc2a4\ub0c5\uc0f7 +label.snapshot=\uc2a4\ub0c5\uc0f7 +label.source.nat=\uc804\uc1a1\uc6d0 NAT +label.source=\uc2dc\uc791 \uc704\uce58 +label.specify.IP.ranges=IP \uc8fc\uc18c \ubc94\uc704 \uc9c0\uc815 +label.specify.vlan=VLAN \uc9c0\uc815 +label.SR.name = SR \uba85 \ub77c\ubca8 +label.srx=SRX +label.start.IP=\uc2dc\uc791 IP \uc8fc\uc18c +label.start.port=\uc2dc\uc791 \ud3ec\ud1a0 +label.start.reserved.system.IP=\uc608\uc57d\ub41c \uc2dc\uc791 \uc2dc\uc2a4\ud15c IP \uc8fc\uc18c +label.start.vlan=\uc2dc\uc791 VLAN +label.state=\uc0c1\ud0dc +label.static.nat.enabled=\uc815\uc801 NAT \uc720\ud6a8 +label.static.nat.to=\uc815\uc801 NAT \uc124\uc815 \uc704\uce58\: +label.static.nat=\uc815\uc801 NAT +label.static.nat.vm.details=\uc815\uc801 NAT VM \uc0c1\uc138 \uc815\ubcf4 +label.statistics=\ud1b5\uacc4 +label.status=\uc0c1\ud0dc +label.step.1.title=\ub2e8\uacc4 1. \ud15c\ud50c\ub9bf \uc120\ud0dd +label.step.1=\ub2e8\uacc4 1 +label.step.2.title=\ub2e8\uacc4 2. \uc11c\ube44\uc2a4 \uc81c\uacf5 +label.step.2=\ub2e8\uacc4 2 +label.step.3.title=\ub2e8\uacc4 3. \ub514\uc2a4\ud06c \uc81c\uacf5 \uc120\ud0dd +label.step.3=\ub2e8\uacc4 3 +label.step.4.title=\ub2e8\uacc4 4. \ub124\ud2b8\uc6cc\ud06c +label.step.4=\ub2e8\uacc4 4 +label.step.5.title=\ub2e8\uacc4 5. \ucd5c\uc885 \ud655\uc778 +label.step.5=\ub2e8\uacc4 5 +label.stickiness=\uc9c0\uc18d\uc131 +label.sticky.cookie-name=Cookie \uba85 +label.sticky.domain=\ub3c4\uba54\uc778 +label.sticky.expire=\ub9cc\ub8cc\uc2dc\uac04 +label.sticky.holdtime=\ubcf4\uad00 \uc720\uc9c0 \uc2dc\uac04 +label.sticky.indirect=\uac04\uc811 +label.sticky.length=\uae38\uc774 +label.sticky.mode=\ubaa8\ub4dc +label.sticky.nocache=\uce90\uc2dc \uc5c6\uc74c +label.sticky.postonly=\ud3ec\uc2a4\ud2b8\ub9cc +label.sticky.prefix=\ud504\ub808\ud53d\uc2a4 +label.sticky.request-learn=\ub7ec\ub2dd \uc694\uad6c +label.sticky.tablesize=\ud14c\uc774\ube14 \ud06c\uae30 +label.stopped.vms=\uc815\uc9c0 \uc911 VM +label.stop=\uc815\uc9c0 +label.storage.tags=\uc2a4\ud1a0\ub9ac\uc9c0 \ud0dc\uadf8 +label.storage.traffic=\uc2a4\ud1a0\ub9ac\uc9c0 \ud2b8\ub798\ud53d +label.storage.type=\uc2a4\ud1a0\ub9ac\uc9c0 \uc885\ub958 +label.storage=\uc2a4\ud1a0\ub9ac\uc9c0 +label.subdomain.access=\uc11c\ube0c \ub3c4\uba54\uc778 \uc811\uadfc +label.submitted.by=[\uc0ac\uc6a9\uc790\: ] +label.submit=\ubcf4\ub0b4\uae30 +label.succeeded=\uc644\ub8cc +label.sunday=\uc77c\uc694\uc77c +label.super.cidr.for.guest.networks=\uc190\ub2d8 \ub124\ud2b8\uc6cc\ud06c \uc288\ud37c CIDR +label.supported.services=\uae30\uc220 \uc9c0\uc6d0\ub418\ub294 \uc11c\ube44\uc2a4 +label.supported.source.NAT.type=\uae30\uc220 \uc9c0\uc6d0\ub418\ub294 \uc804\uc1a1 NAT \uc885\ub958 +label.suspend.project=\ud504\ub85c\uc81d\ud2b8 \uc77c\uc2dc\uc815\uc9c0 +label.system.capacity=\uc2dc\uc2a4\ud15c \ucc98\ub9ac \ub2a5\ub825 +label.system.offering=\uc2dc\uc2a4\ud15c \uc81c\uacf5 +label.system.service.offering=\uc2dc\uc2a4\ud15c \uc11c\ube44\uc2a4 \uc81c\uacf5 +label.system.vms=\uc2dc\uc2a4\ud15c VM +label.system.vm.type=\uc2dc\uc2a4\ud15c VM \uc885\ub958 +label.system.vm=\uc2dc\uc2a4\ud15c VM +label.system.wide.capacity=\uc2dc\uc2a4\ud15c \uc804\uccb4 \ucc98\ub9ac \ub2a5\ub825 +label.tagged=\ud0dc\uadf8 +label.tags=\ud0dc\uadf8 +label.target.iqn=\ud0c0\uac9f IQN +label.task.completed=\uc791\uc5c5 \uc644\ub8cc +label.template.limits=\ud15c\ud50c\ub9bf \uc81c\ud55c +label.template=\ud15c\ud50c\ub9bf +label.TFTP.dir=TFTP \ub514\ub809\ud1a0\ub9ac +label.theme.default=\uae30\ubcf8 \ud14c\ub9c8 +label.theme.grey=\ub9de\ucda4- \ud68c\uc0c9\uc870 +label.theme.lightblue=\ub9de\ucda4 - \ub77c\uc774\ud2b8 \ube14\ub8e8 +label.thursday=\ubaa9\uc694\uc77c +label.tier.details=\uacc4\uce35 \uc0c1\uc138 \uc7a5\ubc84 +label.tier=\uacc4\uce35 +label.timeout.in.second = \uc2dc\uac04 \ucd08\uacfc (\ucd08) +label.timeout=\uc2dc\uac04 \ucd08\uacfc +label.time=\uc2dc\uac01 +label.time.zone=\uc2dc\uac04\ub300 +label.timezone=\uc2dc\uac04\ub300 +label.token=\ud1a0\ud070 +label.total.cpu=CPU \ud569\uacc4 +label.total.CPU=CPU \ud569\uacc4 +label.total.hosts=\ud638\uc2a4\ud2b8 \ud569\uacc4 +label.total.memory=\uba54\ubaa8\ub9ac \ud569\uacc4 +label.total.of.ip=IP \uc8fc\uc18c \ud569\uacc4 +label.total.of.vm=VM \ud569\uacc4 +label.total.storage=\uc2a4\ud1a0\ub9ac\uc9c0 \ud569\uacc4 +label.total.vms=VM \ud569\uacc4 +label.traffic.label=\ud2b8\ub798\ud53d \ub77c\ubca8 +label.traffic.types=\ud2b8\ub798\ud53d \uc885\ub958 +label.traffic.type=\ud2b8\ub798\ud53d \uc885\ub958 +label.tuesday=\ud654\uc694\uc77c +label.type.id=\uc885\ub958 ID +label.type=\uc885\ub958 +label.unavailable=\uc0ac\uc6a9 \ubd88\uac00 +label.unlimited=\ubb34\uc81c\ud55c +label.untagged=\ud0dc\uadf8 \uc5c6\uc74c +label.update.project.resources=\ud504\ub85c\uc81d\ud2b8 \uc790\uc6d0 \uc5c5\ub370\uc774\ud2b8 +label.update.ssl.cert= SSL \uc778\uc99d\uc11c \uc5c5\ub370\uc774\ud2b8 +label.update.ssl= SSL \uc778\uc99d\uc11c \uc5c5\ub370\uc774\ud2b8 +label.updating=\uc5c5\ub370\uc774\ud2b8\ud558\uace0 \uc788\ub294 \uc911 +label.upload=\uc5c5\ub85c\ub4dc +label.upload.volume=\ubcfc\ub968\uc758 \uc5c5\ub85c\ub4dc label.url=URL -label.usage.interface=사용 ìƒí™© 측정 ì¸í„°íŽ˜ì´ìŠ¤ -label.used=사용 중 -label.user=ì‚¬ìš©ìž -label.username=사용ìžëª… -label.users=ì‚¬ìš©ìž -label.value=ê°’ -label.vcenter.cluster=vCenter í´ëŸ¬ìŠ¤í„° -label.vcenter.datacenter=vCenter ë°ì´í„° 센터 -label.vcenter.datastore=vCenter ë°ì´í„° 스토어 -label.vcenter.host=vCenter 호스트 -label.vcenter.password=vCenter 암호 -label.vcenter.username=vCenter 사용ìžëª… -label.version=버전 -label.virtual.appliance=ê°€ìƒ ì–´í”Œë¼ì´ì–¸ìŠ¤ -label.virtual.appliances=ê°€ìƒ ì–´í”Œë¼ì´ì–¸ìŠ¤ -label.virtual.network=ê°€ìƒ ë„¤íŠ¸ì›Œí¬ +label.usage.interface=\uc0ac\uc6a9 \uc0c1\ud669 \uce21\uc815 \uc778\ud130\ud398\uc774\uc2a4 +label.used=\uc0ac\uc6a9 \uc911 +label.username=\uc0ac\uc6a9\uc790\uba85 +label.users=\uc0ac\uc6a9\uc790 +label.user=\uc0ac\uc6a9\uc790 +label.value=\uac12 +label.vcdcname=vCenter DC \uba85 +label.vcenter.cluster=vCenter \ud074\ub7ec\uc2a4\ud130 +label.vcenter.datacenter=vCenter \ub370\uc774\ud130 \uc13c\ud130 +label.vcenter.datastore=vCenter \ub370\uc774\ud130 \uc2a4\ud1a0\uc5b4 +label.vcenter.host=vCenter \ud638\uc2a4\ud2b8 +label.vcenter.password=vCenter \uc554\ud638 +label.vcenter.username=vCenter \uc0ac\uc6a9\uc790\uba85 +label.vcipaddress=vCenter IP \uc8fc\uc18c +label.version=\ubc84\uc804 +label.view.all=\ubaa8\ub450 \ud45c\uc2dc +label.view.console=\ucf58\uc194 \ud45c\uc2dc +label.viewing=\ud45c\uc2dc \ud56d\ubaa9\: +label.view.more=\uc0c1\uc138 \ud45c\uc2dc +label.view=\ud45c\uc2dc - +label.virtual.appliances=\uac00\uc0c1 \uc5b4\ud50c\ub77c\uc774\uc5b8\uc2a4 +label.virtual.appliance=\uac00\uc0c1 \uc5b4\ud50c\ub77c\uc774\uc5b8\uc2a4 +label.virtual.machines=\uac00\uc0c1 \uba38\uc2e0 +label.virtual.network=\uac00\uc0c1 \ub124\ud2b8\uc6cc\ud06c +label.virtual.routers=\uac00\uc0c1 \ub77c\uc6b0\ud130 +label.virtual.router=\uac00\uc0c1 \ub77c\uc6b0\ud130 label.vlan.id=VLAN ID -label.vlan.range=VLAN 범위 -label.vm.add=ì¸ìŠ¤í„´ìŠ¤ 추가 -label.vm.destroy=파기 -label.vm.reboot=재시작 -label.vm.start=시작 -label.vm.stop=정지 +label.vlan.range=VLAN \ubc94\uc704 +label.vlan=\uac00\uc0c1 \ub124\ud2b8\uc6cc\ud06c(VLAN) +label.vm.add=\uc778\uc2a4\ud134\uc2a4 \ucd94\uac00 +label.vm.destroy=\ud30c\uae30 +label.vm.display.name=VM \ud45c\uc2dc\uba85 +label.VMFS.datastore=VMFS \ub370\uc774\ud130 \uc2a4\ud1a0\uc5b4 label.vmfs=VMFS +label.vm.name=VM \uba85 +label.vm.reboot=\uc7ac\uc2dc\uc791 +label.VMs.in.tier=\uacc4\uce35 \ub0b4\ubd80 \uac00\uc0c1\uba38\uc2e0 +label.vmsnapshot.type=\uc885\ub958 +label.vm.start=\uc2dc\uc791 +label.vm.state=VM \uc0c1\ud0dc +label.vm.stop=\uc815\uc9c0 label.vms=VM -label.volume.limits=볼륨 제한 -label.volume.name=볼륨명 -label.volume=볼륨 -label.volumes=볼륨 -label.vsphere.managed=vSphere 관리 -label.waiting=대기하는 중 -label.warn=경고 -label.wednesday=ìˆ˜ìš”ì¼ -label.weekly=매주 -label.welcome.cloud.console=관리 ì½˜ì†”ì— ì˜¤ì‹ ê²ƒì„ í™˜ì˜í•©ë‹ˆë‹¤! -label.welcome=ì–´ì„œ 오십시오 -label.yes=예 +label.vmware.traffic.label=VMware \ud2b8\ub798\ud53d \ub77c\ubca8 +label.volgroup=\ubcfc\ub968 \uadf8\ub8f9 +label.volume.limits=\ubcfc\ub968 \uc81c\ud55c +label.volume.name=\ubcfc\ub968\uba85 +label.volumes=\ubcfc\ub968 +label.volume=\ubcfc\ub968 +label.vpc.id=VPC ID +label.VPC.router.details=VPC \ub77c\uc6b0\ud130 \uc0c1\uc138 +label.vpc=VPC +label.VPN.connection=VPN \uc811\uc18d +label.vpn.customer.gateway=VPN \uace0\uac1d \uac8c\uc774\ud2b8\uc6e8\uc774 +label.VPN.customer.gateway=VPN \uace0\uac1d \uac8c\uc774\ud2b8\uc6e8\uc774 +label.VPN.gateway=VPN \uac8c\uc774\ud2b8\uc6e8\uc774 +label.vpn=\uac00\uc0c1 \uc0ac\uc124\ub9dd(VPN) +label.vsmctrlvlanid=\uc81c\uc5b4 VLAN ID +label.vsmpktvlanid=\ud328\ud0b7 VLAN ID +label.vsmstoragevlanid=\uc2a4\ud1a0\ub9ac\uc9c0 VLAN ID +label.vsphere.managed=vSphere \uad00\ub9ac +label.waiting=\ub300\uae30\ud558\ub294 \uc911 +label.warn=\uacbd\uace0 +label.wednesday=\uc218\uc694\uc77c +label.weekly=\ub9e4\uc8fc +label.welcome.cloud.console=\uad00\ub9ac \ucf58\uc194\uc5d0 \uc624\uc2e0\uac83\uc744 \ud658\uc601\ud569\ub2c8\ub2e4\! +label.welcome=\uc5b4\uc11c \uc624\uc2ed\uc2dc\uc624 +label.what.is.cloudstack=CloudStack\u2122 \uc815\ubcf4 +label.xen.traffic.label=XenServer \ud2b8\ub798\ud53d \ub77c\ubca8 +label.yes=\uc608 +label.zone.details=Zone \uc0c1\uc138 label.zone.id=Zone ID -label.zone.step.1.title=단계 1. ë„¤íŠ¸ì›Œí¬ ì„ íƒ -label.zone.step.2.title=단계 2. Zone 추가 -label.zone.step.3.title=단계 3. Pod 추가 -label.zone.step.4.title=단계 4. IP 주소 범위 추가 -label.zone.wide=Zone ì „ì²´ +label.zone.name=Zone \uc774\ub984 +label.zone.step.1.title=\ub2e8\uacc4 1. \ub124\ud2b8\uc6cc\ud06c \uc120\ud0dd +label.zone.step.2.title=\ub2e8\uacc4 2. Zone \ucd94\uac00 +label.zone.step.3.title=\ub2e8\uacc4 3. Pod \ucd94\uac00 +label.zone.step.4.title=\ub2e8\uacc4 4. IP \uc8fc\uc18c \ubc94\uc704 \ucd94\uac00 +label.zones=Zone +label.zone.type=Zone \uc885\ub958 +label.zone.wide=Zone \uc804\uccb4 label.zone=Zone - -#Messages -message.acquire.public.ip=새로운 IP 주소를 ì·¨ë“하는 Zoneì„ ì„ íƒí•´ 주십시오. -message.action.cancel.maintenance.mode=현재 유지 보수를 취소하시겠습니까? -message.action.cancel.maintenance=호스트 유지 보수는 ì •ìƒì ìœ¼ë¡œ 취소ë˜ì—ˆìŠµë‹ˆë‹¤. 처리ì—는 몇 분 ì •ë„ ê±¸ë¦´ 수 있습니다. -message.action.delete.ISO.for.all.zones=ì´ ISO는 모든 Zoneì—ì„œ 사용하고 있습니다. 모든 Zoneì—ì„œ 삭제하시겠습니까? -message.action.delete.ISO=현재 ISO를 삭제하시겠습니까? -message.action.delete.cluster=현재 í´ëŸ¬ìŠ¤í„°ë¥¼ 삭제하시겠습니까? -message.action.delete.disk.offering=현재 디스í¬ì œê³µì„ 삭제하시겠습니까? -message.action.delete.domain=현재 ë„ë©”ì¸ì„ 삭제하시겠습니까? -message.action.delete.external.firewall=현재 외부 방화벽(fire wall)를 삭제하시겠습니까? 경고: ê°™ì€ ì™¸ë¶€ 방화벽(fire wall)를 다시 추가할 경우는 기기 사용 ìƒí™© ë°ì´í„°ë¥¼ 재설정해야 합니다. -message.action.delete.external.load.balancer=현재 외부 ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 장치를 삭제하시겠습니까? 경고: ê°™ì€ ì™¸ë¶€ ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 장치를 다시 추가할 경우는 기기 사용 ìƒí™© ë°ì´í„°ë¥¼ 재설정해야 합니다. -message.action.delete.ingress.rule=현재 수신 ê·œì¹™ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.delete.network=현재 네트워í¬ë¥¼ 삭제하시겠습니까? -message.action.delete.pod=현재 Pod를 삭제하시겠습니까? -message.action.delete.primary.storage=현재 기본 스토리지를 삭제하시겠습니까? -message.action.delete.secondary.storage=현재 2ì°¨ 스토리지를 삭제하시겠습니까? -message.action.delete.security.group=현재 보안 ê·¸ë£¹ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.delete.service.offering=현재 ì„œë¹„ìŠ¤ì œê³µì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.delete.snapshot=현재 ìŠ¤ëƒ…ìƒ·ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.delete.template.for.all.zones=ê·¸ í…œí”Œë¦¿ì€ ëª¨ë“  Zoneì—ì„œ 사용ë˜ì–´ 있습니다. 모든 Zoneì—ì„œ 삭제하시겠습니까? -message.action.delete.template=현재 í…œí”Œë¦¿ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.delete.volume=현재 ë³¼ë¥¨ì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.delete.zone=현재 Zoneì„ ì‚­ì œí•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.destroy.instance=현재 ì¸ìŠ¤í„´ìŠ¤ë¥¼ 파기하시겠습니까? -message.action.destroy.systemvm=현재 시스템 VM를 파기하시겠습니까? -message.action.disable.static.NAT=ì •ì  NAT를 사용 안 함으로 설정하시겠습니까? -message.action.enable.maintenance=호스트를 유지 보수할 준비를 í•  수 있었습니다. ì´ í˜¸ìŠ¤íŠ¸ìƒ VM ìˆ˜ì— ë”°ë¼ì„œ ì²˜ë¦¬ì— ëª‡ 분 ì´ìƒ 걸릴 ê°€ëŠ¥ì„±ì´ ìžˆìŠµë‹ˆë‹¤. -message.action.force.reconnect=호스트는 ê°•ì œì ìœ¼ë¡œ 재접ì†í–ˆìŠµë‹ˆë‹¤. ì´ ì²˜ë¦¬ì—는 몇 분 ì´ìƒ 걸릴 ê°€ëŠ¥ì„±ì´ ìžˆìŠµë‹ˆë‹¤ -message.action.host.enable.maintenance.mode=유지 보수 모드를 사용 하면, ì´ í˜¸ìŠ¤íŠ¸ë¡œ 실행 ì¤‘ì¸ ëª¨ë“  ì¸ìŠ¤í„´ìŠ¤ë¥¼ 다른 사용가능 호스트ì—게 실시간 ì´ì „ë©ë‹ˆë‹¤. -message.action.instance.reset.password=현재 ê°€ìƒ ë¨¸ì‹  루트 암호를 변경하시겠습니까? -message.action.primarystorage.enable.maintenance.mode=경고: 기본 스토리지를 유지 보수 모드로 하면 ê·¸ ìŠ¤í† ë¦¬ì§€ìƒ ë³¼ë¥¨ì„ ì‚¬ìš©í•˜ëŠ” 모든 VMê°€ 정지합니다. 실행하시겠습니까? -message.action.reboot.instance=현재 ì¸ìŠ¤í„´ìŠ¤ë¥¼ 재시작하시겠습니까? -message.action.reboot.systemvm=현재 시스템 VMì„ ìž¬ì‹œìž‘í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.release.ip=현재 IP 주소를 해제하시겠습니까? -message.action.restore.instance=현재 ì¸ìŠ¤í„´ìŠ¤ë¥¼ ë³µì›í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.start.instance=현재 ì¸ìŠ¤í„´ìŠ¤ë¥¼ 시작하시겠습니까? -message.action.start.router=현재 ë¼ìš°í„°ë¥¼ 시작하시겠습니까? -message.action.start.systemvm=현재 시스템 VMì„ ì‹œìž‘í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.stop.instance=현재 ì¸ìŠ¤í„´ìŠ¤ë¥¼ 정지하시겠습니까? -message.action.stop.systemvm=현재 시스템 VMì„ ì •ì§€í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.action.take.snapshot=현재 볼륨 ìŠ¤ëƒ…ìƒ·ì„ ë§Œë“œì‹œê² ìŠµë‹ˆê¹Œ? -message.add.cluster.zone=Zone ì— í•˜ì´í¼ ë°”ì´ì €ë¡œ 관리ë˜ëŠ” í´ëŸ¬ìŠ¤í„°ë¥¼ 추가합니다. -message.add.cluster=Zone Pod ì— í•˜ì´í¼ ë°”ì´ì €ë¡œ 관리ë˜ëŠ” í´ëŸ¬ìŠ¤í„°ë¥¼ 추가합니다. -message.add.disk.offering=새로운 ë””ìŠ¤í¬ ì œê³µì„ ì¶”ê°€í•˜ê¸° 위해 ë‹¤ìŒ íŒŒë¼ë¯¸í„°ë¥¼ 지정해 주십시오. -message.add.firewall=Zoneì— ë°©í™”ë²½(fire wall)ì„ ì¶”ê°€í•©ë‹ˆë‹¤. -message.add.host=새로운 호스트를 추가하기 위해 아래 파ë¼ë¯¸í„°ë¥¼ 지정해 주십시오. -message.add.ip.range.direct.network=Zone ì§ì ‘ ë„¤íŠ¸ì›Œí¬ ì— IP 주소 범위를 추가합니다 -message.add.ip.range.to.pod=

Pod ì— IP 주소 범위를 추가합니다.

-message.add.ip.range=Zone 공개 네트워í¬ì— IP 주소 범위를 추가합니다. -message.add.load.balancer=Zoneì— ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 장치를 추가합니다. -message.add.network=Zone ì— ìƒˆë¡œìš´ 네트워í¬ë¥¼ 추가합니다. -message.add.pod=Zone ì— ìƒˆë¡œìš´ Pod를 추가합니다. -message.add.primary.storage=Zone Pod ì— ìƒˆë¡œìš´ 기본 스토리지를 추가합니다. -message.add.primary=새로운 기본 스토리지를 추가하기 위해 아래 파ë¼ë¯¸í„°ë¥¼ 지정해 주십시오. -message.add.secondary.storage=Zone ì— ìƒˆë¡œìš´ 스토리지를 추가합니다 -message.add.service.offering=새로운 컴퓨팅 ìžì› ì œê³µì„ ì¶”ê°€í•˜ê¸° 위해서, ë‹¤ìŒ ë°ì´í„°ë¥¼ 입력해 주십시오. -message.add.template=새로운 í…œí”Œë¦¿ì„ ë§Œë“¤ê¸°í•˜ê¸° 위해 아래 ë°ì´í„°ë¥¼ 입력해 주십시오. -message.add.volume=새로운 ë³¼ë¥¨ì„ ì¶”ê°€í•˜ê¸° 위해 아래 ë°ì´í„°ë¥¼ 입력해 주십시오. -message.additional.networks.desc=ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ê°€ ì ‘ì†í•˜ëŠ” 추가 네트워í¬ë¥¼ ì„ íƒí•´ 주십시오. -message.advanced.mode.desc=VLAN 기술 지ì›ë¥¼ 사용 하는 경우는 ì´ ë„¤íŠ¸ì›Œí¬ ëª¨ë¸ì„ ì„ íƒí•´ 주십시오.ì´ ëª¨ë¸ì—서는 가장 유연하게 카스íƒë„¤íŠ¸ì›Œí¬ ì œê³µì„ ì œê³µí•  수 있어 방화벽(fire wall), VPN, ë„¤íŠ¸ì›Œí¬ ë¡œë“œ 공유 장치 기술 ì§€ì› ì™¸ì—, ì§ì ‘ 네트워í¬ì™€ ê°€ìƒ ë„¤íŠ¸ì›Œí¬ë„ 사용 í•  수 있습니다. -message.advanced.security.group=게스트 VM를 분리하기 위해서 보안 ê·¸ë£¹ì„ ì‚¬ìš©í•˜ëŠ” 경우는 ì´ ì˜µì…˜ì„ ì„ íƒí•´ 주십시오. -message.advanced.virtual=게스트 VM를 분리하기 위해서 ì¡´ ì „ì²´ VLAN를 사용하는 경우는 ì´ ì˜µì…˜ì„ ì„ íƒí•´ 주십시오. -message.allow.vpn.access=VPN 접근를 허가하는 ì‚¬ìš©ìž ì‚¬ìš©ìžëª…ê³¼ 암호를 입력해 주십시오. -message.attach.iso.confirm=현재 ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ì— ISO 파ì¼ì„ ì—°ê²° 하시겠습니까? -message.attach.volume=새로운 ë³¼ë¥¨ì„ ì—°ê²° 하기 위해 아래 ë°ì´í„°ë¥¼ 입력해 주십시오.Windows ë² ì´ìŠ¤ ê°€ìƒ ë¨¸ì‹ ì— ë””ìŠ¤í¬ ë³¼ë¥¨ì„ ì—°ê²° 하는 경우는 ì—°ê²° í•œ 디스í¬ë¥¼ ì¸ì‹í•˜ê¸° 위해서 ì¸ìŠ¤í„´ìŠ¤ë¥¼ 재시작할 필요가 있습니다. -message.basic.mode.desc=VLAN 기술 지ì›ê°€ë¶ˆí•„요한경우는 ì´ ë„¤íŠ¸ì›Œí¬ ëª¨ë¸ì„ ì„ íƒí•´ 주십시오.ì´ ë„¤íŠ¸ì›Œí¬ ëª¨ë¸ë¡œ 만들기ë˜ëŠ” 모든 ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ì— 네트워í¬ì—ì„œ ì§ì ‘ IP 주소를 할당할 수 있어 보안 ê·¸ë£¹ì„ ì‚¬ìš©í•´ 보안와 분리가 제공ë©ë‹ˆë‹¤. -message.change.offering.confirm=현재 ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ ì„œë¹„ìŠ¤ì œê³µì„ ë³€ê²½í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.copy.iso.confirm=ISO를 ë‹¤ìŒ ìž¥ì†Œì— ë³µì‚¬í•˜ì‹œê² ìŠµë‹ˆê¹Œ? -message.copy.template=ì¡´ 으ì—ì„œ 템플릿 XXX를 ë‹¤ìŒ ìž¥ì†Œì— ë³µì‚¬í•©ë‹ˆë‹¤: -message.create.template.vm=템플릿 으ì—ì„œ VM를 만들었습니다. -message.create.template.volume=ë””ìŠ¤í¬ ë³¼ë¥¨ í…œí”Œë¦¿ì„ ë§Œë“¤ê¸°í•˜ê¸° ì „ì—, ë‹¤ìŒ ì •ë³´ë¥¼ 지정해 주십시오.볼륨 í¬ê¸°ì— ë”°ë¼ì„œëŠ” 템플릿 만들기ì—는 몇분 ì´ìƒ 걸릴 ê°€ëŠ¥ì„±ì´ ìžˆìŠµë‹ˆë‹¤. -message.delete.account=현재 계정 정보를 삭제하시겠습니까? -message.detach.iso.confirm=현재 ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ì—ì„œ ISO 파ì¼ì„ 분리 하시겠습니까? -message.disable.account=현재 계정 정보를 사용 안 함으로 하시겠습니까?ì´ ê³„ì • ì •ë³´ 모든 사용ìžê°€ í´ë¼ìš°ë“œ ìžì›ì— ì ‘ê·¼ í•  수 없게 ë©ë‹ˆë‹¤. 실행중 모든 ê°€ìƒ ë¨¸ì‹ ì€ ê¸ˆë°©ì— ì¢…ë£Œ ë©ë‹ˆë‹¤. -message.disable.vpn.access=VPN 접근를 사용 안 함으로 하시겠습니까? -message.download.ISO=ISO를 다운로드하려면 00000ì„ í´ë¦­í•©ë‹ˆë‹¤. -message.download.template=í…œí”Œë¦¿ì„ ë‹¤ìš´ë¡œë“œí•˜ë ¤ë©´ 00000ì„ í´ë¦­í•©ë‹ˆë‹¤. -message.download.volume=ë³¼ë¥¨ì„ ë‹¤ìš´ë¡œë“œí•˜ë ¤ë©´ 00000ì„ í´ë¦­í•©ë‹ˆë‹¤. -message.edit.confirm=[저장]ì„ í´ë¦­í•˜ê¸° 전으로 변경 ë‚´ìš©ì„ í™•ì¸í•´ 주십시오. -message.edit.limits=ë‹¤ìŒ ìžì›ì— ì œí•œì„ ì§€ì •í•´ 주십시오.「-1ã€ì€ ìžì› ë§Œë“¤ê¸°ì— ì œí•œì´ ì—†ë‹¤ëŠ” ì˜ë¯¸ìž…니다. -message.enable.account=현재 계정 정보를 사용 하시겠습니까? -message.enable.vpn.access=í˜„ìž¬ì´ IP ì£¼ì†Œì— ëŒ€í•œ VPN는 유효하지 ì•Šì€ìž…니다. VPN 접근를 사용 하시겠습니까? -message.enabled.vpn.ip.sec=IPSec 사전 공유 키: -message.enabled.vpn=현재 VPN ì ‘ê·¼ 사용 설정ë˜ì–´ 있습니다. ë‹¤ìŒ IP 주소 경유로 ì ‘ê·¼ í•  수 있습니다. -message.launch.vm.on.private.network=ì‚¬ì  ì „ìš© 네트워í¬ë¡œ ì¸ìŠ¤í„´ìŠ¤ë¥¼ 시작합니까? -message.lock.account=현재 계정 정보를 ìž ê·¸ì–´ë„ ì¢‹ìŠµë‹ˆê¹Œ? ì´ ê³„ì • ì •ë³´ 모든 사용ìžê°€ í´ë¼ìš°ë“œ ìžì›ì„ 관리할 수 없게 ë©ë‹ˆë‹¤. ê·¸ í›„ë„ ê¸°ì¡´ Zone ìžì›ì—는 ì ‘ê·¼ í•  수 있습니다. -message.migrate.instance.confirm=ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ ì´ì „ 위치는 ë‹¤ìŒ í˜¸ìŠ¤íŠ¸ë¡œ 하시겠습니까? -message.new.user=계정 ì •ë³´ì— ìƒˆë¡œìš´ 사용ìžë¥¼ 추가하기 위해 아래 정보를 지정해 주십시오. -message.no.network.support.configuration.not.true=보안 ê·¸ë£¹ì´ ìœ íš¨í•œ Zoneì´ ì—†ê¸° ë•Œë¬¸ì— ì¶”ê°€ ë„¤íŠ¸ì›Œí¬ ê¸°ëŠ¥ì€ ì—†ìŠµë‹ˆë‹¤. 단계 5ë¡œ 진행해 주십시오. -message.no.network.support=하ì´í¼ ë°”ì´ì €ë¡œì„œ vSphere를 ì„ íƒí–ˆìœ¼ë‚˜ ì´ í•˜ì´í¼ ë°”ì´ì €ì— 추가 ë„¤íŠ¸ì›Œí¬ ê¸°ëŠ¥ì€ ì—†ìŠµë‹ˆë‹¤. 단계 5ë¡œ 진행해 주십시오. -message.number.clusters=

í´ëŸ¬ìŠ¤í„°ìˆ˜

-message.number.hosts=

호스트수

-message.number.pods=

Pod수

-message.number.storage=

기본 스토리지 볼륨수

-message.number.zones=

Zone수

-message.remove.vpn.access=ë‹¤ìŒ ì‚¬ìš©ìžì—ì„œ VPN 접근를 삭제하시겠습니까? -message.restart.mgmt.server=새로운 ì„¤ì •ì„ ì‚¬ìš© 하기 위해 관리 서버를 재시작해 주십시오. -message.restart.mgmt.usage.server=새로운 ì„¤ì •ì„ ì‚¬ìš© 하기 위해 관리 서버와 사용 ìƒí™© 측정 서버를 재시작해 주십시오. -message.security.group.usage=(해당하는 보안 ê·¸ë£¹ì„ ëª¨ë‘ ì„ íƒí•˜ë ¤ë©´ Ctrl 키를 누르면서 í´ë¦­í•´ 주십시오) -message.snapshot.schedule=ë‹¤ìŒ ì˜µì…˜ì—ì„œ ì„ íƒí•œ ì •ì±… 기본 ì„¤ì •ì„ ì ìš©í•˜ì—¬ 정기 스냅샷 ìŠ¤ì¼€ì¤„ì„ ì„¤ì • í•  수 있습니다. -message.step.1.continue=실행하려면 템플릿 ë˜ëŠ” ISO를 ì„ íƒí•´ 주십시오. -message.step.1.desc=새로운 ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ìš© í…œí”Œë¦¿ì„ ì„ íƒí•´ 주십시오.ISO를 설치 í•  수 있는 공백 í…œí”Œë¦¿ì„ ì„ íƒí•  ìˆ˜ë„ ìžˆìŠµë‹ˆë‹¤. -message.step.2.continue=실행하려면 ì„œë¹„ìŠ¤ì œê³µì„ ì„ íƒí•´ 주십시오. +managed.state=\uad00\ub9ac \ub300\uc0c1 \uc0c1\ud0dc +message.acquire.new.ip=\ud604\uc7ac \ub124\ud2b8\uc6cc\ud06c\uac00 \uc0c8\ub85c\uc6b4 IP \uc8fc\uc18c\ub97c \ucde8\ub4dd\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.acquire.public.ip=\uc0c8\ub85c\uc6b4 IP \uc8fc\uc18c\ub97c \ucde8\ub4dd\ud558\ub294 Zone\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.action.cancel.maintenance.mode=\ud604\uc7ac \uc720\uc9c0 \ubcf4\uc218\ub97c \ucde8\uc18c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.cancel.maintenance=\ud638\uc2a4\ud2b8 \uc720\uc9c0 \ubcf4\uc218\ub294 \uc815\uc0c1\uc801\uc73c\ub85c \ucde8\uc18c\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \ucc98\ub9ac\uc5d0\ub294 \uba87 \ubd84 \uc815\ub3c4 \uac78\ub9b4 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.action.change.service.warning.for.instance=\ud604\uc7ac \uc11c\ube44\uc2a4 \uc81c\uacf5\uc744 \ubcc0\uacbd\ud558\uae30 \uc804\uc5d0 \uc778\uc2a4\ud134\uc2a4\ub97c \uc815\uc9c0\ud574\uc57c \ud569\ub2c8\ub2e4. +message.action.change.service.warning.for.router=\ud604\uc7ac \uc11c\ube44\uc2a4 \uc81c\uacf5\uc744 \ubcc0\uacbd\ud558\uae30 \uc804\uc5d0 \ub77c\uc6b0\ud130\ub97c \uc815\uc9c0\ud574\uc57c \ud569\ub2c8\ub2e4. +message.action.delete.cluster=\ud604\uc7ac \ud074\ub7ec\uc2a4\ud130\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.disk.offering=\ud604\uc7ac \ub514\uc2a4\ud06c\uc81c\uacf5\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.domain=\ud604\uc7ac \ub3c4\uba54\uc778\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.external.firewall=\ud604\uc7ac \uc678\ubd80 \ubc29\ud654\ubcbd(fire wall)\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? \uacbd\uace0\: \uac19\uc740 \uc678\ubd80 \ubc29\ud654\ubcbd(fire wall)\ub97c \ub2e4\uc2dc \ucd94\uac00\ud560 \uacbd\uc6b0\ub294 \uae30\uae30 \uc0ac\uc6a9 \uc0c1\ud669 \ub370\uc774\ud130\ub97c \uc7ac\uc124\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. +message.action.delete.external.load.balancer=\ud604\uc7ac \uc678\ubd80 \ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? \uacbd\uace0\: \uac19\uc740 \uc678\ubd80 \ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58\ub97c \ub2e4\uc2dc \ucd94\uac00\ud560 \uacbd\uc6b0\ub294 \uae30\uae30 \uc0ac\uc6a9 \uc0c1\ud669 \ub370\uc774\ud130\ub97c \uc7ac\uc124\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. +message.action.delete.ingress.rule=\ud604\uc7ac \uc218\uc2e0 \uaddc\uce59\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.ISO.for.all.zones=\uc774 ISO\ub294 \ubaa8\ub4e0 Zone\uc5d0\uc11c \uc0ac\uc6a9\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4. \ubaa8\ub4e0 Zone\uc5d0\uc11c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.ISO=\ud604\uc7ac ISO\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.network=\ud604\uc7ac \ub124\ud2b8\uc6cc\ud06c\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.nexusVswitch=\ud604\uc7ac Nexus 1000V\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.physical.network=\ud604\uc7ac \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.pod=\ud604\uc7ac Pod\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.primary.storage=\ud604\uc7ac \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.secondary.storage=\ud604\uc7ac 2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.security.group=\ud604\uc7ac \ubcf4\uc548 \uadf8\ub8f9\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.service.offering=\ud604\uc7ac \uc11c\ube44\uc2a4\uc81c\uacf5\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.snapshot=\ud604\uc7ac \uc2a4\ub0c5\uc0f7\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.system.service.offering=\ud604\uc7ac \uc2dc\uc2a4\ud15c \uc11c\ube44\uc2a4 \uc81c\uacf5\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.template.for.all.zones=\uadf8 \ud15c\ud50c\ub9bf\uc740 \ubaa8\ub4e0 Zone\uc5d0\uc11c \uc0ac\uc6a9\ub418\uc5b4 \uc788\uc2b5\ub2c8\ub2e4. \ubaa8\ub4e0 Zone\uc5d0\uc11c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.template=\ud604\uc7ac \ud15c\ud50c\ub9bf\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.volume=\ud604\uc7ac \ubcfc\ub968\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.delete.zone=\ud604\uc7ac Zone\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.destroy.instance=\ud604\uc7ac \uc778\uc2a4\ud134\uc2a4\ub97c \ud30c\uae30\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.destroy.systemvm=\ud604\uc7ac \uc2dc\uc2a4\ud15c VM\ub97c \ud30c\uae30\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.disable.cluster=\ud604\uc7ac \ud074\ub7ec\uc2a4\ud130\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.disable.nexusVswitch=\ud604\uc7ac Nexus 1000V\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.disable.physical.network=\ud604\uc7ac \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.disable.pod=\ud604\uc7ac Pod\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.disable.static.NAT=\uc815\uc801 NAT\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \uc124\uc815\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.disable.zone=\ud604\uc7ac Zone\uc744 \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.download.iso=\ud604\uc7ac ISO\ub97c \ub2e4\uc6b4\ub85c\ub4dc\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.download.template=\ud604\uc7ac \ud15c\ud50c\ub9bf\uc744 \ub2e4\uc6b4\ub85c\ub4dc\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.enable.cluster=\ud604\uc7ac \ud074\ub7ec\uc2a4\ud130\ub97c \uc0ac\uc6a9 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.enable.maintenance=\ud638\uc2a4\ud2b8\ub97c \uc720\uc9c0 \ubcf4\uc218\ud560 \uc900\ube44\ub97c \ud560 \uc218 \uc788\uc5c8\uc2b5\ub2c8\ub2e4. \uc774 \ud638\uc2a4\ud2b8\uc0c1 VM \uc218\uc5d0 \ub530\ub77c\uc11c \ucc98\ub9ac\uc5d0 \uba87 \ubd84 \uc774\uc0c1 \uac78\ub9b4 \uac00\ub2a5\uc131\uc774 \uc788\uc2b5\ub2c8\ub2e4. +message.action.enable.nexusVswitch=\ud604\uc7ac Nexus 1000V\ub97c \uc0ac\uc6a9 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.enable.physical.network=\ud604\uc7ac \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\ub97c \uc0ac\uc6a9\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.enable.pod=\ud604\uc7ac Pod\ub97c \uc0ac\uc6a9 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.enable.zone=\ud604\uc7ac Zone\uc744 \uc0ac\uc6a9 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.force.reconnect=\ud638\uc2a4\ud2b8\ub294 \uac15\uc81c\uc801\uc73c\ub85c \uc7ac\uc811\uc18d\ud588\uc2b5\ub2c8\ub2e4. \uc774 \ucc98\ub9ac\uc5d0\ub294 \uba87 \ubd84 \uc774\uc0c1 \uac78\ub9b4 \uac00\ub2a5\uc131\uc774 \uc788\uc2b5\ub2c8\ub2e4 +message.action.host.enable.maintenance.mode=\uc720\uc9c0 \ubcf4\uc218 \ubaa8\ub4dc\ub97c \uc0ac\uc6a9 \ud558\uba74, \uc774 \ud638\uc2a4\ud2b8\ub85c \uc2e4\ud589 \uc911\uc778 \ubaa8\ub4e0 \uc778\uc2a4\ud134\uc2a4\ub97c \ub2e4\ub978 \uc0ac\uc6a9\uac00\ub2a5 \ud638\uc2a4\ud2b8\uc5d0\uac8c \uc2e4\uc2dc\uac04 \uc774\uc804\ub429\ub2c8\ub2e4. +message.action.instance.reset.password=\ud604\uc7ac \uac00\uc0c1 \uba38\uc2e0 \ub8e8\ud2b8 \uc554\ud638\ub97c \ubcc0\uacbd\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.manage.cluster=\ud074\ub7ec\uc2a4\ud130\ub97c \uad00\ub9ac \ub300\uc0c1\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.primarystorage.enable.maintenance.mode=\uacbd\uace0\: \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \uc720\uc9c0 \ubcf4\uc218 \ubaa8\ub4dc\ub85c \ud558\uba74 \uadf8 \uc2a4\ud1a0\ub9ac\uc9c0\uc0c1 \ubcfc\ub968\uc744 \uc0ac\uc6a9\ud558\ub294 \ubaa8\ub4e0 VM\uac00 \uc815\uc9c0\ud569\ub2c8\ub2e4. \uc2e4\ud589\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.reboot.instance=\ud604\uc7ac \uc778\uc2a4\ud134\uc2a4\ub97c \uc7ac\uc2dc\uc791\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.reboot.router=\ud604\uc7ac \uac00\uc0c1 \ub77c\uc6b0\ud130\ub85c \uc81c\uacf5\ud558\ub294 \ubaa8\ub4e0 \uc11c\ube44\uc2a4\uac00 \uc911\ub2e8\ub429\ub2c8\ub2e4. \uc774 \ub77c\uc6b0\ud130\ub97c \uc7ac\uc2dc\uc791\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.reboot.systemvm=\ud604\uc7ac \uc2dc\uc2a4\ud15c VM\uc744 \uc7ac\uc2dc\uc791\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.release.ip=\ud604\uc7ac IP \uc8fc\uc18c\ub97c \ud574\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.remove.host=\ud604\uc7ac \ud638\uc2a4\ud2b8\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.reset.password.off=\uc778\uc2a4\ud134\uc2a4\ub294 \ud604\uc7ac \uae30\ub2a5\uc744 \uc9c0\uc6d0 \ud558\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. +message.action.reset.password.warning=\ud604\uc7ac \uc554\ud638\ub97c \ubcc0\uacbd\ud558\uae30 \uc804\uc5d0 \uc778\uc2a4\ud134\uc2a4\ub97c \uc815\uc9c0\ud574\uc57c \ud569\ub2c8\ub2e4. +message.action.restore.instance=\ud604\uc7ac \uc778\uc2a4\ud134\uc2a4\ub97c \ubcf5\uc6d0\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.start.instance=\ud604\uc7ac \uc778\uc2a4\ud134\uc2a4\ub97c \uc2dc\uc791\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.start.router=\ud604\uc7ac \ub77c\uc6b0\ud130\ub97c \uc2dc\uc791\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.start.systemvm=\ud604\uc7ac \uc2dc\uc2a4\ud15c VM\uc744 \uc2dc\uc791\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.stop.instance=\ud604\uc7ac \uc778\uc2a4\ud134\uc2a4\ub97c \uc815\uc9c0\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.stop.router=\ud604\uc7ac \uac00\uc0c1 \ub77c\uc6b0\ud130\ub85c \uc81c\uacf5\ud558\ub294 \ubaa8\ub4e0 \uc11c\ube44\uc2a4\uac00 \uc911\ub2e8\ub429\ub2c8\ub2e4. \uc774 \ub77c\uc6b0\ud130\ub97c \uc815\uc9c0\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.stop.systemvm=\ud604\uc7ac \uc2dc\uc2a4\ud15c VM\uc744 \uc815\uc9c0\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.take.snapshot=\ud604\uc7ac \ubcfc\ub968 \uc2a4\ub0c5\uc0f7\uc744 \ub9cc\ub4dc\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.action.unmanage.cluster=\ud074\ub7ec\uc2a4\ud130\ub97c \ube44\uad00\ub9ac \ub300\uc0c1\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.activate.project=\ud604\uc7ac \ud504\ub85c\uc81d\ud2b8\ub97c \ud65c\uc131\ud654 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.add.cluster=Zone Pod \uc5d0 \ud558\uc774\ud37c \ubc14\uc774\uc800\ub85c \uad00\ub9ac\ub418\ub294 \ud074\ub7ec\uc2a4\ud130\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. +message.add.cluster.zone=Zone \uc5d0 \ud558\uc774\ud37c \ubc14\uc774\uc800\ub85c \uad00\ub9ac\ub418\ub294 \ud074\ub7ec\uc2a4\ud130\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. +message.add.disk.offering=\uc0c8\ub85c\uc6b4 \ub514\uc2a4\ud06c \uc81c\uacf5\uc744 \ucd94\uac00\ud558\uae30 \uc704\ud574 \ub2e4\uc74c \ud30c\ub77c\ubbf8\ud130\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.add.domain=\ud604\uc7ac \ub3c4\uba54\uc778\uc5d0 \ub9cc\ub4e4\uace0\uc790 \ud558\ub294 \uc11c\ube0c \ub3c4\uba54\uc778\uc744 \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.add.firewall=Zone\uc5d0 \ubc29\ud654\ubcbd(fire wall)\uc744 \ucd94\uac00\ud569\ub2c8\ub2e4. +message.add.guest.network=\uc190\ub2d8 \ub124\ud2b8\uc6cc\ud06c\ub97c \ucd94\uac00\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.add.host=\uc0c8\ub85c\uc6b4 \ud638\uc2a4\ud2b8\ub97c \ucd94\uac00\ud558\uae30 \uc704\ud574 \uc544\ub798 \ud30c\ub77c\ubbf8\ud130\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.adding.host=\ud638\uc2a4\ud2b8\ub97c \ucd94\uac00\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4 +message.adding.Netscaler.device=Netscaler \uae30\uae30\ub97c \ucd94\uac00\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4 +message.adding.Netscaler.provider=Netscaler \uc81c\uacf5\uc790\ub97c \ucd94\uac00\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4. +message.add.ip.range.direct.network=Zone \uc9c1\uc811 \ub124\ud2b8\uc6cc\ud06c \uc5d0 IP \uc8fc\uc18c \ubc94\uc704\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4 +message.add.ip.range.to.pod=

Pod \uc5d0 IP \uc8fc\uc18c \ubc94\uc704\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4.

+message.add.ip.range=Zone \uacf5\uac1c \ub124\ud2b8\uc6cc\ud06c\uc5d0 IP \uc8fc\uc18c \ubc94\uc704\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. +message.additional.networks.desc=\uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\uac00 \uc811\uc18d\ud558\ub294 \ucd94\uac00 \ub124\ud2b8\uc6cc\ud06c\ub97c \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.add.load.balancer.under.ip=\ub2e4\uc74c IP \uc8fc\uc18c\uc5d0 \ub300\ud574\uc11c \ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uaddc\uce59\uc744 \ucd94\uac00\ud569\ub2c8\ub2e4\: +message.add.load.balancer=Zone\uc5d0 \ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. +message.add.network=Zone \uc5d0 \uc0c8\ub85c\uc6b4 \ub124\ud2b8\uc6cc\ud06c\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. +message.add.new.gateway.to.vpc=\ud604\uc7ac VPC\uc5d0 \uc0c8\ub85c\uc6b4 \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \ucd94\uac00\ud558\uae30 \uc704\ud55c \uc815\ubcf4\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.add.pod.during.zone.creation=\uac01 Zone\uc5d0\ub294 \ud55c \uac1c \uc774\uc0c1 Pod\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc9c0\uae08 \uc5ec\uae30\uc11c \uccab\ubc88\uc9f8 Pod\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. Pod\ub294 \ud638\uc2a4\ud2b8\uc640 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\uc5d0\uc11c \uad6c\uc131\ud569\ub2c8\ub2e4\ub9cc \uc774\ub294 \ub2e4\uc74c \uc21c\uc11c\ub85c \ucd94\uac00\ud569\ub2c8\ub2e4. \ub9e8 \ucc98\uc74c CloudStack \ub0b4\ubd80 \uad00\ub9ac \ud2b8\ub798\ud53d\uc744 \uc704\ud574\uc11c IP \uc8fc\uc18c \ubc94\uc704\ub97c \uc608\uc57d\ud569\ub2c8\ub2e4. IP \uc8fc\uc18c \ubc94\uc704\ub294 \ud074\ub77c\uc6b0\ub4dc \ub0b4\ubd80 \uac01 Zone\uc5d0\uc11c \uc911\ubcf5 \ud558\uc9c0 \uc54a\uac8c \uc608\uc57d\ud560 \ud544\uc694\uac00 \uc788\uc2b5\ub2c8\ub2e4. +message.add.pod=Zone \uc5d0 \uc0c8\ub85c\uc6b4 Pod\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. +message.add.primary.storage=Zone Pod \uc5d0 \uc0c8\ub85c\uc6b4 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. +message.add.primary=\uc0c8\ub85c\uc6b4 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \ucd94\uac00\ud558\uae30 \uc704\ud574 \uc544\ub798 \ud30c\ub77c\ubbf8\ud130\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.add.secondary.storage=Zone \uc5d0 \uc0c8\ub85c\uc6b4 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4 +message.add.service.offering=\uc0c8\ub85c\uc6b4 \ucef4\ud4e8\ud305 \uc790\uc6d0 \uc81c\uacf5\uc744 \ucd94\uac00\ud558\uae30 \uc704\ud574\uc11c, \ub2e4\uc74c \ub370\uc774\ud130\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.add.system.service.offering=\uc0c8\ub85c\uc6b4 \uc2dc\uc2a4\ud15c \uc11c\ube44\uc2a4 \uc81c\uacf5\uc744 \ucd94\uac00\ud558\uae30 \uc704\ud574 \ub2e4\uc74c \ub370\uc774\ud130\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.add.template=\uc0c8\ub85c\uc6b4 \ud15c\ud50c\ub9bf\uc744 \ub9cc\ub4e4\uae30\ud558\uae30 \uc704\ud574 \uc544\ub798 \ub370\uc774\ud130\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.add.volume=\uc0c8\ub85c\uc6b4 \ubcfc\ub968\uc744 \ucd94\uac00\ud558\uae30 \uc704\ud574 \uc544\ub798 \ub370\uc774\ud130\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.add.VPN.gateway=VPN \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \ucd94\uac00\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.advanced.mode.desc=VLAN \uae30\uc220 \uc9c0\uc6d0\ub97c \uc0ac\uc6a9 \ud558\ub294 \uacbd\uc6b0\ub294 \uc774 \ub124\ud2b8\uc6cc\ud06c \ubaa8\ub378\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624.\uc774 \ubaa8\ub378\uc5d0\uc11c\ub294 \uac00\uc7a5 \uc720\uc5f0\ud558\uac8c \uce74\uc2a4\ud0d0\ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5\uc744 \uc81c\uacf5\ud560 \uc218 \uc788\uc5b4 \ubc29\ud654\ubcbd(fire wall), VPN, \ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58 \uae30\uc220 \uc9c0\uc6d0 \uc678\uc5d0, \uc9c1\uc811 \ub124\ud2b8\uc6cc\ud06c\uc640 \uac00\uc0c1 \ub124\ud2b8\uc6cc\ud06c\ub3c4 \uc0ac\uc6a9 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.advanced.security.group=\uac8c\uc2a4\ud2b8 VM\ub97c \ubd84\ub9ac\ud558\uae30 \uc704\ud574\uc11c \ubcf4\uc548 \uadf8\ub8f9\uc744 \uc0ac\uc6a9\ud558\ub294 \uacbd\uc6b0\ub294 \uc774 \uc635\uc158\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.advanced.virtual=\uac8c\uc2a4\ud2b8 VM\ub97c \ubd84\ub9ac\ud558\uae30 \uc704\ud574\uc11c \uc874 \uc804\uccb4 VLAN\ub97c \uc0ac\uc6a9\ud558\ub294 \uacbd\uc6b0\ub294 \uc774 \uc635\uc158\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.after.enable.swift=Swift\uac00 \uad6c\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \uc8fc\uc758\:\uc774 \ud398\uc774\uc9c0\ub97c \ub2eb\uc73c\uba74 Swift\ub97c \uc7ac\uad6c\uc131\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. +message.alert.state.detected=\uacbd\uacc4\uccb4\uc81c \uc0c1\ud0dc\uac00 \uac10\uc9c0\ub418\uc5c8\uc2b5\ub2c8\ub2e4 +message.allow.vpn.access=VPN \uc811\uadfc\ub97c \ud5c8\uac00\ud558\ub294 \uc0ac\uc6a9\uc790 \uc0ac\uc6a9\uc790\uba85\uacfc \uc554\ud638\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.apply.snapshot.policy=\ud604\uc7ac \uc2a4\ub0c5\uc0f7 \uc815\ucc45\ub97c \uc5c5\ub370\uc774\ud2b8\ud588\uc2b5\ub2c8\ub2e4. +message.attach.iso.confirm=\ud604\uc7ac \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\uc5d0 ISO \ud30c\uc77c\uc744 \uc5f0\uacb0 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.attach.volume=\uc0c8\ub85c\uc6b4 \ubcfc\ub968\uc744 \uc5f0\uacb0 \ud558\uae30 \uc704\ud574 \uc544\ub798 \ub370\uc774\ud130\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624.Windows \ubca0\uc774\uc2a4 \uac00\uc0c1 \uba38\uc2e0\uc5d0 \ub514\uc2a4\ud06c \ubcfc\ub968\uc744 \uc5f0\uacb0 \ud558\ub294 \uacbd\uc6b0\ub294 \uc5f0\uacb0 \ud55c \ub514\uc2a4\ud06c\ub97c \uc778\uc2dd\ud558\uae30 \uc704\ud574\uc11c \uc778\uc2a4\ud134\uc2a4\ub97c \uc7ac\uc2dc\uc791\ud560 \ud544\uc694\uac00 \uc788\uc2b5\ub2c8\ub2e4. +message.basic.mode.desc=VLAN \uae30\uc220 \uc9c0\uc6d0\uac00\ubd88\ud544\uc694\ud55c\uacbd\uc6b0\ub294 \uc774 \ub124\ud2b8\uc6cc\ud06c \ubaa8\ub378\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624.\uc774 \ub124\ud2b8\uc6cc\ud06c \ubaa8\ub378\ub85c \ub9cc\ub4e4\uae30\ub418\ub294 \ubaa8\ub4e0 \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\uc5d0 \ub124\ud2b8\uc6cc\ud06c\uc5d0\uc11c \uc9c1\uc811 IP \uc8fc\uc18c\ub97c \ud560\ub2f9\ud560 \uc218 \uc788\uc5b4 \ubcf4\uc548 \uadf8\ub8f9\uc744 \uc0ac\uc6a9\ud574 \ubcf4\uc548\uc640 \ubd84\ub9ac\uac00 \uc81c\uacf5\ub429\ub2c8\ub2e4. +message.change.offering.confirm=\ud604\uc7ac \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4 \uc11c\ube44\uc2a4\uc81c\uacf5\uc744 \ubcc0\uacbd\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.change.password=\uc554\ud638\ub97c \ubcc0\uacbd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.configure.all.traffic.types=\ubcf5\uc218\uc758 \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\uac00 \uc788\uc2b5\ub2c8\ub2e4. [\ud3b8\uc9d1]\uc744 \ud074\ub9ad\ud574 \ud2b8\ub798\ud53d\uc758 \uc885\ub958 \ub9c8\ub2e4 \ub77c\ubca8\uc744 \uad6c\uc131\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.configuring.guest.traffic=\uac8c\uc2a4\ud2b8 \ud2b8\ub798\ud53d\uc744 \uad6c\uc131\ud574 \uc788\uc2b5\ub2c8\ub2e4 +message.configuring.physical.networks=\ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\ub97c \uad6c\uc131\ud574 \uc788\uc2b5\ub2c8\ub2e4 +message.configuring.public.traffic=\uacf5\uac1c \ud2b8\ub798\ud53d\uc744 \uad6c\uc131\ud574 \uc788\uc2b5\ub2c8\ub2e4 +message.configuring.storage.traffic=\uc2a4\ud1a0\ub9ac\uc9c0 \ud2b8\ub798\ud53d\uc744 \uad6c\uc131\ud574 \uc788\uc2b5\ub2c8\ub2e4 +message.confirm.action.force.reconnect=\ud604\uc7ac \ud638\uc2a4\ud2b8\ub97c \uac15\uc81c \uc7ac\uc811\uc18d\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.confirm.delete.F5=F5\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.confirm.delete.NetScaler=NetScaler\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.confirm.delete.SRX=SRX\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.confirm.destroy.router=\ud604\uc7ac \ub77c\uc6b0\ud130\ub97c \ud30c\uae30\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.confirm.disable.provider=\ud604\uc7ac \uc81c\uacf5\uc790\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.confirm.enable.provider=\ud604\uc7ac \uc81c\uacf5\uc790\ub97c \uc0ac\uc6a9\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.confirm.join.project=\ud604\uc7ac \ud504\ub85c\uc81d\ud2b8\uc5d0 \ucc38\uc5ec\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.confirm.remove.IP.range=\ud604\uc7ac IP \uc8fc\uc18c \ubc94\uc704\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.confirm.shutdown.provider=\ud604\uc7ac \uc81c\uacf5\uc790\ub97c \uc885\ub8cc\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.copy.iso.confirm=ISO\ub97c \ub2e4\uc74c \uc7a5\uc18c\uc5d0 \ubcf5\uc0ac\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.copy.template=\uc874 \uc73c\uc5d0\uc11c \ud15c\ud50c\ub9bf XXX\ub97c \ub2e4\uc74c \uc7a5\uc18c\uc5d0 \ubcf5\uc0ac\ud569\ub2c8\ub2e4\: +message.create.template=\ud15c\ud50c\ub9bf\uc744 \ub9cc\ub4e4\uae30\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.create.template.vm=\ud15c\ud50c\ub9bf \uc73c\uc5d0\uc11c VM\ub97c \ub9cc\ub4e4\uc5c8\uc2b5\ub2c8\ub2e4. +message.create.template.volume=\ub514\uc2a4\ud06c \ubcfc\ub968 \ud15c\ud50c\ub9bf\uc744 \ub9cc\ub4e4\uae30\ud558\uae30 \uc804\uc5d0, \ub2e4\uc74c \uc815\ubcf4\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624.\ubcfc\ub968 \ud06c\uae30\uc5d0 \ub530\ub77c\uc11c\ub294 \ud15c\ud50c\ub9bf \ub9cc\ub4e4\uae30\uc5d0\ub294 \uba87\ubd84 \uc774\uc0c1 \uac78\ub9b4 \uac00\ub2a5\uc131\uc774 \uc788\uc2b5\ub2c8\ub2e4. +message.creating.cluster=\ud074\ub7ec\uc2a4\ud130\ub97c \ub9cc\ub4e4\uc5c8\uc2b5\ub2c8\ub2e4. +message.creating.guest.network=\uc190\ub2d8 \ub124\ud2b8\uc6cc\ud06c\ub97c \ub9cc\ub4ed\ub2c8\ub2e4. +message.creating.physical.networks=\ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\ub97c \ub9cc\ub4e4\uc5c8\uc2b5\ub2c8\ub2e4. +message.creating.pod=Pod\ub97c \ub9cc\ub4e4\uc5c8\uc2b5\ub2c8\ub2e4. +message.creating.primary.storage=\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \ub9cc\ub4e4\uc5c8\uc2b5\ub2c8\ub2e4. +message.creating.secondary.storage=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \ub9cc\ub4e4\uc5c8\uc2b5\ub2c8\ub2e4. +message.creating.zone=Zone\uc744 \ub9cc\ub4e4\uc5c8\uc2b5\ub2c8\ub2e4. +message.decline.invitation=\ud604\uc7ac \ud504\ub85c\uc81d\ud2b8\uc5d0 \ucd08\ub300\ub97c \uac70\uc808\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.delete.account=\ud604\uc7ac \uacc4\uc815 \uc815\ubcf4\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.delete.gateway=\ud604\uc7ac \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.delete.project=\ud604\uc7ac \ud504\ub85c\uc81d\ud2b8\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.delete.user=\ud604\uc7ac \uc0ac\uc6a9\uc790\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.delete.VPN.connection=VPN \uc811\uc18d\uc744 \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.delete.VPN.customer.gateway=\ud604\uc7ac VPN \uace0\uac1d \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.delete.VPN.gateway=\ud604\uc7ac VPN \uac8c\uc774\ud2b8\uc6e8\uc774\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.desc.advanced.zone=\ubcf4\ub2e4 \uc138\ub828\ub41c \ub124\ud2b8\uc6cc\ud06c \uae30\uc220\uc744 \uc9c0\uc6d0\ud569\ub2c8\ub2e4. \uc774 \ub124\ud2b8\uc6cc\ud06c \ubaa8\ub378\uc744 \uc120\ud0dd\ud558\uba74, \ubcf4\ub2e4 \uc720\uc5f0\ud558\uac8c \uac8c\uc2a4\ud2b8 \ub124\ud2b8\uc6cc\ud06c\ub97c \uc815\ud558\uace0 \ubc29\ud654\ubcbd(fire wall), VPN, \ub124\ud2b8\uc6cc\ud06c \ub85c\ub4dc \uacf5\uc720 \uc7a5\uce58 \uae30\uc220 \uc9c0\uc6d0\uc640 \uac19\uc740 \uc0ac\uc6a9\uc790 \uc9c0\uc815 \ud55c \ub124\ud2b8\uc6cc\ud06c \uc81c\uacf5\uc744 \uc81c\uacf5\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.desc.basic.zone=\uac01 VM \uc778\uc2a4\ud134\uc2a4\uc5d0 IP \uc8fc\uc18c\uac00 \ub124\ud2b8\uc6cc\ud06c\uc5d0\uc11c \uc9c1\uc811 \ud560\ub2f9\ud560 \uc218 \uc788\ub294 \ub2e8\uc77c \ub124\ud2b8\uc6cc\ud06c\ub97c \uc81c\uacf5\ud569\ub2c8\ub2e4. \ubcf4\uc548 \uadf8\ub8f9 (\uc804\uc1a1\uc6d0 IP \uc8fc\uc18c \ud544\ud130)\uacfc \uac19\uc740 \uce35 \uc138 \uac00\uc9c0 \ub808\ubca8 \ubc29\ubc95\uc73c\ub85c \uac8c\uc2a4\ud2b8\ub97c \ubd84\ub9ac\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.desc.cluster=\uac01 Pod\uc5d0\ub294 \ud55c \uac1c \uc774\uc0c1 \ud074\ub7ec\uc2a4\ud130\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc9c0\uae08 \uc5ec\uae30\uc11c \ucd5c\ucd08 \ud074\ub7ec\uc2a4\ud130\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. \ud074\ub7ec\uc2a4\ud130\ub294 \ud638\uc2a4\ud2b8\ub97c \uadf8\ub8f9\ud654 \ud558\ub294 \ubc29\ubc95\uc785\ub2c8\ub2e4. \ud55c \ud074\ub7ec\uc2a4\ud130 \ub0b4\ubd80 \ud638\uc2a4\ud2b8\ub294 \ubaa8\ub450 \ub3d9\uc77c\ud55c \ud558\ub4dc\uc6e8\uc5b4\uc5d0\uc11c \uad6c\uc131\ub418\uc5b4 \uac19\uc740 \ud558\uc774\ud37c \ubc14\uc774\uc800\ub97c \uc2e4\ud589\ud558\uace0 \uac19\uc740 \uc11c\ube0c \ub124\ud2b8\uc6cc\ud06c\uc0c1\uc5d0 \uc788\uc5b4 \uac19\uc740 \uacf5\uc720 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \uc811\uadfc \ud569\ub2c8\ub2e4. \uac01 \ud074\ub7ec\uc2a4\ud130\ub294 \ud55c \uac1c \uc774\uc0c1 \ud638\uc2a4\ud2b8\uc640 \ud55c \uac1c \uc774\uc0c1 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\uc5d0\uc11c \uad6c\uc131\ub429\ub2c8\ub2e4. +message.desc.host=\uac01 \ud074\ub7ec\uc2a4\ud130\uc5d0\ub294 \uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1 \uac8c\uc2a4\ud2b8 VM\ub97c \uc2e4\ud589\ud558\uae30 \uc704\ud55c \ud638\uc2a4\ud2b8 (\ucef4\ud4e8\ud130)\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc9c0\uae08 \uc5ec\uae30\uc11c \uccab\ubc88\uc9f8 \ud638\uc2a4\ud2b8\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. CloudStack\uc73c\ub85c \ud638\uc2a4\ud2b8\ub97c \ub3d9\uc791\ud558\ub824\uba74 \ud638\uc2a4\ud2b8\uc5d0\uac8c \ud558\uc774\ud37c \ubc14\uc774\uc800\ub97c \uc124\uce58\ud558\uace0 IP \uc8fc\uc18c\ub97c \ud560\ub2f9\ud574 \ud638\uc2a4\ud2b8\uac00 CloudStack \uad00\ub9ac \uc11c\ubc84\uc5d0 \uc811\uc18d\ud558\ub3c4\ub85d \ud569\ub2c8\ub2e4.

\ud638\uc2a4\ud2b8 DNS \uba85 \ub610\ub294 IP \uc8fc\uc18c, \uc0ac\uc6a9\uc790\uba85(\uc6d0\ub798 root)\uacfc \uc554\ud638 \ubc0f \ud638\uc2a4\ud2b8 \ubd84\ub958\uc5d0 \uc0ac\uc6a9\ud558\ub294 \ub77c\ubca8\uc744 \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.desc.primary.storage=\uac01 \ud074\ub7ec\uc2a4\ud130\uc5d0\ub294 \uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1\uc758 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc9c0\uae08 \uc5ec\uae30\uc11c \uccab\ubc88\uc9f8 \uc11c\ubc84\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub294 \ud074\ub7ec\uc2a4\ud130 \ub0b4 \ubd80 \ud638\uc2a4\ud2b8\uc0c1\uc5d0\uc11c \ub3d9\uc791\ud558\ub294 \ubaa8\ub4e0 VM \ub514\uc2a4\ud06c \ubcfc\ub968\uc744 \ud3ec\ud568\ud569\ub2c8\ub2e4. \uae30\ubcf8\uc801\uc73c\ub85c \ud558\uc774\ud37c \ubc14\uc774\uc800\uc5d0\uc11c \uae30\uc220 \uc9c0\uc6d0\ub418\ub294 \ud45c\uc900\uc5d0 \uc900\uac70\ud55c \ud504\ub85c\ud1a0\ucf5c\uc744 \uc0ac\uc6a9\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.desc.secondary.storage=\uac01 Zone\uc5d0\ub294 \uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1\uc758 NFS \uc989 2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\uac00 \ud544\uc694\ud569\ub2c8\ub2e4. \uc9c0\uae08 \uc5ec\uae30\uc11c \uccab\ubc88\uc9f8 \uc11c\ubc84\ub97c \ucd94\uac00\ud569\ub2c8\ub2e4. 2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0\ub294 VM \ud15c\ud50c\ub9bf, ISO \uc774\ubbf8\uc9c0 \ubc0f VM \ub514\uc2a4\ud06c \ubcfc\ub968 \uc2a4\ub0c5\uc0f7\uc744 \ud3ec\ud568\ud569\ub2c8\ub2e4. \uc774 \uc11c\ubc84\ub294 Zone\ub0b4 \ubaa8\ub4e0 \ud638\uc2a4\ud2b8\uc5d0\uc11c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4.

IP \uc8fc\uc18c\uc640 \ub0b4\ubcf4\ub0b4\ub0bc \uacbd\ub85c\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.desc.zone=Zone\uc740 CloudStack \ud658\uacbd\ub0b4 \ucd5c\ub300 \uc870\uc9c1 \ub2e8\uc704\ub85c \uc6d0\ub798 \ub2e8\uc77c \ub370\uc774\ud130 \uc13c\ud130\uc5d0 \ud574\ub2f9\ud569\ub2c8\ub2e4. Zone\uc5d0 \ud574\uc11c \ubb3c\ub9ac\uc801\uc778 \ubd84\ub9ac\uc640 \uc911\ubcf5\uc131\uc774 \uc81c\uacf5\ub429\ub2c8\ub2e4. Zone\uc740 \ud55c \uac1c \uc774\uc0c1 Pod( \uac01 Pod\ub294 \ud638\uc2a4\ud2b8\uc640 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\uc5d0\uc11c \uad6c\uc131)\uc640 Zone\ub0b4 \ubaa8\ub4e0 Pod\ub85c \uacf5\uc720\ub418\ub294 2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\ub85c \uad6c\uc131\ub429\ub2c8\ub2e4. +message.detach.disk=\ud604\uc7ac \ub514\uc2a4\ud06c\ub97c \ubd84\ub9ac \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.detach.iso.confirm=\ud604\uc7ac \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\uc5d0\uc11c ISO \ud30c\uc77c\uc744 \ubd84\ub9ac \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.disable.account=\ud604\uc7ac \uacc4\uc815 \uc815\ubcf4\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c?\uc774 \uacc4\uc815 \uc815\ubcf4 \ubaa8\ub4e0 \uc0ac\uc6a9\uc790\uac00 \ud074\ub77c\uc6b0\ub4dc \uc790\uc6d0\uc5d0 \uc811\uadfc \ud560 \uc218 \uc5c6\uac8c \ub429\ub2c8\ub2e4. \uc2e4\ud589\uc911 \ubaa8\ub4e0 \uac00\uc0c1 \uba38\uc2e0\uc740 \uae08\ubc29\uc5d0 \uc885\ub8cc \ub429\ub2c8\ub2e4. +message.disable.snapshot.policy=\ud604\uc7ac \uc2a4\ub0c5\uc0f7 \uc815\ucc45\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \uc124\uc815\ud588\uc2b5\ub2c8\ub2e4. +message.disable.user=\ud604\uc7ac \uc0ac\uc6a9\uc790\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.disable.vpn.access=VPN \uc811\uadfc\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.disable.vpn=VPN\ub97c \uc0ac\uc6a9 \uc548 \ud568\uc73c\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.download.ISO=ISO\ub97c \ub2e4\uc6b4\ub85c\ub4dc\ud558\ub824\uba74 00000\uc744 \ud074\ub9ad\ud569\ub2c8\ub2e4. +message.download.template=\ud15c\ud50c\ub9bf\uc744 \ub2e4\uc6b4\ub85c\ub4dc\ud558\ub824\uba74 00000\uc744 \ud074\ub9ad\ud569\ub2c8\ub2e4. +message.download.volume.confirm=\ud604\uc7ac \ubcfc\ub968\uc744 \ub2e4\uc6b4\ub85c\ub4dc\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.download.volume=\ubcfc\ub968\uc744 \ub2e4\uc6b4\ub85c\ub4dc\ud558\ub824\uba74 00000\uc744 \ud074\ub9ad\ud569\ub2c8\ub2e4. +message.edit.account=\ud3b8\uc9d1 ("-1"\ub294 \uc790\uc6d0 \ub9cc\ub4e4\uae30 \uc22b\uc790\uc5d0 \uc81c\ud55c\uc774 \uc5c6\ub294 \uac12\uc785\ub2c8\ub2e4.) +message.edit.confirm=[\uc800\uc7a5]\uc744 \ud074\ub9ad\ud558\uae30 \uc804\uc73c\ub85c \ubcc0\uacbd \ub0b4\uc6a9\uc744 \ud655\uc778\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.edit.limits=\ub2e4\uc74c \uc790\uc6d0\uc5d0 \uc81c\ud55c\uc744 \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624.\u300c-1\u300d\uc740 \uc790\uc6d0 \ub9cc\ub4e4\uae30\uc5d0 \uc81c\ud55c\uc774 \uc5c6\ub2e4\ub294 \uc758\ubbf8\uc785\ub2c8\ub2e4. +message.edit.traffic.type=\ud604\uc7ac \ud2b8\ub798\ud53d\uc758 \uc885\ub958\uc5d0 \uad00\ub828 \ud2b8\ub798\ud53d \ub77c\ubca8\uc744 \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.enable.account=\ud604\uc7ac \uacc4\uc815 \uc815\ubcf4\ub97c \uc0ac\uc6a9 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.enabled.vpn.ip.sec=IPSec \uc0ac\uc804 \uacf5\uc720 \ud0a4\: +message.enabled.vpn=\ud604\uc7ac VPN \uc811\uadfc \uc0ac\uc6a9 \uc124\uc815\ub418\uc5b4 \uc788\uc2b5\ub2c8\ub2e4. \ub2e4\uc74c IP \uc8fc\uc18c \uacbd\uc720\ub85c \uc811\uadfc \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.enable.user=\ud604\uc7ac \uc0ac\uc6a9\uc790\ub97c \uc0ac\uc6a9 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.enable.vpn.access=\ud604\uc7ac\uc774 IP \uc8fc\uc18c\uc5d0 \ub300\ud55c VPN\ub294 \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740\uc785\ub2c8\ub2e4. VPN \uc811\uadfc\ub97c \uc0ac\uc6a9 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.enable.vpn=\ud604\uc7ac IP \uc8fc\uc18c\uc5d0 \ub300\ud55c VPN \uc811\uadfc\ub97c \uc0ac\uc6a9 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.enabling.security.group.provider=\ubcf4\uc548 \uadf8\ub8f9 \uc81c\uacf5\uc790\ub97c \uc0ac\uc6a9 \ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4. +message.enabling.zone=Zone\uc744 \uc0ac\uc6a9\ud558\uace0 \uc788\uc2b5\ub2c8\ub2e4 +message.enter.token=\uc804\uc790 \uba54\uc77c \ucd08\ub300\uc7a5\uc5d0 \uc124\uba85\ub418\uc5b4 \uc788\ub294 \ud1a0\ud070\uc744 \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.generate.keys=\ud604\uc7ac \uc0ac\uc6a9\uc790\uc5d0\uac8c \uc0c8\ub85c\uc6b4 \ud0a4\ub97c \uc0dd\uc131\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.guest.traffic.in.advanced.zone=\uc190\ub2d8 \ub124\ud2b8\uc6cc\ud06c \ud2b8\ub798\ud53d\uc740 \ucd5c\uc885 \uc0ac\uc6a9\uc790 \uac00\uc0c1 \uba38\uc2e0\uac04 \ud1b5\uc2e0\uc785\ub2c8\ub2e4. \uac01 \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c \uac8c\uc2a4\ud2b8 \ud2b8\ub798\ud53d\uc744 \ud1b5\uc2e0\ud558\uae30 \uc704\ud55c VLAN ID \ubc94\uc704\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.guest.traffic.in.basic.zone=\uc190\ub2d8 \ub124\ud2b8\uc6cc\ud06c \ud2b8\ub798\ud53d\uc740 \ucd5c\uc885 \uc0ac\uc6a9\uc790\uc758 \uac00\uc0c1 \uba38\uc2e0\uac04 \ud1b5\uc2e0\uc785\ub2c8\ub2e4. CloudStack\uc5d0 \uac8c\uc2a4\ud2b8 VM\uc5d0 \ud560\ub2f9\ud560 \uc218 \uc788\ub294 IP \uc8fc\uc18c \ubc94\uc704\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624.\uc774 \ubc94\uc704\uac00 \uc608\uc57d \ub05d\ub09c \uc2dc\uc2a4\ud15c IP \uc8fc\uc18c \ubc94\uc704\uc640 \uc911\ubcf5 \ud558\uc9c0 \uc54a\uac8c \uc8fc\uc758\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.installWizard.click.retry=\uc2dc\uc791\uc744 \uc7ac\uc2dc\ud589\ud558\ub824\uba74 \ubc84\ud2bc\uc744 \ud074\ub9ad\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.installWizard.copy.whatIsACluster=\ud074\ub7ec\uc2a4\ud130\ub294 \ud638\uc2a4\ud2b8\ub97c \uadf8\ub8f9\ud654 \ud558\ub294 \ubc29\ubc95\uc785\ub2c8\ub2e4. \ud55c \uac00\uc9c0 \ud074\ub7ec\uc2a4\ud130\ub0b4 \ud638\uc2a4\ud2b8\ub294 \ubaa8\ub450 \ub3d9\uc77c\ud55c \ud558\ub4dc\uc6e8\uc5b4\uc5d0\uc11c \uad6c\uc131\ub418\uc5b4 \uac19\uc740 \ud558\uc774\ud37c \ubc14\uc774\uc800\ub97c \uc2e4\ud589\ud558\uace0 \uac19\uc740 \uc11c\ube0c \ub124\ud2b8\uc6cc\ud06c\uc0c1\uc5d0 \uc788\uc5b4\uc11c \uac19\uc740 \uacf5\uc720 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \uc811\uadfc \ud569\ub2c8\ub2e4. \uac19\uc740 \ud074\ub7ec\uc2a4\ud130\ub0b4\uc758 \ud638\uc2a4\ud2b8 \uc0ac\uc774\uc5d0\uc11c\ub294 \uc0ac\uc6a9\uc790\uc5d0\uac8c \uc11c\ube44\uc2a4\ub97c \uc911\ub2e8\ud558\uc9c0 \uc54a\uace0 \uac00\uc0c1 \uba38\uc2e0 \uc778\uc2a4\ud134\uc2a4\ub97c \uc2e4\uc2dc\uac04 \uc774\uc804 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \ud074\ub7ec\uc2a4\ud130\ub294 CloudStack\u2122 \ud658\uacbd\ub0b4\uc758 \uc138 \ubc88\uc9f8\ub85c \ud070 \uc870\uc9c1 \ub2e8\uc704\uc785\ub2c8\ub2e4. \ud074\ub7ec\uc2a4\ud130\ub294 Pod\uc5d0 \ud3ec\ud568\ub418\uc5b4 Pod\ub294 Zone\uc5d0 \ud3ec\ud568\ub429\ub2c8\ub2e4.

CloudStack\u2122 \uc5d0\uc11c\ub294 \ud55c \uac00\uc9c0 \ud074\ub77c\uc6b0\ub4dc \ud658\uacbd\uc5d0 \ubcf5\uc218 \ud074\ub7ec\uc2a4\ud130\ub97c \uc124\uc815\ud560 \uc218 \uc788\uc73c\ub098 \uae30\ubcf8 \uc124\uce58\uc5d0\uc11c\ub294 \ud074\ub7ec\uc2a4\ud130\ub294 \ud55c \uac1c\uc785\ub2c8\ub2e4. +message.installWizard.copy.whatIsAHost=\ud638\uc2a4\ud2b8\ub294 \ub2e8\uc77c \ucef4\ud4e8\ud130\ub85c \uc190\ub2d8 \uac00\uc0c1 \uba38\uc2e0\uc744 \uc2e4\ud589\ud558\ub294 \ucef4\ud4e8\ud305 \uc790\uc6d0\uc744 \uc81c\uacf5\ud569\ub2c8\ub2e4. \ubca0\uc5b4 \uba54\ud0c8 \ud638\uc2a4\ud2b8\ub97c \uc81c\uc678\ud558\uace0, \uac01 \ud638\uc2a4\ud2b8\ub294 \uac8c\uc2a4\ud2b8 \uac00\uc0c1 \uba38\uc2e0\uc744 \uad00\ub9ac\ud558\uae30 \uc704\ud55c \ud558\uc774\ud37c \ubc14\uc774\uc800 \uc18c\ud504\ud2b8\uc6e8\uc5b4\ub97c \uc124\uce58\ud569\ub2c8\ub2e4. \ubca0\uc5b4 \uba54\ud0c8 \ud638\uc2a4\ud2b8\uc5d0 \ub300\ud574\uc11c\ub294 \uc124\uce58 \uac00\uc774\ub4dc \uace0\uae09\ud3b8 \ud2b9\uc218 \uc0ac\ub840\ub85c\uc11c \uc124\uba85\ud569\ub2c8\ub2e4. \uc608\ub97c \ub4e4\uc5b4, KVM\uc740 \uc720\ud6a8\ud55c Linux \uc11c\ubc84, Citrix XenServer\uac00 \ub3d9\uc791\ud558\ub294 \uc11c\ubc84 \ubc0f ESXi \uc11c\ubc84\uac00 \ud638\uc2a4\ud2b8\uc785\ub2c8\ub2e4. \uae30\ubcf8 \uc124\uce58\uc5d0\uc11c\ub294 XenServer \ub610\ub294 KVM\ub97c \uc2e4\ud589\ud558\ub294 \ub2e8\uc77c \ud638\uc2a4\ud2b8\ub97c \uc0ac\uc6a9\ud569\ub2c8\ub2e4.

\ud638\uc2a4\ud2b8\ub294 CloudStack\u2122 \ud658\uacbd\ub0b4\uc758 \ucd5c\uc18c\uc758 \uc870\uc9c1 \ub2e8\uc704\uc785\ub2c8\ub2e4. \ud638\uc2a4\ud2b8\ub294 \ud074\ub7ec\uc2a4\ud130\uc5d0 \ud3ec\ud568\ub418\uc5b4 \ud074\ub7ec\uc2a4\ud130\ub294 Pod\uc5d0 \ud3ec\ud568\ub418\uc5b4 Pod\ub294 Zone\uc5d0 \ud3ec\ud568\ub429\ub2c8\ub2e4. +message.installWizard.copy.whatIsAPod=\uc6d0\ub798 \ud55c \uac00\uc9c0 Pod\ub294 \ub2e8\uc77c \uc7a0\uae08\uc744 \ub098\ud0c0\ub0c5\ub2c8\ub2e4. \uac19\uc740 Pod\ub0b4 \ud638\uc2a4\ud2b8\ub294 \uac19\uc740 \uc11c\ube0c \ub124\ud2b8\uc6cc\ud06c\uc5d0 \ud3ec\ud568\ub429\ub2c8\ub2e4.

Pod\ub294 CloudStack\u2122 \ud658\uacbd\ub0b4\uc758 \ub450 \ubc88\uc9f8\ub85c \ud070 \uc870\uc9c1 \ub2e8\uc704\uc785\ub2c8\ub2e4. Pod\ub294 Zone\uc5d0 \ud3ec\ud568\ub429\ub2c8\ub2e4. \uac01 Zone\uc740 \ud55c \uac1c \uc774\uc0c1\uc758 Pod\ub97c \ud3ec\ud568\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \uae30\ubcf8 \uc124\uce58\uc5d0\uc11c\ub294 Zone\ub0b4 Pod\ub294 \ud55c \uac1c\uc785\ub2c8\ub2e4. +message.installWizard.copy.whatIsAZone=Zone\uc740 CloudStack\u2122 \ud658\uacbd\ub0b4 \ucd5c\ub300 \uc870\uc9c1 \ub2e8\uc704\uc785\ub2c8\ub2e4. \ud55c \uac00\uc9c0 \ub370\uc774\ud130 \uc13c\ud130\ub0b4\uc5d0 \ubcf5\uc218 Zone\uc744 \uc124\uc815\ud560 \uc218 \uc788\uc73c\ub098 \uc6d0\ub798 Zone\uc740 \ub2e8\uc77c\uc758 \ub370\uc774\ud130 \uc13c\ud130\uc5d0 \ud560\ub2f9\ud569\ub2c8\ub2e4. \uc778\ud504\ub77c\uc2a4\ud2b8\ub7ed\uccd0\ub97c Zone\uc5d0 \uc870\uc9c1\ud654\ud558\uba74, Zone\uc744 \ubb3c\ub9ac\uc801\uc6b0\ub85c \ubd84\ub9ac\ud574 \uc124\uc815\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \uc608\ub97c \ub4e4\uc5b4, \uac01 Zone\uc5d0 \uc804\uc6d0\uacfc \ub124\ud2b8\uc6cc\ud06c \uc5c5\ub9c1\ud06c\ub97c \ubc30\uce58\ud569\ub2c8\ub2e4. \ud544\uc218\uac00 \uc544\ub2c8\uc9c0\ub9cc \uc6d0\uaca9\uc9c0\uc5d0 \ubd84\uc0b0\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.installWizard.copy.whatIsCloudStack=CloudStack\u2122\ub294 \ucef4\ud4e8\ud305 \uc790\uc6d0\uc744 \ud3ec\ud568\ud558\ub294 \uc18c\ud504\ud2b8\uc6e8\uc5b4 \ud50c\ub7ab\uc6f9 \uc591\uc2dd\uc5d0\uc11c \uacf5\uac1c, \uc0ac\uc124, \ubc0f \ud558\uc774\ube0c\ub9ac\ub4dc\uc758 Infrastructure as a Service (IaaS) \ud074\ub77c\uc6b0\ub4dc\ub97c \uad6c\ucd95\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. CloudStack\u2122\ub97c \uc0ac\uc6a9\ud558\uace0, \ud074\ub77c\uc6b0\ub4dc \uc778\ud504\ub77c\uc2a4\ud2b8\ub7ed\uccd0\ub97c \uad6c\uc131\ud558\ub294 \ub124\ud2b8\uc6cc\ud06c, \uc2a4\ud1a0\ub9ac\uc9c0 \ubc0f \ucef4\ud4e8\ud305 \ub178\ub4dc\ub97c \uad00\ub9ac\ud558\uace0 \ud074\ub77c\uc6b0\ub4dc \ucef4\ud4e8\ud305 \ud658\uacbd\uc744 \uc124\uc815, \uad00\ub9ac \ubc0f \uad6c\uc131\ud569\ub2c8\ub2e4.

CloudStack\u2122\uc740 \ud558\ub4dc\uc6e8\uc5b4\uc0c1\uc5d0\uc11c \ub3d9\uc791\ud558\ub294 \uac1c\ubcc4 \uac00\uc0c1 \uba38\uc2e0 \uc774\ubbf8\uc9c0\ub97c \ub118\uc5b4 \ud655\uc7a5\ud560 \uc218 \uc788\uae30 \ub54c\ubb38\uc5d0 \uac04\ub2e8\ud55c \uc124\uc815\uc73c\ub85c \ub3d9\uc791\ud558\ub294 \ud074\ub77c\uc6b0\ub4dc \uc778\ud504\ub77c\uc2a4\ud2b8\ub7ed\uccd0 \uc18c\ud504\ud2b8\uc6e8\uc5b4 \uc2a4\ud0dd\uc5d0 \uc758\ud574 \uac00\uc0c1 \ub370\uc774\ud130 \uc13c\ud130 \uc989 \uc5ec\ub7ec \uce35\ud615 \uba40\ud2f0 \uc138\uc785\uc790 \ud074\ub77c\uc6b0\ub4dc \uc560\ud50c\ub9ac\ucf00\uc774\uc158\uc744 \uc11c\ube44\uc2a4\ub85c\uc11c \uad6c\ucd95\ud558\uace0 \uc124\uc815\ud558\uace0 \uad00\ub9ac\ud558\uae30 \uc704\ud574\uc11c \ubd88\uac00\uacb0\ud55c \ud56d\ubaa9\uc744 \ubaa8\ub450 \uc81c\uacf5\ud569\ub2c8\ub2e4. \uc624\ud508 \uc18c\uc2a4 \ubc84\uc804\uacfc \ud504\ub9ac\ubbf8\uc5c4 \ubc84\uc804 \uc591\ucabd \ubaa8\ub450\uc5d0 \uc81c\uacf5\ud558\uba70 \uc624\ud508 \uc18c\uc2a4 \ubc84\uc804\uc5d0\uc11c\ub3c4 \ub300\ubd80\ubd84 \uae30\ub2a5\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.installWizard.copy.whatIsPrimaryStorage=CloudStack\u2122 \ud074\ub77c\uc6b0\ub4dc \uc778\ud504\ub77c\uc2a4\ud2b8\ub7ed\uccd0\uc5d0\uc11c\ub294 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\uc640 2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 \ub450 \uc885\ub958\uc758 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \uc0ac\uc6a9\ud569\ub2c8\ub2e4. \uc591\ucabd \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0\uc11c iSCSI, NFS \uc11c\ubc84, \ub610\ub294 \ub85c\uceec \ub514\uc2a4\ud06c\ub97c \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.

\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub294 \ud074\ub7ec\uc2a4\ud130\uc5d0 \uad00\ub828\ub418\uc5b4\uadf8 \ud074\ub7ec\uc2a4\ud130\ub0b4\uc758 \ud638\uc2a4\ud2b8\ub85c \ub3d9\uc791\ud558\ub294 \ubaa8\ub4e0 VM \uc911 \uac01 \uac8c\uc2a4\ud2b8 VM\uc758 \ub514\uc2a4\ud06c \ubcfc\ub968\uc744 \ud3ec\ud568\ud569\ub2c8\ub2e4. \uc6d0\ub798, \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \uc11c\ubc84\ub294 \ud638\uc2a4\ud2b8 \uadfc\ucc98\uc5d0 \uc124\uce58\ud569\ub2c8\ub2e4. +message.installWizard.copy.whatIsSecondaryStorage=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0\ub294 Zone\uacfc \uad00\ub828\ub3e4 \uc544\ub798\uc758 \ud56d\ubaa9\uc744 \ud3ec\ud568\ud569\ub2c8\ub2e4.
  • \ud15c\ud50c\ub9bf - VM \uc2dc\uc791 \uc2dc \uc0ac\uc6a9\ud560 \uc218 \uc788\ub294 OS \uc774\ubbf8\uc9c0\ub85c \uc560\ud50c\ub9ac\ucf00\uc774\uc158\uc758 \uc124\uce58 \ub4f1 \ucd94\uac00 \uad6c\uc131\uc744 \ud3ec\ud568\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
  • ISO \uc774\ubbf8\uc9c0 - \ubc14\ub85c \uc2dc\uc791 \uac00\ub2a5 \ub610\ub294 \uc2dc\uc791 \ubd88\uac00\uc758 OS \uc774\ubbf8\uc9c0\uc785\ub2c8\ub2e4.
  • \ub514\uc2a4\ud06c \ubcfc\ub968 \uc2a4\ub0c5\uc0f7 - VM \ub370\uc774\ud130 \uc800\uc7a5 \ubcf5\uc0ac\ubcf8\uc785\ub2c8\ub2e4. \ub370\uc774\ud130\uc758 \ubcf5\uc6d0 \ub610\ub294 \uc0c8\ub85c\uc6b4 \ud15c\ud50c\ub9bf \ub9cc\ub4e4\uae30\uc5d0 \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.
+message.installWizard.now.building=\ud074\ub77c\uc6b0\ub4dc\ub97c \uad6c\ucd95\ud558\uace0 \uc788\ub294 \uc911... +message.installWizard.tooltip.addCluster.name=\ud074\ub7ec\uc2a4\ud130 \uc774\ub984\uc785\ub2c8\ub2e4. CloudStack\uc5d0\uc11c \uc608\uc57d\ud558\uc9c0 \uc54a\uc740 \uc784\uc758 \ud14d\uc2a4\ud2b8\ub97c \uc9c0\uc815\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.installWizard.tooltip.addHost.hostname=\ud638\uc2a4\ud2b8 DNS \uba85 \ub610\ub294 IP \uc8fc\uc18c\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addHost.password=XenServer \uce21\uc5d0\uc11c \uc9c0\uc815\ud55c \uc704\uc758 \uc0ac\uc6a9\uc790\uba85\uc5d0 \ub300\ud55c \uc554\ud638\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addHost.username=\uc6d0\ub798 root \uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addPod.name=Pod \uc774\ub984\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addPod.reservedSystemEndIp=\uc774\uac83\uc740 2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 VM \ubc0f \ucf58\uc194 \ud504\ub85d\uc2dc VM\ub97c \uad00\ub9ac\ud558\uae30 \uc704\ud574\uc11c CloudStack\uc5d0\uc11c \uc0ac\uc6a9\ud558\ub294 \uc0ac\uc124 \ub124\ud2b8\uc6cc\ud06c\ub0b4 IP \uc8fc\uc18c \ubc94\uc704\uc785\ub2c8\ub2e4. \uc774\ub7ec\ud55c IP \uc8fc\uc18c\ub294 \ucef4\ud4e8\ud305 \uc11c\ubc84\uc640 \uac19\uc740 \uc11c\ube0c\ub124\ud2b8\uc6cc\ud06c\uc5d0\uc11c \ud560\ub2f9\ud569\ub2c8\ub2e4. +message.installWizard.tooltip.addPod.reservedSystemGateway=\ud604\uc7ac Pod\ub0b4 \ud638\uc2a4\ud2b8 \uac8c\uc774\ud2b8\uc6e8\uc774\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addPod.reservedSystemNetmask=\uac8c\uc2a4\ud2b8\uac00 \uc0ac\uc6a9\ud558\ub294 \uc11c\ube0c\ub124\ud2b8\uc6cc\ud06c\uc0c1\uc5d0\uc11c \uc9c0\uc815\ud55c \ub137 \ub9c8\uc2a4\ud06c\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addPod.reservedSystemStartIp=\uc774\uac83\uc740 2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0 VM \ubc0f \ucf58\uc194 \ud504\ub85d\uc2dc VM\ub97c \uad00\ub9ac\ud558\uae30 \uc704\ud574\uc11c CloudStack\uc5d0\uc11c \uc0ac\uc6a9\ud558\ub294 \uc0ac\uc124 \ub124\ud2b8\uc6cc\ud06c\ub0b4\uc758 IP \uc8fc\uc18c \ubc94\uc704\uc785\ub2c8\ub2e4. \uc774\ub7ec\ud55c IP \uc8fc\uc18c\ub294 \ucef4\ud4e8\ud305 \uc11c\ubc84\uc640 \uac19\uc740 \uc11c\ube0c\ub124\ud2b8\uc6cc\ud06c\uc5d0\uc11c \ud560\ub2f9\ud569\ub2c8\ub2e4. +message.installWizard.tooltip.addPrimaryStorage.name=\uc2a4\ud1a0\ub9ac\uc9c0 \uae30\uae30\uc758 \uc774\ub984\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addPrimaryStorage.path=(NFS\uc758 \uacbd\uc6b0) \uc11c\ubc84\uc5d0\uc11c \ub0b4\ubcf4\ub0b4\uae30 \uacbd\ub85c\uc785\ub2c8\ub2e4. (SharedMountPoint\uc758 \uacbd\uc6b0) \uc77c\ubc18 \uacbd\ub85c\uc785\ub2c8\ub2e4. KVM\uc5d0\uc11c\ub294 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\uac00 \ub9c8\uc6b4\ud2b8\ub418\ub294 \uac01 \ud638\uc2a4\ud2b8\uc0c1\uc758 \uacbd\ub85c\uc785\ub2c8\ub2e4. \uc608\ub97c \ub4e4\uc5b4, /mnt/primary \uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addPrimaryStorage.server=(NFS, iSCSI \ub610\ub294 PreSetup\uc758 \uacbd\uc6b0) \uc2a4\ud1a0\ub9ac\uc9c0 \uae30\uae30\uc758 IP \uc8fc\uc18c \ub610\ub294 DNS \uba85\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addSecondaryStorage.nfsServer=2\ucc28 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \ud638\uc2a4\ud2b8 \ud558\ub294 NFS \uc11c\ubc84 IP \uc8fc\uc18c\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addSecondaryStorage.path=\uc704\uc5d0\uc11c \uc9c0\uc815\ud55c \uc11c\ubc84\uc5d0 \uc874\uc7ac\ud558\ub294 \ub0b4\ubcf4\ub0b4\uae30 \uacbd\ub85c\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.addZone.dns1=Zone\ub0b4\uc758 \uac8c\uc2a4\ud2b8 VM\uc73c\ub85c \uc0ac\uc6a9\ud558\ub294 DNS \uc11c\ubc84\uc785\ub2c8\ub2e4. \uc774\ub7ec\ud55c DNS \uc11c\ubc84\uc5d0\ub294 \ub2e4\uc74c\uc5d0 \ucd94\uac00\ud558\ub294 \uacf5\uac1c \ub124\ud2b8\uc6cc\ud06c \uacbd\uc720\ub85c \uc811\uadfc \ud569\ub2c8\ub2e4. Zone\uc758 \uacf5\uac1c IP \uc8fc\uc18c\uc5d0\uc11c \uc5ec\uae30\uc11c \uc9c0\uc815\ud558\ub294 \uacf5\uac1c DNS \uc11c\ubc84\uc5d0 \ud1b5\uc2e0\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. +message.installWizard.tooltip.addZone.dns2=Zone\ub0b4 \uac8c\uc2a4\ud2b8 VM \ub85c \uc0ac\uc6a9\ud558\ub294 DNS \uc11c\ubc84\uc785\ub2c8\ub2e4. \ud604\uc7ac DNS \uc11c\ubc84\uc5d0\ub294 \ub2e4\uc74c\uc5d0 \ucd94\uac00\ud558\ub294 \uacf5\uac1c \ub124\ud2b8\uc6cc\ud06c \uacbd\uc720\ub85c \uc811\uadfc\ud569\ub2c8\ub2e4. Zone\uc758 \uacf5\uac1c IP \uc8fc\uc18c\uc5d0\uc11c \uc5ec\uae30\uc11c \uc9c0\uc815\ud558\ub294 \uacf5\uac1c DNS \uc11c\ubc84\uc5d0 \ud1b5\uc2e0\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. +message.installWizard.tooltip.addZone.internaldns1=Zone\ub0b4\uc758 \uc2dc\uc2a4\ud15c VM \ub85c \uc0ac\uc6a9\ud558\ub294 DNS \uc11c\ubc84\uc785\ub2c8\ub2e4. \ud604\uc7ac DNS \uc11c\ubc84\ub294 \uc2dc\uc2a4\ud15c VM\uc758 \uc0ac\uc124 \ub124\ud2b8\uc6cc\ud06c \uc778\ud130\ud398\uc774\uc2a4\ub97c \uac1c\uc785\uc2dc\ucf1c \uc811\uadfc\ud569\ub2c8\ub2e4. Pod\uc758 \uc0ac\uc124 IP \uc8fc\uc18c\uc5d0\uc11c \uc5ec\uae30\uc11c \uc9c0\uc815\ud558\ub294 DNS \uc11c\ubc84\uc5d0 \ud1b5\uc2e0\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. +message.installWizard.tooltip.addZone.internaldns2=Zone\ub0b4 \uc2dc\uc2a4\ud15c VM\uc73c\ub85c \uc0ac\uc6a9\ud558\ub294 DNS \uc11c\ubc84\uc785\ub2c8\ub2e4. \ud604\uc7ac DNS \uc11c\ubc84\ub294 \uc2dc\uc2a4\ud15c VM\uc758 \uc0ac\uc124 \ub124\ud2b8\uc6cc\ud06c \uc778\ud130\ud398\uc774\uc2a4\ub97c \uac1c\uc785\uc2dc\ucf1c \uc811\uadfc\ud569\ub2c8\ub2e4. Pod\uc758 \uc0ac\uc124 IP \uc8fc\uc18c\uc5d0\uc11c \uc5ec\uae30\uc11c \uc9c0\uc815\ud558\ub294 DNS \uc11c\ubc84\uc5d0 \ud1b5\uc2e0\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. +message.installWizard.tooltip.addZone.name=Zone\uc758 \uc774\ub984\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.configureGuestTraffic.description=\ub124\ud2b8\uc6cc\ud06c \uc124\uba85\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.configureGuestTraffic.guestEndIp=\ud604\uc7ac Zone\uc758 \uac8c\uc2a4\ud2b8\uc5d0\uac8c \ud560\ub2f9\ud560 \uc218 \uc788\ub294 IP \uc8fc\uc18c \ubc94\uc704\uc785\ub2c8\ub2e4. \uc0ac\uc6a9\ud558\ub294 NIC\uac00 \ud55c \uac00\uc9c0\uc778 \uacbd\uc6b0\ub294 \uc774\ub7ec\ud55c IP \uc8fc\uc18c\ub294 Pod\uc758 CIDR\uc640 \uac19\uc740 CIDR\uc5d0 \ud3ec\ud568\ub418\uc5b4 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. +message.installWizard.tooltip.configureGuestTraffic.guestGateway=\uac8c\uc2a4\ud2b8\uc5d0\uc11c \uc0ac\uc6a9\ud558\ub294 \uac8c\uc774\ud2b8\uc6e8\uc774\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.configureGuestTraffic.guestNetmask=\uac8c\uc2a4\ud2b8\uc5d0\uc11c \uc0ac\uc6a9\ud558\ub294 \uc11c\ube0c\ub124\ud2b8\uc6cc\ud06c\uc0c1\uc5d0\uc11c \uc0ac\uc6a9\ub418\ub294 \ub137 \ub9c8\uc2a4\ud06c\uc785\ub2c8\ub2e4. +message.installWizard.tooltip.configureGuestTraffic.guestStartIp=\ud604\uc7ac Zone\uc758 \uac8c\uc2a4\ud2b8\uc5d0\uac8c \ud560\ub2f9\ud560 \uc218 \uc788\ub294 IP \uc8fc\uc18c \ubc94\uc704\uc785\ub2c8\ub2e4. \uc0ac\uc6a9\ud558\ub294 NIC\uac00 \ud55c \uac00\uc9c0 \uacbd\uc6b0\ub294 \uc774\ub7ec\ud55c IP \uc8fc\uc18c\ub294 Pod\uc758 CIDR\uc640 \uac19\uc740 CIDR\uc5d0 \ud3ec\ud568\ub418\uc5b4 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. +message.installWizard.tooltip.configureGuestTraffic.name=\ub124\ud2b8\uc6cc\ud06c \uc774\ub984\uc785\ub2c8\ub2e4. +message.instanceWizard.noTemplates=\uc0ac\uc6a9 \uac00\ub2a5\ud55c \ud15c\ud50c\ub9bf\uc774 \uc5c6\uc2b5\ub2c8\ub2e4. \ud638\ud658\uc131\uc774 \uc788\ub294 \ud15c\ud50c\ub9bf\uc744 \ucd94\uac00\ud558\uace0, \uc778\uc2a4\ud134\uc2a4 \uc704\uc800\ub4dc\ub97c \uc7ac\uc2dc\uc791\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.ip.address.changed=\uc0ac\uc6a9 IP \uc8fc\uc18c\uac00 \ubcc0\uacbd\ub41c \uac00\ub2a5\uc131\uc774 \uc788\uc2b5\ub2c8\ub2e4. \ubaa9\ub85d\uc744 \uc5c5\ub370\uc774\ud2b8\ud569\ub2c8\uae4c? \uadf8 \uacbd\uc6b0\ub294 \uc0c1\uc138 \uc124\uc815\ucc3d\uc774 \ub2eb\ub294 \uac83\uc5d0 \uc8fc\uc758\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.iso.desc=\ub370\uc774\ud130 \ub610\ub294 OS \uc2dc\uc791 \uac00\ub2a5 \ubbf8\ub514\uc5b4\ub97c \ud3ec\ud568\ud55c \ub514\uc2a4\ud06c \uc774\ubbf8\uc9c0 +message.join.project=\uc774\uac83\uc73c\ub85c, \ud504\ub85c\uc81d\ud2b8\uc5d0 \ucc38\uc5ec\ud588\uc2b5\ub2c8\ub2e4. \ud504\ub85c\uc81d\ud2b8\ub97c \ucc38\uc870\ud558\ub824\uba74 \ud504\ub85c\uc81d\ud2b8 \ubcf4\uae30\ub85c \uc804\ud658\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.launch.vm.on.private.network=\uc0ac\uc801 \uc804\uc6a9 \ub124\ud2b8\uc6cc\ud06c\ub85c \uc778\uc2a4\ud134\uc2a4\ub97c \uc2dc\uc791\ud569\ub2c8\uae4c? +message.launch.zone=Zone\uc744 \uc2dc\uc791\ud560 \uc900\ube44\uac00 \ub418\uc5c8\uc2b5\ub2c8\ub2e4. \ub2e4\uc74c \uc21c\uc11c\uc5d0 \ub530\ub77c \uc9c4\ud589\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.lock.account=\ud604\uc7ac \uacc4\uc815 \uc815\ubcf4\ub97c \uc7a0\uadf8\uc5b4\ub3c4 \uc88b\uc2b5\ub2c8\uae4c? \uc774 \uacc4\uc815 \uc815\ubcf4 \ubaa8\ub4e0 \uc0ac\uc6a9\uc790\uac00 \ud074\ub77c\uc6b0\ub4dc \uc790\uc6d0\uc744 \uad00\ub9ac\ud560 \uc218 \uc5c6\uac8c \ub429\ub2c8\ub2e4. \uadf8 \ud6c4\ub3c4 \uae30\uc874 Zone \uc790\uc6d0\uc5d0\ub294 \uc811\uadfc \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.migrate.instance.confirm=\uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4 \uc774\uc804 \uc704\uce58\ub294 \ub2e4\uc74c \ud638\uc2a4\ud2b8\ub85c \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.migrate.instance.to.host=\ub2e4\ub978 \ud638\uc2a4\ud2b8\uc5d0\uac8c \uc778\uc2a4\ud134\uc2a4\ub97c \uc774\uc804\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.migrate.instance.to.ps=\ub2e4\ub978 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \uc778\uc2a4\ud134\uc2a4\ub97c \uc774\uc804\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.migrate.router.confirm=\ub77c\uc6b0\ud130 \uc774\uc804 \uc704\uce58\ub85c \ud638\uc2a4\ud2b8\ub97c \uc120\ud0dd\uc2ed\uc2dc\uc624. +message.migrate.systemvm.confirm=\uc2dc\uc2a4\ud15c VM \uc774\uc804 \uc774\uc804 \uc704\uce58\ub85c \ud638\uc2a4\ud2b8\ub97c \uc120\ud0dd\uc2ed\uc2dc\uc624. +message.migrate.volume=\ub2e4\ub978 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\uc5d0 \ubcfc\ub968\uc744 \uc774\uc804\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.new.user=\uacc4\uc815 \uc815\ubcf4\uc5d0 \uc0c8\ub85c\uc6b4 \uc0ac\uc6a9\uc790\ub97c \ucd94\uac00\ud558\uae30 \uc704\ud574 \uc544\ub798 \uc815\ubcf4\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.no.network.support.configuration.not.true=\ubcf4\uc548 \uadf8\ub8f9\uc774 \uc720\ud6a8\ud55c Zone\uc774 \uc5c6\uae30 \ub54c\ubb38\uc5d0 \ucd94\uac00 \ub124\ud2b8\uc6cc\ud06c \uae30\ub2a5\uc740 \uc5c6\uc2b5\ub2c8\ub2e4. \ub2e8\uacc4 5\ub85c \uc9c4\ud589\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.no.network.support=\ud558\uc774\ud37c \ubc14\uc774\uc800\ub85c\uc11c vSphere\ub97c \uc120\ud0dd\ud588\uc73c\ub098 \uc774 \ud558\uc774\ud37c \ubc14\uc774\uc800\uc5d0 \ucd94\uac00 \ub124\ud2b8\uc6cc\ud06c \uae30\ub2a5\uc740 \uc5c6\uc2b5\ub2c8\ub2e4. \ub2e8\uacc4 5\ub85c \uc9c4\ud589\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.no.projects.adminOnly=\ud504\ub85c\uc81d\ud2b8\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.
\uad00\ub9ac\uc790\uc5d0\uac8c \uc0c8\ub85c\uc6b4 \ud504\ub85c\uc81d\ud2b8 \uc0dd\uc131\uc744 \uc758\ub8b0\ud558\uc2ed\uc2dc\uc624. +message.no.projects=\ud504\ub85c\uc81d\ud2b8\uac00 \uc5c6\uc2b5\ub2c8\ub2e4.
\ud504\ub85c\uc81d\ud2b8 \uc139\uc158\uc5d0\uc11c \uc0c8\ub85c\uc6b4 \ud504\ub85c\uc81d\ud2b8\ub97c \ub9cc\ub4e4\uc5b4 \uc8fc\uc2ed\uc2dc\uc624. +message.number.clusters=

\ud074\ub7ec\uc2a4\ud130\uc218

+message.number.hosts=

\ud638\uc2a4\ud2b8\uc218

+message.number.pods=

Pod\uc218

+message.number.storage=

\uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0 \ubcfc\ub968\uc218

+message.number.zones=

Zone\uc218

+message.pending.projects.1=\ubcf4\ub958\uc911\uc778 \ud504\ub85c\uc81d\ud2b8 \ucd08\ub300\uc7a5\uc774 \uc788\uc2b5\ub2c8\ub2e4. +message.pending.projects.2=\ud45c\uc2dc\ud558\ub824\uba74 \ud504\ub85c\uc81d\ud2b8 \uc139\uc158\uc73c\ub85c \uc774\ub3d9\ud558\uace0 \ubaa9\ub85d\uc5d0\uc11c \ucd08\ub300\uc7a5\uc744 \uc120\ud0dd\ud569\ub2c8\ub2e4. +message.please.add.at.lease.one.traffic.range=\uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1 \ud2b8\ub798\ud53d \ubc94\uc704\ub97c \ucd94\uac00\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.please.proceed=\ub2e4\uc74c\uc758 \uc21c\uc11c\uc5d0 \uc9c4\ud589\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.please.select.a.configuration.for.your.zone=Zone \uad6c\uc131\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.please.select.a.different.public.and.management.network.before.removing=\uc0ad\uc81c \uc804\uc5d0 \ub2e4\ub978 \uacf5\uac1c \ubc0f \uad00\ub9ac \ub124\ud2b8\uc6cc\ud06c\ub97c \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.please.select.networks=\uac00\uc0c1 \uba38\uc2e0 \ub124\ud2b8\uc6cc\ud06c\ub97c \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.please.wait.while.zone.is.being.created=Zone\uc774 \ub9cc\ub4e4\uae30\ub420 \ub54c\uae4c\uc9c0 \uc7a0\uae50 \uae30\ub2e4\ub824 \uc8fc\uc2ed\uc2dc\uc624... +message.project.invite.sent=\uc0ac\uc6a9\uc790\uc5d0\uac8c \ucd08\ub300\uc7a5\uc774 \uc804\uc1a1\ub418\uc5c8\uc2b5\ub2c8\ub2e4. \uc0ac\uc6a9\uc790\uac00 \ucd08\ub300\ub97c \uc2b9\uc778\ud558\uba74, \ud504\ub85c\uc81d\ud2b8\uc5d0 \ucd94\uac00\ub429\ub2c8\ub2e4. +message.public.traffic.in.advanced.zone=\ud074\ub77c\uc6b0\ub4dc \ub0b4\ubd80 VM\uc774 \uc778\ud130\ub137\uc5d0 \uc811\uadfc \ud558\uba74, \uacf5\uac1c \ud2b8\ub798\ud53d\uc774 \uc0dd\uc131\ub429\ub2c8\ub2e4. \uc774 \ub54c\ubb38\uc5d0 \uc77c\ubc18\uc801\uc73c\ub85c \uc811\uadfc \uac00\ub2a5\ud55c IP \uc8fc\uc18c\ub97c \ud560\ub2f9\ud560 \ud544\uc694\uac00 \uc788\uc2b5\ub2c8\ub2e4. \ucd5c\uc885 \uc0ac\uc6a9\uc790\ub294 CloudStack \uc0ac\uc6a9\uc790 \uc778\ud130\ud398\uc774\uc2a4\ub97c \uc0ac\uc6a9\ud574 \uc774\ub7ec\ud55c IP \uc8fc\uc18c\ub97c \ucde8\ub4dd\ud558\uace0 \uc190\ub2d8 \ub124\ud2b8\uc6cc\ud06c\uc640 \uacf5\uac1c \ub124\ud2b8\uc6cc\ud06c \uc0ac\uc774\uc5d0 NAT\ub97c \uad6c\ud604\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.

\uc778\ud130\ub137 \ud2b8\ub798\ud53d\uc744 \uc704\ud574 \uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1 IP \uc8fc\uc18c \ubc94\uc704\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.public.traffic.in.basic.zone=\ud074\ub77c\uc6b0\ub4dc \ub0b4\ubd80 VM\uc774 \uc778\ud130\ub137\uc5d0 \uc811\uadfc \ud560 \ub54c \uc778\ud130\ub137 \uacbd\uc720\ub85c \ud074\ub77c\uc774\uc5b8\ud2b8\uc5d0 \uc11c\ube44\uc2a4\ub97c \uc81c\uacf5\ud558\uba74, \uacf5\uac1c \ud2b8\ub798\ud53d\uc774 \uc0dd\uc131\ub429\ub2c8\ub2e4. \uc774 \ub54c\ubb38\uc5d0 \uc77c\ubc18\uc801\uc73c\ub85c \uc811\uadfc \uac00\ub2a5\ud55c IP \uc8fc\uc18c\ub97c \ud560\ub2f9\ud560 \ud544\uc694\uac00 \uc788\uc2b5\ub2c8\ub2e4. \uc778\uc2a4\ud134\uc2a4\ub97c \ub9cc\ub4e4\uae30\ud558\uba74, \uac8c\uc2a4\ud2b8 IP \uc8fc\uc18c \uc678\uc5d0\uc774 \uacf5\uac1c IP \uc8fc\uc18c \ubc94\uc704\uc5d0\uc11c \uc8fc\uc18c\uac00 \ud558\ub098\uc758 \uc778\uc2a4\ud134\uc2a4\uc5d0 \ud560\ub2f9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \uacf5\uac1c IP \uc8fc\uc18c\uc640 \uac8c\uc2a4\ud2b8 IP \uc8fc\uc18c \uc0ac\uc774\uc5d0 \uc815\uc801\uc778 1\ub300 1 NAT\uac00 \uc790\ub3d9\uc73c\ub85c \uc124\uc815 \ub429\ub2c8\ub2e4. \ucd5c\uc885 \uc0ac\uc6a9\uc790\ub294 CloudStack \uc0ac\uc6a9\uc790 \uc778\ud130\ud398\uc774\uc2a4\ub97c \uc0ac\uc6a9\ud574 \ucd94\uac00 IP \uc8fc\uc18c\ub97c \ucde8\ub4dd\ud558\uace0 \uc778\uc2a4\ud134\uc2a4\uc640 \uacf5\uac1c IP \uc8fc\uc18c \uc0ac\uc774\uc5d0 \uc815\uc801 NAT\ub97c \uad6c\ud604\ud560 \uc218\ub3c4 \uc788\uc2b5\ub2c8\ub2e4. +message.remove.vpc=VPC\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.remove.vpn.access=\ub2e4\uc74c \uc0ac\uc6a9\uc790\uc5d0\uc11c VPN \uc811\uadfc\ub97c \uc0ad\uc81c\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.reset.password.warning.notPasswordEnabled=\ud604\uc7ac \uc778\uc2a4\ud134\uc2a4 \ud15c\ud50c\ub9bf\uc740 \uc554\ud638 \uad00\ub9ac\ub97c \uc0ac\uc6a9 \ud558\uc9c0 \uc54a\uace0 \uc0dd\uc131\ub418\uc5c8\uc2b5\ub2c8\ub2e4. +message.reset.password.warning.notStopped=\ud604\uc7ac \uc554\ud638\ub97c \ubcc0\uacbd\ud558\uae30 \uc804\uc5d0 \uc778\uc2a4\ud134\uc2a4\ub97c \uc815\uc9c0\ud574\uc57c \ud569\ub2c8\ub2e4. +message.reset.VPN.connection=VPN \uc811\uc18d\uc744 \uc7ac\uc124\uc815 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.restart.mgmt.server=\uc0c8\ub85c\uc6b4 \uc124\uc815\uc744 \uc0ac\uc6a9 \ud558\uae30 \uc704\ud574 \uad00\ub9ac \uc11c\ubc84\ub97c \uc7ac\uc2dc\uc791\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.restart.mgmt.usage.server=\uc0c8\ub85c\uc6b4 \uc124\uc815\uc744 \uc0ac\uc6a9 \ud558\uae30 \uc704\ud574 \uad00\ub9ac \uc11c\ubc84\uc640 \uc0ac\uc6a9 \uc0c1\ud669 \uce21\uc815 \uc11c\ubc84\ub97c \uc7ac\uc2dc\uc791\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.restart.network=\ud604\uc7ac \ub124\ud2b8\uc6cc\ud06c\ub85c \uc81c\uacf5\ud558\ub294 \ubaa8\ub4e0 \uc11c\ube44\uc2a4\uac00 \uc911\ub2e8\ub429\ub2c8\ub2e4. \uc774 \ub124\ud2b8\uc6cc\ud06c\ub97c \uc7ac\uc2dc\uc791\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.restart.vpc=VPC\ub97c \uc7ac\uc2dc\uc791\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.security.group.usage=(\ud574\ub2f9\ud558\ub294 \ubcf4\uc548 \uadf8\ub8f9\uc744 \ubaa8\ub450 \uc120\ud0dd\ud558\ub824\uba74 Ctrl \ud0a4\ub97c \ub204\ub974\uba74\uc11c \ud074\ub9ad\ud574 \uc8fc\uc2ed\uc2dc\uc624) +message.select.a.zone=Zone\uc740 \uc6d0\ub798 \ub2e8\uc77c \ub370\uc774\ud130 \uc13c\ud130\uc5d0 \ud574\ub2f9\ud569\ub2c8\ub2e4. \ubcf5\uc218 Zone\uc744 \uc124\uc815\ud558\uace0 \ubb3c\ub9ac\uc801\uc73c\ub85c \ubd84\ub9ac\ud558\ub294 \ubc29\ubc95\uc73c\ub85c \ud074\ub77c\uc6b0\ub4dc\uc758 \uc2e0\ub8b0\uc131\uc744 \ub192\uc77c \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.select.instance=\uc778\uc2a4\ud134\uc2a4\ub97c \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.select.iso=\uc0c8\ub85c\uc6b4 \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4 ISO\ub97c \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.select.item=\ud56d\ubaa9\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.select.security.groups=\uc0c8\ub85c\uc6b4 \uac00\uc0c1 \uba38\uc2e0 \ubcf4\uc548 \uadf8\ub8f9\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.select.template=\uc0c8\ub85c\uc6b4 \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4 \ud15c\ud50c\ub9bf\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.setup.physical.network.during.zone.creation.basic=\uae30\ubcf8 Zone\uc744 \ucd94\uac00\ud560 \ub54c\ub294 \ud558\uc774\ud37c \ubc14\uc774\uc800\uc0c1\uc758 \ub124\ud2b8\uc6cd\uce74\ub4dc(NIC)\uc5d0 \ub300\uc751\ud558\ub294 \ud55c \uac00\uc9c0 \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\ub97c \uc124\uc815 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \ub124\ud2b8\uc6cc\ud06c\ub294 \uba87 \uac00\uc9c0 \uc885\ub958\uc758 \ud2b8\ub798\ud53d\uc744 \uc804\uc1a1\ud569\ub2c8\ub2e4.

\ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\uc5d0 \ub2e4\ub978 \ud2b8\ub798\ud53d\uc758 \uc885\ub958\ub97c\ub4dc\ub798\uadf8 \uc564 \ub4dc\ub86d \ud560 \uc218\ub3c4 \uc788\uc2b5\ub2c8\ub2e4. +message.setup.physical.network.during.zone.creation=\ud655\uc7a5 Zone\uc744 \ucd94\uac00\ud560 \ub54c\ub294 \ud55c \uac1c \uc774\uc0c1 \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\ub97c \uc124\uc815\ud574\uc57c \ud569\ub2c8\ub2e4. \uac01 \ub124\ud2b8\uc6cc\ud06c\ub294 \ud558\uc774\ud37c \ubc14\uc774\uc800\uc0c1 \ud55c \uac00\uc9c0 \ub124\ud2b8\uc6cc\ud06c \uce74\ub4dc(NIC)\uc5d0 \ub300\uc751\ud569\ub2c8\ub2e4. \uac01 \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\uc5d0\uc11c\ub294 \uad6c\uc131\uc5d0 \uc81c\ud55c\uc774 \uc788\uc73c\ub098, \ud55c \uac00\uc9c0 \uc885\ub958 \uc774\uc0c1 \ud2b8\ub798\ud53d\uc744 \ud1b5\uc2e0\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4.

\uac01 \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\uc5d0 \ub300\ud574\uc11c\ud2b8\ub798\ud53d \uc885\ub958\ub97c \ub4dc\ub798\uadf8 \uc564 \ub4dc\ub86d\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.setup.successful=\ud074\ub77c\uc6b0\ub4dc\uac00 \uc124\uc815 \ub418\uc5c8\uc2b5\ub2c8\ub2e4. +message.snapshot.schedule=\ub2e4\uc74c \uc635\uc158\uc5d0\uc11c \uc120\ud0dd\ud55c \uc815\ucc45 \uae30\ubcf8 \uc124\uc815\uc744 \uc801\uc6a9\ud558\uc5ec \uc815\uae30 \uc2a4\ub0c5\uc0f7 \uc2a4\ucf00\uc904\uc744 \uc124\uc815 \ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.specify.url=URL\ub97c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624 +message.step.1.continue=\uc2e4\ud589\ud558\ub824\uba74 \ud15c\ud50c\ub9bf \ub610\ub294 ISO\ub97c \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.step.1.desc=\uc0c8\ub85c\uc6b4 \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\uc6a9 \ud15c\ud50c\ub9bf\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624.ISO\ub97c \uc124\uce58 \ud560 \uc218 \uc788\ub294 \uacf5\ubc31 \ud15c\ud50c\ub9bf\uc744 \uc120\ud0dd\ud560 \uc218\ub3c4 \uc788\uc2b5\ub2c8\ub2e4. +message.step.2.continue=\uc2e4\ud589\ud558\ub824\uba74 \uc11c\ube44\uc2a4\uc81c\uacf5\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. message.step.2.desc= -message.step.3.continue=실행하려면 디스í¬ì œê³µì„ ì„ íƒí•´ 주십시오. +message.step.3.continue=\uc2e4\ud589\ud558\ub824\uba74 \ub514\uc2a4\ud06c\uc81c\uacf5\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. message.step.3.desc= -message.step.4.continue=실행하려면 네트워í¬ë¥¼ ì ì–´ë„ í•œ ê°œ ì´ìƒ ì„ íƒí•´ 주십시오. -message.step.4.desc=ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ê°€ ì ‘ì†í•˜ëŠ” 기본 네트워í¬ë¥¼ ì„ íƒí•´ 주십시오. -message.update.os.preference=현재 호스트 OS 기본 ì„¤ì •ì„ ì„ íƒí•´ 주십시오.ê°™ì€ ê¸°ë³¸ ì„¤ì •ì„ ê°€ì§€ëŠ” 모든 ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ëŠ” 다른 호스트를 ì„ íƒí•˜ê¸° ì „ì— ìš°ì„ ì´ í˜¸ìŠ¤íŠ¸ê°€ 할당할 수 있습니다. -message.update.ssl=ê° ì½˜ì†” 프ë¡ì‹œ ê°€ìƒ ì¸ìŠ¤í„´ìŠ¤ë¡œ ì—…ë°ì´íŠ¸í•˜ëŠ” X.509 기반 새 SSL ì¸ì¦ì„œë¥¼ 전송해 주십시오: -message.virtual.network.desc=계정 ì •ë³´ ì „ìš© ê°€ìƒ ë„¤íŠ¸ì›Œí¬ìž…니다. 브로드ìºìŠ¤íŠ¸ ë„ë©”ì¸ì€ VLAN ë‚´ì— ë°°ì¹˜ë˜ì–´ 공개 네트워í¬ì— 접근는 ëª¨ë‘ ê°€ìƒ ë¼ìš°í„°ì— í•´ì„œ 루팅 ë©ë‹ˆë‹¤. -message.volume.create.template.confirm=현재 ë””ìŠ¤í¬ ë³¼ë¥¨ í…œí”Œë¦¿ì„ ë§Œë“œì‹œê² ìŠµë‹ˆê¹Œ? 볼륨 í¬ê¸°ì— ë”°ë¼ í…œí”Œë¦¿ ë§Œë“¤ê¸°ì— ëª‡ 분 ì´ìƒ 걸릴 ê°€ëŠ¥ì„±ì´ ìžˆìŠµë‹ˆë‹¤. -message.zone.step.1.desc=Zone ë„¤íŠ¸ì›Œí¬ ëª¨ë¸ì„ ì„ íƒí•´ 주십시오. -message.zone.step.2.desc=새 Zoneì„ ì¶”ê°€í•˜ê¸° 위해 아래 정보를 입력해 주십시오. -message.zone.step.3.desc=새 Pod를 추가하기 위해 아래 정보를 입력해 주십시오. -message.apply.snapshot.policy=현재 스냅샷 정책를 ì—…ë°ì´íŠ¸í–ˆìŠµë‹ˆë‹¤. -message.disable.snapshot.policy=현재 스냅샷 정책를 사용 안 함으로 설정했습니다. -message.action.change.service.warning.for.instance=현재 서비스 ì œê³µì„ ë³€ê²½í•˜ê¸° ì „ì— ì¸ìŠ¤í„´ìŠ¤ë¥¼ 정지해야 합니다. -message.action.change.service.warning.for.router=현재 서비스 ì œê³µì„ ë³€ê²½í•˜ê¸° ì „ì— ë¼ìš°í„°ë¥¼ 정지해야 합니다. -message.action.reset.password.warning=현재 암호를 변경하기 ì „ì— ì¸ìŠ¤í„´ìŠ¤ë¥¼ 정지해야 합니다. -message.action.reset.password.off=ì¸ìŠ¤í„´ìŠ¤ëŠ” 현재 ê¸°ëŠ¥ì„ ì§€ì› í•˜ì§€ 않습니다. - -#Errors -error.login=사용ìžëª…/암호가 기ë¡ê³¼ ì¼ì¹˜í•˜ì§€ 않습니다. -error.menu.select=í•­ëª©ì´ ì„ íƒë˜ì–´ 있지 않기 ë•Œë¬¸ì— ìž‘ì—…ì„ ì‹¤í–‰í•  수 없습니다. -error.mgmt.server.inaccessible=관리 ì„œë²„ì— ì ‘ê·¼ í•  수 없습니다. 다ìŒì— 재실행해 주십시오. -error.session.expired=세션 ìœ íš¨ê¸°ê°„ì´ ëŠì–´ì¡ŒìŠµë‹ˆë‹¤. - -#resizeVolumes -label.resize.new.size=새 í¬ê¸°(GB) -label.action.resize.volume=볼륨 í¬ê¸° 변경 -label.action.resize.volume.processing=볼륨 í¬ê¸° 변경 중... -label.resize.new.offering.id=새로 제공 -label.resize.shrink.ok=변경 완료 +message.step.4.continue=\uc2e4\ud589\ud558\ub824\uba74 \ub124\ud2b8\uc6cc\ud06c\ub97c \uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.step.4.desc=\uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\uac00 \uc811\uc18d\ud558\ub294 \uae30\ubcf8 \ub124\ud2b8\uc6cc\ud06c\ub97c \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.storage.traffic=\ud638\uc2a4\ud2b8\ub098 CloudStack \uc2dc\uc2a4\ud15c VM \ub4f1 \uad00\ub9ac \uc11c\ubc84\uc640 \ud1b5\uc2e0\ud558\ub294 CloudStack \ub0b4\ubd80 \uc790\uc6d0\uac04 \ud2b8\ub798\ud53d\uc785\ub2c8\ub2e4. \uc5ec\uae30\uc11c \uc2a4\ud1a0\ub9ac\uc9c0 \ud2b8\ub798\ud53d\uc744 \uad6c\uc131\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.suspend.project=\ud604\uc7ac \ud504\ub85c\uc81d\ud2b8\ub97c \uc77c\uc2dc\uc815\uc9c0\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.template.desc=VM\uc758 \uc2dc\uc791\uc5d0 \uc0ac\uc6a9\ud560 \uc218 \uc788\ub294 OS \uc774\ubbf8\uc9c0 +message.tooltip.dns.1=Zone\ub0b4 VM \ub85c \uc0ac\uc6a9\ud558\ub294 DNS \uc11c\ubc84 \uc774\ub984\uc785\ub2c8\ub2e4. Zone \uacf5\uac1c IP \uc8fc\uc18c\uc5d0\uc11c \uc774 \uc11c\ubc84\uc5d0 \ud1b5\uc2e0\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. +message.tooltip.dns.2=Zone\ub0b4 VM \ub85c \uc0ac\uc6a9\ud558\ub294 \ub450\ubc88\uc9f8 DNS \uc11c\ubc84 \uc774\ub984\uc785\ub2c8\ub2e4. Zone \uacf5\uac1c IP \uc8fc\uc18c\uc5d0\uc11c \uc774 \uc11c\ubc84\uc5d0 \ud1b5\uc2e0\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. +message.tooltip.internal.dns.1=Zone\ub0b4 CloudStack \ub0b4\ubd80 \uc2dc\uc2a4\ud15c VM \ub85c \uc0ac\uc6a9\ud558\ub294 DNS \uc11c\ubc84 \uc774\ub984\uc785\ub2c8\ub2e4. Pod \uc0ac\uc124 IP \uc8fc\uc18c\uc5d0\uc11c \uc774 \uc11c\ubc84\uc5d0 \ud1b5\uc2e0\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. +message.tooltip.internal.dns.2=Zone\ub0b4 CloudStack \ub0b4\ubd80 \uc2dc\uc2a4\ud15c VM \ub85c \uc0ac\uc6a9\ud558\ub294 DNS \uc11c\ubc84 \uc774\ub984\uc785\ub2c8\ub2e4. Pod \uc0ac\uc124 IP \uc8fc\uc18c\uc5d0\uc11c \uc774 \uc11c\ubc84\uc5d0 \ud1b5\uc2e0\ud560 \uc218 \uc788\uc5b4\uc57c \ud569\ub2c8\ub2e4. +message.tooltip.network.domain=DNS \uc11c\ud53d\uc2a4\uc785\ub2c8\ub2e4. \uc774 \uc11c\ud53d\uc2a4\uc5d0\uc11c \uac8c\uc2a4\ud2b8 VM \ub85c \uc811\uadfc \ud558\ub294 \ub124\ud2b8\uc6cc\ud06c \ub9de\ucda4\ud615 \ub3c4\uba54\uc778\uba85\uc744 \ub9cc\ub4ed\ub2c8\ub2e4. +message.tooltip.pod.name=\ud604\uc7ac Pod \uc774\ub984\uc785\ub2c8\ub2e4. +message.tooltip.reserved.system.gateway=Pod\ub0b4 \ud638\uc2a4\ud2b8 \uac8c\uc774\ud2b8\uc6e8\uc774\uc785\ub2c8\ub2e4. +message.tooltip.reserved.system.netmask=Pod \uc11c\ube0c\ub124\ud2b8\uc6cc\ud06c\ub97c \uc815\ud558\ub294 \ub124\ud2b8\uc6cc\ud06c \ud504\ub808\ud53d\uc2a4\uc785\ub2c8\ub2e4. CIDR \ud45c\uae30\ub97c \uc0ac\uc6a9\ud569\ub2c8\ub2e4. +message.tooltip.zone.name=Zone \uc774\ub984\uc785\ub2c8\ub2e4. +message.update.os.preference=\ud604\uc7ac \ud638\uc2a4\ud2b8 OS \uae30\ubcf8 \uc124\uc815\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624.\uac19\uc740 \uae30\ubcf8 \uc124\uc815\uc744 \uac00\uc9c0\ub294 \ubaa8\ub4e0 \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\ub294 \ub2e4\ub978 \ud638\uc2a4\ud2b8\ub97c \uc120\ud0dd\ud558\uae30 \uc804\uc5d0 \uc6b0\uc120\uc774 \ud638\uc2a4\ud2b8\uac00 \ud560\ub2f9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. +message.update.resource.count=\ud604\uc7ac \uacc4\uc815 \uc815\ubcf4 \uc790\uc6d0\uc218\ub97c \uc5c5\ub370\uc774\ud2b8\ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.update.ssl=\uac01 \ucf58\uc194 \ud504\ub85d\uc2dc \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\ub85c \uc5c5\ub370\uc774\ud2b8\ud558\ub294 X.509 \uae30\ubc18 \uc0c8 SSL \uc778\uc99d\uc11c\ub97c \uc804\uc1a1\ud574 \uc8fc\uc2ed\uc2dc\uc624\: +message.validate.instance.name=\uc778\uc2a4\ud134\uc2a4\uba85\uc740 63 \ubb38\uc790 \uc774\ub0b4\uc5d0\uc11c \uc9c0\uc815\ud574 \uc8fc\uc2ed\uc2dc\uc624. ASCII \ubb38\uc790\uc758 a-z, A-Z, \uc22b\uc790\uc758 0-9 \ubc0f \ud558\uc774\ud508\ub9cc\uc744 \uc0ac\uc6a9\ud560 \uc218 \uc788\uc2b5\ub2c8\ub2e4. \ubb38\uc790\ub85c \uc2dc\uc791\ud558\uc5ec \ubb38\uc790 \ub610\ub294 \uc22b\uc790\ub85c \ub05d\ub0b4\uc57c \ud569\ub2c8\ub2e4. +message.virtual.network.desc=\uacc4\uc815 \uc815\ubcf4 \uc804\uc6a9 \uac00\uc0c1 \ub124\ud2b8\uc6cc\ud06c\uc785\ub2c8\ub2e4. \ube0c\ub85c\ub4dc\uce90\uc2a4\ud2b8 \ub3c4\uba54\uc778\uc740 VLAN \ub0b4\uc5d0 \ubc30\uce58\ub418\uc5b4 \uacf5\uac1c \ub124\ud2b8\uc6cc\ud06c\uc5d0 \uc811\uadfc\ub294 \ubaa8\ub450 \uac00\uc0c1 \ub77c\uc6b0\ud130\uc5d0 \ud574\uc11c \ub8e8\ud305 \ub429\ub2c8\ub2e4. +message.vm.create.template.confirm=\ud15c\ud50c\ub9bf \ub9cc\ub4e4\uae30\ud558\uba74 VM\uc774 \uc790\ub3d9\uc73c\ub85c \uc7ac\uc2dc\uc791\ub429\ub2c8\ub2e4. +message.vm.review.launch=\ub2e4\uc74c\uc758 \uc815\ubcf4\ub97c \ucc38\uc870\ud558\uace0 \uac00\uc0c1 \uc778\uc2a4\ud134\uc2a4\ub97c \uc62c\ubc14\ub974\uac8c \uc124\uc815\ud55c \uac83\uc744 \ud655\uc778\ud558\uace0 \ub098\uc11c \uc2dc\uc791\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.volume.create.template.confirm=\ud604\uc7ac \ub514\uc2a4\ud06c \ubcfc\ub968 \ud15c\ud50c\ub9bf\uc744 \ub9cc\ub4dc\uc2dc\uaca0\uc2b5\ub2c8\uae4c? \ubcfc\ub968 \ud06c\uae30\uc5d0 \ub530\ub77c \ud15c\ud50c\ub9bf \ub9cc\ub4e4\uae30\uc5d0 \uba87 \ubd84 \uc774\uc0c1 \uac78\ub9b4 \uac00\ub2a5\uc131\uc774 \uc788\uc2b5\ub2c8\ub2e4. +message.you.must.have.at.least.one.physical.network=\uc801\uc5b4\ub3c4 \ud55c \uac1c \uc774\uc0c1 \ubb3c\ub9ac \ub124\ud2b8\uc6cc\ud06c\uac00 \ud544\uc694\ud569\ub2c8\ub2e4 +message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone\uc744 \ub9cc\ub4e4\uc5c8\uc2b5\ub2c8\ub2e4. \uc774 Zone\uc744 \uc0ac\uc6a9 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +message.Zone.creation.complete=Zone\uc744 \ub9cc\ub4e4\uc5c8\uc2b5\ub2c8\ub2e4. +message.zone.no.network.selection=\uc120\ud0dd\ud55c Zone\uc5d0\uc11c\ub294 \ub124\ud2b8\uc6cc\ud06c\ub97c \uc120\ud0dd\ud560 \uc218 \uc5c6\uc2b5\ub2c8\ub2e4. +message.zone.step.1.desc=Zone \ub124\ud2b8\uc6cc\ud06c \ubaa8\ub378\uc744 \uc120\ud0dd\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.zone.step.2.desc=\uc0c8 Zone\uc744 \ucd94\uac00\ud558\uae30 \uc704\ud574 \uc544\ub798 \uc815\ubcf4\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.zone.step.3.desc=\uc0c8 Pod\ub97c \ucd94\uac00\ud558\uae30 \uc704\ud574 \uc544\ub798 \uc815\ubcf4\ub97c \uc785\ub825\ud574 \uc8fc\uc2ed\uc2dc\uc624. +message.zoneWizard.enable.local.storage=\uacbd\uace0\:\ud604\uc7ac Zone\uc758 \ub85c\uceec \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \uc0ac\uc6a9 \ud558\ub294 \uacbd\uc6b0\ub294 \uc2dc\uc2a4\ud15c VM\uc758 \uc2dc\uc791 \uc7a5\uc18c\uc5d0 \ub530\ub77c \ub2e4\uc74c \uc791\uc5c5\uc774 \ud544\uc694\ud569\ub2c8\ub2e4.

1. \uc2dc\uc2a4\ud15c VM\uc744 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub85c \uc2dc\uc791\ud574\uc57c \ud558\ub294 \uacbd\uc6b0 \uae30\ubcf8 \uc2a4\ud1a0\ub9ac\uc9c0\ub97c \ub9cc\ub4e4\uae30\ud55c \ub2e4\uc74c\uc5d0 Zone\uc5d0 \ucd94\uac00\ud574\uc57c \ud569\ub2c8\ub2e4. \ub610\ud55c, \uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 \uc0c1\ud0dc\uc758 Zone\uc744 \uc2dc\uc791\ud574\uc57c \ud569\ub2c8\ub2e4.

2. \uc2dc\uc2a4\ud15c VM\ub97c \ub85c\uceec \uc2a4\ud1a0\ub9ac\uc9c0\ub85c \uc2dc\uc791\ud560 \ud544\uc694\uac00 \uc788\ub294 \uacbd\uc6b0 system.vm.use.local.storage\ub97c true \ub85c \uc124\uc815\ud558\uace0 \ub098\uc11c Zone\uc744 \uc0ac\uc6a9\ud574\uc57c \ud569\ub2c8\ub2e4.


\uc9c4\ud589 \ud558\uc2dc\uaca0\uc2b5\ub2c8\uae4c? +mode=\ubaa8\ub4dc +network.rate=\ub124\ud2b8\uc6cc\ud06c \uc18d\ub3c4 +notification.reboot.instance=\uc778\uc2a4\ud134\uc2a4 \uc7ac\uc2dc\uc791 +notification.start.instance=\uc778\uc2a4\ud134\uc2a4 \uc2dc\uc791 +notification.stop.instance=\uc778\uc2a4\ud134\uc2a4 \uc815\uc9c0 +side.by.side=\ubcd1\ub82c +state.Accepted=\uc2b9\uc778 \uc644\ub8cc +state.Active=\ud65c\uc131 +state.Allocated=\ud560\ub2f9 \ub05d\ub09c \uc0c1\ud0dc +state.Allocating=\ud560\ub2f9 \uc911 +state.BackedUp=\ubc31\uc5c5 \uc644\ub8cc +state.BackingUp=\ubc31\uc5c5 \uc911 +state.Completed=\uc644\ub8cc +state.Creating=\uc0dd\uc131 \uc911 +state.Declined=\uac70\uc808 +state.Destroyed=\ud30c\uae30\ub41c \uc0c1\ud0dc +state.Disabled=\uc720\ud6a8\ud558\uc9c0 \uc54a\uc740 +state.Enabled=\uc0ac\uc6a9\ud568 +state.enabled=\uc720\ud6a8\ud568 +state.Error=\uc624\ub958 +state.Expunging=\uc81c\uac70 \uc911 +state.Migrating=\uc774\uc804 \uc911 +state.Pending=\ubcf4\ub958 +state.ready=\uc900\ube44 \uc644\ub8cc +state.Ready=\uc900\ube44 \uc644\ub8cc +state.Running=\uc2e4\ud589 \uc911 +state.Starting=\uc2dc\uc791 \uc911 +state.Stopped=\uc815\uc9c0\ub41c \uc0c1\ud0dc +state.Stopping=\uc815\uc9c0\ud558\uace0 \uc788\ub294 \uc911 +state.Suspended=\uc77c\uc2dc\uc815\uc9c0 +ui.listView.filters.all=\ubaa8\ub450 +ui.listView.filters.mine=\ub0b4 \uc815\ubcf4\ub9cc diff --git a/client/WEB-INF/classes/resources/messages_nb_NO.properties b/client/WEB-INF/classes/resources/messages_nb_NO.properties new file mode 100644 index 00000000000..be412449398 --- /dev/null +++ b/client/WEB-INF/classes/resources/messages_nb_NO.properties @@ -0,0 +1,365 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +changed.item.properties=Endrede egenskaper +error.could.not.enable.zone=Kunne ikke aktivere sonen +error.installWizard.message=Noe gikk galt. G\u00e5 tilbake og korriger feilene. +error.password.not.match=Passordfeltene sammensvarer ikke +error.something.went.wrong.please.correct.the.following=Noe gikk galt. Vennligst korrig\u00e9r f\u00f8lgende +force.delete=Tving sletting +force.remove=Tving fjerning +force.stop=Tving stopp +instances.actions.reboot.label=Omstart av instans +label.accept.project.invitation=Aksepter prosjektinvitasjon +label.action.disable.cluster=Deaktiver klyngen +label.action.disable.cluster.processing=Deaktiverer klyngen... +label.action.disable.pod=Deaktiver pod +label.action.disable.pod.processing=Deaktiverer pod... +label.action.disable.zone=Deaktiver sonen +label.action.disable.zone.processing=Deaktiverer sonen... +label.action.enable.cluster=Aktiver klynge +label.action.enable.cluster.processing=Aktiverer klyngen... +label.action.enable.pod=Aktiver pod +label.action.enable.pod.processing=Aktiverer pod... +label.action.enable.zone=Aktiver sone +label.action.enable.zone.processing=Aktiverer sone... +label.action.unmanage.cluster.processing=Fjerner administrasjon av klynge... +label.activate.project=Aktiver prosjekt +label.add.accounts=Legg til kontoer +label.add.accounts.to=Legg kontoer til +label.add.account.to.project=Legg kontoen til prosjektet +label.add.by=Legg til ved +label.add.guest.network=Legg til gjestenettverk +label.add.network.device=Legg til nettverksenhet +label.add.new.F5=Legg til ny F5 +label.add.new.NetScaler=Legg til ny NetScaler +label.add.new.SRX=Legg til ny SRX +label.add.physical.network=Legg til fysisk nettverk +label.add.resources=Legg til ressurser +label.add.system.service.offering=Legg til et systemtilbud +label.add.to.group=Legg til gruppe +label.add.vms=Legg til VMer +label.advanced=Avansert +label.agree=Godtar +label.allocated=Allokert +label.allocation.state=Allokeringsstatus +label.apply=Bruk +label.bandwidth=B\u00e5ndbredde +label.basic=Basis +label.capacity=Kapasitet +label.change.service.offering=Endre tjenestetilbud +label.change.value=Endre verdi +label.cidr=CIDR +label.cidr.list=Kilde-CIDR +label.clean.up=Rydd opp +label.clvm=CLVM +label.compute.and.storage=Regnekraft og lagring +label.compute=Beregne +label.configure=Konfigurer +label.confirm.password=Bekreft passord +label.congratulations=Gratulerer\! +label.continue.basic.install=Fortsett med enkelt oppsett +label.continue=Fortsett +label.corrections.saved=Endringer lagret +label.CPU.cap=CPU begrensning +label.created.by.system=Opprettet av systemet +label.create.project=Opprett prosjekt +label.create.template=Opprett mal +label.decline.invitation=Avvis invitasjon +label.dedicated=Dedikert +label.default=Standardverdi +label.default.use=Standard bruk +label.default.view=Standardvisning +label.delete.project=Slett prosjekt +label.destination.physical.network.id=Fysisk nettverksid-destinasjon +label.destroy.router=Slett ruter +label.dhcp=DHCP +label.DHCP.server.type=DHCP servertype +label.disabled=Inaktiv +label.disable.provider=Deaktiver tilbyder +label.display.name=Visningsnavn +label.done=Utf\u00f8rt +label.drag.new.position=Dra til ny posisjon +label.edit.network.details=Edit\u00e9r nettverksdetaljer +label.edit.project.details=Editer prosjektdetaljer +label.elastic=Elastisk +label.elastic.IP=Elastisk IP +label.elastic.LB=Elastisk LB +label.enable.provider=Aktiver tilbyder +label.enable.vpn=Aktiver VPN +label.end.IP=Slutt-IP +label.end.vlan=Slutt-VLAN +label.enter.token=Skriv inn koden +label.error=Feil +label.f5=F5 +label.filterBy=Filtrer etter +label.guest.end.ip=Gjest slutt-IP +label.guest=Gjest +label.guest.networks=Gjestenettverk +label.guest.start.ip=Gjest start-IP +label.guest.traffic=Gjestetrafikk +label.hints=Hint +label.installWizard.addClusterIntro.subtitle=Hva er en klynge? +label.installWizard.addClusterIntro.title=La oss legge til en klynge +label.installWizard.addHostIntro.subtitle=Hva er en vert? +label.installWizard.addHostIntro.title=La oss legge til en vert +label.installWizard.addPodIntro.subtitle=Hva er en pod? +label.installWizard.addPodIntro.title=La oss legge til en pod +label.installWizard.addPrimaryStorageIntro.subtitle=Hva er prim\u00e6rlagring? +label.installWizard.addPrimaryStorageIntro.title=Legg til prim\u00e6rlagring +label.installWizard.addSecondaryStorageIntro.subtitle=Hva er sekund\u00e6rlagring? +label.installWizard.addSecondaryStorageIntro.title=Legg til sekund\u00e6rlagring +label.installWizard.addZoneIntro.subtitle=Hva er en sone? +label.installWizard.addZoneIntro.title=La oss legge til en sone +label.installWizard.addZone.title=Legg til sone +label.installWizard.click.launch=Klikk startknappen. +label.installWizard.subtitle=Denne veiviseren vil hjelpe deg i din installasjon av CloudStack&\#8482 +label.installWizard.title=Hei og velkommen til CloudStack&\#8482 +label.introduction.to.cloudstack=Introduksjon til CloudStack&\#8482 +label.invitations=Invitasjoner +label.invited.accounts=Inviterte kontoer +label.invite=Inviter +label.invite.to=Inviter til +label.ip.ranges=IP-rekke +label.is.redundant.router=Redundant +label.item.listing=Elementlisting +label.kvm.traffic.label=KVM trafikketikett +label.launch=Start +label.launch.vm=Start VM +label.LB.isolation=LB-isolering +label.least.connections=F\u00e6rrest tilkoblinger +label.load.balancing=Lastbalansering +label.load.balancing.policies=Regler for lastbalansering +label.local.storage=Lokal lagring +label.make.project.owner=Gj\u00f8r konto prosjekteier +label.management=Administrasjon +label.manage.resources=Behandle ressurser +label.max.public.ips=Maks offentlige IPer +label.max.snapshots=Maks \u00f8yeblikksbilder +label.max.templates=Maks maler +label.max.vms=Maks bruker-VMer +label.max.volumes=Maks volumer +label.may.continue=Du kan n\u00e5 fortsette. +label.menu.system.service.offerings=Systemtilbud +label.migrate.instance.to.host=Migrer instansen til en annen vert +label.migrate.instance.to.ps=Migrer instansen til en annen sekund\u00e6r lagring. +label.migrate.volume=Migrer volumet til en annen prim\u00e6rlagring. +label.move.down.row=Flytt \u00e9n rad ned +label.move.to.top=Flytt til toppen +label.move.up.row=Flytt \u00e9n rad opp +label.my.network=Mitt nettverk +label.my.templates=Mine maler +label.netScaler=NetScaler +label.network.device=Nettverksenhet +label.network.device.type=Type nettverksenhet +label.networking.and.security=Nettverk og sikkerhet +label.network.label.display.for.blank.value=Bruk standard gateway +label.networks=Nettverk +label.new=Ny +label.new.project=Nytt prosjekt +label.new.vm=Ny VM +label.no.data=Ingen data \u00e5 vise +label.no.thanks=Nei, takk +label.notifications=Notifikasjoner +label.ok=OK +label.order=Rekkef\u00f8lge +label.physical.network.ID=Fysisk nettverksid +label.PING.CIFS.password=PING CIFS passord +label.PING.CIFS.username=PING CIFS brukernavn +label.PING.dir=PING-mappe +label.PING.storage.IP=PING lagrings-IP +label.please.specify.netscaler.info=Vennligst spesifiser NetScaler-info +label.port.forwarding.policies=Regler for portvideresending +label.previous=Forrige +label.project.dashboard=Prosjektoversikt +label.project.id=Prosjektid +label.project.invite=Inviter til prosjekt +label.project.name=Prosjektnavn +label.project=Prosjekt +label.projects=Prosjekter +label.project.view=Prosjektvisning +label.providers=Tilbydere +label.public.network=Offentlig nettverk +label.Pxe.server.type=PXE Servertype +label.redundant.router.capability=Redundant ruter +label.redundant.router=Redundant ruter +label.redundant.state=Redundant tilstand +label.remind.later=P\u00e5minn meg senere +label.remove.ip.range=Fjern IP-rekke +label.removing=Fjerner +label.restart.network=Nettverksomstart +label.restart.required=Omstart p\u00e5krevd +label.review=Gjennomg\u00e5 +label.revoke.project.invite=Tilbakekall invitasjonen +label.round.robin=Ringdistribusjon +label.save.and.continue=Lagre og fortsett +label.select.a.template=Velg en mal +label.select.a.zone=Velg en sone +label.select.iso.or.template=Velg ISO eller mal +label.select.project=Velg prosjekt +label.select-view=Velg visning +label.setup.network=Nettverksoppsett +label.setup=Oppsett +label.setup.zone=Soneoppsett +label.set.up.zone.type=Oppsett av sonetype +label.shutdown.provider=Steng tilbyder +label.skip.guide=Jeg har brukt CloudStack tidligere. Hopp over denne veiviseren +label.source=Kilde +label.SR.name = SR navnelapp +label.srx=SRX +label.start.IP=Start-IP +label.start.vlan=Start-VLAN +label.static.nat.enabled=Statisk NAT aktivert +label.stickiness=Klebrighet +label.storage.tags=Merkelapper for lagring +label.storage.traffic=Lagringstrafikk +label.subdomain.access=Tilgang for underdomene +label.supported.source.NAT.type=Supporterte kilde-NAT typer +label.suspend.project=Suspender prosjekt +label.task.completed=Oppgave utf\u00f8rt +label.TFTP.dir=TFTP-mappe +label.timeout=Tidsavbrudd +label.token=Kode +label.traffic.types=Trafikktyper +label.update.project.resources=Oppdater prosjektressurser +label.view.all=Vis alle +label.view.console=Se konsoll +label.viewing=Viser +label.view=Vis +label.virtual.machines=Virtuelle maskiner +label.virtual.router=Virtuell ruter +label.vm.display.name=Visningsnavn for VM +label.VMFS.datastore=VMFS lagringsomr\u00e5de +label.vm.name=VM-navn +label.vmware.traffic.label=VMware trafikketikett +label.volgroup=Volumgruppe +label.what.is.cloudstack=Hva er CloudStack&\#8482? +label.xen.traffic.label=XenServer trafikketikett +label.zone.details=Sonedetaljer +label.zone.name=Sonenavn +label.zone.type=Sonetype +message.acquire.new.ip=Vennligst bekreft at du \u00f8nsker \u00e5 anskaffe en ny IP for dette nettverket +message.action.disable.pod=Vennligst bekreft at du \u00f8nsker \u00e5 aktivere denne poden +message.action.disable.zone=Vennligst bekreft at du \u00f8nsker \u00e5 deaktivere denne sonen. +message.action.enable.cluster=Vennligst bekreft at du \u00f8nsker \u00e5 aktivere denne klyngen. +message.action.enable.pod=Vennligst bekreft at du \u00f8nsker \u00e5 aktivere denne poden. +message.action.enable.zone=Vennligst bekreft at du \u00f8nsker \u00e5 aktivere denne sonen. +message.activate.project=Er du sikker p\u00e5 du \u00f8nsker \u00e5 aktivere dette prosjektet? +message.add.guest.network=Vennligst bekreft at du \u00f8nsker \u00e5 legge til gjestenettverk +message.adding.host=Legger til vert +message.adding.Netscaler.device=Legg til NetScaler-enhet +message.alert.state.detected=Alarm oppdaget +message.change.password=Vennligst endre ditt passord +message.configuring.guest.traffic=Konfigurerer gjestetrafikk +message.configuring.physical.networks=Konfigurer fysisk nettverk +message.configuring.public.traffic=Konfigurerer offentlig trafikk +message.configuring.storage.traffic=Konfigurerer lagringstrafikk +message.confirm.destroy.router=Vennligst bekreft at du \u00f8nsker \u00e5 fjerne denne ruteren +message.confirm.disable.provider=Vennligst bekreft at du \u00f8nsker \u00e5 deaktivere denne tilbyderen +message.confirm.enable.provider=Vennligst bekreft at du \u00f8nsker \u00e5 aktivere denne tilbyderen +message.confirm.join.project=Vennligst bekreft at du \u00f8nsker \u00e5 delta i dette prosjektet. +message.confirm.shutdown.provider=Vennligst bekreft at du \u00f8nsker \u00e5 stenge denne tilbyderen +message.create.template=Er du sikker p\u00e5 at du \u00f8nsker \u00e5 lage malen? +message.creating.cluster=Oppretter klynge +message.creating.pod=Oppretter pod +message.creating.primary.storage=Oppretter prim\u00e6rlagring +message.creating.secondary.storage=Oppretter sekund\u00e6rlagring +message.decline.invitation=Er du sikker p\u00e5 du \u00f8nsker \u00e5 avvise denne prosjektinvitasjonen? +message.delete.project=Er du sikker p\u00e5 du \u00f8nsker \u00e5 slette dette prosjektet? +message.detach.disk=Er du sikker p\u00e5 at du \u00f8nsker \u00e5 frakoble denne disken? +message.download.volume.confirm=Vennligst bekreft at du \u00f8nsker \u00e5 laste ned dette volumet +message.enable.vpn=Vennligst bekreft at du \u00f8nsker \u00e5 aktivere VPN-tilgang for denne IP-adressen +message.enabling.zone=Aktiverer sonen +message.enter.token=Vennligst skriv inn koden du fikk i invitasjonsmailen. +message.installWizard.click.retry=Klikk p\u00e5 knappen for \u00e5 pr\u00f8ve oppstart p\u00e5 nytt. +message.installWizard.tooltip.addCluster.name=Klyngenavnet. Dette kan v\u00e6re hva som helst og er ikke benyttet av CloudStack. +message.installWizard.tooltip.addHost.hostname=DNS-navnet eller IP-adressen til verten. +message.installWizard.tooltip.addHost.password=Dette er passordet for brukeren gjengitt ovenfor (fra din XenServer-installasjon). +message.installWizard.tooltip.addHost.username=Vanligvis root. +message.installWizard.tooltip.addPod.name=Et navn for poden +message.installWizard.tooltip.addPod.reservedSystemGateway=Gatewayen til vertene i poden. +message.installWizard.tooltip.addPod.reservedSystemNetmask=Nettmasken benyttet p\u00e5 subnettet gjestene vil bruke. +message.installWizard.tooltip.addPrimaryStorage.name=Navnet p\u00e5 lagringsenheten. +message.installWizard.tooltip.addPrimaryStorage.path=(for NFS) I NFS er dette den eksporterte filbanen fra serveren. Banen (for SharedMountPoint). Med KVM er dette banen p\u00e5 hver vert hvor denne prim\u00e6re lagringen er tilkoblet. For eksempel\: "mnt/primary". +message.installWizard.tooltip.addPrimaryStorage.server=(for NFS, iSCSI eller PreSetup) IP-adressen eller DNS-navnet til lagringsenheten. +message.installWizard.tooltip.addSecondaryStorage.nfsServer=IP-adressen til NFS-serveren som inneholder sekund\u00e6r lagring +message.installWizard.tooltip.addSecondaryStorage.path=Den eksporterte filbanen, fra serveren du spesifiserte ovenfor +message.installWizard.tooltip.addZone.dns1=Dette er DNS-serveren som benyttes av gjeste-VMer i sonen. Disse DNS-serverene vil bli aksessert via det offentlige nettverket du vil legge til senere. De offentlige IP-adressene for en sone m\u00e5 ha en rute til DNS-serveren navngitt her. +message.installWizard.tooltip.addZone.dns2=Dette er DNS-serveren som benyttes av gjeste-VMer i sonen. Disse DNS-serverene vil bli aksessert via det offentlige nettverket du vil legge til senere. De offentlige IP-adressene for en sone m\u00e5 ha en rute til DNS-serveren navngitt her. +message.installWizard.tooltip.addZone.name=Et navn for sonen +message.installWizard.tooltip.configureGuestTraffic.description=En beskrivelse av nettverket +message.installWizard.tooltip.configureGuestTraffic.guestGateway=Gatewayen gjestene skal bruke +message.installWizard.tooltip.configureGuestTraffic.guestNetmask=Nettmasken benyttet p\u00e5 subnettet gjestene skal bruke +message.installWizard.tooltip.configureGuestTraffic.name=Et navn for nettverket +message.instanceWizard.noTemplates=Du har ingen maler tilgjengelig. Vennligst legg til en kompatibel mal og kj\u00f8r instansveiviseren. +message.ip.address.changed=Din IP-adresse kan ha endret seg. \u00d8nsker du \u00e5 oppdatere visningen? Merk at detaljvisningen vil i s\u00e5fall lukkes. +message.iso.desc=Diskimage som inneholder data etter oppstartsbar media for OS +message.join.project=Du har n\u00e5 deltatt i et prosjekt. Vennligst bytt til prosjektvisning for \u00e5 se prosjektet. +message.migrate.instance.to.host=Vennligst bekreft at du \u00f8nsker \u00e5 migrere instansen til en annen vert. +message.migrate.instance.to.ps=Vennligst bekreft at du \u00f8nsker \u00e5 migrere instansen til en annen sekund\u00e6r lagring. +message.migrate.volume=Vennligst bekreft at du \u00f8nsker \u00e5 migrere volumet til en annen prim\u00e6rlagring. +message.no.projects.adminOnly=Du har ingen prosjekter.
Vennligst be din administrator om \u00e5 opprette et nytt prosjekt. +message.no.projects=Du har ingen prosjekter.
Vennligst opprett et nytt fra prosjektseksjonen. +message.pending.projects.1=Du har f\u00f8lgende prosjektinvitasjoner\: +message.pending.projects.2=For \u00e5 se, vennligst g\u00e5 til prosjektseksjonen og velg invitasjoner fra nedtrekksmenyen. +message.please.add.at.lease.one.traffic.range=Vennligst legg til minst \u00e9tt trafikkniv\u00e5 +message.please.proceed=Vennligst fortsett til neste steg +message.please.select.a.configuration.for.your.zone=Vennligst velg en konfigurasjon for din sone +message.please.select.a.different.public.and.management.network.before.removing=Vennligst velg et annet offentlig- og administrasjonsnettverk f\u00f8r du fjerner +message.please.select.networks=Vennligst velg nettverk for din VM +message.please.wait.while.zone.is.being.created=Vennlist vent mens din sone opprettes. Dette kan ta noe tid... +message.project.invite.sent=Invitasjon sendt til bruker. De vil bli lagt til prosjektet s\u00e5 snart de har akseptert invitasjonen +message.reset.password.warning.notPasswordEnabled=Denne malen vil bli opprettet uten passord +message.reset.password.warning.notStopped=Din instans m\u00e5 stoppes f\u00f8r man fors\u00f8ker \u00e5 bytte n\u00e5v\u00e6rende passord +message.select.iso=Vennligst velg en ISO for din nye virtuelle instans. +message.select.item=Vennligst velg et element +message.select.security.groups=Vennligst velg sikkerhetsgruppe(r) for din nye VM +message.select.template=Vennligst velg en mal for din nye virtuelle instans. +message.setup.successful=Oppsettet av nettskyen er vellykket\! +message.step.2.desc= +message.step.3.desc= +message.suspend.project=Er du sikker du \u00f8nsker \u00e5 pause dette prosjektet? +message.template.desc=OS-image som kan brukes til \u00e5 starte VMer +message.vm.review.launch=Vennligst vurder f\u00f8lgende informasjon og bekreft at din virtuelle instans er korrekt f\u00f8r kj\u00f8ring +message.you.must.have.at.least.one.physical.network=Du trenger minst ett fysisk nettverk +message.Zone.creation.complete=Opprettelsen av sonen utf\u00f8rt +message.zone.creation.complete.would.you.like.to.enable.this.zone=Soneopprettelse fullf\u00f8rt. \u00d8nsker du \u00e5 aktivere denne sonen? +message.zone.no.network.selection=Sonen du har valgt har ingen mulighet for valg av nettverk. +notification.reboot.instance=Omstart av instans +notification.start.instance=Start instans +notification.stop.instance=Stopp instans +state.Accepted=Akseptert +state.Active=Aktiv +state.Allocated=Allokert +state.BackedUp=Sikkerhetskopiert +state.BackingUp=Sikkerhetskopierer +state.Completed=Utf\u00f8rt +state.Creating=Oppretter +state.Declined=Avvist +state.Destroyed=Destruert +state.Disabled=Inaktiv +state.Error=Feil +state.Expunging=Fjerner +state.Pending=Venter +state.ready=Klar +state.Ready=Klar +state.Running=Kj\u00f8rer +state.Starting=Starter +state.Stopped=Stoppet +state.Suspended=Pauset +ui.listView.filters.all=Alle +ui.listView.filters.mine=Mine diff --git a/client/WEB-INF/classes/resources/messages_pt_BR.properties b/client/WEB-INF/classes/resources/messages_pt_BR.properties index 5202f562cba..fd24f542e8d 100644 --- a/client/WEB-INF/classes/resources/messages_pt_BR.properties +++ b/client/WEB-INF/classes/resources/messages_pt_BR.properties @@ -15,1018 +15,424 @@ # specific language governing permissions and limitations # under the License. - -#new labels (begin) ********************************************************************************************** -# label.isolation.uri=Isolation URI -# label.broadcast.uri=Broadcast URI -#new labels (end) ************************************************************************************************ - - -#modified labels (begin) ***************************************************************************************** -# 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\:

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.

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.


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=Habilitar rede física -label.action.disable.physical.network=Desabilitar rede física -message.action.enable.physical.network=Por favor confirme que você deseja habilitar esta rede física. -message.action.disable.physical.network=Por favor confirme que você deseja desabilitar esta rede física. - -# 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.site.to.site.VPN=site-to-site VPN -# 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=Texto do domínio de rede -label.memory.mb=Memória -label.cpu.mhz=CPU (em MHz) - -message.action.remove.host=Remover o único/último host do cluster e reinstalar o host irá provocar a perda do ambiente/banco do host tornando os Cloud Servers inutilizáveis. - -message.action.reboot.router=Confirme que você deseja reiniciar este roteador. -message.action.stop.router=Confirme que você deseja parar este roteador. -message.restart.network=Por favor confirme que você deseja reiniciar a rede - - -label.ipaddress=Endereço IP -label.vcdcname=Nome do vCenter DC -label.vcipaddress=Endereço IP do vCenter -label.vsmctrlvlanid=Control VLAN ID -label.vsmpktvlanid=Packet VLAN ID -label.vsmstoragevlanid=Storage VLAN ID -label.nexusVswitch=Nexus Vswitch -label.action.delete.nexusVswitch=Remover NexusVswitch -label.action.enable.nexusVswitch=Habilitar NexusVswitch -label.action.disable.nexusVswitch=Desabilitar NexusVswitch -label.action.list.nexusVswitch=Listar NexusVswitch -message.action.delete.nexusVswitch=Por favor confirme que você deseja remover este nexusVswitch. -message.action.enable.nexusVswitch=Por favor confirme que você deseja habilitar este nexusVswitch. -message.action.disable.nexusVswitch=Por favor confirme que você deseja desabilitar este nexusVswitch -message.specify.url=Por favor especifique a URL -label.select.instance.to.attach.volume.to=Escolha uma instância para conectar o volume -label.upload=Enviar -label.upload.volume=Enviar o Volume -label.virtual.routers=Roteadores Virtuais -label.primary.storage.count=Pools de Storage Primários -label.secondary.storage.count=Pools de Storage secundários -label.number.of.system.vms=Número de VMs de sistema -label.number.of.virtual.routers=Número de Roteadores Virtuais -label.action.register.iso=Registrar ISO -label.isolation.method=Método de isolação -label.action.register.template=Registrar template -label.checksum=MD5 checksum -label.vpn=VPN -label.vlan=VLAN - - -label.management.ips=Gerenciamento de Endereços IP -label.devices=Dispositivos -label.rules=Regras -# label.traffic.label=Traffic label -label.vm.state=Estado da VM -message.setup.physical.network.during.zone.creation.basic=Quando adicionar uma zona básica, você pode configurar uma rede física, que corresponde a uma NIC no hypervisor. A rede carrega diversos tipos de tráfego.

Você pode adicionar e remover outros tipos de tráfego na mesma interface de rede física. -label.domain.router=Roteador do Domínio -label.console.proxy=Console proxy -label.secondary.storage.vm=VM de storage secundário -label.add.netScaler.device=Adicionar dispositivo Netscaler -label.add.F5.device=Adicionar dispositivo F5 -label.add.SRX.device=Adicionar dispositivo SRX -label.account.and.security.group=Contas, grupos de Segurança -label.fetch.latest=Obter últimos -label.system.offering=Ofertas de Sistema -message.validate.instance.name=Nomes de instâncias não podem ter mais de 63 caracteres. Somente letras ASCII a~z, A~Z, dígitos 0~9 e hífen são permitidos. Deve começar com uma letra e terminar com uma letra ou dígito. - - -label.isolated.networks=Redes Isoladas -label.latest.events=Últimos eventos -state.Enabled=Habilitado -label.system.wide.capacity=Capacidade Total do Sistema -label.network.service.providers=Provedores de Serviços de Rede -message.launch.zone=A zona está pronta para ser executada; por favor continue para o próximo passo. -error.unable.to.reach.management.server=Não foi possível acessar o Servidor de Gerenciamento -label.internal.name=Nome interno -# 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=Editar tipo de tráfego -# label.label=Label -label.max.networks=Máx. de redes -error.invalid.username.password=Usuário ou senha inválidos -message.enabling.security.group.provider=Habilitar provider de grupo de segurança -message.adding.Netscaler.provider=Adicionando Netscaler provider -message.creating.guest.network=Criando rede guest -label.action.delete.physical.network=Deletar rede física -message.action.delete.physical.network=Por favor confirme que você deseja deletar esta rede física -message.installWizard.copy.whatIsAHost=Um host é um único computador. Os Hosts provêem os recursos computacionais para executar as máquinas virtuais. Cada host possuí o software do hypervisor instalado nele para gerenciar as guest VMs (Exceto os hosts bare metal, que são um caso especial discutido no Guia Avançado de Instalação). Por exemplo, um servidor Linux com KVM habilitado, um servidor Citrix XenServer e um servidor ESXi são hosts. Na Instalação Básica, nós utilizamos um único host rodando XenServer ou KVM.

O host é a menor unidade organizacional dentro de uma instalação CloudStack&\#8482; . Hosts estão contidos dentro de Clusters, clusters estão contidos dentro de pods e pods estão contidos dentro de zonas. - - -label.add.compute.offering=Adicionar oferta de computação -label.compute.offering=Oferta de Computação -label.compute.offerings=Ofertas de Computação -label.select.offering=Selecionar Oferta -label.menu.infrastructure=Infra-estrutura -label.sticky.tablesize=Tamanho da Tabela -label.sticky.expire=Expires -label.sticky.cookie-name=Nome do Cookie -label.sticky.mode=Modo -label.sticky.length=Tamanho -label.sticky.holdtime=Tempo de espera -# label.sticky.request-learn=Request learn -label.sticky.prefix=Prefixo -label.sticky.nocache=Sem Cache -label.sticky.indirect=Indireto -# label.sticky.postonly=Post only -label.sticky.domain=Domínio -state.Allocating=Alocando -state.Migrating=Migrando -error.please.specify.physical.network.tags=Ofertas de Rede não estarão disponíveis enquanto você não especificar tags para esta interface física. - - -state.Stopping=Parando -message.add.load.balancer.under.ip=A regra do balanceador de carga foi adicionada para o IP\: -message.select.instance=Por favor selecione uma instância. -label.select=Selecionar -label.select.vm.for.static.nat=Selecionar VM para NAT estático -label.select.instance=Selecionar instância -label.nat.port.range=Range de Portas NAT -label.static.nat.vm.details=Detalhes de NAT estático da VM -label.edit.lb.rule=Editar regra de LB -message.migrate.instance.to.host=Por favor confirme que você deseja migrar a instância para outro host. -label.migrate.instance.to.host=Migrar instância para outro host -message.migrate.instance.to.ps=Por favor confirme que você deseja migrar a instância para outro storage primário. -label.migrate.instance.to.ps=Migrar instância para outro storage primário -label.corrections.saved=Alterações salvas -message.installWizard.copy.whatIsSecondaryStorage=O storage secundário está associado a uma zona, ele é responsável por armazenar o seguinte\:
  • Imagens de Templates do SO - que podem ser utilizadas para boot das VMs e podem incluir configurações adicionais, como por exemplo as aplicações instaladas
  • Imagens ISO - Imagens de sistema operacional que podem ser bootáveis ou não
  • Snapshots do volume de discos - cópias salvas dos dados de uma VM que pode ser utilizada para recuperação de dados ou criação de novos templates
-message.installWizard.copy.whatIsPrimaryStorage=Uma infraestrutura de Cloud CloudStack&\#8482; utiliza dois tipos de storage\: storage primário e storage secundário. Ambos os tipos podem ser iSCSI, NFS servers, ou disco local.

O Storage primário está associado com um cluster, e armazena os volumes de disco de cada guest VM para todas as VMs em execução nos hosts deste cluster. O servidor de storage primário tipicamente encontra-se localizado perto dos hosts. -message.installWizard.copy.whatIsACluster=Um cluster provê uma maneira de agrupar hosts. Os hosts em um cluster tem hardware idêntico, rodam o mesmo hypervisor, estão na mesma subnet, acessam o mesmo storage compartilhado. Instâncias de máquinas virtuais (VMs) podem ser migradas a quente - live migration - de um host para outro host no mesmo cluster, sem interromper o serviço para o usuário. Um Cluster é a terceira maior unidade organizacional em uma instalação CloudStack&\#8482; . Clusters estão contidos em pods e pods estão contidos em zonas.

O CloudStack&\#8482; permite múltiplos clusters em uma mesma cloud, entretanto para a instalação básica, nós iremos precisar apenas de um cluster. -message.installWizard.copy.whatIsAPod=Um pod normalmente representa um único rack. Hosts no mesmo pod estão na mesma subrede.

Um pod é a segunda maior unidade organizacional de uma instalação CloudStack&\#8482; . Pods estão contidos dentro de zonas. Cada zona, pode conter um ou mais pods; Na instalação básica, você irá ter apenas um pod na sua zona. -message.installWizard.copy.whatIsAZone=Uma zona é a maior unidade organizacional em uma instalação CloudStack&\#8482; . Uma zona tipicamente corresponde a um único datacenter, apesar de ser possível ter múltiplas zonas no mesmo datacenter. O benefício de se organizar a infra-estrutura em zonas é permitir o isolamento físico e redundância. Por exemplo, cada zona pode possuir sua própria alimentação de energia e link de saída de internet e zonas podem estar geograficamente separadas (apesar de não ser obrigatório). -message.installWizard.copy.whatIsCloudStack=O CloudStack&\#8482 é uma plataforma de software que agrega recursos computacionais para construir uma Cloud de Infra-estrutura como Serviço (IaaS) pública, privada ou híbrida. O CloudStack&\#8482 gerência a rede, o storage e os recursos computacionais que compõem a infra-estrutura de cloud. Utilize o CloudStack&\#8482 para instalar, gerenciar e configurar os ambientes de cloud computing.

Indo além de imagens de máquinas virtuais individuais rodando em hardware commodity, CloudStack&\#8482 provê uma solução completa de software de infra-estrutura de cloud para entregar datacenters virtuais como um serviço - possuindo todos os componentes essenciais para contruir, instalar e gerenciar aplicações na cloud multi-camadas e multi-tenant. Ambas as versões open-source e premium estão disponíveis, com a versão opensource oferecendo praticamente os mesmos recursos. -message.installWizard.tooltip.addSecondaryStorage.path=Path exportado, localizado no servidor que você especificou acima -message.installWizard.tooltip.addSecondaryStorage.nfsServer=O endereço IP do servidor NFS hospedando o storage secundário -message.installWizard.tooltip.addPrimaryStorage.path=(para NFS) No NFS este é o path exportado pelo servidor. Path (para SharedMountPoint). Com o KVM este é o path em cada host onde o storage primário está montado. Por exemplo, "/mnt/primary". -message.installWizard.tooltip.addPrimaryStorage.server=(para NFS, iSCSI ou PreSetup) O Endereço IP ou nome DNS do dispositivo de storage. -message.installWizard.tooltip.addPrimaryStorage.name=O Nome do dispositivo de storage. -message.installWizard.tooltip.addHost.password=Este é a senha do usuário especificado acima (da sua instalação do XenServer) -message.installWizard.tooltip.addHost.username=Usualmente root. -message.installWizard.tooltip.addHost.hostname=O nome DNS ou endereço IP do host. -message.installWizard.tooltip.addCluster.name=Um nome para o cluster. Este nome pode ser um nome de sua escolha e não é usado pelo CloudStack. -message.installWizard.tooltip.addPod.reservedSystemEndIp=Este é o range de IP na rede privada que o CloudStack utiliza para gerenciar o storage secundário das VMs e Proxy Console das VMs. Estes endereços IP são obtidos da mesma subrede dos servidores hosts. -message.installWizard.tooltip.addPod.reservedSystemStartIp=Este é o range de IP na rede privada que o CloudStack utiliza para gerenciar as VMs de storage secundário e as VMs de Console Proxy. Estes endereços IP devem estar na mesma subnet dos servidores de processamento. -message.installWizard.tooltip.addPod.reservedSystemNetmask=A máscara de rede está em uso na subrede que os guests irão utilizar. -message.installWizard.tooltip.addPod.reservedSystemGateway=O gateway para os hosts neste pod. -message.installWizard.tooltip.addPod.name=O nome para o pod -message.installWizard.tooltip.configureGuestTraffic.guestEndIp=O range de endereços IP que estará disponível para alocação para os guests nesta zona. Caso uma NIC seja utilizada, estes IPs devem estar no mesmo CIDR que o CIDR do pod. -message.installWizard.tooltip.configureGuestTraffic.guestStartIp=O range de endereços IP que estará disponível para alocação para os guests nesta zona. Caso uma NIC seja utilizada, estes IPs devem estar no mesmo CIDR que o CIDR do pod. -message.installWizard.tooltip.configureGuestTraffic.guestNetmask=A máscara de rede da subrede que os guests devem usar -message.installWizard.tooltip.configureGuestTraffic.guestGateway=O gateway que os guests devem usar -message.installWizard.tooltip.configureGuestTraffic.description=Uma descrição da sua rede -message.installWizard.tooltip.configureGuestTraffic.name=Um nome para sua rede -message.installWizard.tooltip.addZone.internaldns2=Estes são os servidores DNS utilizados pelas VMs de sistema nesta zona. Estes servidores DNS serão acessados através da interface de rede privada das VMs de sistema. O endereço IP privado que você configurar para os pods deve possuir uma rota para os servidores DNS configurados aqui. -message.installWizard.tooltip.addZone.internaldns1=Estes são os servidores DNS utilizados pelas VMs de sistema nesta zona. Estes servidores DNS serão acessados através da interface de rede privada das VMs de sistema. O endereço IP privado que você configurar para os pods deve possuir uma rota para os servidores DNS configurados aqui. -message.installWizard.tooltip.addZone.dns2=Estes são os servidores DNS utilizados pelas VMs convidadas nesta zona. Estes servidores DNS serão acessados pela interface de rede pública que você irá adicionar posteriormente. O endereço IP público de uma zona deve possuir uma rota para os servidores DNS configurados aqui. -message.installWizard.tooltip.addZone.name=Um nome para a zona -message.installWizard.tooltip.addZone.dns1=Estes são os servidores DNS utilizados pelas guest VMs na zona. Estes servidores DNS serão acessados pela interface de rede pública que você irá adicionar posteriormente. O endereço IP público da zona deve possuir uma rota para os servidores DNS configurados aqui. -message.setup.successful=Cloud configurada com sucesso\! -label.may.continue=Você pode continuar agora -error.installWizard.message=Alguma coisa está errada; você pode voltar e corrigir quaisquer erros -message.installWizard.now.building=Construindo sua cloud agora... -message.installWizard.click.retry=Click no botão para tentar executar novamente. -label.launch=Executar -label.installWizard.click.launch=Click no botão executar. -label.congratulations=Parabéns\! -label.installWizard.addSecondaryStorageIntro.subtitle=Qual é o storage secundário ? -label.installWizard.addSecondaryStorageIntro.title=Vamos adicionar o storage secundário -label.installWizard.addPrimaryStorageIntro.subtitle=Qual é o storage primário ? -label.installWizard.addPrimaryStorageIntro.title=Vamos adicionar o storage primário -label.installWizard.addHostIntro.subtitle=O que é um Host ? -label.installWizard.addHostIntro.title=Vamos adicionar um host -label.installWizard.addClusterIntro.subtitle=O que é um cluster? -label.installWizard.addClusterIntro.title=Vamos adicionar um cluster -label.installWizard.addPodIntro.subtitle=O que é um pod ? -label.installWizard.addPodIntro.title=Vamos adicionar um pod -label.installWizard.addZone.title=Adicionar zona -label.installWizard.addZoneIntro.subtitle=O que é uma zona? -label.installWizard.addZoneIntro.title=Vamos adicionar uma zona -error.password.not.match=Os campos de senha não combinam -label.confirm.password=Confirme a senha -message.change.password=Por favor, troque sua senha. -label.save.and.continue=Salvar e continuar -label.skip.guide=Eu utilizei o CloudStack antes, pular este guia -label.continue.basic.install=Continuar com a instalação básica -label.introduction.to.cloudstack=Introdução ao CloudStack&\#8482 -label.what.is.cloudstack=O que é o CloudStack&\#8482? -label.hints=Dicas -label.installWizard.subtitle=Este tour vai auxiliar você na configuração da sua instalação de CloudStack&\#8482 -label.continue=Continuar -label.installWizard.title=Olá, seja bem vindo ao CloudStack&\#8482 -label.agree=Concordo -label.manage.resources=Gerenciar Recursos -label.port.forwarding.policies=Políticas de redirecionamento de portas -label.load.balancing.policies=Políticas de balanceamento de carga -label.networking.and.security=Rede e segurança -label.bandwidth=Bandwidth -label.virtual.machines=Máquinas virtuais -label.compute.and.storage=Processamento e Armazenamento -label.task.completed=Tarefa completa -label.update.project.resources=Atualizar recursos de projeto -label.remove.project.account=Remover conta de projeto -label.item.listing=Listar items -message.select.item=Por favor selecione um item. -label.removing=Removendo -label.invite=Convidar -label.add.by=Adicionado por -label.max.vms=Máx. VMs de usuário -label.max.public.ips=Máx. IPs públicos -label.max.volumes=Máx. volumes -label.max.snapshots=Max. snapshots -label.max.templates=Máx. templates -# label.max.vpcs=Max. VPCs -label.project.dashboard=Dashboard do Projeto -label.remind.later=Me lembre depois -label.invited.accounts=Contas convidadas -label.invite.to=Convidar para -label.add.accounts.to=Adicionar contas para -label.add.accounts=Adicionar contas -label.project.name=Nome de projeto -label.create.project=Criar um projeto -label.networks=Redes -label.launch.vm=Executar VM -label.new.vm=Nova VM -label.previous=Anterior -label.add.to.group=Adicionar ao grupo -message.vm.review.launch=Por favor revise a informação abaixo e confirme que sua instância virtual está correta antes de executa-la. -message.select.security.groups=Por favor selecione o(s) grupo(s) de segurança para sua nova VM -label.new=Novo -message.please.select.networks=Por favor selecione as redes para sua máquina virtual. -message.please.proceed=Por favor continue para o próximo passo. -message.zone.no.network.selection=A zona que você selecionou não possui nenhuma rede para ser escolhida. -label.no.thanks=Não obrigado -label.my.templates=Meus templates -message.select.template=Por favor selecione um template para sua nova instância virtual. -message.select.iso=Por favor selecione um ISO para sua nova instância virtual -message.template.desc=Imagem de SO que pode ser utilizada para bootar VMs -message.iso.desc=Imagem de disco contendo dados ou mídia de sistema operacional bootável -label.select.iso.or.template=Selecione ISO ou template -message.select.a.zone=A zone tipicamente corresponde a um único datacenter. Múltiplas zonas auxiliam a cloud a ser mais confiável provendo isolamento físico e redundância. -label.select.a.zone=Selecione uma zona -label.review=Revisar -label.select.a.template=Selecione um template -label.setup=Configuração -state.Allocated=Alocado changed.item.properties=Alteradas propriedades do item -label.apply=Aplicar -label.default=Padrão -label.viewing=Visualizar -label.move.to.top=Mover para o topo -label.move.up.row=Mover uma célula para cima -label.move.down.row=Mover uma célula para baixo -# label.move.to.bottom=Move to bottom -label.drag.new.position=Arrastar para uma nova posição -label.order=Ordenar -label.no.data=Sem dados para mostrar -label.change.value=Alterar valor -label.clear.list=Limpar lista -label.full.path=Path completo -message.add.domain=Por favor especifique o subdomínio que você deseja criar neste domínio -message.delete.user=Por favor confirme que você deseja deletar este usuário. -message.enable.user=Por favor confirme que você deseja habilitar este usuário. -message.disable.user=Por favor confirme que você deseja desabilitar este usuário. -message.generate.keys=Por favor confirme que você deseja gerar novas chaves para este usuário. -message.update.resource.count=Por favor confirme que você quer atualizar a contagem de recursos para esta conta. -message.edit.account=Editar ("-1" indica que não haverá limites para a quantidade de recursos criado) -label.total.of.vm=Total de VM -label.total.of.ip=Total de endereços IP -state.enabled=Habilitado -message.action.download.iso=Por favor confirme que você deseja baixar esta ISO. -message.action.download.template=Por favor confirme que você deseja baixar este template. -label.destination.zone=Zona de Destino -label.keyboard.type=Tipo de Teclado -label.nic.adapter.type=Tipo de adaptador NIC -label.root.disk.controller=Controlador do disco Root -label.community=Comunidade -label.remove.egress.rule=Remover regra egress -label.add.egress.rule=Adicionar regra egress -label.egress.rule=Regra Egress -label.remove.ingress.rule=Remover regra ingress -label.delete.vpn.user=Deletar usuário VPN -label.add.vpn.user=Adicionar usuário VPN -label.remove.pf=Remover regra de redirecionamento de porta -label.remove.vm.from.lb=Remover VM da regra de balanceamento de carga -label.add.vms.to.lb=Add VM(s) na regra de balanceamento de carga -label.add.vm=Adicionar VM -label.remove.static.nat.rule=Remover regra de NAT estático -label.remove.rule=Remover regra -label.add.static.nat.rule=Adicionar regra de NAT estático -label.add.rule=Adicionar regra -label.configuration=Configuração -message.disable.vpn=Você tem certeza que deseja desabilitar a VPN? -label.disable.vpn=Desabilitar VPN -message.enable.vpn=Por favor confirme que você deseja acesso VPN habilitado para este endereço IP. -label.enable.vpn=Habilitar VPN -message.acquire.new.ip=Por favor confirme que você gostaria de adquirir um novo IP para esta rede. -label.elastic=Elástico -label.my.network=Minha rede -label.add.vms=Adicionar VMs -label.configure=Configurar -# label.stickiness=Stickiness -label.source=Origem -label.least.connections=Least connections -label.round.robin=Round-robin -label.restart.required=Reiniciar obrigatório -label.clean.up=Limpar -label.restart.network=Reiniciar rede -label.edit.network.details=Editar detalhes de rede -label.add.guest.network=Adicionar rede guest -label.guest.networks=Redes Guest -message.ip.address.changed=Seu endereço IP pode ter mudado; você gostaria de atualizar a listagem ? Note que neste caso o painel de detalhes irá fechar. -# state.BackingUp=Backing Up -# state.BackedUp=Backed Up -label.done=Pronto -label.vm.name=Nome da VM -message.migrate.volume=Por favor confirme que você deseja migrar o volume para outro storage primário. -label.migrate.volume=Migrar volume para outro storage primário -message.create.template=Você tem certeza que deseja criar um template ? -label.create.template=Criar template -message.download.volume.confirm=Por favor confirme que você quer baixar este volume -message.detach.disk=Você tem certeza que deseja desconectar este disco ? -state.ready=Pronto -state.Ready=Pronto -label.vm.display.name=Nome de exibição da VM -label.select-view=Selecionar visualização -label.local.storage=Storage Local -label.direct.ips=IPs Diretos -label.view.all=Visualizar tudo -label.zone.details=Detalhes de zona -message.alert.state.detected=Alerta de estado detectado -state.Starting=Iniciando -# state.Expunging=Expunging -state.Creating=Criando -message.decline.invitation=Você tem certeza que quer rejeitar este convite de projeto ? -label.decline.invitation=Rejeitar convite -message.confirm.join.project=Por favor confirme que você deseja entrar neste projeto -message.join.project=Você agora entrou em um projeto. Por favor troque para a visão de Projeto para visualizar o projeto. -label.accept.project.invitation=Aceitar convite de projeto. -label.token=Token -label.project.id=ID de Projeto -message.enter.token=Por favor entre o token que você recebeu no e-mail privado. -label.enter.token=Digite o token -state.Accepted=Aceito -state.Pending=Pendente -state.Completed=Completo -state.Declined=Recusado -label.project=Projeto -label.invitations=Convites -label.delete.project=Deletar projeto -message.delete.project=Você tem certeza que deseja deletar este projeto ? -message.activate.project=Você tem certeza que deseja ativar este projeto ? -label.activate.project=Ativar Projeto -label.suspend.project=Suspender Projeto -message.suspend.project=Você tem certeza que deseja suspender este projeto ? -state.Suspended=Suspendido -label.edit.project.details=Editar detalhes do projeto -label.new.project=Novo Projeto -state.Active=Ativo -state.Disabled=Desativado -label.projects=Projetos -label.make.project.owner=Criar proprietário de conta de projeto -label.remove.project.account=Remover conta de projeto -message.project.invite.sent=Convite enviado para o usuário; Eles serão adicionados ao projeto após aceitarem o convite -label.add.account.to.project=Adicionar conta ao projeto -label.revoke.project.invite=Revogar convite -label.project.invite=Convidar para o projeto -label.select.project=Selecionar Projeto -message.no.projects=Você não possui nenhum projeto.
Por favor crie um novo projeto à partir da seção Projetos. -message.no.projects.adminOnly=Você não possui nenhum projeto.
Por favor solicite ao seu administrador a criação de um novo projeto. -message.pending.projects.1=Você possui convites de projetos pendentes\: -message.pending.projects.2=Para visualizar, por favor acesse a seção de projetos, depois selecione os convites no menu drop-down. -message.instanceWizard.noTemplates=Você não possui nenhum template disponível; por favor adicione um template compatível e reinicie o wizard de instância. -label.view=Visualizar -instances.actions.reboot.label=Reiniciar instância -label.filterBy=Filtrar por -label.ok=OK -notification.reboot.instance=Reiniciar instância -notification.start.instance=Iniciar instãncia -notification.stop.instance=Parar instância -label.display.name=Nome de exibição -label.zone.name=Nome da zona -ui.listView.filters.all=Todos -ui.listView.filters.mine=Meus -state.Running=Executando -state.Stopped=Parado -state.Destroyed=Destruído -state.Error=Erro -message.reset.password.warning.notPasswordEnabled=O template desta instância foi criado sem senha habilitada -message.reset.password.warning.notStopped=Sua instância deve estar parada antes de tentar trocar sua senha atual -label.notifications=Notificações -label.default.view=Visão Padrão -label.project.view=Visão de Projeto - -message.add.system.service.offering=Por favor preencha os dados abaixo para adicionar uma nova oferta de serviço de sistema. -message.action.delete.system.service.offering=Por favor confirme que você deseja deletar esta oferta de serviço de sistema. -label.action.delete.system.service.offering=Deletar Oferta de Serviço de Sistema -label.hypervisor.capabilities=Recursos de Virtualizador -label.hypervisor.version=Versão de Virtualizador -label.max.guest.limit=Limite máx. de guest -label.add.network.offering=Adicionar oferta de rede -label.supported.services=Serviços Suportados -label.service.capabilities=Recursos de serviços -label.guest.type=Tipo de Guest -label.specify.IP.ranges=Especifique range de IP -# label.conserve.mode=Conserve mode -label.created.by.system=Criado pelo sistema -label.menu.system.service.offerings=Ofertas do Sistema -label.add.system.service.offering=Adicionar Plano para VM de Sistema -label.redundant.router.capability=Recurso de roteador redundante -label.supported.source.NAT.type=Tipo de Source NAT Suportado -label.elastic.LB=LB Elástico -label.LB.isolation=Isolamento de LB -label.elastic.IP=IP Elástico -label.network.label.display.for.blank.value=Utilizar gateway default -label.xen.traffic.label=Etiqueta de tráfego XenServer -label.kvm.traffic.label=Etiqueta de tráfego KVM -label.vmware.traffic.label=Etiqueta de tráfego VMware -label.start.IP=IP do início -label.end.IP=IP do fim -label.remove.ip.range=Remover range de IP -label.ip.ranges=Ranges de IP -label.start.vlan=Vlan do início -label.end.vlan=Vlan do fim -label.broadcast.domain.range=Range do domínio de Broadcast -# label.compute=Compute -message.add.guest.network=Por favor confirme que você gostaria de adicionar uma rede guest. -label.subdomain.access=Acesso ao subdomínio -label.guest.start.ip=IP de início do guest -label.guest.end.ip=IP do fim do guest -label.virtual.router=Roteador Virtual -label.physical.network.ID=ID da rede física -label.destination.physical.network.id=ID de destino da rede física -label.dhcp=DHCP -label.destroy.router=Destruir roteador -message.confirm.destroy.router=Por favor confirme que você gostaria de destruir este roteador -label.change.service.offering=Alterar oferta de serviço -label.view.console=Visualizar Console -# label.redundant.state=Redundant state -label.enable.provider=Habilitar provider -message.confirm.enable.provider=Por favor confirme que você gostaria de habilitar este provider -label.disable.provider=Desabilitar Provider -message.confirm.disable.provider=Por favor confirme que você gostaria de desabilitar este provider -# label.shutdown.provider=Shutdown provider -message.confirm.shutdown.provider=Por favor confirme que você deseja desligar este provider -label.netScaler=NetScaler -label.add.new.NetScaler=Adicionar um novo NetScaler -label.capacity=Capacidade -label.dedicated=Dedicado -label.f5=F5 -label.add.new.F5=Adicionar um novo F5 -label.srx=SRX -label.providers=Providers -label.add.new.SRX=Adicionar um novo SRX -label.timeout=Timeout -label.public.network=Rede Pública -label.private.network=Rede Privada -label.enable.swift=Habilitar Swift -confirm.enable.swift=Por favor preencha as informações abaixo para habilitar suporte ao Swift -message.after.enable.swift=Swift Configurado. Nota\: Após deixar esta página, você não será capaz de reconfigurar o Swift novamente. -label.key=Chave -label.delete.NetScaler=Remover NetScaler -message.confirm.delete.NetScaler=Por favor confirme que você deseja remover o NetScaler -label.delete.F5=Remover F5 -message.confirm.delete.F5=Por favor confirme que você deseja remover o F5 -label.delete.SRX=Remover SRX -message.confirm.delete.SRX=Por favor confirme que você deseja remover o SRX -label.pods=Pods -label.pod.name=Nome do Pod -label.reserved.system.gateway=Gateway de sistema reservado -label.reserved.system.netmask=Máscara de rede do sistema reservado -label.start.reserved.system.IP=Início dos IPs reservados para o sistema -label.end.reserved.system.IP=Fim dos IPs reservados para o sistema -label.clusters=Clusters -label.cluster.name=Nome do Cluster -label.host.MAC=Host MAC -label.agent.username=Usuário do Agente -label.agent.password=Senha do Agente -message.confirm.action.force.reconnect=Por favor confirme que você deseja forçar a reconexão com este host. -label.resource.state=Estado do Recurso -label.LUN.number=LUN \# -message.confirm.remove.IP.range=Por favor confirme que você deseja remover este range de IP. -message.tooltip.zone.name=Um nome para a zona. -# 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=Um servidor DNS secundário para ser utilizado pelas VMs nesta zona. Os endereços IP públicos nesta zona devem ter rota para este servidor. -message.tooltip.internal.dns.1=Nome de um servidor DNS que será utilizado pelas VMs internas de sistema do CloudStack nesta zona. Os endereços privados dos pods devem ter uma rota para este servidor. -message.tooltip.internal.dns.2=Nome de um servidor DNS que será utilizado pelas VMs internas de sistema do CloudStack nesta zona. Os endereços privados dos pods devem ter uma rota para este servidor. -message.tooltip.network.domain=Um sufixo DNS que irá criar um nome de domínio customizado para a rede que é acessada pelas guest VMs. -message.tooltip.pod.name=Um nome para este pod. -message.tooltip.reserved.system.gateway=O gateway para os hosts neste pod. -message.tooltip.reserved.system.netmask=O prefixo de rede que define a subrede deste pod. Utilize a notação CIDR. -message.creating.zone=Criando zona. -message.creating.physical.networks=Criando redes fisicas -message.configuring.physical.networks=Configurando redes físicas -message.adding.Netscaler.device=Adicionando dispositivo Nescaler -message.creating.pod=Criando pod -message.configuring.public.traffic=Configurando tráfego público -message.configuring.storage.traffic=Configurando tráfego de storage -message.configuring.guest.traffic=Configurando tráfego do guest -message.creating.cluster=Criando cluster -message.adding.host=Adicionando host -message.creating.primary.storage=Criando storage primário -message.creating.secondary.storage=Criando storage secundário -message.Zone.creation.complete=Criação de zona completa -message.enabling.zone=Habilitando zona +confirm.enable.s3=Por favor preencha as informa\u00e7\u00f5es abaixo para habilitar suporte a storage secund\u00e1ria fornecida por S3 +confirm.enable.swift=Por favor preencha as informa\u00e7\u00f5es abaixo para habilitar suporte ao Swift +error.could.not.enable.zone=N\u00e3o foi poss\u00edvel habilitar a zona +error.installWizard.message=Alguma coisa est\u00e1 errada; voc\u00ea pode voltar e corrigir quaisquer erros +error.invalid.username.password=Usu\u00e1rio ou senha inv\u00e1lidos +error.login=Usu\u00e1rio ou senha inv\u00e1lido. +error.menu.select=N\u00e3o foi poss\u00edvel realizar a a\u00e7\u00e3o pois nenhum item foi selecionado. +error.mgmt.server.inaccessible=O servidor de gerenciamento est\u00e1 inacess\u00edvel. Tente novamente mais tarde. +error.password.not.match=Os campos de senha n\u00e3o combinam +error.please.specify.physical.network.tags=Ofertas de Rede n\u00e3o estar\u00e3o dispon\u00edveis enquanto voc\u00ea n\u00e3o especificar tags para esta interface f\u00edsica. +error.session.expired=Sua sess\u00e3o expirou. error.something.went.wrong.please.correct.the.following=Algo deu errado; por favor corrija abaixo -error.could.not.enable.zone=Não foi possível habilitar a zona -message.zone.creation.complete.would.you.like.to.enable.this.zone=Criação de zona completa. Você gostaria de habilitar esta zona? -message.please.add.at.lease.one.traffic.range=Por favor adicione pelo menos um range de tráfego. -message.you.must.have.at.least.one.physical.network=Você deve ter pelo menos uma rede física -message.please.select.a.different.public.and.management.network.before.removing=Por favor selecione uma rede pública e de gerenciamento diferente antes de remover - -label.zone.type=Tipo de Zona -label.setup.zone=Configurar Zona -label.setup.network=Configurar Rede -label.add.resources=Adicionar Recursos -label.launch=Executar -label.set.up.zone.type=Configurar tipo de zona -message.please.select.a.configuration.for.your.zone=Por favor selecione uma configuracao para sua zona. -# 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=Básico -# 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=Avançado -# 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=Rede Física -label.public.traffic=Tráfego Público -label.guest.traffic=Tráfego do guest -label.storage.traffic=Tráfego do Storage -# 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.

Drag and drop one or more traffic types onto each physical network. -label.add.physical.network=Adicionar rede física -label.traffic.types=Tipos de Tráfego -label.management=Gerenciamento -label.guest=Guest -label.please.specify.netscaler.info=Por favor especifique as informações do Netscaler -# 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.

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.

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.

Provide the IP address and exported path. -label.launch.zone=Executar zona. -message.please.wait.while.zone.is.being.created=Por favor, espere enquanto sua zona está sendo criada; isto pode demorar um pouco... - -label.load.balancing=Balanceamento de Carga -label.static.nat.enabled=NAT estático Habilitado -label.zones=Zonas -label.view.more=Ver mais -label.number.of.zones=Número de Zonas -label.number.of.pods=Número de Pods -label.number.of.clusters=Número de Clusters -label.number.of.hosts=Número de Hosts -label.total.hosts=Total de Hosts -label.total.CPU=CPU TOTAL -label.total.memory=Total de Memória -label.total.storage=Totam de Storage -label.purpose=Propósito - - - - -label.action.migrate.router=Migrar Roteador -label.action.migrate.router.processing=Migrando Roteador... -message.migrate.router.confirm=Por favor confirme o host que você deseja migrar o roteador para\: -label.migrate.router.to=Migrar Roteador para - -label.action.migrate.systemvm=Migrar VM de Sistema -label.action.migrate.systemvm.processing=Migrando VM de Sistema... -message.migrate.systemvm.confirm=Por favor confirme o host para o qual você deseja migrar a VM de sistema\: -label.migrate.systemvm.to=Migrar VM de sistema para - - -mode=Modo -side.by.side=Lado a Lado -# inline=Inline - -# extractable=Extractable - -label.ocfs2=OCFS2 - -label.action.edit.host=Editar Host - -network.rate=Taxa de Transferência - +error.unable.to.reach.management.server=N\u00e3o foi poss\u00edvel acessar o Servidor de Gerenciamento +error.unresolved.internet.name=Imposs\u00edvel resolver DNS +force.delete.domain.warning=Aten\u00e7\u00e3o\: Esta op\u00e7\u00e3o remover\u00e1 todos os dom\u00ednios, contas e recursos associados. +force.delete=For\u00e7ar Exclus\u00e3o +force.remove=For\u00e7ar Remo\u00e7\u00e3o +force.remove.host.warning=Aten\u00e7\u00e3o\: O CloudStack desligar\u00e1 de maneira for\u00e7ada todas as VMs antes de remover o host do cluster. +force.stop=For\u00e7ar Parada +force.stop.instance.warning=Aviso\: For\u00e7ar o desligamento desta inst\u00e2ncia deve ser sua \u00faltima op\u00e7\u00e3o. Isto pode levar a perda de dados, bem como comportamento inconsist\u00eante do estado da m\u00e1quina virtual. +ICMP.code=C\u00f3digo ICMP ICMP.type=Tipo ICMP -ICMP.code=Código ICMP - -image.directory=Diretório da Imagem - -label.action.create.template.from.vm=Criar Template a partir da VM -label.action.create.template.from.volume=Criar Template a partir do Disco - -message.vm.create.template.confirm=Criar Template reiniciará a VM automaticamente. - -label.action.manage.cluster=Vincular Cluster -message.action.manage.cluster=Confirma a vinculação do cluster. -label.action.manage.cluster.processing=Vinculando o Cluster.... - -label.action.unmanage.cluster=Desvincular Cluster -message.action.unmanage.cluster=Confirma a desvinculação do cluster. -label.action.unmanage.cluster.processing=Desvinculando Cluster.... - -label.allocation.state=Status da Alocação -managed.state=Status do Gerenciamento - -label.default.use=Uso padrão -# label.host.tags=Host Tags - -label.cidr=CIDR -label.cidr.list=CIDR de Origem - -label.storage.tags=Tags de Storage - -label.redundant.router=Roteador Redundantee -label.is.redundant.router=Redundante - -force.delete=Forçar Exclusão -force.delete.domain.warning=Atenção\: Esta opção removerá todos os domínios, contas e recursos associados. - -force.remove=Forçar Remoção -force.remove.host.warning=Atenção\: O CloudStack desligará de maneira forçada todas as VMs antes de remover o host do cluster. - -force.stop=Forçar Parada -force.stop.instance.warning=Aviso\: Forçar o desligamento desta instância deve ser sua última opção. Isto pode levar a perda de dados, bem como comportamento inconsistênte do estado da máquina virtual. - -label.PreSetup=PreSetup -label.SR.name = SR Name-Label -label.SharedMountPoint=SharedMountPoint -label.clvm=CLVM -label.volgroup=Grupo de Volume -label.VMFS.datastore=VMFS datastore - -label.network.device=Dispositivo de Rede -label.add.network.device=Adicionar Dispositivo de Rede -label.network.device.type=Tipo de Dispositivo de Rede -label.DHCP.server.type=Tipo de Servidor DHCP -label.Pxe.server.type=Tipo de Servidor PXE -label.PING.storage.IP=Disparar PING para IP do Storage -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=Ativar Zona -label.action.enable.zone.processing=Ativando Zona.... -message.action.enable.zone=Confirma a ativação da zona. -label.action.disable.zone=Desativar Zona -label.action.disable.zone.processing=Desativando Zona.... -message.action.disable.zone=Confirma a desativação da zona. - -label.action.enable.pod=Ativar POD -label.action.enable.pod.processing=Ativando POD.... -message.action.enable.pod=Confirma a ativação do POD. -label.action.disable.pod=Desativar POD -label.action.disable.pod.processing=Desativando POD.... -message.action.disable.pod=Confirma a desativação do POD. - -label.action.enable.cluster=Ativar Cluster -label.action.enable.cluster.processing=Ativando Cluster.... -message.action.enable.cluster=Confirma a ativação do cluster. -label.action.disable.cluster=Desativar Cluster -label.action.disable.cluster.processing=Desativando Cluster.... -message.action.disable.cluster=Confirma a desativação do cluster. - +image.directory=Diret\u00f3rio da Imagem +instances.actions.reboot.label=Reiniciar inst\u00e2ncia +label.accept.project.invitation=Aceitar convite de projeto. +label.account.and.security.group=Contas, grupos de Seguran\u00e7a +label.account=Conta label.account.id=ID da Conta label.account.name=Nome da Conta -# label.account.specific=Account-Specific -label.account=Conta label.accounts=Contas +label.account.specific=Conta-Specific label.acquire.new.ip=Adquirir novo IP -label.show.ingress.rule=Mostrar Regra de Entrada -label.hide.ingress.rule=Ocultar Regra de Entrada -label.action.attach.disk.processing=Anexando Disco.... label.action.attach.disk=Anexar Disco -label.action.attach.iso.processing=Anexando ISO.... +label.action.attach.disk.processing=Anexando Disco.... label.action.attach.iso=Anexar ISO -label.action.cancel.maintenance.mode.processing=Cancelando Modo de Manutenção.... -label.action.cancel.maintenance.mode=Cancelar Modo de Manutenção +label.action.attach.iso.processing=Anexando ISO.... +label.action.cancel.maintenance.mode=Cancelar Modo de Manuten\u00e7\u00e3o +label.action.cancel.maintenance.mode.processing=Cancelando Modo de Manuten\u00e7\u00e3o.... label.action.change.password=Troca de Senha label.action.change.service.processing=Trocando de Plano.... label.action.change.service=Trocar Plano -label.action.copy.ISO.processing=Copiando ISO.... label.action.copy.ISO=Copiar ISO -label.action.copy.template.processing=Copiando Template.... +label.action.copy.ISO.processing=Copiando ISO.... label.action.copy.template=Copiar Template -label.action.create.template.processing=Criando Template.... +label.action.copy.template.processing=Copiando Template.... label.action.create.template=Criar Template -label.action.create.vm.processing=Criando VM.... +label.action.create.template.from.vm=Criar Template a partir da VM +label.action.create.template.from.volume=Criar Template a partir do Disco +label.action.create.template.processing=Criando Template.... label.action.create.vm=Criar VM -label.action.create.volume.processing=Criando Disco.... +label.action.create.vm.processing=Criando VM.... label.action.create.volume=Criar Disco -label.action.delete.IP.range.processing=Removendo Range de IP.... -label.action.delete.IP.range=Remover Range IP -label.action.delete.ISO.processing=Removendo ISO.... -label.action.delete.ISO=Removendo ISO +label.action.create.volume.processing=Criando Disco.... label.action.delete.account.processing=Removendo conta.... label.action.delete.account=Remover conta label.action.delete.cluster.processing=Removendo Cluster.... label.action.delete.cluster=Remover Cluster label.action.delete.disk.offering.processing=Removendo Oferta de Disco.... label.action.delete.disk.offering=Remover Oferta de Disco - -label.action.update.resource.count=Atualiza Contador de Recursos -label.action.update.resource.count.processing=Atualizando Contador de Recursos.... - -label.action.delete.domain=Remover Domínio -label.action.delete.domain.processing=Removendo Domínio.... - +label.action.delete.domain.processing=Removendo Dom\u00ednio.... +label.action.delete.domain=Remover Dom\u00ednio label.action.delete.firewall.processing=Removendo Firewall.... label.action.delete.firewall=Remover regra de firewall label.action.delete.ingress.rule.processing=Removendo Regra de Entrada.... label.action.delete.ingress.rule=Remover Regra de Entrada +label.action.delete.IP.range.processing=Removendo Range de IP.... +label.action.delete.IP.range=Remover Range IP +label.action.delete.ISO.processing=Removendo ISO.... +label.action.delete.ISO=Removendo ISO label.action.delete.load.balancer.processing=Removendo Load Balancer.... label.action.delete.load.balancer=Remover regra de balanceador de carga -label.action.edit.network.processing=Editarando Rede.... -label.action.edit.network=Editar Rede label.action.delete.network.processing=Removendo Rede.... label.action.delete.network=Remover Rede +label.action.delete.nexusVswitch=Remover NexusVswitch +label.action.delete.physical.network=Deletar rede f\u00edsica label.action.delete.pod.processing=Removendo POD.... label.action.delete.pod=Remover POD -label.action.delete.primary.storage.processing=Removendo Storage Primário.... -label.action.delete.primary.storage=Remover Storage Primário -label.action.delete.secondary.storage.processing=Removendo Storage Secundário.... -label.action.delete.secondary.storage=Remover Storage Secundário +label.action.delete.primary.storage.processing=Removendo Storage Prim\u00e1rio.... +label.action.delete.primary.storage=Remover Storage Prim\u00e1rio +label.action.delete.secondary.storage.processing=Removendo Storage Secund\u00e1rio.... +label.action.delete.secondary.storage=Remover Storage Secund\u00e1rio label.action.delete.security.group.processing=Removendo Security Group.... label.action.delete.security.group=Remover Security Group label.action.delete.service.offering.processing=Removendo Plano.... label.action.delete.service.offering=Remover Plano label.action.delete.snapshot.processing=Removendo Snapshot.... label.action.delete.snapshot=Remover Snapshot +label.action.delete.system.service.offering=Deletar Oferta de Servi\u00e7o de Sistema label.action.delete.template.processing=Removendo Template.... label.action.delete.template=Remover Template -label.action.delete.user.processing=Removendo Usuário.... -label.action.delete.user=Remover Usuário +label.action.delete.user.processing=Removendo Usu\u00e1rio.... +label.action.delete.user=Remover Usu\u00e1rio label.action.delete.volume.processing=Removendo Disco.... label.action.delete.volume=Remover Disco label.action.delete.zone.processing=Removendo Zona.... label.action.delete.zone=Remover Zona -label.action.destroy.instance.processing=Apagando Cloud Server.... label.action.destroy.instance=Apagar Cloud Server -label.action.destroy.systemvm.processing=Apagando VM de Sistema.... +label.action.destroy.instance.processing=Apagando Cloud Server.... label.action.destroy.systemvm=Apagar VM de Sistema -label.action.detach.disk.processing=Desplugando Disco.... +label.action.destroy.systemvm.processing=Apagando VM de Sistema.... label.action.detach.disk=Desplugar Disco -label.action.detach.iso.processing=Desplugando ISO.... +label.action.detach.disk.processing=Desplugando Disco.... label.action.detach.iso=Desplugar ISO -label.action.disable.account.processing=Desativando conta.... +label.action.detach.iso.processing=Desplugando ISO.... label.action.disable.account=Desativar conta -label.action.disable.static.NAT.processing=Desativando NAT Estático.... -label.action.disable.static.NAT=Desativar NAT Estático -label.action.disable.user.processing=Desativando Usuário.... -label.action.disable.user=Desativar Usuário +label.action.disable.account.processing=Desativando conta.... +label.action.disable.cluster=Desativar Cluster +label.action.disable.cluster.processing=Desativando Cluster.... +label.action.disable.nexusVswitch=Desabilitar NexusVswitch +label.action.disable.physical.network=Desabilitar rede f\u00edsica +label.action.disable.pod=Desativar POD +label.action.disable.pod.processing=Desativando POD.... +label.action.disable.static.NAT=Desativar NAT Est\u00e1tico +label.action.disable.static.NAT.processing=Desativando NAT Est\u00e1tico.... +label.action.disable.user=Desativar Usu\u00e1rio +label.action.disable.user.processing=Desativando Usu\u00e1rio.... +label.action.disable.zone=Desativar Zona +label.action.disable.zone.processing=Desativando Zona.... label.action.download.ISO=Baixar ISO label.action.download.template=Baixar Template -label.action.download.volume.processing=Baixando Disco.... label.action.download.volume=Baixar Disco -label.action.edit.ISO=Editar ISO +label.action.download.volume.processing=Baixando Disco.... label.action.edit.account=Editar conta label.action.edit.disk.offering=Editar Oferta de Disco -label.action.edit.domain=Editar Domínio -label.action.edit.global.setting=Editar Configurações Globais +label.action.edit.domain=Editar Dom\u00ednio +label.action.edit.global.setting=Editar Configura\u00e7\u00f5es Globais +label.action.edit.host=Editar Host label.action.edit.instance=Editar Cloud Server +label.action.edit.ISO=Editar ISO +label.action.edit.network=Editar Rede label.action.edit.network.offering=Editar Oferta de Rede +label.action.edit.network.processing=Editarando Rede.... label.action.edit.pod=Editar Pod -label.action.edit.primary.storage=Editar Storage Primário +label.action.edit.primary.storage=Editar Storage Prim\u00e1rio label.action.edit.resource.limits=Editar Limite de Recursos label.action.edit.service.offering=Editar Plano label.action.edit.template=Editar Template -label.action.edit.user=Editar Usuário +label.action.edit.user=Editar Usu\u00e1rio label.action.edit.zone=Editar Zona -label.action.enable.account.processing=Ativando conta.... label.action.enable.account=Ativar conta -label.action.enable.maintenance.mode.processing=Ativando Modo de Manutenção.... -label.action.enable.maintenance.mode=Ativar Modo de Manutenção -label.action.enable.static.NAT.processing=Ativando NAT Estático.... -label.action.enable.static.NAT=Ativar NAT Estático -label.action.enable.user.processing=Habilitando Usuário... -label.action.enable.user=Habilitar usuário -label.action.force.reconnect.processing=Reconectando.... +label.action.enable.account.processing=Ativando conta.... +label.action.enable.cluster=Ativar Cluster +label.action.enable.cluster.processing=Ativando Cluster.... +label.action.enable.maintenance.mode=Ativar Modo de Manuten\u00e7\u00e3o +label.action.enable.maintenance.mode.processing=Ativando Modo de Manuten\u00e7\u00e3o.... +label.action.enable.nexusVswitch=Habilitar NexusVswitch +label.action.enable.physical.network=Habilitar rede f\u00edsica +label.action.enable.pod=Ativar POD +label.action.enable.pod.processing=Ativando POD.... +label.action.enable.static.NAT=Ativar NAT Est\u00e1tico +label.action.enable.static.NAT.processing=Ativando NAT Est\u00e1tico.... +label.action.enable.user=Habilitar usu\u00e1rio +label.action.enable.user.processing=Habilitando Usu\u00e1rio... +label.action.enable.zone=Ativar Zona +label.action.enable.zone.processing=Ativando Zona.... label.action.force.reconnect=Force Reconnect -label.action.generate.keys.processing=Gerando Chaves.... +label.action.force.reconnect.processing=Reconectando.... label.action.generate.keys=Gerar Chaves -label.action.lock.account.processing=Bloqueando conta.... +label.action.generate.keys.processing=Gerando Chaves.... +label.action.list.nexusVswitch=Listar NexusVswitch label.action.lock.account=Bloquear conta +label.action.lock.account.processing=Bloqueando conta.... +label.action.manage.cluster.processing=Vinculando o Cluster.... +label.action.manage.cluster=Vincular Cluster label.action.migrate.instance=Migrar Cloud Server label.action.migrate.instance.processing=Migrando Cloud Server... +label.action.migrate.router=Migrar Roteador +label.action.migrate.router.processing=Migrando Roteador... +label.action.migrate.systemvm=Migrar VM de Sistema +label.action.migrate.systemvm.processing=Migrando VM de Sistema... label.action.reboot.instance.processing=Reiniciando Cloud Server... label.action.reboot.instance=Reiniciar Cloud Server label.action.reboot.router.processing=Reiniciando Roteador.... label.action.reboot.router=Reiniciar Roteador label.action.reboot.systemvm.processing=Reiniciando VM de Sistema.... label.action.reboot.systemvm=Reiniciar VM de Sistema -# label.action.recurring.snapshot=Recurring Snapshots -label.action.release.ip.processing=Liberando IP.... +label.action.register.iso=Registrar ISO +label.action.register.template=Registrar template label.action.release.ip=Liberar IP +label.action.release.ip.processing=Liberando IP.... label.action.remove.host.processing=Removendo Host.... label.action.remove.host=Remover Host label.action.reset.password.processing=Recuperando a Senha.... label.action.reset.password=Recuperar Senha +label.action.resize.volume.processing=Resizing Volume.... +label.action.resize.volume=Resize Volume label.action.resource.limits=Limite de Recursos label.action.restore.instance.processing=Restaurando Cloud Server... label.action.restore.instance=Restaurar Cloud Server -label.action.start.instance.processing=Iniciando Cloud Server... +label.actions=A\u00c3\u00a7\u00c3\u00b5es label.action.start.instance=Iniciar Cloud Server -label.action.start.router.processing=Iniciando Roteador.... +label.action.start.instance.processing=Iniciando Cloud Server... label.action.start.router=Iniciar Roteador -label.action.start.systemvm.processing=Iniciando VM de Sistema.... +label.action.start.router.processing=Iniciando Roteador.... label.action.start.systemvm=Iniciar VM de Sistema -label.action.stop.instance.processing=Parando Cloud Server... +label.action.start.systemvm.processing=Iniciando VM de Sistema.... label.action.stop.instance=Parar Cloud Server -label.action.stop.router.processing=Parando Roteador.... +label.action.stop.instance.processing=Parando Cloud Server... label.action.stop.router=Parar Roteador -label.action.stop.systemvm.processing=Parando VM de Sistema.... +label.action.stop.router.processing=Parando Roteador.... label.action.stop.systemvm=Parar VM de Sistema +label.action.stop.systemvm.processing=Parando VM de Sistema.... label.action.take.snapshot.processing=Tirando Snapshot.... label.action.take.snapshot=Tirar Snapshot -label.action.update.OS.preference.processing=Atualizando Preferência de SO.... -label.action.update.OS.preference=Atualizar Preferência de SO -label.actions=Ações -label.active.sessions=Sessões Ativas +label.action.unmanage.cluster=Desvincular Cluster +label.action.unmanage.cluster.processing=Desvinculando Cluster.... +label.action.update.OS.preference=Atualizar Prefer\u00eancia de SO +label.action.update.OS.preference.processing=Atualizando Prefer\u00eancia de SO.... +label.action.update.resource.count=Atualiza Contador de Recursos +label.action.update.resource.count.processing=Atualizando Contador de Recursos.... +label.activate.project=Ativar Projeto +label.active.sessions=Sess\u00f5es Ativas label.add.account=Adicionar Conta +label.add.accounts=Adicionar contas +label.add.accounts.to=Adicionar contas para +label.add.account.to.project=Adicionar conta ao projeto +label.add.ACL=Adicionar ACL +label.add=Adicionar +label.add.by=Adicionado por label.add.by.cidr=Adicionar por CIDR label.add.by.group=Adicionar por Grupo label.add.cluster=Adicionar Cluster +label.add.compute.offering=Adicionar oferta de computa\u00e7\u00e3o label.add.direct.iprange=Add Direct Ip Range label.add.disk.offering=Adicionar Oferta de Disco -label.add.domain=Adicionar Domínio +label.add.domain=Adicionar Dom\u00ednio +label.add.egress.rule=Adicionar regra egress +label.add.F5.device=Adicionar dispositivo F5 label.add.firewall=Adicionar regra de Firewall +label.add.guest.network=Adicionar rede guest label.add.host=Adicionar Host -label.add.ingress.rule=Adicionar Regra de Entrada -label.add.ip.range=Adicionar Range de IP -label.add.load.balancer=Adicionar Load Balance -label.add.more=Adicionar Mais -label.add.network=Adicionar Rede -label.add.pod=Adicionar POD -label.add.primary.storage=Adicionar Storage Primário -label.add.secondary.storage=Adicionar Storage Secundário -label.add.security.group=Adicionar Security Group -label.add.service.offering=Adicionar Plano -label.add.template=Adicionar Template -label.add.user=Adicionar Usuário -label.add.vlan=Adicionar VLAN -label.add.volume=Adicionar Disco -label.add.zone=Adicionar Zona -label.add=Adicionar +label.adding=Adicionando label.adding.cluster=Adicionando Cluster label.adding.failed=Falha ao Adicionar label.adding.pod=Adicionando POD label.adding.processing=Adicionando.... +label.add.ingress.rule=Adicionar Regra de Entrada label.adding.succeeded=Adicionado com Sucesso -label.adding.user=Adicionando Usuário +label.adding.user=Adicionando Usu\u00e1rio label.adding.zone=Adicionando Zona -label.adding=Adicionando +label.add.ip.range=Adicionar Range de IP label.additional.networks=Redes Adicionais +label.add.load.balancer=Adicionar Load Balance +label.add.more=Adicionar Mais +label.add.netScaler.device=Adicionar dispositivo Netscaler +label.add.network.ACL=Adicione ACL de rede +label.add.network=Adicionar Rede +label.add.network.device=Adicionar Dispositivo de Rede +label.add.network.offering=Adicionar oferta de rede +label.add.new.F5=Adicionar um novo F5 +label.add.new.gateway=Adicionar novo gateway +label.add.new.NetScaler=Adicionar um novo NetScaler +label.add.new.SRX=Adicionar um novo SRX +label.add.new.tier=Adicionar nova camada +label.add.physical.network=Adicionar rede f\u00edsica +label.add.pod=Adicionar POD +label.add.port.forwarding.rule=Adicionar regra de encaminhamento de porta +label.add.primary.storage=Adicionar Storage Prim\u00e1rio +label.add.resources=Adicionar Recursos +label.add.route=Adicionar rota +label.add.rule=Adicionar regra +label.add.secondary.storage=Adicionar Storage Secund\u00e1rio +label.add.security.group=Adicionar Security Group +label.add.service.offering=Adicionar Plano +label.add.SRX.device=Adicionar dispositivo SRX +label.add.static.nat.rule=Adicionar regra de NAT est\u00e1tico +label.add.static.route=Adicionar rota est\u00e1tica +label.add.system.service.offering=Adicionar Plano para VM de Sistema +label.add.template=Adicionar Template +label.add.to.group=Adicionar ao grupo +label.add.user=Adicionar Usu\u00e1rio +label.add.vlan=Adicionar VLAN +label.add.vm=Adicionar VM +label.add.vms=Adicionar VMs +label.add.vms.to.lb=Add VM(s) na regra de balanceamento de carga +label.add.VM.to.tier=Adicionar m\u00e1quina virtual \u00e0 camada +label.add.volume=Adicionar Disco +label.add.vpc=Adicionar VPC +label.add.vpn.customer.gateway=Adicionar Gateway de VPN de usu\u00e1rio +label.add.VPN.gateway=Adicionar gateway de VPN +label.add.vpn.user=Adicionar usu\u00e1rio VPN +label.add.zone=Adicionar Zona label.admin.accounts=Contas Administrativas label.admin=Administrador -label.advanced.mode=Modo Avançado -label.advanced.search=Busca Avançada -label.advanced=Avançado +label.advanced=Avan\u00e7ado +label.advanced.mode=Modo Avan\u00e7ado +label.advanced.search=Busca Avan\u00e7ada +label.agent.password=Senha do Agente +label.agent.username=Usu\u00e1rio do Agente +label.agree=Concordo label.alert=Alerta label.algorithm=Algoritmo label.allocated=Alocado +label.allocation.state=Status da Aloca\u00e7\u00e3o label.api.key=API Key -label.assign.to.load.balancer=Atribuindo o Cloud Server ao Load Balancer +label.apply=Aplicar label.assign=Atribuir +label.assign.to.load.balancer=Atribuindo o Cloud Server ao Load Balancer label.associated.network.id=ID de Rede Associado +label.associated.network=Rede associada label.attached.iso=Imagem ISO Plugada -label.availability.zone=Datacenter label.availability=Availability -label.available.public.ips=IP Público Disponível -label.available=Disponível +label.availability.zone=Datacenter +label.available=Dispon\u00edvel +label.available.public.ips=IP P\u00fablico Dispon\u00edvel label.back=Voltar -label.basic.mode=Modo Básico -label.bootable=Inicializável -label.broadcast.domain.type=Tipo de Domínio Broadcast +label.bandwidth=Bandwidth +label.basic=B\u00e1sico +label.basic.mode=Modo B\u00e1sico +label.bootable=Inicializ\u00e1vel +label.broadcast.domain.range=Range do dom\u00ednio de Broadcast +label.broadcast.domain.type=Tipo de Dom\u00ednio Broadcast +label.broadcast.uri=URI de broadcast label.by.account=por Conta label.by.availability=By Availability -label.by.domain=por Domínio +label.by.domain=por Dom\u00ednio label.by.end.date=por Data Final -label.by.level=por Nível +label.by.level=por N\u00edvel label.by.pod=por Pod -label.by.role=por Função +label.by.role=por Fun\u00e7\u00e3o label.by.start.date=por Data Inicial label.by.state=por estado -label.by.traffic.type=por Tipo de Tráfego +label.bytes.received=Bytes Recebidos +label.bytes.sent=Bytes Enviados +label.by.traffic.type=por Tipo de Tr\u00e1fego label.by.type.id=por Tipo de ID label.by.type=Por Tipo label.by.zone=por Zona -label.bytes.received=Bytes Recebidos -label.bytes.sent=Bytes Enviados label.cancel=Cancelar +label.capacity=Capacidade label.certificate=Certificado -label.privatekey=PKCS\#8 Private Key -label.domain.suffix=Sufixo de Domínio DNS (ex. xyz.com) +label.change.service.offering=Alterar oferta de servi\u00e7o +label.change.value=Alterar valor label.character=Caracter +label.checksum=MD5 checksum label.cidr.account=CIDR ou Conta/Security Group +label.cidr=CIDR +label.cidr.list=CIDR de Origem +label.CIDR.list=Lista CIDR +label.CIDR.of.destination.network=CIDR da rede de destino +label.clean.up=Limpar +label.clear.list=Limpar lista label.close=Fechar label.cloud.console=Console de Gerenciamento da Nuvem label.cloud.managed=Cloud.com Managed -label.cluster.type=Tipo de Cluster label.cluster=Cluster -label.code=Código -label.confirmation=Confirmação -label.cpu.allocated.for.VMs=CPU Alocada por VMs +label.cluster.name=Nome do Cluster +label.clusters=Clusters +label.cluster.type=Tipo de Cluster +label.clvm=CLVM +label.code=C\u00f3digo +label.community=Comunidade +label.compute.and.storage=Processamento e Armazenamento +label.compute.offering=Oferta de Computa\u00e7\u00e3o +label.compute.offerings=Ofertas de Computa\u00e7\u00e3o +label.configuration=Configura\u00e7\u00e3o +label.configure=Configurar +label.configure.network.ACLs=Configure ACLs de rede +label.configure.vpc=Configurar VPC +label.confirmation=Confirma\u00e7\u00e3o +label.confirm.password=Confirme a senha +label.congratulations=Parab\u00e9ns\! +label.console.proxy=Console proxy +label.continue.basic.install=Continuar com a instala\u00e7\u00e3o b\u00e1sica +label.continue=Continuar +label.corrections.saved=Altera\u00e7\u00f5es salvas label.cpu.allocated=CPU Alocada -label.cpu.utilized=CPU Utilizada +label.cpu.allocated.for.VMs=CPU Alocada por VMs +label.CPU.cap=CPU Cap label.cpu=CPU +label.cpu.mhz=CPU (em MHz) +label.cpu.utilized=CPU Utilizada +label.created.by.system=Criado pelo sistema label.created=Criado +label.create.project=Criar um projeto +label.create.template=Criar template +label.create.VPN.connection=Criar uma conex\u00e3o VPN label.cross.zones=Inter Zonas label.custom.disk.size=Tamanho Customizado -label.daily=Diário +label.daily=Di\u00e1rio label.data.disk.offering=Oferta de Disco Adicional label.date=Data -label.day.of.month=Dia do Mês +label.day.of.month=Dia do M\u00eas label.day.of.week=Dia da Semana +label.dead.peer.detection=Detec\u00e7\u00e3o de correspondente morto +label.decline.invitation=Rejeitar convite +label.dedicated=Dedicado +label.default=Padr\u00e3o +label.default.use=Uso padr\u00e3o +label.default.view=Vis\u00e3o Padr\u00e3o +label.delete.F5=Remover F5 +label.delete.gateway=delete gateway +label.delete.NetScaler=Remover NetScaler +label.delete.project=Deletar projeto label.delete=Remover +label.delete.SRX=Remover SRX +label.delete.VPN.connection=deletar a conex\u00e3o VPN +label.delete.VPN.customer.gateway=deletar gateway de VPN de usu\u00e1rio +label.delete.VPN.gateway=deletar um gateway de VPN +label.delete.vpn.user=Deletar usu\u00e1rio VPN label.deleting.failed=Falha ao remover label.deleting.processing=Removendo.... -label.description=Descrição +label.description=Descri\u00e7\u00e3o +label.destination.physical.network.id=ID de destino da rede f\u00edsica +label.destination.zone=Zona de Destino +label.destroy=Apagar +label.destroy.router=Destruir roteador label.detaching.disk=Desplugando Disco label.details=Detalhes label.device.id=ID do Dispositivo +label.devices=Dispositivos +label.dhcp=DHCP +label.DHCP.server.type=Tipo de Servidor DHCP +label.direct.ips=IPs Diretos label.disabled=Desativado +label.disable.provider=Desabilitar Provider +label.disable.vpn=Desabilitar VPN label.disabling.vpn.access=Desativando Acesso VPN label.disk.allocated=Disco Alocado label.disk.offering=Oferta de Disco @@ -1034,122 +440,233 @@ label.disk.size.gb=Tamanho (em GB) label.disk.size=Tamanho do Disco label.disk.total=Disco Total label.disk.volume=Disco -label.display.text=Descrição +label.display.name=Nome de exibi\u00e7\u00e3o +label.display.text=Descri\u00e7\u00e3o label.dns.1=DNS 1 label.dns.2=DNS 2 -label.domain.admin=Administrador de Domínio -label.domain.id=ID do Domínio -label.domain.name=Nome do Domínio -label.domain=Domínio -label.double.quotes.are.not.allowed=Aspas duplas não são permitidas +label.dns=DNS +label.DNS.domain.for.guest.networks=Dom\u00ednio DNS para redes h\u00f3spedes +label.domain.admin=Administrador de Dom\u00ednio +label.domain=Dom\u00ednio +label.domain.id=ID do Dom\u00ednio +label.domain.name=Nome do Dom\u00ednio +label.domain.router=Roteador do Dom\u00ednio +label.domain.suffix=Sufixo de Dom\u00ednio DNS (ex. xyz.com) +label.done=Pronto +label.double.quotes.are.not.allowed=Aspas duplas n\u00e3o s\u00e3o permitidas label.download.progress=Status do Download +label.drag.new.position=Arrastar para uma nova posi\u00e7\u00e3o label.edit=Editar +label.edit.lb.rule=Editar regra de LB +label.edit.network.details=Editar detalhes de rede +label.edit.project.details=Editar detalhes do projeto +label.edit.tags=Edite etiquetas +label.edit.traffic.type=Editar tipo de tr\u00e1fego +label.edit.vpc=Editar VPC +label.egress.rule=Regra Egress +label.egress.rules=Regras de sa\u00edda +label.elastic=El\u00e1stico +label.elastic.IP=IP El\u00e1stico +label.elastic.LB=LB El\u00e1stico label.email=Email +label.enable.provider=Habilitar provider +label.enable.s3=Habilita storage secund\u00e1ria fornecida por S3 +label.enable.swift=Habilitar Swift +label.enable.vpn=Habilitar VPN label.enabling.vpn.access=Ativando Acesso VPN label.enabling.vpn=Ativando VPN -label.end.port=Porta Final +label.end.IP=IP do fim label.endpoint.or.operation=Endpoint or Operation -label.error.code=Código de Erro +label.endpoint=Ponto de acesso +label.end.port=Porta Final +label.end.reserved.system.IP=Fim dos IPs reservados para o sistema +label.end.vlan=Vlan do fim +label.enter.token=Digite o token +label.error.code=C\u00f3digo de Erro label.error=Erro +label.ESP.encryption=Encripta\u00e7\u00e3o ESP +label.ESP.hash=Hash ESP +label.ESP.policy=Pol\u00edtica ESP label.esx.host=ESX/ESXi Host label.example=Examplo +label.f5=F5 label.failed=Falhou label.featured=Featured +label.fetch.latest=Obter \u00faltimos +label.filterBy=Filtrar por label.firewall=Firewall label.first.name=Primeiro Nome label.format=Formato label.friday=Sexta-feira label.full=Full +label.full.path=Path completo label.gateway=Gateway label.general.alerts=Alertas Gerais label.generating.url=Criando URL -label.go.step.2=Vá para passo 2 -label.go.step.3=Vá para passo 3 -label.go.step.4=Vá para passo 4 -label.go.step.5=Vá para passo 5 -label.group.optional=Grupo (Opcional) +label.go.step.2=V\u00e1 para passo 2 +label.go.step.3=V\u00e1 para passo 3 +label.go.step.4=V\u00e1 para passo 4 +label.go.step.5=V\u00e1 para passo 5 label.group=Grupo +label.group.optional=Grupo (Opcional) label.guest.cidr=CIDR de rede Convidado +label.guest.end.ip=IP do fim do guest label.guest.gateway=Gateway de rede Convidado +label.guest=Guest +label.guest.ip=Endere\u00e7o IP Convidado label.guest.ip.range=Intervalo de rede convidado -label.guest.ip=Endereço IP Convidado -label.guest.netmask=Máscara de rede Convidado +label.guest.netmask=M\u00e1scara de rede Convidado +label.guest.networks=Redes Guest +label.guest.start.ip=IP de in\u00edcio do guest +label.guest.traffic=Tr\u00e1fego de h\u00f3spedes +label.guest.type=Tipo de Guest label.ha.enabled=HA Ativado label.help=Ajuda +label.hide.ingress.rule=Ocultar Regra de Entrada +label.hints=Dicas label.host.alerts=Alertas de Host -label.host.name=Host Name label.host=Host +label.host.MAC=Host MAC +label.host.name=Host Name label.hosts=Hosts +label.host.tags=Tags de Host label.hourly=A cada hora +label.hypervisor.capabilities=Recursos de Virtualizador +label.hypervisor=Hipervisor label.hypervisor.type=Tipo do Hypervisor -label.hypervisor=Hypervisor +label.hypervisor.version=Vers\u00e3o de Virtualizador label.id=ID +label.IKE.DH=DH IKE +label.IKE.encryption=Encripta\u00e7\u00e3o IKE +label.IKE.hash=Hash IKE +label.IKE.policy=Pol\u00edtica IKE label.info=Info label.ingress.rule=Regra de Entrada label.initiated.by=Iniciado por +label.installWizard.addClusterIntro.subtitle=O que \u00e9 um cluster? +label.installWizard.addClusterIntro.title=Vamos adicionar um cluster +label.installWizard.addHostIntro.subtitle=O que \u00e9 um Host ? +label.installWizard.addHostIntro.title=Vamos adicionar um host +label.installWizard.addPodIntro.subtitle=O que \u00e9 um pod ? +label.installWizard.addPodIntro.title=Vamos adicionar um pod +label.installWizard.addPrimaryStorageIntro.subtitle=Qual \u00e9 o storage prim\u00e1rio ? +label.installWizard.addPrimaryStorageIntro.title=Vamos adicionar o storage prim\u00e1rio +label.installWizard.addSecondaryStorageIntro.subtitle=Qual \u00e9 o storage secund\u00e1rio ? +label.installWizard.addSecondaryStorageIntro.title=Vamos adicionar o storage secund\u00e1rio +label.installWizard.addZoneIntro.subtitle=O que \u00e9 uma zona? +label.installWizard.addZoneIntro.title=Vamos adicionar uma zona +label.installWizard.addZone.title=Adicionar zona +label.installWizard.click.launch=Click no bot\u00e3o executar. +label.installWizard.subtitle=Este tour vai auxiliar voc\u00ea na configura\u00e7\u00e3o da sua instala\u00e7\u00e3o de CloudStack&\#8482 +label.installWizard.title=Ol\u00e1, seja bem vindo ao CloudStack&\#8482 +label.instance=Cloud Server label.instance.limits=Limites do Cloud Server label.instance.name=Nome do Cloud Server -label.instance=Cloud Server label.instances=Cloud Servers label.internal.dns.1=DNS 1 Interno label.internal.dns.2=DNS 2 Interno +label.internal.name=Nome interno label.interval.type=Tipo de Intervalo +label.introduction.to.cloudstack=Introdu\u00e7\u00e3o ao CloudStack&\#8482 label.invalid.integer=Invalid Integer -label.invalid.number=Número Inválido -label.ip.address=Endereço IP -label.ip.allocations=Alocações de IP -label.ip.limits=Limites de IP Público +label.invalid.number=N\u00famero inv\u00e1lido +label.invitations=Convites +label.invite=Convidar +label.invited.accounts=Contas convidadas +label.invite.to=Convidar para +label.ip.address=Endere\u00e7o IP +label.ipaddress=Endere\u00e7o IP +label.ip.allocations=Aloca\u00e7\u00f5es de IP +label.ip=IP +label.ip.limits=Limites de IP P\u00fablico label.ip.or.fqdn=IP ou FQDN label.ip.range=Range de IP -label.ip=IP +label.ip.ranges=Ranges de IP +label.IPsec.preshared.key=Chave IPSec pr\u00e9 compartilhada label.ips=IPs -label.is.default=Ã\u0089 Padrão -label.is.shared=Ã\u0089 Compartilhado -label.is.system=é um sistema label.iscsi=iSCSI +label.is.default=\u00c9\u0089 Padr\u00e3o label.iso.boot=ISO de Boot label.iso=ISO +label.isolated.networks=Redes Isoladas +label.isolation.method=M\u00e9todo de isolamento label.isolation.mode=Modo Isolado +label.isolation.uri=URI de isolamento +label.is.redundant.router=Redundante +label.is.shared=\u00c9 Compartilhado +label.is.system=\u00e9 um sistema +label.item.listing=Listar items label.keep=Manter +label.keyboard.type=Tipo de Teclado +label.key=Chave +label.kvm.traffic.label=Etiqueta de tr\u00e1fego KVM +label.label=Etiqueta +label.lang.brportugese=Portugu\u00eas brasileiro label.lang.chinese=Chinese (Simplified) label.lang.english=English +label.lang.french=Franc\u00eas label.lang.japanese=Japanese label.lang.korean=Coreano +label.lang.russian=Russo label.lang.spanish=Spanish label.last.disconnected=Last Disconnected -label.last.name=Ã\u009altimo Nome -label.level=Nível -label.linklocal.ip=Endereço IP Link Local +label.last.name=\u00daltimo Nome +label.latest.events=\u00daltimos eventos +label.launch=Executar +label.launch.vm=Executar VM +label.launch.zone=Executar zona. +label.LB.isolation=Isolamento de LB +label.least.connections=Least connections +label.level=N\u00edvel +label.linklocal.ip=Endere\u00e7o IP Link Local label.load.balancer=Load Balancer +label.load.balancing=Balanceamento de Carga +label.load.balancing.policies=Pol\u00edticas de balanceamento de carga label.loading=Carregando label.local=Local -# label.local.storage.enabled=Local storage enabled +label.local.storage.enabled=Storage local habilitada +label.local.storage=Storage Local label.login=Entrar label.logout=Sair label.lun=LUN +label.LUN.number=LUN \# +label.make.project.owner=Criar propriet\u00e1rio de conta de projeto label.manage=Gerenciar -label.maximum=Máximo -label.memory.allocated=Memória Alocada -label.memory.total=Memória Total -label.memory.used=Memória Usada -label.memory=Memória (em MB) +label.management=Gerenciamento +label.management.ips=Gerenciamento de Endere\u00e7os IP +label.manage.resources=Gerenciar Recursos +label.max.guest.limit=Limite m\u00e1x. de guest +label.maximum=M\u00e1ximo +label.max.networks=M\u00e1x. de redes +label.max.public.ips=M\u00e1x. IPs p\u00fablicos +label.max.snapshots=Max. snapshots +label.max.templates=M\u00e1x. templates +label.max.vms=M\u00e1x. VMs de usu\u00e1rio +label.max.volumes=M\u00e1x. volumes +label.may.continue=Voc\u00ea pode continuar agora +label.memory.allocated=Mem\u00f3ria Alocada +label.memory.mb=Mem\u00f3ria (em MB) +label.memory=Mem\u00f3ria (em MB) +label.memory.total=Mem\u00f3ria Total +label.memory.used=Mem\u00f3ria Usada label.menu.accounts=Contas label.menu.alerts=Alertas label.menu.all.accounts=Todas as Contas label.menu.all.instances=Todos Cloud Servers -label.menu.community.isos=ISOs Públicas -label.menu.community.templates=Templates Públicos -label.menu.configuration=Configuração +label.menu.community.isos=ISOs P\u00fablicas +label.menu.community.templates=Templates P\u00fablicos +label.menu.configuration=Configura\u00e7\u00e3o label.menu.dashboard=Dashboard label.menu.destroyed.instances=Cloud Servers Apagados label.menu.disk.offerings=Oferta de Discos -label.menu.domains=Domínios +label.menu.domains=dom\u00ednios label.menu.events=Eventos label.menu.featured.isos=ISOs Customizada label.menu.featured.templates=Templates Customizados -label.menu.global.settings=Configurações Globais +label.menu.global.settings=Configura\u00e7\u00f5es Globais +label.menu.infrastructure=Infra-estrutura label.menu.instances=Cloud Servers -label.menu.ipaddresses=Endereços IP +label.menu.ipaddresses=Endere\u00e7os IP label.menu.isos=ISOs label.menu.my.accounts=Minhas Contas label.menu.my.instances=Meus Cloud Servers @@ -1157,332 +674,702 @@ label.menu.my.isos=Minhas ISOs label.menu.my.templates=Meus Templates label.menu.network.offerings=Oferta de Rede label.menu.network=Rede -label.menu.physical.resources=Recursos Físicos +label.menu.physical.resources=Recursos B\u00e1\u00adsicos label.menu.running.instances=Cloud Servers Rodando -label.menu.security.groups=Security Groups +label.menu.security.groups=Grupos de seguran\u00e7a label.menu.service.offerings=Planos label.menu.snapshots=Snapshots label.menu.stopped.instances=Cloud Servers Parados label.menu.storage=Storage -label.menu.system.vms=VM de Sistemas +label.menu.system.service.offerings=Ofertas do Sistema label.menu.system=Sistema +label.menu.system.vms=VM de Sistemas label.menu.templates=Templates -label.menu.virtual.appliances=Appliances Virtuais +label.menu.virtual.appliances=Appliance Virtual label.menu.virtual.resources=Recursos Virtuais label.menu.volumes=Discos +label.migrate.instance.to.host=Migrar inst\u00e2ncia para outro host label.migrate.instance.to=Migrar Cloud Server para -label.minimum=Mínimo -label.minute.past.hour=minuto(s) Última hora +label.migrate.instance.to.ps=Migrar inst\u00e2ncia para outro storage prim\u00e1rio +label.migrate.router.to=Migrar Roteador para +label.migrate.systemvm.to=Migrar VM de sistema para +label.migrate.to.host=Migrar para outro host +label.migrate.volume=Migrar volume para outro storage prim\u00e1rio +label.minimum=M\u00ed\u00adnimo +label.minute.past.hour=minuto(s) \u00daltima hora label.monday=Segunda label.monthly=Mensal label.more.templates=Mais Templates +label.move.down.row=Mover uma c\u00e9lula para baixo +label.move.to.top=Mover para o topo +label.move.up.row=Mover uma c\u00e9lula para cima label.my.account=Minha Conta -label.name.optional=Nome (Opcional) +label.my.network=Minha rede +label.my.templates=Meus templates label.name=Nome -label.netmask=Másrca de Rede -label.network.desc=Descrição de Rede -label.network.domain=Domínio de Rede +label.name.optional=Nome (Opcional) +label.nat.port.range=Range de Portas NAT +label.netmask=M\u00c3\u00a1srca de Rede +label.netScaler=NetScaler +label.network.ACL=ACL de rede +label.network.ACLs=Network ACLs +label.network.desc=Descri\u00e7\u00e3o de Rede +label.network.device=Dispositivo de Rede +label.network.device.type=Tipo de Dispositivo de Rede +label.network.domain=Dom\u00ednio de Rede +label.network.domain.text=Texto do dom\ufffdnio de rede label.network.id=ID de Rede +label.networking.and.security=Rede e seguran\u00e7a +label.network.label.display.for.blank.value=Utilizar gateway default label.network.name=Nome da Rede label.network.offering.display.text=Network Offering Display Text label.network.offering.id=Network Offering ID label.network.offering.name=Network Offering Name label.network.offering=Network Offering -label.network.rate=Taxa de Transferência +label.network.rate=Taxa de Transfer\u00eancia label.network.read=Network Read +label.network=Rede +label.network.service.providers=Provedores de Servi\u00e7os de Rede +label.networks=Redes label.network.type=Tipo de Rede label.network.write=Network Write -label.network=Rede +label.new=Novo label.new.password=Nova Senha -label.next=Próximo +label.new.project=Novo Projeto +label.new.vm=Nova VM +label.next=Pr\u00f3ximo +label.nexusVswitch=Nexus Vswitch +label.nfs=NFS label.nfs.server=Servidor NFS label.nfs.storage=Storage NFS -label.nfs=NFS +label.nic.adapter.type=Tipo de adaptador NIC label.nics=REDE -label.no.actions=Sem Ações Disponíveis +label.no.actions=Sem A\u00e7\u00f5es Dispon\u00edveis label.no.alerts=Sem Alertas Recentes +label.no.data=Sem dados para mostrar label.no.errors=Sem Erros Recentes -label.no.isos=Sem ISO Disponível -label.no.items=Sem Ã\u008dtens Disponíveis -label.no.security.groups=Sem Security Groups Disponíveis -label.no.thanks=Não obrigado -label.no=Não +label.no.isos=Sem ISO Dispon\u00edvel +label.no.items=Sem Itens Dispon\u00edveis label.none=Nenhum -label.not.found=Não Encontrado +label.no=N\u00e3o +label.no.security.groups=Sem Security Groups Dispon\u00edveis +label.not.found=N\u00e3o Encontrado +label.no.thanks=N\u00e3o obrigado +label.notifications=Notifica\u00e7\u00f5es +label.number.of.clusters=N\u00famero de Clusters +label.number.of.hosts=N\u00famero de Hosts +label.number.of.pods=N\u00famero de Pods +label.number.of.system.vms=N\u00famero de VMs de sistema +label.number.of.virtual.routers=N\u00famero de Roteadores Virtuais +label.number.of.zones=N\u00famero de Zonas label.num.cpu.cores=\# de Core CPU -label.numretries=Número de Tentativas +label.numretries=N\u00famero de Tentativas +label.ocfs2=OCFS2 label.offer.ha=Offer HA +label.ok=OK label.optional=Opcional -label.os.preference=Preferência de SO +label.order=Ordenar +label.os.preference=Prefer\u00eancia de SO label.os.type=Tipo de SO -label.owned.public.ips=IP Público Utilizado +label.owned.public.ips=IP P\u00fablico Utilizado label.owner.account=Dono da Conta -label.owner.domain=Dono do Domínio -label.parent.domain=Domínio Principal +label.owner.domain=Dono do Dom\u00ednio +label.parent.domain=Dom\u00ednio Principal label.password.enabled=Senha Ativada label.password=Senha label.path=Caminho (Path) +label.physical.network.ID=ID da rede f\u00edsica +label.physical.network=Rede F\u00edsica +label.PING.CIFS.password=PING CIFS password +label.PING.CIFS.username=PING CIFS username +label.PING.dir=PING Directory +label.PING.storage.IP=Disparar PING para IP do Storage +label.please.specify.netscaler.info=Por favor especifique as informa\u00e7\u00f5es do Netscaler label.please.wait=Por Favor Aguarde +label.pod.name=Nome do Pod label.pod=POD +label.pods=Pods label.port.forwarding=Encaminhamento de Porta +label.port.forwarding.policies=Pol\u00edticas de redirecionamento de portas label.port.range=Range de Porta +label.PreSetup=PreSetup +label.previous=Anterior label.prev=Prev -label.primary.allocated=Alocação do Storage Primário -label.primary.network=Rede Primária -label.primary.storage=Storage Primário -label.primary.used=Uso do Storage Primário +label.primary.allocated=Aloca\u00e7\u00e3o do Storage Prim\u00e1rio +label.primary.network=Rede Prim\u00e1ria +label.primary.storage.count=Pools de Storage Prim\u00e1rios +label.primary.storage=Storage Prim\u00e1rio +label.primary.used=Uso do Storage Prim\u00e1rio +label.private.Gateway=Gateway privado label.private.interface=Interface Privada +label.private.ip=Endere\u00e7o IP Privado label.private.ip.range=Range de IP Privado -label.private.ip=Endereço IP Privado label.private.ips=IPs Privados +label.privatekey=PKCS\#8 Private Key +label.private.network=Rede Privada label.private.port=Porta Privada label.private.zone=Zona Privada +label.project.dashboard=Dashboard do Projeto +label.project.id=ID de Projeto +label.project.invite=Convidar para o projeto +label.project.name=Nome de projeto +label.project=Projeto +label.projects=Projetos +label.project.view=Vis\u00e3o de Projeto label.protocol=Protocolo -label.public.interface=Interface Pública -label.public.ip=Endereço IP Público -label.public.ips=IPs Públicos -label.public.port=Porta Pública -label.public.zone=Zona Pública -label.public=Público +label.providers=Providers +label.public.interface=Interface P\u00fablica +label.public.ip=Endere\u00e7o IP P\u00fablico +label.public.ips=IPs P\u00fablicos +label.public.network=Rede P\u00fablica +label.public.port=Porta P\u00fablica +label.public=P\u00fablico +label.public.traffic=Tr\u00e1fego P\u00fablico +label.public.zone=Zona P\u00fablica +label.purpose=Prop\u00f3sito +label.Pxe.server.type=Tipo de Servidor PXE +label.quickview=Visualiza\u00e7\u00e3o r\u00e1pida +label.reboot=Reiniciar label.recent.errors=Erros Recentes +label.redundant.router.capability=Recurso de roteador redundante +label.redundant.router=Roteador Redundantee label.refresh=Atualizar label.related=Relacionado +label.remind.later=Me lembre depois +label.remove.ACL=Remove ACL +label.remove.egress.rule=Remover regra egress label.remove.from.load.balancer=Removendo Cloud Server do Load Balancer -label.removing.user=Removendo Usuário -label.required=Obrigatório +label.remove.ingress.rule=Remover regra ingress +label.remove.ip.range=Remover range de IP +label.remove.pf=Remover regra de redirecionamento de porta +label.remove.project.account=Remover conta de projeto +label.remove.rule=Remover regra +label.remove.static.nat.rule=Remover regra de NAT est\u00e1tico +label.remove.static.route=Remover rota est\u00e1tica +label.remove.tier=Remover camada +label.remove.vm.from.lb=Remover VM da regra de balanceamento de carga +label.remove.vpc=remover a VPC +label.removing=Removendo +label.removing.user=Removendo Usu\u00e1rio +label.required=Obrigat\u00f3rio +label.reserved.system.gateway=Gateway de sistema reservado label.reserved.system.ip=IP de Sistema Reservado +label.reserved.system.netmask=M\u00e1scara de rede do sistema reservado +label.reset.VPN.connection=Resetar a conex\u00e3o VPN +label.resize.new.offering.id=New Offering +label.resize.new.size=New Size(GB) +label.resize.shrink.ok=Shrink OK label.resource.limits=Limite de Recursos label.resource=Recurso label.resources=Recursos -label.role=Função +label.resource.state=Estado do Recurso +label.restart.network=Reiniciar rede +label.restart.required=Reiniciar obrigat\u00f3rio +label.restart.vpc=reiniciar a VPC +label.restore=Restaurar +label.review=Revisar +label.revoke.project.invite=Revogar convite +label.role=Fun\u00e7\u00e3o +label.root.disk.controller=Controlador do disco Root label.root.disk.offering=Oferta de Disco ROOT +label.round.robin=Round-robin +label.rules=Regras label.running.vms=VMs Rodando -label.saturday=Sábado +label.s3.access_key=Chave de acesso +label.s3.bucket=Balde +label.s3.connection_timeout=Tempo limite de conex\u00e3o +label.s3.endpoint=Ponto de acesso +label.s3.max_error_retry=Limite de tentativas de recupera\u00e7\u00e3o de erro +label.s3.secret_key=Chave Secreta +label.s3.socket_timeout=Tempo limite no socket +label.s3.use_https=Use HTTPS +label.saturday=S\u00e1bado +label.save.and.continue=Salvar e continuar label.save=Salvar label.saving.processing=Salvando.... label.scope=Escopo label.search=Pesquisar -label.secondary.storage=Storage Secundário -label.secondary.used=Uso do Storage Secundário +label.secondary.storage.count=Pools de Storage secund\u00e1rios +label.secondary.storage=Storage Secund\u00e1rio +label.secondary.storage.vm=VM de storage secund\u00e1rio +label.secondary.used=Uso do Storage Secund\u00c3\u00a1rio label.secret.key=Chave Secreta label.security.group.name=Nome do Security Group label.security.group=Security Group label.security.groups.enabled=Security Groups Ativado -label.security.groups=Security Groups +label.security.groups=Grupos de seguran\u00e7a +label.select.a.template=Selecione um template +label.select.a.zone=Selecione uma zona +label.select.instance=Selecionar inst\u00e2ncia +label.select.instance.to.attach.volume.to=Escolha uma inst\u00e2ncia para conectar o volume +label.select.iso.or.template=Selecione ISO ou template +label.select.offering=Selecionar Oferta +label.select.project=Selecionar Projeto +label.select=Selecionar +label.select.tier=Selecione camada +label.select-view=Selecionar visualiza\u00e7\u00e3o +label.select.vm.for.static.nat=Selecionar VM para NAT est\u00e1tico label.sent=Enviado label.server=Servidor +label.service.capabilities=Recursos de servi\u00e7os label.service.offering=Plano -label.system.service.offering=System Service Offering -label.session.expired=Sessão Expirada +label.session.expired=Sess\u00e3o Expirada +label.setup=Configura\u00e7\u00e3o +label.setup.network=Configurar Rede +label.setup.zone=Configurar Zona +label.set.up.zone.type=Configurar tipo de zona label.shared=Compatilhado +label.SharedMountPoint=SharedMountPoint +label.show.ingress.rule=Mostrar Regra de Entrada +label.site.to.site.VPN=Site-to-site VPN label.size=Tamanho +label.skip.guide=Eu utilizei o CloudStack antes, pular este guia label.snapshot.limits=Limites de Snapshot label.snapshot.name=Nome do Snapshot -label.snapshot.s=Snapshot (s) -# label.snapshot.schedule=Setup Recurring Snapshot label.snapshot=Snapshot +label.snapshot.s=Snapshot (s) label.snapshots=Snapshots label.source.nat=Source NAT +label.source=Origem +label.specify.IP.ranges=Especifique range de IP label.specify.vlan=Especificar VLAN -label.start.port=Porta de Início +label.SR.name = SR Name-Label +label.srx=SRX +label.start.IP=IP do in\u00edcio +label.start.port=Porta de In\u00edcio +label.start.reserved.system.IP=In\u00edcio dos IPs reservados para o sistema +label.start.vlan=Vlan do in\u00edcio label.state=Estado -label.static.nat.to=NAT Estático para -label.static.nat=NAT Estático -label.statistics=Estatísticas +label.static.nat.enabled=NAT est\u00e1tico Habilitado +label.static.nat=NAT Est\u00e1tico +label.static.nat.to=NAT Est\u00e1tico para +label.static.nat.vm.details=Detalhes de NAT est\u00e1tico da VM +label.statistics=Estat\u00edsticas label.status=Estado -label.step.1.title=Passo 1\: Selecione o Template label.step.1=Passo 1 -label.step.2.title=Passo 2\: Plano +label.step.1.title=Passo 1\: Selecione o Template label.step.2=Passo 2 -label.step.3.title=Passo 3\: Selecione o Disco Adicional +label.step.2.title=Passo 2\: Plano label.step.3=Passo 3 -label.step.4.title=Passo 4\: Rede +label.step.3.title=Passo 3\: Selecione o Disco Adicional label.step.4=Passo 4 -label.step.5.title=Passo 5\: Revisar +label.step.4.title=Passo 4\: Rede label.step.5=Passo 5 +label.step.5.title=Passo 5\: Revisar +label.sticky.cookie-name=Nome do Cookie +label.sticky.domain=Dom\u00ednio +label.sticky.expire=Expires +label.sticky.holdtime=Tempo de espera +label.sticky.indirect=Indireto +label.sticky.length=Tamanho +label.sticky.mode=Modo +label.sticky.nocache=Sem Cache +label.sticky.postonly=Apenas publicar +label.sticky.prefix=Prefixo +label.sticky.tablesize=Tamanho da Tabela +label.stop=Parar label.stopped.vms=VMs Paradas -label.storage.type=Tipo de Storage label.storage=Storage +label.storage.tags=Tags de Storage +label.storage.traffic=Tr\u00e1fego do Storage +label.storage.type=Tipo de Storage +label.subdomain.access=Acesso ao subdom\u00ednio label.submit=Enviar label.submitted.by=[Enviado por\: ] label.succeeded=Sucedido label.sunday=Domingo +label.super.cidr.for.guest.networks=Super CIDR para redes h\u00f3spedes +label.supported.services=Servi\u00e7os Suportados +label.supported.source.NAT.type=Tipo de Source NAT Suportado +label.suspend.project=Suspender Projeto label.system.capacity=Capacidade do Sistema +label.system.offering=Ofertas de Sistema +label.system.service.offering=System Service Offering +label.system.vms=VM de Sistemas label.system.vm.type=Tipo de VM de Sistema label.system.vm=VM de Sistema -label.system.vms=VM de Sistema +label.system.wide.capacity=Capacidade Total do Sistema label.tagged=Tagged label.tags=Tags label.target.iqn=Target IQN +label.task.completed=Tarefa completa label.template.limits=Limites do Template label.template=Template -label.theme.default=Tema Padrão +label.TFTP.dir=TFTP Directory +label.theme.default=Tema Padr\u00e3o label.theme.grey=Custom - Grey label.theme.lightblue=Custom - Light Blue label.thursday=Quinta -label.time.zone=Fuso Horário -label.time=Time +label.tier=Camada +label.tier.details=Detalhes da camada label.timeout.in.second = Timeout(segundos) -label.timezone=Fuso Horário +label.timeout=Timeout +label.time=Time +label.time.zone=Fuso Hor\u00e1rio +label.timezone=Fuso Hor\u00e1rio +label.token=Token label.total.cpu=CPU TOTAL +label.total.CPU=CPU TOTAL +label.total.hosts=Total de Hosts +label.total.memory=Total de Mem\u00f3ria +label.total.of.ip=Total de endere\u00e7os IP +label.total.of.vm=Total de VM +label.total.storage=Totam de Storage label.total.vms=Total VMs -label.traffic.type=Tipo de Tráfego -label.tuesday=Terça +label.traffic.label=Etiqueta de tr\u00e1fego +label.traffic.types=Tipos de Tr\u00e1fego +label.traffic.type=Tipo de Tr\u00e1fego +label.tuesday=Ter\u00e7a label.type.id=Tipo do ID label.type=Tipo -label.unavailable=Indisponível +label.unavailable=Indispon\u00edvel label.unlimited=Ilimitado -label.untagged=Não Marcado -label.update.ssl.cert=Atualizar Certificado SSL -label.update.ssl=Atualizar Certificado SSL +label.untagged=N\u00e3o Marcado +label.update.project.resources=Atualizar recursos de projeto +label.update.ssl= Atualizar Certificado SSL +label.update.ssl.cert= Atualizar Certificado SSL label.updating=Atualizando +label.upload=Enviar +label.upload.volume=Enviar o Volume label.url=URL label.usage.interface=Usage Interface label.used=Usado -label.user=Usuário -label.username=Nome de Usuário -label.users=Usuários +label.username=Nome de usu\u00e1rio +label.users=Usu\u00e1rios +label.user=Usu\u00e1rio label.value=Valor +label.vcdcname=Nome do vCenter DC label.vcenter.cluster=vCenter Cluster label.vcenter.datacenter=vCenter Datacenter label.vcenter.datastore=vCenter Datastore label.vcenter.host=vCenter Host label.vcenter.password=vCenter Password label.vcenter.username=vCenter Username -label.version=Versão +label.vcipaddress=Endere\u00e7o IP do vCenter +label.version=Vers\u00e3o +label.view.all=Visualizar tudo +label.view.console=Visualizar Console +label.viewing=Visualizar +label.view.more=Ver mais +label.view=Visualizar label.virtual.appliance=Appliance Virtual label.virtual.appliances=Appliance Virtual +label.virtual.machines=M\u00e1quinas virtuais label.virtual.network=Rede Virtual +label.virtual.router=Roteador Virtual +label.virtual.routers=Roteadores Virtuais label.vlan.id=VLAN ID label.vlan.range=Intervalo de VLAN +label.vlan=VLAN label.vm.add=Adicionar Cloud Server label.vm.destroy=Apagar -label.vm.reboot=Reiniciar -label.vm.start=Início -label.vm.stop=Parar +label.vm.display.name=Nome de exibi\u00e7\u00e3o da VM +label.VMFS.datastore=VMFS datastore label.vmfs=VMFS +label.vm.name=Nome da VM +label.vm.reboot=Reiniciar +label.VMs.in.tier=M\u00e1quinas virtuais em camadas +label.vmsnapshot.type=Tipo +label.vm.start=In\u00edcio +label.vm.state=Estado da VM +label.vm.stop=Parar label.vms=VMs +label.vmware.traffic.label=Etiqueta de tr\u00e1fego VMware +label.volgroup=Grupo de Volume +label.volume=Disco label.volume.limits=Limites de Disco label.volume.name=Nome do Disco -label.volume=Disco label.volumes=Discos +label.vpc.id=VPC ID +label.VPC.router.details=Detalhes de roteador de VPC +label.vpc=VPC +label.VPN.connection=Conex\u00e3o VPN +label.vpn.customer.gateway=Gateway de VPN de usu\u00e1rio +label.VPN.customer.gateway=Gateway de VPN de usu\u00e1rio +label.VPN.gateway=Gateway de VPN +label.vpn=VPN +label.vsmctrlvlanid=Control VLAN ID +label.vsmpktvlanid=Packet VLAN ID +label.vsmstoragevlanid=Storage VLAN ID label.vsphere.managed=vSphere Managed label.waiting=Aguardando label.warn=Avisar label.wednesday=Quarta-Feira label.weekly=Semanal -label.welcome.cloud.console=Painel de Controle label.welcome=Bem-Vindo +label.welcome.cloud.console=Painel de Controle +label.what.is.cloudstack=O que \u00e9 o CloudStack&\#8482? +label.xen.traffic.label=Etiqueta de tr\u00e1fego XenServer label.yes=Sim +label.zone.details=Detalhes de zona label.zone.id=ID da Zona +label.zone.name=Nome da zona label.zone.step.1.title=Passo 1\: Selecionar a Rede label.zone.step.2.title=Passo 2\: Adicionar a Zona label.zone.step.3.title=Passo 3\: Adicionar o POD label.zone.step.4.title=Passo 4\: Adicionar um Intervalo de IP -# label.zone.wide=Zone-Wide +label.zones=Zonas +label.zone.type=Tipo de Zona +label.zone.wide=Zone-Wide +label.zoneWizard.trafficType.guest=H\u00f3spede\: tr\u00e1fego entre m\u00e1quinas virtuais de usu\u00e1rios finais +label.zoneWizard.trafficType.management=Ger\u00eancia\: tr\u00e1fego entre recursos internos do CloudStack, incluindo quaisquer componentes que se comunicam com o servidor de gerenciamento, tais como hosts e m\u00e1quinas virtuais de sistema do CloudStack +label.zoneWizard.trafficType.public=P\u00fablico\: tr\u00e1fego entre a internet e m\u00e1quinas virtuais na nuvem. +label.zoneWizard.trafficType.storage=Storage\: tr\u00e1fego entre servidores de storage prim\u00e1ria e secund\u00e1ria, tais como templates de m\u00e1quinas virtuais e snapshots label.zone=Zona - -#Messages -message.acquire.public.ip=Selecione a zona de onde você deseja adquirir o novo IP -message.action.cancel.maintenance.mode=Confirme que você deseja cancelar esta manutenção -message.action.cancel.maintenance=A manutenção do seu HOST foi cancelada com sucesso -message.action.delete.ISO.for.all.zones=Esta ISO é usada por todas as Zonas. Confirme se você deseja excluir a ISO de todas as Zonas -message.action.delete.ISO=Confirme que você deseja excluir esta ISO -message.action.delete.cluster=Confirme que você deseja excluir este HOST -message.action.delete.disk.offering=Confirme que você deseja excluir esta oferta de disco -message.action.delete.domain=Confirme que você deseja excluir este domínio -message.action.delete.external.firewall=Confirme que você gostaria de remover este Firewall externo. Aviso\: Se você está planejando adicionar novamente este mesmo Firewall, é necessário apagar os contadores do dispositivo. -message.action.delete.external.load.balancer=Confirme que você gostaria de remover este Load Balancer Externo. Aviso\: Se você está planejando adicionar novamente este mesmo Load Balancer, é necessário apagar os contadores do dispositivo. -message.action.delete.ingress.rule=Confirme que você deseja excluir esta regra de entrada. -message.action.delete.network=Confirme que você deseja remover esta rede. -message.action.delete.pod=Confirme que você deseja remover este POD. -message.action.delete.primary.storage=Confirme que você deseja remover este Storage Primário. -message.action.delete.secondary.storage=Confirme que você deseja remover este Storage Secundário. -message.action.delete.security.group=Confirme que você deseja remover este Security Group. -message.action.delete.service.offering=Confirme que você deseja remover este Plano. -message.action.delete.snapshot=Confirme que você deseja remover este Snapshot. -message.action.delete.template.for.all.zones=Este Template é usado por todas as zonas. Confirme que você deseja remover o Template de todas as zonas. -message.action.delete.template=Confirme que você deseja remover este Template. -message.action.delete.volume=Confirme que você deseja remover este Disco. -message.action.delete.zone=Confirme que você deseja remover esta Zona. -message.action.destroy.instance=Confirme que você deseja excluir este Cloud Server. -message.action.destroy.systemvm=Confirme que você deseja excluir esta VM de Sistema. -message.action.disable.static.NAT=Confirme que você deseja desativar o NAT estático. -message.action.enable.maintenance=O Host foi preparado com sucesso para manutenção. Este processo poderá levar alguns minutos ou mais dependendo do número de VMs hospedadas neste Host. -message.action.force.reconnect=O procedimento de reconexão forçada foi preparado com sucesso. Este processo poderá levar alguns minutos. -message.action.host.enable.maintenance.mode=Ativar o modo de manutenção irá causar o live migration de todos Cloud Server hospedados neste Host para o próximo disponível. -message.action.instance.reset.password=Por favor confirme que você deseja alterar a senha de ROOT para está máquina virtual. -message.action.primarystorage.enable.maintenance.mode=Aviso\: Colocar o Storage primário em modo de manutenção irá causar a parada de todas as VMs hospedadas nesta unidade. Deseja continuar? -message.action.reboot.instance=Confirme que você deseja reiniciar este Cloud Server. -message.action.reboot.systemvm=Confirme que você deseja reiniciar esta VM de sistema. -message.action.release.ip=Confirme que você deseja liberar este IP. -message.action.remove.host=Remover o único/último host do cluster e reinstalar o host irá provocar a perda do ambiente/banco do host tornando os Cloud Servers inutilizáveis. -message.action.restore.instance=Confirme que você deseja restaurar este Cloud Server. -message.action.start.instance=Confirme que você deseja iniciar este Cloud Server. -message.action.start.router=Confirme que você deseja inciar este roteador. -message.action.start.systemvm=Confirme que você deseja iniciar esta VM de sistema. -message.action.stop.instance=Confirme que você deseja parar este Cloud Server. -message.action.stop.systemvm=Confirme que você deseja parar esta VM de Sistema. -message.action.take.snapshot=Por favor confirme que você deseja criar um snapshot deste volume. -message.add.cluster.zone=Add a hypervisor managed cluster for zone +managed.state=Status do Gerenciamento +message.acquire.new.ip=Por favor confirme que voc\u00ea gostaria de adquirir um novo IP para esta rede. +message.acquire.new.ip.vpc=Por favor confirme que voc\u00ea gostaria de adquirir um novo IP para esta VPC. +message.acquire.public.ip=Selecione a zona de onde voc\u00ea deseja adquirir o novo IP +message.action.cancel.maintenance=A Manuten\u00e7\u00e3o do seu HOST foi cancelada com sucesso +message.action.cancel.maintenance.mode=Confirme que voc\u00ea deseja cancelar esta Manuten\u00e7\u00e3o +message.action.change.service.warning.for.instance=Para troca de plano \u00e9 necess\u00e1rio parar o Cloud Server. +message.action.change.service.warning.for.router=O roteador precisa ser desligado antes de trocar o plano/tamanho. +message.action.delete.cluster=Confirme que voc\u00ea deseja excluir este HOST +message.action.delete.disk.offering=Confirme que voc\u00ea deseja excluir esta oferta de disco +message.action.delete.domain=Confirme que voc\u00ea deseja excluir este Dom\u00ednio +message.action.delete.external.firewall=Confirme que voc\u00ea gostaria de remover este Firewall externo. Aviso\: Se voc\u00ea Est\u00e1 planejando adicionar novamente este mesmo Firewall, \u00e9 necess\u00e1rio apagar os contadores do dispositivo. +message.action.delete.external.load.balancer=Confirme que voc\u00ea gostaria de remover este Load Balancer Externo. Aviso\: Se voc\u00ea Est\u00e1 planejando adicionar novamente este mesmo Load Balancer, \u00e9 necess\u00e1rio apagar os contadores do dispositivo. +message.action.delete.ingress.rule=Confirme que voc\u00ea deseja excluir esta regra de entrada. +message.action.delete.ISO=Confirme que voc\u00ea deseja excluir esta ISO +message.action.delete.ISO.for.all.zones=Esta ISO \u00e9 usada por todas as Zonas. Confirme se voc\u00ea deseja excluir a ISO de todas as Zonas +message.action.delete.network=Confirme que voc\u00ea deseja remover esta rede. +message.action.delete.nexusVswitch=Por favor confirme que voc\ufffd deseja remover este nexusVswitch. +message.action.delete.physical.network=Por favor confirme que voc\u00ea deseja deletar esta rede f\u00edsica +message.action.delete.pod=Confirme que voc\u00ea deseja remover este POD. +message.action.delete.primary.storage=Confirme que voc\u00ea deseja remover este Storage Prim\u00e1rio. +message.action.delete.secondary.storage=Confirme que voc\u00ea deseja remover este Storage Secund\u00e1rio. +message.action.delete.security.group=Confirme que voc\u00ea deseja remover este Security Group. +message.action.delete.service.offering=Confirme que voc\u00ea deseja remover este Plano. +message.action.delete.snapshot=Confirme que voc\u00ea deseja remover este Snapshot. +message.action.delete.system.service.offering=Por favor confirme que voc\u00ea deseja deletar esta oferta de servi\u00e7o de sistema. +message.action.delete.template=Confirme que voc\u00ea deseja remover este Template. +message.action.delete.template.for.all.zones=Este Template \u00e9 usado por todas as zonas. Confirme que voc\u00ea deseja remover o Template de todas as zonas. +message.action.delete.volume=Confirme que voc\u00ea deseja remover este Disco. +message.action.delete.zone=Confirme que voc\u00ea deseja remover esta Zona. +message.action.destroy.instance=Confirme que voc\u00ea deseja excluir este Cloud Server. +message.action.destroy.systemvm=Confirme que voc\u00ea deseja excluir esta VM de Sistema. +message.action.disable.cluster=Confirma a desativa\u00e7\u00e3o do cluster. +message.action.disable.nexusVswitch=Por favor confirme que voc\ufffd deseja desabilitar este nexusVswitch +message.action.disable.physical.network=Por favor confirme que voc\u00ea deseja desabilitar esta rede f\u00edsica. +message.action.disable.pod=Confirma a desativa\u00e7\u00e3o do POD. +message.action.disable.static.NAT=Confirme que voc\u00ea deseja desativar o NAT Est\u00e1tico. +message.action.disable.zone=Confirma a desativa\u00e7\u00e3o da zona. +message.action.download.iso=Por favor confirme que voc\u00ea deseja baixar esta ISO. +message.action.download.template=Por favor confirme que voc\u00ea deseja baixar este template. +message.action.enable.cluster=Confirma a ativa\u00e7\u00e3o do cluster. +message.action.enable.maintenance=O Host foi preparado com sucesso para Manuten\u00e7\u00e3o. Este processo poder\u00e1 levar alguns minutos ou mais dependendo do n\u00famero de VMs hospedadas neste Host. +message.action.enable.nexusVswitch=Por favor confirme que voc\ufffd deseja habilitar este nexusVswitch. +message.action.enable.physical.network=Por favor confirme que voc\u00ea deseja habilitar esta rede f\u00edsica. +message.action.enable.pod=Confirma a ativa\u00e7\u00e3o do POD. +message.action.enable.zone=Confirma a ativa\u00e7\u00e3o da zona. +message.action.force.reconnect=O procedimento de reconex\u00e3o for\u00e7ada foi preparado com sucesso. Este processo poder\u00e1 levar alguns minutos. +message.action.host.enable.maintenance.mode=Ativar o modo de Manuten\u00e7\u00e3o ir\u00e1 causar o live migration de todos Cloud Server hospedados neste Host para o pr\u00f3ximo dispon\u00edvel. +message.action.instance.reset.password=Por favor confirme que voc\u00ea deseja alterar a senha de ROOT para est\u00e1 m\u00e1quina virtual. +message.action.manage.cluster=Confirma a vincula\u00e7\u00e3o do cluster. +message.action.primarystorage.enable.maintenance.mode=Aviso\: Colocar o Storage prim\u00e1rio em modo de Manuten\u00e7\u00e3o ir\u00e1 causar a parada de todas as VMs hospedadas nesta unidade. Deseja continuar? +message.action.reboot.instance=Confirme que voc\u00ea deseja reiniciar este Cloud Server. +message.action.reboot.router=Confirme que voc\ufffd deseja reiniciar este roteador. +message.action.reboot.systemvm=Confirme que voc\u00ea deseja reiniciar esta VM de sistema. +message.action.release.ip=Confirme que voc\u00ea deseja liberar este IP. +message.action.remove.host=Favor confirmar que voc\u00ea deseja remover este host. +message.action.reset.password.off=Seu Cloud Server n\u00e3o suporta esta funcionalidade. +message.action.reset.password.warning=Para recuperar a senha \u00e9 necess\u00e1rio parar o Cloud Server. +message.action.restore.instance=Confirme que voc\u00ea deseja restaurar este Cloud Server. +message.action.start.instance=Confirme que voc\u00ea deseja iniciar este Cloud Server. +message.action.start.router=Confirme que voc\u00ea deseja inciar este roteador. +message.action.start.systemvm=Confirme que voc\u00ea deseja iniciar esta VM de sistema. +message.action.stop.instance=Confirme que voc\u00ea deseja parar este Cloud Server. +message.action.stop.router=Confirme que voc\ufffd deseja parar este roteador. +message.action.stop.systemvm=Confirme que voc\u00ea deseja parar esta VM de Sistema. +message.action.take.snapshot=Por favor confirme que voc\u00ea deseja criar um snapshot deste volume. +message.action.unmanage.cluster=Confirma a desvincula\u00e7\u00e3o do cluster. +message.activate.project=Voc\u00ea tem certeza que deseja ativar este projeto ? message.add.cluster=Add a hypervisor managed cluster for zone , pod -message.add.disk.offering=Especifique o seguintes parâmetros para adicionar uma nova oferta de disco. -message.add.firewall=Adicionar Firewall à zona. -message.add.host=Especifique os seguintes parâmetros para adicionar um novo host. +message.add.cluster.zone=Add a hypervisor managed cluster for zone +message.add.disk.offering=Especifique o seguintes par\u00e2metros para adicionar uma nova oferta de disco. +message.add.domain=Por favor especifique o subdom\u00ednio que voc\u00ea deseja criar neste dom\u00ednio +message.add.firewall=Adicionar Firewall \u00e0\u00a0 zona. +message.add.guest.network=Por favor confirme que voc\u00ea gostaria de adicionar uma rede guest. +message.add.host=Especifique os seguintes par\u00e2metros para adicionar um novo host. +message.adding.host=Adicionando host +message.adding.Netscaler.device=Adicionando dispositivo Nescaler +message.adding.Netscaler.provider=Adicionando Netscaler provider +message.add.ip.range=Add an IP range to public network in zone message.add.ip.range.direct.network=Add an IP range to direct network in zone message.add.ip.range.to.pod=

Add an IP range to pod\:

-message.add.ip.range=Add an IP range to public network in zone +message.additional.networks.desc=Selecione a(s) rede(s) adicionais que seu Cloud Server ter\u00c3\u00a1 acesso. message.add.load.balancer=Add a load balancer to zone +message.add.load.balancer.under.ip=A regra do balanceador de carga foi adicionada para o IP\: message.add.network=Add a new network for zone\: +message.add.new.gateway.to.vpc=Favor especificar a informa\u00e7\u00e3o para adicionar um novo gateway a esta VPC. message.add.pod=Add a new pod for zone -message.add.primary.storage=Adicionar novo Storage primário à zona , pod -message.add.primary=Especifique os seguintes parâmetros para adicionar um novo Storage primário. +message.add.primary=Especifique os seguintes par\u00e2metros para adicionar um novo Storage prim\u00e1rio. +message.add.primary.storage=Adicionar novo Storage prim\u00e1rio \u00c3\u00a0 zona , pod message.add.secondary.storage=Add a new storage for zone -message.add.service.offering=Por favor preencha os dados abaixo para adicionar uma nova oferta de computação. +message.add.service.offering=Por favor preencha os dados abaixo para adicionar uma nova oferta de computa\u00e7\u00e3o. +message.add.system.service.offering=Por favor preencha os dados abaixo para adicionar uma nova oferta de servi\u00e7o de sistema. message.add.template=Entre com os dados para criar um novo template. message.add.volume=Entre com os dados para criar um novo disco. -message.additional.networks.desc=Selecione a(s) rede(s) adicionais que seu Cloud Server terá acesso. +message.add.VPN.gateway=Favor confirmar que voc\u00ea deseja adicionar um gateway de VPN message.advanced.mode.desc=Escolhe este modelo de rede se deseja ter habilitar o suporte a VLAN. Este modelo permite maior flexibilidade ao administrador ao permitir ofertas de rede customizada, firewall, vpn ou load balancer bem como acesso via rede virtual ou acesso direto. -message.advanced.security.group=Escolha esta opção se desejar utilizar Security Groups para isolamento das VMs guest. -message.advanced.virtual=Escolha esta opção se desejar utilizar VLANs para isolamento das VMs guest. -message.allow.vpn.access=Entre com nome de usuário e senha do usuário que terá acesso VPN. -message.attach.iso.confirm=Confirme que você deseja conectar a ISO ao Cloud Server. -message.attach.volume=Preencha os seguintes dados para conectar o novo disco. Se você está conectando um disco a um Cloud Server Windows, será necessário reiniciar o Cloud Server para visualizar o novo disco. -message.basic.mode.desc=Escolha este modelo de rede se você *não* quer suporte a VLAN. Todo Cloud Server criado neste modelo de rede estará ligado diretamente a um IP da rede e será usado Security Groups para prover segurança e separação. -message.change.offering.confirm=Confirme que você deseja mudar o plano deste Cloud Server. -message.copy.iso.confirm=Confirme se você deseja copiar a ISO para +message.advanced.security.group=Escolha esta op\u00e7\u00e3o se desejar utilizar Security Groups para isolamento das VMs guest. +message.advanced.virtual=Escolha esta op\u00e7\u00e3o se desejar utilizar VLANs para isolamento das VMs guest. +message.after.enable.s3=Storage secund\u00e1ria fornecida por S3 configurada. Nota\: ao deixar esta p\u00e1gina, voc\u00ea n\u00e3o ser\u00e1 capaz de reconfigurar S3 novamente. +message.after.enable.swift=Swift Configurado. Nota\: Ap\u00f3s deixar esta p\u00e1gina, voc\u00ea n\u00e3o ser\u00e1 capaz de reconfigurar o Swift novamente. +message.alert.state.detected=Alerta de estado detectado +message.allow.vpn.access=Entre com nome de Usu\u00e1rio e senha do Usu\u00e1rio que ter\u00e1 acesso VPN. +message.apply.snapshot.policy=Voc\u00ea atualizou com sucesso sua pol\u00edtica de Snapshot. +message.attach.iso.confirm=Confirme que voc\u00ea deseja conectar a ISO ao Cloud Server. +message.attach.volume=Preencha os seguintes dados para conectar o novo disco. Se voc\u00ea Est\u00e1 conectando um disco a um Cloud Server Windows, ser\u00e1 necess\u00e1rio reiniciar o Cloud Server para visualizar o novo disco. +message.basic.mode.desc=Escolha este modelo de rede se voc\u00ea *n\u00e3o* quer suporte a VLAN. Todo Cloud Server criado neste modelo de rede estar\u00e1 ligado diretamente a um IP da rede e ser\u00e1 usado Security Groups para prover seguran\u00e7a e separa\u00e7\u00e3o. +message.change.offering.confirm=Confirme que voc\u00ea deseja mudar o plano deste Cloud Server. +message.change.password=Por favor, troque sua senha. +message.configure.all.traffic.types=Voc\u00ea tem m\u00faltiplas redes f\u00edsicas; favor configurar etiquetas para cada tipo de tr\u00e1fego clicando no bot\u00e3o Edit. +message.configuring.guest.traffic=Configurando tr\u00e1fego do guest +message.configuring.physical.networks=Configurando redes f\u00edsicas +message.configuring.public.traffic=Configurando tr\u00e1fego p\u00fablico +message.configuring.storage.traffic=Configurando tr\u00e1fego de storage +message.confirm.action.force.reconnect=Por favor confirme que voc\u00ea deseja for\u00e7ar a reconex\u00e3o com este host. +message.confirm.delete.F5=Por favor confirme que voc\u00ea deseja remover o F5 +message.confirm.delete.NetScaler=Por favor confirme que voc\u00ea deseja remover o NetScaler +message.confirm.delete.SRX=Por favor confirme que voc\u00ea deseja remover o SRX +message.confirm.destroy.router=Por favor confirme que voc\u00ea gostaria de destruir este roteador +message.confirm.disable.provider=Por favor confirme que voc\u00ea gostaria de desabilitar este provider +message.confirm.enable.provider=Por favor confirme que voc\u00ea gostaria de habilitar este provider +message.confirm.join.project=Por favor confirme que voc\u00ea deseja entrar neste projeto +message.confirm.remove.IP.range=Por favor confirme que voc\u00ea deseja remover este range de IP. +message.confirm.shutdown.provider=Por favor confirme que voc\u00ea deseja desligar este provider +message.copy.iso.confirm=Confirme se voc\u00ea deseja copiar a ISO para message.copy.template=Copiar template XXX da zona para message.create.template.vm=Criar VM do template -message.create.template.volume=Especifique as seguintes informações antes de criar o template a partir do disco\: . A criação de um template a partir de um disco pode levar alguns minutos ou mais dependendo do tamnho do disco. -message.delete.account=Confirme se você deseja excluir esta conta. -message.detach.iso.confirm=Confirme se você deseja desconectar a ISO do Cloud Server. -message.disable.account=Por favor confirme que você deseja desabilitar esta conta. Após desabilitar uma conta, todos os usuários desta conta não irão possuir mais acesso aos seus recursos da cloud. Todas as máquinas virtuais serão automaticamente desligadas. -message.disable.vpn.access=Confirme se você deseja desativar o acesso VPN. -message.download.ISO=Por favor clique 00000 para baixar o ISO -message.download.template=Por favor clique 00000 para baixar o template +message.create.template=Voc\u00ea tem certeza que deseja criar um template ? +message.create.template.volume=Especifique as seguintes informa\u00e7\u00f5es antes de criar o template a partir do disco\: . A cria\u00e7\u00e3o de um template a partir de um disco pode levar alguns minutos ou mais dependendo do tamnho do disco. +message.creating.cluster=Criando cluster +message.creating.guest.network=Criando rede guest +message.creating.physical.networks=Criando redes fisicas +message.creating.pod=Criando pod +message.creating.primary.storage=Criando storage prim\u00e1rio +message.creating.secondary.storage=Criando storage secund\u00e1rio +message.creating.zone=Criando zona. +message.decline.invitation=Voc\u00ea tem certeza que quer rejeitar este convite de projeto ? +message.delete.account=Confirme se voc\u00ea deseja excluir esta conta. +message.delete.gateway=Favor confirmar que voc\u00ea deseja deleta o gateway +message.delete.project=Voc\u00ea tem certeza que deseja deletar este projeto ? +message.delete.user=Por favor confirme que voc\u00ea deseja deletar este usu\u00e1rio. +message.delete.VPN.connection=Favor confirmar que voc\u00ea deseja deletar esta conex\u00e3o VPN +message.delete.VPN.customer.gateway=Favor confirmar que voc\u00ea deseja deletar este gateway de VPN de usu\u00e1rio +message.delete.VPN.gateway=Favor confirmar que voc\u00ea deseja deletar este gateway de VPN +message.detach.disk=Voc\u00ea tem certeza que deseja desconectar este disco ? +message.detach.iso.confirm=Confirme se voc\u00ea deseja desconectar a ISO do Cloud Server. +message.disable.account=Por favor confirme que voc\u00ea deseja desabilitar esta conta. Ap\u00f3s desabilitar uma conta, todos os usu\u00e1rios desta conta n\u00e3o ir\u00e3o possuir mais acesso aos seus recursos da cloud. Todas as m\u00e1quinas virtuais ser\u00e3o automaticamente desligadas. +message.disable.snapshot.policy=Voc\u00ea desativou com sucesso sua pol\u00edtica de Snapshot. +message.disable.user=Por favor confirme que voc\u00ea deseja desabilitar este usu\u00e1rio. +message.disable.vpn.access=Confirme se voc\u00ea deseja desativar o acesso VPN. +message.disable.vpn=Voc\u00ea tem certeza que deseja desabilitar a VPN? +message.download.ISO=Por favor clique 00000 para baixar o ISO +message.download.template=Por favor clique 00000 para baixar o template message.download.volume=Clique 00000 para baixar o disco -message.edit.confirm=Por favor confirme suas alterações antes de clicar em "Salvar". +message.download.volume.confirm=Por favor confirme que voc\u00ea quer baixar este volume +message.edit.account=Editar ("-1" indica que n\u00e3o haver\u00e1 limites para a quantidade de recursos criado) +message.edit.confirm=Por favor confirme suas altera\u00e7\u00f5es antes de clicar em "Salvar". message.edit.limits=Especifique os limites para os seguintes recursos. "-1" indica sem limite para o total de recursos criados. -message.enable.account=Confirme se você deseja ativar a conta. -message.enable.vpn.access=VPN está desativada para este endereço IP. Gostaria de ativar o acesso VPN? -message.enabled.vpn.ip.sec=Sua chave IPSec (pre-shared) é -message.enabled.vpn=Seu acesso VPN está ativado e pode ser acessado através do IP -message.launch.vm.on.private.network=Você deseja executar sua instância na sua própria rede privada dedicada ? -message.lock.account=Confirme se você deseja bloquear esta conta. Bloqueando a conta, todos os usuários desta conta não estarão mais habilitados a gerenciar os recursos na nuvem. Os recursos existentes (Cloud Server) ainda poderão ser acessados. -message.migrate.instance.confirm=Confirme o host que você deseja migrar o Cloud Server. -message.new.user=Especifique abaixo para adicionar novos usuários para a conta -message.no.network.support.configuration.not.true=Você não possui nenhuma zona com grupos de segurança habilitado. Assim sendo, não possui recursos adicionais de rede. Por favor continue para o passo 5. -message.no.network.support=O hypervisor escolhido, vSphere, não possui nenhum recurso de rede adicional. Por favor, vá para o passo 5. +message.edit.traffic.type=Favor especificar a etiqueta de tr\u00e1fego que voc\u00ea deseja associar com este tipo de tr\u00e1fego. +message.enable.account=Confirme se voc\u00ea deseja ativar a conta. +message.enabled.vpn.ip.sec=Sua chave IPSec (pre-shared) \u00e9 +message.enabled.vpn=Seu acesso VPN Est\u00e1 ativado e pode ser acessado atrav\u00e9s do IP +message.enable.user=Por favor confirme que voc\u00ea deseja habilitar este usu\u00e1rio. +message.enable.vpn.access=VPN Est\u00e1 desativada para este endere\u00e7o IP. Gostaria de ativar o acesso VPN? +message.enable.vpn=Por favor confirme que voc\u00ea deseja acesso VPN habilitado para este endere\u00e7o IP. +message.enabling.security.group.provider=Habilitar provider de grupo de seguran\u00e7a +message.enabling.zone=Habilitando zona +message.enter.token=Por favor entre o token que voc\u00ea recebeu no e-mail privado. +message.generate.keys=Por favor confirme que voc\u00ea deseja gerar novas chaves para este usu\u00e1rio. +message.installWizard.click.retry=Click no bot\u00e3o para tentar executar novamente. +message.installWizard.copy.whatIsACluster=Um cluster prov\u00ea uma maneira de agrupar hosts. Os hosts em um cluster tem hardware id\u00eantico, rodam o mesmo hypervisor, est\u00e3o na mesma subnet, acessam o mesmo storage compartilhado. Inst\u00e2ncias de m\u00e1quinas virtuais (VMs) podem ser migradas a quente - live migration - de um host para outro host no mesmo cluster, sem interromper o servi\u00e7o para o usu\u00e1rio. Um Cluster \u00e9 a terceira maior unidade organizacional em uma instala\u00e7\u00e3o CloudStack&\#8482; . Clusters est\u00e3o contidos em pods e pods est\u00e3o contidos em zonas.

O CloudStack&\#8482; permite m\u00faltiplos clusters em uma mesma cloud, entretanto para a instala\u00e7\u00e3o b\u00e1sica, n\u00f3s iremos precisar apenas de um cluster. +message.installWizard.copy.whatIsAHost=Um host \u00e9 um \u00fanico computador. Os Hosts prov\u00eaem os recursos computacionais para executar as m\u00e1quinas virtuais. Cada host possu\u00ed o software do hypervisor instalado nele para gerenciar as guest VMs (Exceto os hosts bare metal, que s\u00e3o um caso especial discutido no Guia Avan\u00e7ado de Instala\u00e7\u00e3o). Por exemplo, um servidor Linux com KVM habilitado, um servidor Citrix XenServer e um servidor ESXi s\u00e3o hosts. Na Instala\u00e7\u00e3o B\u00e1sica, n\u00f3s utilizamos um \u00fanico host rodando XenServer ou KVM.

O host \u00e9 a menor unidade organizacional dentro de uma instala\u00e7\u00e3o CloudStack&\#8482; . Hosts est\u00e3o contidos dentro de Clusters, clusters est\u00e3o contidos dentro de pods e pods est\u00e3o contidos dentro de zonas. +message.installWizard.copy.whatIsAPod=Um pod normalmente representa um \u00fanico rack. Hosts no mesmo pod est\u00e3o na mesma subrede.

Um pod \u00e9 a segunda maior unidade organizacional de uma instala\u00e7\u00e3o CloudStack&\#8482; . Pods est\u00e3o contidos dentro de zonas. Cada zona, pode conter um ou mais pods; Na instala\u00e7\u00e3o b\u00e1sica, voc\u00ea ir\u00e1 ter apenas um pod na sua zona. +message.installWizard.copy.whatIsAZone=Uma zona \u00e9 a maior unidade organizacional em uma instala\u00e7\u00e3o CloudStack&\#8482; . Uma zona tipicamente corresponde a um \u00fanico datacenter, apesar de ser poss\u00edvel ter m\u00faltiplas zonas no mesmo datacenter. O benef\u00edcio de se organizar a infra-estrutura em zonas \u00e9 permitir o isolamento f\u00edsico e redund\u00e2ncia. Por exemplo, cada zona pode possuir sua pr\u00f3pria alimenta\u00e7\u00e3o de energia e link de sa\u00edda de internet e zonas podem estar geograficamente separadas (apesar de n\u00e3o ser obrigat\u00f3rio). +message.installWizard.copy.whatIsCloudStack=O CloudStack&\#8482 \u00e9 uma plataforma de software que agrega recursos computacionais para construir uma Cloud de Infra-estrutura como Servi\u00e7o (IaaS) p\u00fablica, privada ou h\u00edbrida. O CloudStack&\#8482 ger\u00eancia a rede, o storage e os recursos computacionais que comp\u00f5em a infra-estrutura de cloud. Utilize o CloudStack&\#8482 para instalar, gerenciar e configurar os ambientes de cloud computing.

Indo al\u00e9m de imagens de m\u00e1quinas virtuais individuais rodando em hardware commodity, CloudStack&\#8482 prov\u00ea uma solu\u00e7\u00e3o completa de software de infra-estrutura de cloud para entregar datacenters virtuais como um servi\u00e7o - possuindo todos os componentes essenciais para contruir, instalar e gerenciar aplica\u00e7\u00f5es na cloud multi-camadas e multi-tenant. Ambas as vers\u00f5es open-source e premium est\u00e3o dispon\u00edveis, com a vers\u00e3o opensource oferecendo praticamente os mesmos recursos. +message.installWizard.copy.whatIsPrimaryStorage=Uma infraestrutura de Cloud CloudStack; utiliza dois tipos de storage\: storage prim\u00e1rio e storage secund\u00e1rio. Ambos os tipos podem ser iSCSI, NFS servers, ou disco local.

O Storage prim\u00e1rio est\u00e1 associado com um cluster, e armazena os volumes de disco de cada guest VM para todas as VMs em execu\u00e7\u00e3o nos hosts deste cluster. O servidor de storage prim\u00e1rio tipicamente encontra-se localizado perto dos hosts. +message.installWizard.copy.whatIsSecondaryStorage=O storage secund\u00e1rio est\u00e1 associado a uma zona, ele \u00e9 respons\u00e1vel por armazenar o seguinte\:
  • Imagens de Templates do SO - que podem ser utilizadas para boot das VMs e podem incluir configura\u00e7\u00f5es adicionais, como por exemplo as aplica\u00e7\u00f5es instaladas
  • Imagens ISO - Imagens de sistema operacional que podem ser boot\u00e1veis ou n\u00e3o
  • Snapshots do volume de discos - c\u00f3pias salvas dos dados de uma VM que pode ser utilizada para recupera\u00e7\u00e3o de dados ou cria\u00e7\u00e3o de novos templates
+message.installWizard.now.building=Construindo sua cloud agora... +message.installWizard.tooltip.addCluster.name=Um nome para o cluster. Este nome pode ser um nome de sua escolha e n\u00e3o \u00e9 usado pelo CloudStack. +message.installWizard.tooltip.addHost.hostname=O nome DNS ou endere\u00e7o IP do host. +message.installWizard.tooltip.addHost.password=Este \u00e9 a senha do usu\u00e1rio especificado acima (da sua instala\u00e7\u00e3o do XenServer) +message.installWizard.tooltip.addHost.username=Usualmente root. +message.installWizard.tooltip.addPod.name=O nome para o pod +message.installWizard.tooltip.addPod.reservedSystemEndIp=Este \u00e9 o range de IP na rede privada que o CloudStack utiliza para gerenciar o storage secund\u00e1rio das VMs e Proxy Console das VMs. Estes endere\u00e7os IP s\u00e3o obtidos da mesma subrede dos servidores hosts. +message.installWizard.tooltip.addPod.reservedSystemGateway=O gateway para os hosts neste pod. +message.installWizard.tooltip.addPod.reservedSystemNetmask=A m\u00e1scara de rede est\u00e1 em uso na subrede que os guests ir\u00e3o utilizar. +message.installWizard.tooltip.addPod.reservedSystemStartIp=Este \u00e9 o range de IP na rede privada que o CloudStack utiliza para gerenciar o storage secund\u00e1rio das VMs e Proxy Console das VMs. Estes endere\u00e7os IP s\u00e3o obtidos da mesma subrede dos servidores hosts. +message.installWizard.tooltip.addPrimaryStorage.name=O Nome do dispositivo de storage. +message.installWizard.tooltip.addPrimaryStorage.path=(para NFS) No NFS este \u00e9 o path exportado pelo servidor. Path (para SharedMountPoint). Com o KVM este \u00e9 o path em cada host onde o storage prim\u00e1rio est\u00e1 montado. Por exemplo, "/mnt/primary". +message.installWizard.tooltip.addPrimaryStorage.server=(para NFS, iSCSI ou PreSetup) O Endere\u00e7o IP ou nome DNS do dispositivo de storage. +message.installWizard.tooltip.addSecondaryStorage.nfsServer=O endere\u00e7o IP do servidor NFS hospedando o storage secund\u00e1rio +message.installWizard.tooltip.addSecondaryStorage.path=Path exportado, localizado no servidor que voc\u00ea especificou acima +message.installWizard.tooltip.addZone.dns1=Estes s\u00e3o os servidores DNS utilizados pelas guest VMs na zona. Estes servidores DNS ser\u00e3o acessados pela interface de rede p\u00fablica que voc\u00ea ir\u00e1 adicionar posteriormente. O endere\u00e7o IP p\u00fablico da zona deve possuir uma rota para os servidores DNS configurados aqui. +message.installWizard.tooltip.addZone.dns2=Estes s\u00e3o os servidores DNS utilizados pelas guest VMs na zona. Estes servidores DNS ser\u00e3o acessados pela interface de rede p\u00fablica que voc\u00ea ir\u00e1 adicionar posteriormente. O endere\u00e7o IP p\u00fablico da zona deve possuir uma rota para os servidores DNS configurados aqui. +message.installWizard.tooltip.addZone.internaldns1=Estes s\u00e3o os servidores DNS utilizados pelas VMs de sistema nesta zona. Estes servidores DNS ser\u00e3o acessados atrav\u00e9s da interface de rede privada das VMs de sistema. O endere\u00e7o IP privado que voc\u00ea configurar para os pods deve possuir uma rota para os servidores DNS configurados aqui. +message.installWizard.tooltip.addZone.internaldns2=Estes s\u00e3o os servidores DNS utilizados pelas VMs de sistema nesta zona. Estes servidores DNS ser\u00e3o acessados atrav\u00e9s da interface de rede privada das VMs de sistema. O endere\u00e7o IP privado que voc\u00ea configurar para os pods deve possuir uma rota para os servidores DNS configurados aqui. +message.installWizard.tooltip.addZone.name=Um nome para a zona +message.installWizard.tooltip.configureGuestTraffic.description=Uma descri\u00e7\u00e3o da sua rede +message.installWizard.tooltip.configureGuestTraffic.guestEndIp=O range de endere\u00e7os IP que estar\u00e1 dispon\u00edvel para aloca\u00e7\u00e3o para os guests nesta zona. Caso uma NIC seja utilizada, estes IPs devem estar no mesmo CIDR que o CIDR do pod. +message.installWizard.tooltip.configureGuestTraffic.guestGateway=O gateway que os guests devem usar +message.installWizard.tooltip.configureGuestTraffic.guestNetmask=A m\u00e1scara de rede da subrede que os guests devem usar +message.installWizard.tooltip.configureGuestTraffic.guestStartIp=O range de endere\u00e7os IP que estar\u00e1 dispon\u00edvel para aloca\u00e7\u00e3o para os guests nesta zona. Caso uma NIC seja utilizada, estes IPs devem estar no mesmo CIDR que o CIDR do pod. +message.installWizard.tooltip.configureGuestTraffic.name=Um nome para sua rede +message.instanceWizard.noTemplates=Voc\u00ea n\u00e3o possui nenhum template dispon\u00edvel; por favor adicione um template compat\u00edvel e reinicie o wizard de inst\u00e2ncia. +message.ip.address.changed=Seu endere\u00e7o IP pode ter mudado; voc\u00ea gostaria de atualizar a listagem ? Note que neste caso o painel de detalhes ir\u00e1 fechar. +message.iso.desc=Imagem de disco contendo dados ou m\u00eddia de sistema operacional boot\u00e1vel +message.join.project=Voc\u00ea agora entrou em um projeto. Por favor troque para a vis\u00e3o de Projeto para visualizar o projeto. +message.launch.vm.on.private.network=Voc\u00ea deseja executar sua inst\u00e2ncia na sua pr\u00f3pria rede privada dedicada ? +message.launch.zone=A zona est\u00e1 pronta para ser executada; por favor continue para o pr\u00f3ximo passo. +message.lock.account=Confirme se voc\u00ea deseja bloquear esta conta. Bloqueando a conta, todos os Usu\u00e1rios desta conta n\u00e3o estar\u00e3o mais habilitados a gerenciar os recursos na nuvem. Os recursos existentes (Cloud Server) ainda poder\u00e3o ser acessados. +message.migrate.instance.confirm=Confirme o host que voc\u00ea deseja migrar o Cloud Server. +message.migrate.instance.to.host=Por favor confirme que voc\u00ea deseja migrar a inst\u00e2ncia para outro host. +message.migrate.instance.to.ps=Por favor confirme que voc\u00ea deseja migrar a inst\u00e2ncia para outro storage prim\u00e1rio. +message.migrate.router.confirm=Por favor confirme o host que voc\u00ea deseja migrar o roteador para\: +message.migrate.systemvm.confirm=Por favor confirme o host para o qual voc\u00ea deseja migrar a VM de sistema\: +message.migrate.volume=Por favor confirme que voc\u00ea deseja migrar o volume para outro storage prim\u00e1rio. +message.new.user=Especifique abaixo para adicionar novos usu\u00e1rios para a conta +message.no.network.support.configuration.not.true=Voc\u00ea n\u00e3o possui nenhuma zona com grupos de seguran\u00e7a habilitado. Assim sendo, n\u00e3o possui recursos adicionais de rede. Por favor continue para o passo 5. +message.no.network.support=O hypervisor escolhido, vSphere, n\u00e3o possui nenhum recurso de rede adicional. Por favor, v\u00e1 para o passo 5. +message.no.projects.adminOnly=Voc\u00ea n\u00e3o possui nenhum projeto.
Por favor solicite ao seu administrador a cria\u00e7\u00e3o de um novo projeto. +message.no.projects=Voc\u00ea n\u00e3o possui nenhum projeto.
Por favor crie um novo projeto \u00e0 partir da se\u00e7\u00e3o Projetos. message.number.clusters=

Clusters

message.number.hosts=

Hosts

message.number.pods=

PODs

-message.number.storage=

Volumes do Storage Primário

+message.number.storage=

Volumes do Storage Prim\u00e1rio

message.number.zones=

Zonas

-message.remove.vpn.access=Confirme se você deseja remover acesso VPN do seguinte usuário. -message.restart.mgmt.server=Reinicie o(s) servidor(es) de gerenciamento para que a nova configuração tenha efeito. -message.restart.mgmt.usage.server=Por favor reinicie seu servidor(es) de gerenciamento e seu servidor(es) de utilização para as mudanças entrarem em efeito. +message.pending.projects.1=Voc\u00ea possui convites de projetos pendentes\: +message.pending.projects.2=Para visualizar, por favor acesse a se\u00e7\u00e3o de projetos, depois selecione os convites no menu drop-down. +message.please.add.at.lease.one.traffic.range=Por favor adicione pelo menos um range de tr\u00e1fego. +message.please.proceed=Por favor continue para o pr\u00f3ximo passo. +message.please.select.a.configuration.for.your.zone=Por favor selecione uma configuracao para sua zona. +message.please.select.a.different.public.and.management.network.before.removing=Por favor selecione uma rede p\u00fablica e de gerenciamento diferente antes de remover +message.please.select.networks=Por favor selecione as redes para sua m\u00e1quina virtual. +message.please.wait.while.zone.is.being.created=Por favor, espere enquanto sua zona est\u00e1 sendo criada; isto pode demorar um pouco... +message.project.invite.sent=Convite enviado para o usu\u00e1rio; Eles ser\u00e3o adicionados ao projeto ap\u00f3s aceitarem o convite +message.remove.vpc=Favor confirmar que voc\u00ea deseja remover a VPC +message.remove.vpn.access=Confirme se voc\u00ea deseja remover acesso VPN do seguinte Usu\u00e1rio. +message.reset.password.warning.notPasswordEnabled=O template desta inst\u00e2ncia foi criado sem senha habilitada +message.reset.password.warning.notStopped=Sua inst\u00e2ncia deve estar parada antes de tentar trocar sua senha atual +message.reset.VPN.connection=Favor confirmar que voc\u00ea deseja resetar a conex\u00e3o VPN +message.restart.mgmt.server=Reinicie o(s) servidor(es) de gerenciamento para que a nova configura\u00c3\u00a7\u00c3\u00a3o tenha efeito. +message.restart.mgmt.usage.server=Por favor reinicie seu servidor(es) de gerenciamento e seu servidor(es) de utiliza\u00e7\u00e3o para as mudan\u00e7as entrarem em efeito. +message.restart.network=Por favor confirme que voc\ufffd deseja reiniciar a rede +message.restart.vpc=Favor confirmar que voc\u00ea deseja reiniciar a VPC message.security.group.usage=(Use Ctrl-clique para selecionar todos os Security Groups) -message.snapshot.schedule=Você pode configurar Snapshots recorrentes agendados selecionando as opções disponíveis abaixo +message.select.a.zone=A zone tipicamente corresponde a um \u00fanico datacenter. M\u00faltiplas zonas auxiliam a cloud a ser mais confi\u00e1vel provendo isolamento f\u00edsico e redund\u00e2ncia. +message.select.instance=Por favor selecione uma inst\u00e2ncia. +message.select.iso=Por favor selecione um ISO para sua nova inst\u00e2ncia virtual +message.select.item=Por favor selecione um item. +message.select.security.groups=Por favor selecione o(s) grupo(s) de seguran\u00e7a para sua nova VM +message.select.template=Por favor selecione um template para sua nova inst\u00e2ncia virtual. +message.setup.physical.network.during.zone.creation.basic=Quando adicionar uma zona b\u00e1sica, voc\u00ea pode configurar uma rede f\u00edsica, que corresponde a uma NIC no hypervisor. A rede carrega diversos tipos de tr\u00e1fego.

Voc\u00ea pode adicionar e remover outros tipos de tr\u00e1fego na mesma interface de rede f\u00edsica. +message.setup.successful=Cloud configurada com sucesso\! +message.snapshot.schedule=Voc\u00ea pode configurar Snapshots recorrentes agendados selecionando as op\u00e7\u00f5es Dispon\u00edveis abaixo +message.specify.url=Por favor especifique a URL message.step.1.continue=Selecione o template ou ISO para continuar message.step.1.desc=Selecione o template para o novo Cloud Server. message.step.2.continue=Selecione o plano @@ -1490,30 +1377,59 @@ message.step.2.desc= message.step.3.continue=Seleciona a oferta de disco message.step.3.desc= message.step.4.continue=Selecione pelo menos uma rede para continuar -message.step.4.desc=Selecione a rede principal que seu Cloud Server será conectado. -message.update.os.preference=Escolha o SO de preferencia para este host. Todos Cloud Server com preferencias similares serão alocados neste host antes de tentar em outro. +message.step.4.desc=Selecione a rede principal que seu Cloud Server ser\u00e1 conectado. +message.suspend.project=Voc\u00ea tem certeza que deseja suspender este projeto ? +message.template.desc=Imagem de SO que pode ser utilizada para bootar VMs +message.tooltip.dns.2=Um servidor DNS secund\u00e1rio para ser utilizado pelas VMs nesta zona. Os endere\u00e7os IP p\u00fablicos nesta zona devem ter rota para este servidor. +message.tooltip.internal.dns.1=Nome de um servidor DNS que ser\u00e1 utilizado pelas VMs internas de sistema do CloudStack nesta zona. Os endere\u00e7os privados dos pods devem ter uma rota para este servidor. +message.tooltip.internal.dns.2=Nome de um servidor DNS que ser\u00e1 utilizado pelas VMs internas de sistema do CloudStack nesta zona. Os endere\u00e7os privados dos pods devem ter uma rota para este servidor. +message.tooltip.network.domain=Um sufixo DNS que ir\u00e1 criar um nome de dom\u00ednio customizado para a rede que \u00e9 acessada pelas guest VMs. +message.tooltip.pod.name=Um nome para este pod. +message.tooltip.reserved.system.gateway=O gateway para os hosts neste pod. +message.tooltip.reserved.system.netmask=O prefixo de rede que define a subrede deste pod. Utilize a nota\u00e7\u00e3o CIDR. +message.tooltip.zone.name=Um nome para a zona. +message.update.os.preference=Escolha o SO de preferencia para este host. Todos Cloud Server com preferencias similares ser\u00e3o alocados neste host antes de tentar em outro. +message.update.resource.count=Por favor confirme que voc\u00ea quer atualizar a contagem de recursos para esta conta. message.update.ssl=Envie o novo certificado SSL X.509 para ser atualizado em cada console proxy\: -message.virtual.network.desc=Rede virtual dedicado para sua conta. O domínio de broadcast está na VLAN e todo acesso a internet é roteado através do virtual router. -message.volume.create.template.confirm=Confirme se você deseja criar um template a partir deste disco. A criação do template pode levar alguns minutos ou mais dependendo do tamanho do disco. +message.validate.instance.name=Nomes de inst\u00e2ncias n\u00e3o podem ter mais de 63 caracteres. Somente letras ASCII a~z, A~Z, d\u00edgitos 0~9 e h\u00edfen s\u00e3o permitidos. Deve come\u00e7ar com uma letra e terminar com uma letra ou d\u00edgito. +message.virtual.network.desc=Rede virtual dedicado para sua conta. O Dom\u00ednio de broadcast Est\u00e1 na VLAN e todo acesso a internet \u00e9 roteado atrav\u00e9s do virtual router. +message.vm.create.template.confirm=Criar Template reiniciar\u00e1 a VM automaticamente. +message.vm.review.launch=Por favor revise a informa\u00e7\u00e3o abaixo e confirme que sua inst\u00e2ncia virtual est\u00e1 correta antes de executa-la. +message.volume.create.template.confirm=Confirme se voc\u00ea deseja criar um template a partir deste disco. A cria\u00e7\u00e3o do template pode levar alguns minutos ou mais dependendo do tamanho do disco. +message.you.must.have.at.least.one.physical.network=Voc\u00ea deve ter pelo menos uma rede f\u00edsica +message.Zone.creation.complete=Cria\u00e7\u00e3o de zona completa +message.zone.creation.complete.would.you.like.to.enable.this.zone=Cria\u00e7\u00e3o de zona completa. Voc\u00ea gostaria de habilitar esta zona? +message.zone.no.network.selection=A zona que voc\u00ea selecionou n\u00e3o possui nenhuma rede para ser escolhida. message.zone.step.1.desc=Seleciona o modelo de rede para a zona. -message.zone.step.2.desc=Entre a informação a seguir para adicionar uma nova zona -message.zone.step.3.desc=Entre a informação a seguir para adicionar um novo pod -message.apply.snapshot.policy=Você atualizou com sucesso sua política de Snapshot. -message.disable.snapshot.policy=Você desativou com sucesso sua política de Snapshot. -message.action.change.service.warning.for.instance=Para troca de plano é necessário parar o Cloud Server. -message.action.change.service.warning.for.router=O roteador precisa ser desligado antes de trocar o plano/tamanho. -message.action.reset.password.warning=Para recuperar a senha é necessário parar o Cloud Server. -message.action.reset.password.off=Seu Cloud Server não suporta esta funcionalidade. - -#Errors -error.login=Usuário ou senha inválido. -error.menu.select=Não foi possível realizar a ação pois nenhum item foi selecionado. -error.mgmt.server.inaccessible=O servidor de gerenciamento está inacessível. Tente novamente mais tarde. -error.session.expired=Sua sessão expirou. -error.unresolved.internet.name=Impossível resolver DNS -#resizeVolumes -label.resize.new.size=New Size(GB) -label.action.resize.volume=Resize Volume -label.action.resize.volume.processing=Resizing Volume.... -label.resize.new.offering.id=New Offering -label.resize.shrink.ok=Shrink OK +message.zone.step.2.desc=Entre a informa\u00e7\u00e3o a seguir para adicionar uma nova zona +message.zone.step.3.desc=Entre a informa\u00e7\u00e3o a seguir para adicionar um novo pod +message.zoneWizard.enable.local.storage=ALERTA\: se voc\u00ea habilitar storage local para esta zona, voc\u00ea deve fazer o seguinte, dependendo se voc\u00ea quiser que suas m\u00e1quinas virtuais de sistema inicializem\:

1. Se m\u00e1quinas virtuais de sistema precisam ser iniciadas em storage prim\u00e1ria, storage prim\u00e1ria precisa ser adicionada \u00e0 zona ap\u00f3s a cria\u00e7\u00e3o. Voc\u00ea tamb\u00e9m deve ativar a zona em um estado desabilitado.

2. Se m\u00e1quinas virtuais de sistema precisam ser iniciadas em storage local, system.vm.use.local.storage precisa ser estabelecida como verdadeira antes de voc\u00ea habilitar a zona.


Voc\u00ea quer continuar? +mode=Modo +network.rate=Taxa de Transfer\u00eancia +notification.reboot.instance=Reiniciar inst\u00e2ncia +notification.start.instance=Iniciar inst\u00e3ncia +notification.stop.instance=Parar inst\u00e2ncia +side.by.side=Lado a Lado +state.Accepted=Aceito +state.Active=Ativo +state.Allocated=Alocado +state.Allocating=Alocando +state.Completed=Completo +state.Creating=Criando +state.Declined=Recusado +state.Destroyed=Destru\u00eddo +state.Disabled=Desativado +state.enabled=Habilitado +state.Enabled=Habilitado +state.Error=Erro +state.Migrating=Migrando +state.Pending=Pendente +state.ready=Pronto +state.Ready=Pronto +state.Running=Executando +state.Starting=Iniciando +state.Stopped=Parado +state.Stopping=Parando +state.Suspended=Suspendido +ui.listView.filters.all=Todos +ui.listView.filters.mine=Meus diff --git a/client/WEB-INF/classes/resources/messages_ru_RU.properties b/client/WEB-INF/classes/resources/messages_ru_RU.properties index c6631192085..b28f6b69e6f 100644 --- a/client/WEB-INF/classes/resources/messages_ru_RU.properties +++ b/client/WEB-INF/classes/resources/messages_ru_RU.properties @@ -1,1521 +1,1371 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -#new labels (begin) ********************************************************************************************** -# label.isolation.uri=Isolation URI -# label.broadcast.uri=Broadcast URI -#new labels (end) ************************************************************************************************ - - -#modified labels (begin) ***************************************************************************************** -# 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\:

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.

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.


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=Включить физичеÑкую Ñеть -label.action.disable.physical.network=Отключить физичеÑкую Ñеть -message.action.enable.physical.network=Подтвердите, что вы дейÑтвительно хотите включить Ñту физичеÑкую Ñеть. -message.action.disable.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.site.to.site.VPN=site-to-site VPN -# 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=ТекÑÑ‚ домена Ñети -label.memory.mb=ПамÑÑ‚ÑŒ (в МБ) -label.cpu.mhz=CPU (в Мгц) - -message.action.remove.host=Удаление поÑледнего/единÑтвенного Ñервера в клаÑтере и Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð°Ñ ÐµÐ³Ð¾ уÑтановка приведет уничтожению рабочего окружениÑ/базы данных на Ñервере и Ñделае гоÑтевые машины непригодными к иÑпользованию. - -message.action.reboot.router=Подтвердите, что вы дейÑтвительно хотите перезагрузить Ñтот роутер. -message.action.stop.router=Подтвердите, что вы дейÑтвительно хотите оÑтановить Ñтот роутер. -message.restart.network=Подтвердите, что вы дейÑтвительно хотите перезапуÑтить Ñеть. - - -label.ipaddress=IP адреÑÑа -label.vcdcname=Ð˜Ð¼Ñ vCenter DC -label.vcipaddress=vCenter IP ÐдреÑÑ -label.vsmctrlvlanid=Управление VLAN ID -label.vsmpktvlanid=Пакет VLAN ID -label.vsmstoragevlanid=Хранение VLAN ID -label.nexusVswitch=Nexus Vswitch -label.action.delete.nexusVswitch=Удалить NexusVswitch -label.action.enable.nexusVswitch=Включить NexusVswitch -label.action.disable.nexusVswitch=Отключить NexusVswitch -label.action.list.nexusVswitch=ЛиÑÑ‚ NexusVswitch -message.action.delete.nexusVswitch=ПожалуйÑта, подтвердите, что вы хотите удалить Ñто nexusVswitch. -message.action.enable.nexusVswitch=ПожалуйÑта, подтвердите, что вы хотите включить Ñто nexusVswitch. -message.action.disable.nexusVswitch=ПожалуйÑта, подтвердите, что вы хотите отключить Ñту nexusVswitch. -message.specify.url=ПожалуйÑта, укажите URL -label.select.instance.to.attach.volume.to=Выбирите Ñервер Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±ÑŒÐµÐ¼Ð° -label.upload=Загрузить -label.upload.volume=Добавить объем -label.virtual.routers=Виртуальный роутер -label.primary.storage.count=Первичный архив Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ -label.secondary.storage.count=Вторичный архив Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ -label.number.of.system.vms=КоличеÑтво ÑиÑтемы виртуальных машин -label.number.of.virtual.routers=КоличеÑтво виртуальных маршрутизаторов -label.action.register.iso=РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ISO -label.isolation.method=Метод изолÑции -label.action.register.template=РегиÑÑ‚Ñ€Ð°Ñ†Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð° -label.checksum=Проверить MD5 Ñумму -label.vpn=VPN -label.vlan=VLAN - - -label.management.ips=Панель ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ IP адреÑÑами -label.devices=УÑтройÑтво -label.rules=Правила -label.traffic.label=Трафик -label.vm.state=Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ñервера -message.setup.physical.network.during.zone.creation.basic=При Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð² оÑновную зону, вы можите Ñоздать одну физичеÑкую Ñеть, ÐºÐ¾Ñ‚Ð¾Ñ€Ð°Ñ ÑоотвеÑтвует NIC на гипервизор. Сеть оÑущеÑтвлÑет неÑколько видов трафика.

Ð’Ñ‹ можете также перетаÑкивать drag and drop другие типы трафика на физичеÑкие Ñети. -label.domain.router=Машрутизатор -label.console.proxy=ПрокÑи -label.secondary.storage.vm=Вторичный файловый Ñервер -label.add.netScaler.device=Добавить Netscaler уÑтройÑтво -label.add.F5.device=Добавить F5 уÑтройво -label.add.SRX.device=Добавить SRX уÑтройÑтво -label.account.and.security.group=Ðккаунт, группы безопаÑноÑти -label.fetch.latest=Выборка поÑледних -label.system.offering=СиÑтема Ñ€Ð°Ð·Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ -message.validate.instance.name=Ð˜Ð¼Ñ Ñервера не может быть длинее 63 Ñимвола. Только ASCII, буквы a~z, A~Z, цыфры 0~9, Ð´ÐµÑ„Ð¸Ñ Ð½Ðµ допуÑкаетÑÑ. Должна начинатьÑÑ Ñ Ð±ÑƒÐºÐ²Ñ‹ и заканчиватьÑÑ Ð±ÑƒÐºÐ²Ð¾Ð¹ или цифрой. - - -label.isolated.networks=Изолированные Ñети -label.latest.events=ПоÑледнии ÑÐ¾Ð±Ñ‹Ñ‚Ð¸Ñ -state.Enabled=Включено -label.system.wide.capacity=ОбщеÑиÑтемного потенциала -label.network.service.providers=ПоÑтавщики Ñетевых Ñлужб -message.launch.zone=Зона готова к запуÑку, пожалуйÑта, перейдите к Ñледующему шагу. -error.unable.to.reach.management.server=Ðе удаетÑÑ Ð¿Ð¾Ð´ÐºÐ»ÑŽÑ‡Ð¸Ñ‚ÑŒÑÑ Ðº Ñерверу ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ -label.internal.name=Внутреннее Ð¸Ð¼Ñ -message.configure.all.traffic.types=У Ð²Ð°Ñ ÐµÑÑ‚ÑŒ неÑколько физичеÑких Ñетей, пожалуйÑта, наÑтроить метки Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ типа трафика, нажав на кнопку Изменить. -message.edit.traffic.type=ПожалуйÑта, укажите трафик метки вы хотите, ÑвÑзанных Ñ Ñтим типом трафика. -label.edit.traffic.type=Изменить тип трафика -label.label=Метка -label.max.networks=МакÑимум Ñетей -error.invalid.username.password=Ðеправильній логин или пароль -message.enabling.security.group.provider=Включение поÑтавщика заÑищеной Ñети -message.adding.Netscaler.provider=Добавить Netscaler -message.creating.guest.network=Создать гоÑтевую Ñеть -label.action.delete.physical.network=Удаление физичеÑкой Ñети -message.action.delete.physical.network=ПожалуйÑта, подтвердите, что вы хотите удалить Ñтот физичеÑкую Ñеть -message.installWizard.copy.whatIsAHost=Узел - Ñто отдельный компьютер. Узлы предоÑтавлÑÑŽÑ‚ вычиÑлительные реÑурÑÑ‹ Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка гоÑтевых виртуальных машин. Каждый узел Ñодержит гипервизор Ð´Ð»Ñ ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð’Ðœ (кроме узлов BareMetal, они ÑвлÑÑŽÑ‚ÑÑ Ð¸Ñключением из правил и раÑÑматриваетÑÑ Ð² раÑширенном руководÑтве по уÑтановке). Ðапример, Ñто Linux-Ñервер Ñ KVM, Ñервер Citrix XenServer или Ñервер ESXI. При проÑтой уÑтановке вы можете иÑпользовать один узел Ñ XenServer.

Узел - Ñто Ð½Ð°Ð¸Ð¼ÐµÐ½ÑŒÑˆÐ°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð° в платформе CloudStack&\#8482;, далее узлы раÑпологаютÑÑ Ð² клаÑтерах, клаÑтеры - в Ñтендах, Ñтенды - в зонах. - - -label.add.compute.offering=Добавить вычиÑÐ»ÐµÐ½Ð¸Ñ Ð¿Ñ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ðµ -label.compute.offering=ВычиÑлить предложение -label.compute.offerings=ВычиÑлить предложений -label.select.offering=Выберите предложение -label.menu.infrastructure=ИнфорÑтруктура -label.sticky.tablesize=Размер таблицы -label.sticky.expire=ИÑтекает -label.sticky.cookie-name=Cookie Ð¸Ð¼Ñ -label.sticky.mode=Режим -label.sticky.length=Длина -label.sticky.holdtime=Ð²Ñ€ÐµÐ¼Ñ ÑƒÐ´ÐµÑ€Ð¶Ð°Ð½Ð¸Ñ -label.sticky.request-learn=ТребуетÑÑ Ð¸Ð·ÑƒÑ‡ÐµÐ½Ð¸Ðµ. -label.sticky.prefix=ÐŸÑ€ÐµÑ„Ð¸ÐºÑ -label.sticky.nocache=Ðет кÑша -label.sticky.indirect=КоÑвенный -label.sticky.postonly=Сообщение только -label.sticky.domain=Домен -state.Allocating=Выделение -state.Migrating=Мигрирующий -error.please.specify.physical.network.tags=Сеть предложений не доÑтупна, пока вы указать теги Ð´Ð»Ñ Ñтого физичеÑкой Ñети. - - -state.Stopping=ОÑтановить -message.add.load.balancer.under.ip=Правило баланÑировки нагрузки был добавлен в IP\: -message.select.instance=ПожалуйÑта, выберите Ñервер. -label.select=Выбрать -label.select.vm.for.static.nat=Выбор VM Ð´Ð»Ñ NAT -label.select.instance=Выбирите Ñервер -label.nat.port.range=NAT диапазон портов -label.static.nat.vm.details=СтатиÑтика NAT виртуальных машин -label.edit.lb.rule=Редактировать LB правила -message.migrate.instance.to.host=Подтвердите, что вы дейÑтвительно хотите перенеÑти машину на другой узел. -label.migrate.instance.to.host=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð¼Ð°ÑˆÐ¸Ð½Ñ‹ на другой узел -message.migrate.instance.to.ps=Подтвердите, что вы дейÑтвительно хотите перенеÑти машину на другое оÑновное хранилище. -label.migrate.instance.to.ps=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð¼Ð°ÑˆÐ¸Ð½Ñ‹ на другое оÑновное хранилище -label.corrections.saved=Ð˜Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñохранены -message.installWizard.copy.whatIsSecondaryStorage=Дополнительное хранилище привÑзано к зоне и Ñодержит Ñледующее\:
  • Шаблоны - образы ОС, которые можно иÑпользовать Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ Ð’Ðœ и Ñодержащие дополнительную информацию, такую как уÑтановленные приложениÑ.
  • Образы ISO - Ñто загрузочные или незагрузочные образы ОС
  • Снимки диÑковых томов - Ñохраненные копии данных Ð’Ðœ, которых можно иÑпользовать Ð´Ð»Ñ Ð²Ð¾ÑÑÑ‚Ð°Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ… или Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ шаблона
-message.installWizard.copy.whatIsPrimaryStorage=CloudStack&\#8482; - Ñто Ð¾Ð±Ð»Ð°Ñ‡Ð½Ð°Ñ Ð¿Ð»Ð°Ñ‚Ñ„Ð¾Ñ€Ð¼Ð°, иÑÐ¿Ð¾Ð»ÑŒÐ·ÑƒÑŽÑ‰Ð°Ñ Ð´Ð²Ð° типа хранилища\: оÑновное и дополнительное. Ð’ качеÑтве хранилищ можно иÑпользовать iSCSI или NFS-Ñервер, а также локальный диÑк.

ОÑновное хранилище привÑзано к клаÑтеру и Ñодержит диÑковые тома каждой Ð’Ðœ, запущенной в узлах Ñтого клаÑтера. Как правило, оÑновное хранилище размещаетÑÑ Ð² Ñамих узлах. -message.installWizard.copy.whatIsACluster=КлаÑтер предоÑтавлÑет группы узлов. Узлы в клаÑтере имеют одинаковое оборудование, запущены в одинаковом гипервизере, находÑÑ‚ÑÑ Ð² одной подÑети и имеют доÑтуп к одному и тому же общему хранилищу. Виртуальные машины могут быть перенеÑены "вживую" Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ узла на другой в пределах клаÑтера, без оÑтановки Ñлужб пользователем. КлаÑтер - Ñ‚Ñ€ÐµÑ‚ÑŒÑ Ð¿Ð¾ размерноÑти единица в платформе CloudStack&\#8482;. КлаÑтеры раÑпоогаютÑÑ Ð² Ñтендах, а Ñтенды - в зонах.

CloudStack&\#8482; разрешает иÑпользовать неÑколько клаÑтеров, но при проÑтой уÑтановке Ñта возможноÑÑ‚ÑŒ отÑутÑтвует. -message.installWizard.copy.whatIsAPod=Стенд, как правило, предоÑтавлÑет одну Ñтойку Ñ Ð¼Ð°ÑˆÐ¸Ð½Ð°Ð¼Ð¸. Узлы в одном Ñтенде раÑположены в одной подÑети.

Стенд - Ð²Ñ‚Ð¾Ñ€Ð°Ñ Ð¿Ð¾ размерноÑти единица в платформе CloudStack&\#8482;. Стенды раÑпологаютÑÑ Ð² зонах. ÐšÐ°Ð¶Ð´Ð°Ñ Ð·Ð¾Ð½Ð° может Ñодержать неÑколько Ñтендов, но при проÑтой уÑтановке в зоне можно Ñоздать лишь один Ñтенд. -message.installWizard.copy.whatIsAZone=Зона - Ñто наиболее ÐºÑ€ÑƒÐ¿Ð½Ð°Ñ Ð¾Ñ€Ð³Ð°Ð½Ð¸Ð·Ð°Ñ†Ð¸Ð¾Ð½Ð½Ð°Ñ ÐµÐ´Ð¸Ð½Ð¸Ñ†Ð° в платформе CloudStack&\#8482;. Зона обычно ÑоответÑтвует единичному ЦОД, Ñ…Ð¾Ñ‚Ñ Ð¸Ð¼ÐµÐµÑ‚ÑÑ Ð²Ð¾Ð·Ð¼Ð¾Ð¶Ð½Ð¾ÑÑ‚ÑŒ иÑпользовать неÑколько зон в пределах одного ЦОД. ОÑновным преимущеÑтвом поÑÑ‚Ñ€Ð¾ÐµÐ½Ð¸Ñ Ð¸Ð½Ñ„Ñ€Ð°Ñтруктуры Ñ Ð¸Ñпользование зон ÑвлÑетÑÑ Ð¾Ð±ÐµÑпечение Ð¸Ð·Ð¾Ð»Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¸ избыточноÑти. Ðапример, ÐºÐ°Ð¶Ð´Ð°Ñ Ð·Ð¾Ð½Ð° может иметь Ñвой блок Ð¿Ð¸Ñ‚Ð°Ð½Ð¸Ñ Ð¸ Ñеть, а Ñами зоны могут широко раÑположены географичеÑки. -message.installWizard.copy.whatIsCloudStack=CloudStack&\#8482 - Ñто Ð¿Ñ€Ð¾Ð³Ñ€Ð°Ð¼Ð¼Ð½Ð°Ñ Ð¿Ð»Ð°Ñ„Ñ‚Ð¾Ñ€Ð¼Ð° Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð¿ÑƒÐ±Ð»Ð¸Ñ‡Ð½Ñ‹Ñ…, чаÑтных и гибридных облаков по Ñхеме «ИнфраÑтруктура как ÑервиÑ» (IaaS). CloudStack&\#8482 управлÑет Ñетью, хранилищем и вычиÑлительными узлами, входÑщие в облачную инфраÑтруктуру. Главным образом, CloudStack&\#8482 иÑпользуетÑÑ Ð´Ð»Ñ Ñ€Ð°Ð·Ð²ÐµÑ€Ñ‚Ñ‹Ð²Ð°Ð½Ð¸Ñ, ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¸ наÑтройкой Ñложных облачных решений.

CloudStack&\#8482 реализует предоÑтавление как уÑлуги целого центра обработки данных Ñ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ñ‹Ð¼Ð¸ компонентами Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ñложных инфраÑтруктур на оÑнове облака. Мы можете выбрать между Ñвободной и БезнеÑ-верÑиÑми, которые почти ничем не отличаютÑÑ. -message.installWizard.tooltip.addSecondaryStorage.path=Путь ÑкÑпорта, раÑположенный на вышеуказанном Ñервере. -message.installWizard.tooltip.addSecondaryStorage.nfsServer=IP-Ð°Ð´Ñ€ÐµÑ Ñервера NFS, где находитÑÑ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ðµ хранилище -message.installWizard.tooltip.addPrimaryStorage.path=(Ð´Ð»Ñ NFS) Ð’ NFS Ñто путь Ñкпорта Ñервера. Путь (Ð´Ð»Ñ ÐžÑ‚ÐºÑ€Ñ‹Ñ‚Ð¾Ð¹Ð¢Ð¾Ñ‡ÐºÐ¸Ð”Ð¾Ñтупа). Ð’ KVM Ñто путь Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð³Ð¾ узла, который указывает раÑположение оÑновного хранилища. Ðапример, "/mnt/primary". -message.installWizard.tooltip.addPrimaryStorage.server=(Ð´Ð»Ñ NFS, iSCSI или PreSetup) IP-Ð°Ð´Ñ€ÐµÑ Ð¸Ð»Ð¸ Ð¸Ð¼Ñ DNS уÑтройÑтва хранилища. -message.installWizard.tooltip.addPrimaryStorage.name=Ð˜Ð¼Ñ ÑƒÑтройÑтва хранилища. -message.installWizard.tooltip.addHost.password=Этот пароль Ð´Ð»Ñ Ð²Ñ‹ÑˆÐµÑƒÐºÐ°Ð·Ð°Ð½Ð½Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ (Ñ Ð²Ð°ÑˆÐµÐ³Ð¾ XenServer) -message.installWizard.tooltip.addHost.username=Обычно root. -message.installWizard.tooltip.addHost.hostname=Ð˜Ð¼Ñ DNS или IP-Ð°Ð´Ñ€ÐµÑ ÑƒÐ·Ð»Ð°. -message.installWizard.tooltip.addCluster.name=Ð˜Ð¼Ñ ÐºÐ»Ð°Ñтера. Ð’Ñ‹ можете Ñами выбрать имÑ, не иÑпользуемый Cloudstack. -message.installWizard.tooltip.addPod.reservedSystemEndIp=Это диапазон IP чаÑтной Ñети, который иÑпользуетÑÑ CloudStack Ð´Ð»Ñ Ð’Ðœ дополнительного хранилища и конÑольного прокÑи. Эти адреÑа получаютÑÑ Ð¸Ð· Ñети вычиÑлительных Ñерверов. -message.installWizard.tooltip.addPod.reservedSystemStartIp=Это диапазон IP чаÑтной Ñети, который иÑпользуетÑÑ CloudStack Ð´Ð»Ñ Ð’Ðœ дополнительного хранилища и конÑольного прокÑи. Эти адреÑа получаютÑÑ Ð¸Ð· Ñети вычиÑлительных Ñерверов. -message.installWizard.tooltip.addPod.reservedSystemNetmask=Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¼Ð°Ñка подÑети Ð´Ð»Ñ Ð³Ð¾Ñтей. -message.installWizard.tooltip.addPod.reservedSystemGateway=Шлюз Ð´Ð»Ñ ÑƒÐ·Ð»Ð¾Ð² Ñтого Ñтенда. -message.installWizard.tooltip.addPod.name=Ð˜Ð¼Ñ Ñтенда -message.installWizard.tooltip.configureGuestTraffic.guestEndIp=Диапазон IP-адреÑов, которые будут доÑтупны Ð´Ð»Ñ Ð³Ð¾Ñтей Ñтой зоны. При иÑпользовании одного Ñетевого уÑтройÑтва (NIC) Ñти адреÑа должны быть в подÑети (CIDR) Ñтенда. -message.installWizard.tooltip.configureGuestTraffic.guestStartIp=Диапазон IP-адреÑов, которые будут доÑтупны Ð´Ð»Ñ Ð³Ð¾Ñтей Ñтой зоны. При иÑпользовании одного Ñетевого уÑтройÑтва (NIC) Ñти адреÑа должны быть в подÑети (CIDR) Ñтенда. -message.installWizard.tooltip.configureGuestTraffic.guestNetmask=Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¼Ð°Ñка подÑети Ð´Ð»Ñ Ð³Ð¾Ñтей. -message.installWizard.tooltip.configureGuestTraffic.guestGateway=Шлюз Ð´Ð»Ñ Ð³Ð¾ÑÑ‚Ñми -message.installWizard.tooltip.configureGuestTraffic.description=ОпиÑание Ñтой Ñети -message.installWizard.tooltip.configureGuestTraffic.name=Ð˜Ð¼Ñ Ñтой Ñети -message.installWizard.tooltip.addZone.internaldns2=Это cерверы DNS Ð´Ð»Ñ ÑиÑтемных Ð’Ðœ Ñтой зоны. Эти Ñерверы будут доÑтупны через чаÑтный Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ ÑиÑтемной Ð’Ðœ. ЧаÑтный IP-адреÑ, предоÑтавленный в Ñтенде, должен иметь маршрут к Ñтим Ñерверам DNS. -message.installWizard.tooltip.addZone.internaldns1=Это cерверы DNS Ð´Ð»Ñ ÑиÑтемных Ð’Ðœ Ñтой зоны. Эти Ñерверы будут доÑтупны через чаÑтный Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ ÑиÑтемной Ð’Ðœ. ЧаÑтный IP-адреÑ, предоÑтавленный в Ñтенде, должен иметь маршрут к Ñтим Ñерверам DNS. -message.installWizard.tooltip.addZone.dns2=Это cерверы DNS Ð´Ð»Ñ Ð³Ð¾Ñтевых Ð’Ðœ Ñтой зоны. Эти Ñерверы будут доÑтупны через публичный интерфейÑ, который вы добавите позже. Публичные IP-адреÑа, предоÑтавленные в зоне, должны иметь маршрут к Ñтим Ñерверам DNS. -message.installWizard.tooltip.addZone.name=Ð˜Ð¼Ñ Ð·Ð¾Ð½Ñ‹ -message.installWizard.tooltip.addZone.dns1=Это cерверы DNS Ð´Ð»Ñ Ð³Ð¾Ñтевых Ð’Ðœ Ñтой зоны. Эти Ñерверы будут доÑтупны через публичный интерфейÑ, который вы добавите позже. Публичные IP-адреÑа, предоÑтавленные в зоне, должны иметь маршрут к Ñтим Ñерверам DNS. -message.setup.successful=ÐаÑтройка облака завершена\! -label.may.continue=Ð’Ñ‹ можете продолжить. -error.installWizard.message=Что-то не так. ВернитеÑÑŒ назад и иÑправьте ошибки. -message.installWizard.now.building=Ваше облако ÑоздаётÑÑ... -message.installWizard.click.retry=Кликните, чтобы повторить запуÑк. -label.launch=ЗапуÑк -label.installWizard.click.launch=Кликните на кнопку запуÑка -label.congratulations=ПоздравлÑем\! -label.installWizard.addSecondaryStorageIntro.subtitle=Что такое "Дополнительное хранилище"? -label.installWizard.addSecondaryStorageIntro.title=Давайте добавим допольнительное хранилище. -label.installWizard.addPrimaryStorageIntro.subtitle=Что такое "ОÑновное хранилище"? -label.installWizard.addPrimaryStorageIntro.title=Давайте добавим оÑновное хранилище -label.installWizard.addHostIntro.subtitle=Что такое "Узел"? -label.installWizard.addHostIntro.title=Давайте добавим узел -label.installWizard.addClusterIntro.subtitle=Что такое "КлаÑтер"? -label.installWizard.addClusterIntro.title=Давайте добавим клаÑтер -label.installWizard.addPodIntro.subtitle=Что такое "Стенд"? -label.installWizard.addPodIntro.title=Давайте добавим Ñтенд -label.installWizard.addZone.title=Добавить зону -label.installWizard.addZoneIntro.subtitle=Что такое "Зона"? -label.installWizard.addZoneIntro.title=Давайте добавим зону -error.password.not.match=Пароли не Ñовпадают -label.confirm.password=Подтвердите пароль -message.change.password=Измените ваш пароль. -label.save.and.continue=Сохранить и продолжить -label.skip.guide=Я уже великий маÑтер CloudStack, пропуÑтить Ñто руководÑтво -label.continue.basic.install=Продолжить проÑтую уÑтановку -label.introduction.to.cloudstack=Введение в CloudStack -label.what.is.cloudstack=Что такое CloudStack? -label.hints=ПодÑказки -label.installWizard.subtitle=Это руководÑтво наÑтроит ваш CloudStack. -label.continue=Продолжить -label.installWizard.title=ЗдравÑтвуйте и добро пожаловать в CloudStack\! -label.agree=СоглаÑен -label.manage.resources=Управление реÑурÑами -label.port.forwarding.policies=Политики проброÑа портов -label.load.balancing.policies=Политики баланÑировки нагрузки -label.networking.and.security=Сеть и безопаÑноÑÑ‚ÑŒ -label.bandwidth=ПропуÑÐºÐ½Ð°Ñ ÑпоÑобноÑÑ‚ÑŒ -label.virtual.machines=Виртуальные машины -label.compute.and.storage=ВычиÑÐ»ÐµÐ½Ð¸Ñ Ð¸ хранилище -label.task.completed=Задача выполнена -label.update.project.resources=Обновить реÑурÑÑ‹ проекта -label.remove.project.account=Удалить учетную запиÑÑŒ проекта -label.item.listing=СпиÑок Ñлементов -message.select.item=Выберите Ñлемент -label.removing=Удаление -label.invite=ПриглаÑить -label.add.by=Добавить -label.max.vms=МакÑ. количеÑтво пользовательÑких Ð’Ðœ -label.max.public.ips=МакÑ. публичных IP -label.max.volumes=МакÑ. томов -label.max.snapshots=МакÑ. Ñнимков -label.max.templates=МакÑ. шаблонов -# label.max.vpcs=Max. VPCs -label.project.dashboard=Панель проекта -label.remind.later=Предупредить позже -label.invited.accounts=Приглашённые учетные запиÑи -label.invite.to=ПриглаÑить -label.add.accounts.to=Добавить учётные запиÑи -label.add.accounts=Добавить аккаунты -label.project.name=Ð˜Ð¼Ñ Ð¿Ñ€Ð¾ÐµÐºÑ‚Ð° -label.create.project=Создать проект -label.networks=Сети -label.launch.vm=ЗапуÑк Ð’Ðœ -label.new.vm=ÐÐ¾Ð²Ð°Ñ Ð’Ðœ -label.previous=Предыдущий -label.add.to.group=Добавить в группу -message.vm.review.launch=Проверьте Ñледующую информацию и удоÑтоверьтеÑÑŒ в том, что ваша машина наÑтроена правильно. -message.select.security.groups=Выберите группу/группы безопаÑноÑти Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ Ð’Ðœ -label.new=Создать -message.please.select.networks=Выберите Ñети Ð´Ð»Ñ Ð²Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð¾Ð¹ машины -message.please.proceed=Перейдите к Ñледующему шагу -message.zone.no.network.selection=Ð’Ñ‹Ð±Ñ€Ð°Ð½Ð½Ð°Ñ Ð·Ð¾Ð½Ð° не имеет вариантов Ð´Ð»Ñ Ð²Ñ‹Ð±Ð¾Ñ€Ð° Ñети. -label.no.thanks=Ðет, ÑпаÑибо -label.my.templates=Мои шаблоны -message.select.template=Выберите шаблон Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ Ð’Ðœ -message.select.iso=Выберите образ ISO Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð¹ Ð’Ðœ -message.template.desc=Образ ОС, который можно иÑпользовать в качеÑтве загрузочной в Ð’Ðœ -message.iso.desc=Образ диÑка Ñодержит загрузочные или незагрузочные данные Ð´Ð»Ñ ÐžÐ¡. -label.select.iso.or.template=Выберите ISO или шаблон -message.select.a.zone=Зона обычно ÑоответÑтвует единичному центру обработки данных. ÐеÑколько зоныпомогают Ñоздавать более надежные облака, обеÑÐ¿ÐµÑ‡Ð¸Ð²Ð°Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑкую изолÑцию и избыточноÑÑ‚ÑŒ. -label.select.a.zone=Выберите зону -label.review=Обзор -label.select.a.template=Выберите шаблон -label.setup=ÐаÑтройка -state.Allocated=РаÑпределено -changed.item.properties=Параметры Ñлемента изменены -label.apply=Применить -label.default=По умолчанию -label.viewing=ПроÑмотр -label.move.to.top=ПеремеÑтить на Ñамый верх -label.move.up.row=ПеремеÑтить на одну Ñтроку выше -label.move.down.row=ПеремеÑтить на одну Ñтроку ниже -# label.move.to.bottom=Move to bottom -label.drag.new.position=ПеремеÑтить на новую позицию -label.order=Очередь -label.no.data=Ðет информации Ð´Ð»Ñ Ð¿Ð¾ÐºÐ°Ð·Ð° -label.change.value=Изменить значение -label.clear.list=ОчиÑтить ÑпиÑок -label.full.path=Полный путь -message.add.domain=Укажите поддомен, где вы хотите Ñоздать ваш домен -message.delete.user=Подтвердите, что вы дейÑтвительно хотите удалить Ñтого пользователÑ. -message.enable.user=Подтвердите, что вы дейÑтвительно хотите включить Ñтого пользователÑ. -message.disable.user=Подтвердите, что вы дейÑтвительно хотите выключить Ñтого пользователÑ. -message.generate.keys=Подтвердите, что вы дейÑтвительно хотите Ñоздать новые ключи Ð´Ð»Ñ Ñтого пользователÑ. -message.update.resource.count=Подтвердите, что вы дейÑтвительно хотите обновить Ñчетчик реÑурÑов Ð´Ð»Ñ Ñтого аккаунта. -message.edit.account=Редактировать (значение "-1" показывает отÑутÑтвие пределов Ð´Ð»Ñ Ñ€ÐµÑурÑа) -label.total.of.vm=Ð’Ñего Ð’Ðœ -label.total.of.ip=Ð’Ñего IP-адреÑов -state.enabled=Включено -message.action.download.iso=Подтвердите, что вы дейÑтвительно хотите загрузить Ñтот ISO. -message.action.download.template=Подтвердите, что вы дейÑтвительно хотите загрузить Ñтот шаблон. -label.destination.zone=Ð¦ÐµÐ»ÐµÐ²Ð°Ñ Ð·Ð¾Ð½Ð° -label.keyboard.type=Тип клавиатуры -label.nic.adapter.type=Тип Ñетевой карты (NIC) -label.root.disk.controller=Контроллер корневого диÑка -label.community=СообщеÑтво -label.remove.egress.rule=Удалить выходное правило -label.add.egress.rule=Добавить выходное правило -label.egress.rule=Выходное правило -label.remove.ingress.rule=Удалить входное правило -label.delete.vpn.user=Удалить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ VPN -label.add.vpn.user=Добавить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ VPN -label.remove.pf=Удалить правило проброÑа порта -label.remove.vm.from.lb=Удалить Ð’Ðœ Ñ Ð¿Ñ€Ð°Ð²Ð¸Ð»Ð° баланÑировки нагрузки -label.add.vms.to.lb=Добавить Ð’Ðœ в правило баланÑировки нагрузки -label.add.vm=Добавить Ð’Ðœ -label.remove.static.nat.rule=Удалить правило Ñтатичного NAT -label.remove.rule=Удалить правило -label.add.static.nat.rule=Добавить правило Ñтатичного NAT -label.add.rule=Добавить правило -label.configuration=ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ -message.disable.vpn=Ð’Ñ‹ дейÑтвительно хотите выключить VPN? -label.disable.vpn=Выключить VPN -message.enable.vpn=Подтвердите, что вы дейÑтвительно хотите открыть доÑтуп к VPN Ð´Ð»Ñ Ñтого IP-адреÑа. -label.enable.vpn=Включить VPN -message.acquire.new.ip=Подтвердите, что вы дейÑтвительно хотите получить "белый" IP Ð´Ð»Ñ Ñтой Ñети. -label.elastic=Гибкий -label.my.network=ÐœÐ¾Ñ Ñеть -label.add.vms=Добавить Ð’Ðœ -label.configure=ÐаÑтроить -label.stickiness=Липкий -label.source=ИÑточник -label.least.connections=Least connections -label.round.robin=Round-robin -label.restart.required=ТребуетÑÑ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑк -label.clean.up=ОчиÑтить -label.restart.network=ПерезапуÑтить Ñеть -label.edit.network.details=Редактировать детали Ñети -label.add.guest.network=Добавить гоÑтевую Ñеть -label.guest.networks=ГоÑтевые Ñети -message.ip.address.changed=Ваши IP-адреÑа могли быть изменены, хотите обновить ÑпиÑок адреÑов? Помните, что в Ñтом Ñлучае облаÑÑ‚ÑŒ деталей будет закрыта. -state.BackingUp=Резервное копирование -state.BackedUp=Зарезервировано -label.done=Готово -label.vm.name=Ð˜Ð¼Ñ VM -message.migrate.volume=Подтвердите, что вы дейÑтвительно хотите перенеÑти том в другое оÑновное хранилище. -label.migrate.volume=ПеренеÑти том в другое оÑновное хранилище -message.create.template=Ð’Ñ‹ дейÑтвительно хотите Ñоздать шаблонн? -label.create.template=Создать шаблон -message.download.volume.confirm=Подтвердите, что вы дейÑтвительно загрузить Ñтот том -message.detach.disk=Ð’Ñ‹ дейÑтвительно хотите приÑоединить Ñтот диÑк? -state.ready=Готов -state.Ready=Готов -label.vm.display.name=Отображаемое Ð¸Ð¼Ñ Ð’Ðœ -label.select-view=Выберите вид -label.local.storage=Локальное хранилище -label.direct.ips=ПрÑмые IP-адреÑа -label.view.all=ПроÑмотреть вÑÑ‘ -label.zone.details=ПодробноÑти зоны -message.alert.state.detected=Обнаружен Ñигнал тревоги -state.Starting=ЗапуÑкаетÑÑ -state.Expunging=Удалён -state.Creating=СоздаетÑÑ -message.decline.invitation=Подтвердите, что вы хотите отменить приглашение на проект. -label.decline.invitation=Отменить приглашение -message.confirm.join.project=Подтвердите приÑоединение к проекту. -message.join.project=Теперь вы приÑоединены к проекту. Выберите "Проектный вид" Ð´Ð»Ñ Ð¿Ñ€Ð¾Ñмотра проекта. -label.accept.project.invitation=ПринÑÑ‚ÑŒ приглашение на проект -label.token=Талон -label.project.id=ID проекта -message.enter.token=Введите ключ, который вы получили в приглаÑительном пиÑьме -label.enter.token=Введите талон -state.Accepted=ПринÑто -state.Pending=ОжидаетÑÑ -state.Completed=Завершено -state.Declined=Отклонено -label.project=Проект -label.invitations=ÐŸÑ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ -label.delete.project=Удалить проект -message.delete.project=Ð’Ñ‹ дейÑтвительно хотите удалить Ñтот проект? -message.activate.project=Ð’Ñ‹ дейÑтвительно хотите запуÑтить Ñтот проект? -label.activate.project=ЗапуÑтить проект -label.suspend.project=ПриоÑтановить проект -message.suspend.project=Ð’Ñ‹ дейÑтвительно хотите приоÑтановить проект? -state.Suspended=ПриоÑтановлено -label.edit.project.details=Редактировать детали проекта -label.new.project=Ðовый проект -state.Active=Включен -state.Disabled=Выключен -label.projects=Проекты -label.make.project.owner=Сделать аккаунт владельцем проекта -label.remove.project.account=Удалить учетную запиÑÑŒ проекта -message.project.invite.sent=Приглашение было отправлено пользователю; он будет добавлен в проект поÑле Ð¿Ð¾Ð´Ñ‚Ð²ÐµÑ€Ð¶Ð´ÐµÐ½Ð¸Ñ Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ. -label.add.account.to.project=Добавить аккаунт в проект -label.revoke.project.invite=Отозвать приглашение -label.project.invite=ПриглаÑить в проект -label.select.project=Выберите проект -message.no.projects=У Ð²Ð°Ñ Ð½ÐµÑ‚ проектов.
Создайте новый проект в Ñекции "Проекты" -message.no.projects.adminOnly=У Ð²Ð°Ñ Ð½ÐµÑ‚ проектовю
ОбратитеÑÑŒ к вашему админиÑтратору Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ проекта. -message.pending.projects.1=Ð’ ожидании Ñледующие приглашениÑ\: -message.pending.projects.2=Ð”Ð»Ñ Ð¿Ñ€Ð¾Ñмотра перейдите к раздел проектов, далее выберите Ð¿Ñ€Ð¸Ð³Ð»Ð°ÑˆÐµÐ½Ð¸Ñ Ð¸Ð· выпадающего меню. -message.instanceWizard.noTemplates=Ð’Ñ‹ не имеете доÑтупных шаблонов; Ð´Ð»Ñ Ð¿ÐµÑ€ÐµÐ·Ð°Ð¿ÑƒÑка машины добавьте ÑовмеÑтивый шаблон. -label.view=Вид -instances.actions.reboot.label=Перезагрузить машину -label.filterBy=Фильтровать -label.ok=OK -notification.reboot.instance=Перезагрузить машину -notification.start.instance=ЗапуÑтить машину -notification.stop.instance=ОÑтановить машину -label.display.name=Отображаемое Ð¸Ð¼Ñ -label.zone.name=Ð˜Ð¼Ñ Ð·Ð¾Ð½Ñ‹ -ui.listView.filters.all=Ð’Ñе -ui.listView.filters.mine=Mine -state.Running=Запущено -state.Stopped=ОÑтановлено -state.Destroyed=Уничтожено -state.Error=Ошибка -message.reset.password.warning.notPasswordEnabled=Шаблон Ð´Ð»Ñ Ñтой машины Ñоздан без иÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ -message.reset.password.warning.notStopped=Ð”Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ Ð½ÐµÐ¾Ð±Ñ…Ð¾Ð´Ð¸Ð¼Ð¾ оÑтановить машину -label.notifications=ÐžÐ¿Ð¾Ð²ÐµÑ‰ÐµÐ½Ð¸Ñ -label.default.view=Стандартный вид -label.project.view=Проектный вид - -message.add.system.service.offering=Дополните Ñледующую информацию Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ реÑурÑа Ð´Ð»Ñ ÑиÑтемных Ñлужб. -message.action.delete.system.service.offering=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот реÑÑƒÑ€Ñ Ð´Ð»Ñ ÑиÑтемных Ñлужб. -label.action.delete.system.service.offering=Удалить ÑиÑтемный реÑÑƒÑ€Ñ -label.hypervisor.capabilities=ВозможноÑти гипервизора -label.hypervisor.version=ВерÑÐ¸Ñ Ð³Ð¸Ð¿ÐµÑ€Ð²Ð¸Ð·Ð¾Ñ€Ð° -label.max.guest.limit=Предел количеÑтва гоÑтей -label.add.network.offering=Добавить Ñетевой реÑÑƒÑ€Ñ -label.supported.services=Поддерживаемые Ñлужбы -label.service.capabilities=ВозможноÑти Ñлужбы -label.guest.type=Тип гоÑÑ‚Ñ -label.specify.IP.ranges=Укажите диапазон IP-адреÑов -label.conserve.mode=Экономичный режим -label.created.by.system=Создано ÑиÑтемой -label.menu.system.service.offerings=СиÑтемные реÑурÑÑ‹ -label.add.system.service.offering=Добавить ÑиÑтемный реÑÑƒÑ€Ñ -label.redundant.router.capability=ВозможноÑти резервного роутера -label.supported.source.NAT.type=Поддерживаемые типы NAT-иÑточника -label.elastic.LB=Гибкий LB -label.LB.isolation=ИзолÑÑ†Ð¸Ñ LB -label.elastic.IP=Гибкий IP -label.network.label.display.for.blank.value=ИÑп. оÑновной шлюз -label.xen.traffic.label=Метка трафика XenServer -label.kvm.traffic.label=Метка трафика KVM -label.vmware.traffic.label=Метка трафика VMware -label.start.IP=Ðачальный IP -label.end.IP=Конечный IP -label.remove.ip.range=Удалить диапазон IP -label.ip.ranges=Диапазоны IP -label.start.vlan=Ðачальный VLAN -label.end.vlan=Конечный VLAN -label.broadcast.domain.range=Диапазон широковещательного домена -label.compute=ВычиÑление -message.add.guest.network=Подтвердите, что вы дейÑтвительно хотите добавить гоÑтевую Ñеть -label.subdomain.access=ДоÑтуп к поддомену -label.guest.start.ip=Ðачальный гоÑтевой IP -label.guest.end.ip=Конечный гоÑтевой IP. -label.virtual.router=Виртуальный роутер -label.physical.network.ID=ID физичеÑкой Ñети -label.destination.physical.network.id=ID целевой физичеÑкой Ñети -label.dhcp=DHCP -label.destroy.router=Удалить роутер -message.confirm.destroy.router=Подтвердите, что вы дейÑтвительно хотите удалить роутер -label.change.service.offering=Изменить Ñлужебный реÑÑƒÑ€Ñ -label.view.console=Показать конÑоль -label.redundant.state=СоÑтоÑние резерва -label.enable.provider=Включить поÑтавщика -message.confirm.enable.provider=Подтвердите, что вы дейÑтвительно хотите включить поÑтавщика -label.disable.provider=Выключить поÑтавщика -message.confirm.disable.provider=Подтвердите, что вы дейÑтвительно хотите выключить поÑтавщика -label.shutdown.provider=Отключить поÑтавщика -message.confirm.shutdown.provider=Подтвердите, что вы дейÑтвительно хотите отключить Ñтого поÑтавщика -label.netScaler=NetScaler -label.add.new.NetScaler=Добавить новый NetScaler -label.capacity=МощноÑÑ‚ÑŒ -label.dedicated=Выделенный -label.f5=F5 -label.add.new.F5=Добавить новый F5 -label.srx=SRX -label.providers=ПоÑтавщики -label.add.new.SRX=Добавить новый SRX -label.timeout=Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ñ -label.public.network=ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð°Ñ Ñеть -label.private.network=ЧаÑÑ‚Ð½Ð°Ñ Ñеть -label.enable.swift=Включить Swift -confirm.enable.swift=Заполните нижеÑледующую информацию Ð´Ð»Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶Ð¸ Swift -message.after.enable.swift=Swift наÑтроен. Примечание\: ЕÑли вы покинете Ñту Ñтраницу, вам не придетÑÑ Ð½Ð°Ñтраивать Swift Ñнова -label.key=Ключ -label.delete.NetScaler=Удалить NetScaler -message.confirm.delete.NetScaler=Подтвердите, что вы дейÑтвительно хотите удалить NetScaler -label.delete.F5=Удалить F5 -message.confirm.delete.F5=Подтвердите, что вы дейÑтвительно хотите удалить F5 -label.delete.SRX=Удалить SRX -message.confirm.delete.SRX=Подтвердите, что вы дейÑтвительно хотите удалить SRX -label.pods=Стенды -label.pod.name=Ð˜Ð¼Ñ Ñтенда -label.reserved.system.gateway=Зарезервированный ÑиÑтемный шлюз -label.reserved.system.netmask=Ð—Ð°Ñ€ÐµÐ·ÐµÑ€Ð²Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð½Ð°Ñ ÑиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð¼Ð°Ñка -label.start.reserved.system.IP=Ðачальный зарезервированный ÑиÑтемный IP-Ð°Ð´Ñ€ÐµÑ -label.end.reserved.system.IP=Конечный зарезервированный ÑиÑтемный IP-Ð°Ð´Ñ€ÐµÑ -label.clusters=КлаÑтеры -label.cluster.name=Ð˜Ð¼Ñ ÐºÐ»Ð°Ñтера -label.host.MAC=MAC узла -label.agent.username=Ð˜Ð¼Ñ Ð°Ð³ÐµÐ½Ñ‚Ð° -label.agent.password=Пароль агента -message.confirm.action.force.reconnect=Подтвердите, что вы дейÑтвительно хотите переподключитьÑÑ Ðº узлу -label.resource.state=СоÑтоÑние реÑурÑов -label.LUN.number=LUN \# -message.confirm.remove.IP.range=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот диапазон IP. -message.tooltip.zone.name=Ð˜Ð¼Ñ Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ -message.tooltip.dns.1=Ð˜Ð¼Ñ Ñервера DNS Ð´Ð»Ñ Ð’Ðœ Ñтой зоны. Публичные IP-адреÑа Ñтой зоны должны иметь маршрут до Ñтого Ñервера. -message.tooltip.dns.2=Ð˜Ð¼Ñ Ð²Ñ‚Ð¾Ñ€Ð¾Ð³Ð¾ Ñервера DNS Ð´Ð»Ñ Ð’Ðœ Ñтой зоны. Публичные IP-адреÑа Ñтой зоны должны иметь маршрут до Ñтого Ñервера. -message.tooltip.internal.dns.1=Ð˜Ð¼Ñ Ñервера DNS Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½Ð¸Ñ… Ð’Ðœ CloudStack Ñтой зоны. ЧаÑтные IP-адреÑа Ñтендов должны иметь маршрут до Ñтого Ñервера. -message.tooltip.internal.dns.2=Ð˜Ð¼Ñ Ñервера DNS Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½Ð¸Ñ… Ð’Ðœ CloudStack Ñтой зоны. ЧаÑтные IP-адреÑа Ñтендов должны иметь маршрут до Ñтого Ñервера. -message.tooltip.network.domain=Ð¡ÑƒÑ„Ñ„Ð¸ÐºÑ DNS Ð´Ð»Ñ ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ ÑобÑтвенного доменного имени Ñети, доÑтупный гоÑтевыми Ð’Ðœ. -message.tooltip.pod.name=Ð˜Ð¼Ñ Ð´Ð»Ñ Ñтенда -message.tooltip.reserved.system.gateway=Шлюз Ð´Ð»Ñ ÑƒÐ·Ð»Ð¾Ð² Ñтого Ñтенда -message.tooltip.reserved.system.netmask=ÐŸÑ€ÐµÑ„Ð¸ÐºÑ Ñети, определÑющий подÑеть Ñтенда. ИÑпользуетÑÑ Ð¾Ð±Ð¾Ð·Ð½Ð°Ñ‡ÐµÐ½Ð¸Ðµ CIDR. -message.creating.zone=Создание зоны -message.creating.physical.networks=Создание физичеÑких Ñетей -message.configuring.physical.networks=ÐаÑтройка физичеÑких Ñетей -message.adding.Netscaler.device=Добавление уÑтройÑтва NetScaler -message.creating.pod=Создание Ñтенда -message.configuring.public.traffic=ÐаÑтройка публичного трафика -message.configuring.storage.traffic=ÐаÑтройка трафика хранилища -message.configuring.guest.traffic=ÐаÑтройка гоÑтевого трафика -message.creating.cluster=Создание клаÑтера -message.adding.host=Добавление узла -message.creating.primary.storage=Создание оÑновного хранилища -message.creating.secondary.storage=Создание дополнительного хранилища -message.Zone.creation.complete=Создание зоны завершено -message.enabling.zone=Включить зону -error.something.went.wrong.please.correct.the.following=Что-то не так, иÑправьте ошибки -error.could.not.enable.zone=Ðе удалоÑÑŒ включить зону -message.zone.creation.complete.would.you.like.to.enable.this.zone=Создание зоны завершено. Хотите включить Ñту зону? -message.please.add.at.lease.one.traffic.range=Добавьте как минимум один диапазон Ð´Ð»Ñ Ñ‚Ñ€Ð°Ñ„Ð¸ÐºÐ° -message.you.must.have.at.least.one.physical.network=Добавьте как минимум одну физичеÑкую Ñеть -message.please.select.a.different.public.and.management.network.before.removing=Выберите другую публичную и обÑлуживающую Ñеть перед удалением - -label.zone.type=Тип зоны -label.setup.zone=ÐаÑтройка зоны -label.setup.network=ÐаÑтройка Ñети -label.add.resources=Добавить реÑурÑов -label.launch=ЗапуÑк -label.set.up.zone.type=ÐаÑтроить тип зоны -message.please.select.a.configuration.for.your.zone=Выберите конфигурацию вашей зоны -message.desc.basic.zone=ПредоÑтавлÑет едиÑтвенную Ñеть, где ÐºÐ°Ð¶Ð´Ð°Ñ Ð’Ðœ имеет «белый» IP-Ð°Ð´Ñ€ÐµÑ Ñети. ИзолÑции гоÑтей можно добитьÑÑ Ð¸Ñпользованием Ñети 3-го уровнÑ, например, группы безопаÑноÑти (Ñ„Ð¸Ð»ÑŒÑ‚Ñ€Ð°Ñ†Ð¸Ñ IP-вдреÑов) -label.basic=ПроÑтой -message.desc.advanced.zone=Ð”Ð»Ñ Ð±Ð¾Ð»ÐµÐµ Ñложных Ñетевых топологий. Эта ÑÐµÑ‚ÐµÐ²Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ обеÑпечивает макÑимальную гибкоÑÑ‚ÑŒ в определении гоÑтевой Ñети и предоÑтавление уÑлуг, таких как межÑетевой Ñкран, VPN, или поддержка баланÑировки нагрузки. -label.advanced=Продвинутый -message.desc.zone=layer 3 -label.physical.network=ФизичеÑкие Ñети -label.public.traffic=Публичный трафик -label.guest.traffic=ГоÑтевой трафик -label.storage.traffic=Трафик хранилища -message.setup.physical.network.during.zone.creation=Во Ð²Ñ€ÐµÐ¼Ñ Ñ€Ð°Ñширенной наÑтройки зоны, вам необходимо указать один или неÑколько физичеÑких Ñетей. ÐšÐ°Ð¶Ð´Ð°Ñ Ñеть ÑоответÑтвует Ñетевому интерфейÑу гипервизора. ÐšÐ°ÐºÐ¶Ð´Ð°Ñ Ñ„Ð¸Ð·Ð¸Ñ‡ÐµÑÐºÐ°Ñ Ñеть может иÑпользоватьÑÑ Ð´Ð»Ñ Ð¾Ð´Ð½Ð¾Ð³Ð¾ или неÑкольких видов трафика Ñ Ð½ÐµÐºÐ¾Ñ‚Ð¾Ñ€Ñ‹Ð¼Ð¸ ограничениÑми при объединении видов трафика.

Перетащите один или неÑколько видов трафика к каждой физичеÑкой Ñети. -label.add.physical.network=Добавить физичеÑкую Ñеть -label.traffic.types=Типы трафика -label.management=Управление -label.guest=ГоÑÑ‚ÑŒ -label.please.specify.netscaler.info=Укажите данные NetScaler -message.public.traffic.in.advanced.zone=Публичный трафик генерируетÑÑ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð’Ðœ доÑтупа к Интернету. Публично доÑтупные IP должны быть обÑзательно выделены. Пользователь может ииÑпользовать CloudStack UI Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ IP и ÑÐ¾Ð·Ð´Ð°Ð½Ð¸Ñ NAT, иÑпользуемый Ð´Ð»Ñ Ð¾Ð±Ñ‰ÐµÐ½Ð¸Ñ Ð¼ÐµÐ¶Ð´Ñƒ гоÑтевой и публичной Ñетью.

Укажите как минимум один диапазон адреÑов Ð´Ð»Ñ Ð¸Ð½Ñ‚ÐµÑ€Ð½ÐµÑ‚-трафика. -message.public.traffic.in.basic.zone=Публичный трафик генерируетÑÑ Ð¿Ñ€Ð¸ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð’Ðœ доÑтупа к Интернету или при предоÑтавлении клиентам Ñлужб через Интернет. Публично доÑтупные IP должны быть обÑзательно выделены. При Ñоздании Ð’Ðœ, Ð°Ð´Ñ€ÐµÑ Ð¸Ð· диапазона публичных Ip привÑжетÑÑ Ðº машине в дополнение гоÑтевого адреÑа IP. СтатичеÑкий 1-1 NAT должен автоматичеÑки наÑтроитьÑÑ Ð½Ð° работу между публичной и гоÑтевой Ñетью. Пользователь также имеет возможноÑÑ‚ÑŒ иÑпользовать CloudStack UI Ð´Ð»Ñ Ð¿Ð¾Ð»ÑƒÑ‡ÐµÐ½Ð¸Ñ Ð´Ð¾Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ñ‹Ñ… адреÑов Ð´Ð»Ñ Ñ€ÐµÐ°Ð»Ð¸Ð·Ð°Ñ†Ð¸Ð¸ ÑтатичеÑкого NAT между машинами и публичной Ñетью. -message.add.pod.during.zone.creation=ÐšÐ°Ð¶Ð´Ð°Ñ Ð·Ð¾Ð½Ð° Ñодержит один или более Ñтендов, который вы ÑÐµÐ¹Ñ‡Ð°Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚Ðµ первым. Стенд Ñодержит узлы и Ñерверы оÑновного хранилища, которые будут добавлены в поÑледнем шаге. Ð”Ð»Ñ Ð½Ð°Ñ‡Ð°Ð»Ð° необходимо наÑтроить диапазон резервных адреÑов IP Ð´Ð»Ñ Ð²Ð½ÑƒÑ‚Ñ€ÐµÐ½Ð½ÐµÐ¹ Ñети управлениÑ. Диапазон резервных IP должен быть уникальным Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ зоны облака. -message.guest.traffic.in.advanced.zone=ГоÑтевой трафик Ñети ÑвÑзи между конечными пользователÑми виртуальных машин. Укажите диапазон идентификаторов VLAN проводить гоÑÑ‚Ñ Ñ‚Ñ€Ð°Ñ„Ð¸Ðº Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ физичеÑкой Ñети. -message.guest.traffic.in.basic.zone=ГоÑтевой трафик генерируетÑÑ Ð¿Ñ€Ð¸ общении между виртуальными машинами. Укажите диапазон адреÑов IP, который CloudStack Ñможет выделить Ð´Ð»Ñ Ð’Ðœ. УбедитеÑÑŒ, что Ñтот диапазон не перекрещиваетÑÑ Ñ Ð´Ð¸Ð°Ð¿Ð°Ð·Ð¾Ð½Ð¾Ð¼ резервных адреÑов. -message.storage.traffic=Трафик между внутренними реÑурÑами CloudStack, Ð²ÐºÐ»ÑŽÑ‡Ð°Ñ Ð²Ñе компоненты, которые взаимодейÑтвуют Ñ Ñервером управлениÑ, такие как виртуальные хоÑÑ‚Ñ‹ и CloudStack ÑиÑтемы. ÐаÑтройте трафик Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð·Ð´ÐµÑÑŒ. -message.desc.cluster=Каждый Ñтенд должен иметь один или более клаÑтеров, первый из которых вы ÑÐµÐ¹Ñ‡Ð°Ñ Ð´Ð¾Ð±Ð°Ð²Ð¸Ñ‚Ðµ. КлаÑтер предоÑтавлÑет группу узлов. Узлы в клаÑтере имеют одинаковое оборудование, запуÑкаетÑÑ Ñ‡ÐµÑ€ÐµÐ· один гипервизор, находÑÑ‚ÑÑ Ð² одной Ñети и имеют доÑтуп к одному и тому же открытому хранилищу. Каждый клаÑтер Ñодержит один или более узлов, а также иеть один или неÑколько оÑновных хранилищ. -message.desc.host=Каждый клаÑтер должен Ñодержать как минимум один узел (компьютер) Ð´Ð»Ñ Ð·Ð°Ð¿ÑƒÑка Ð’Ðœ, первый из клаÑтер вы добавите ÑейчаÑ. Ð”Ð»Ñ Ñ€Ð°Ð±Ð¾Ñ‚Ñ‹ узла в CloudStack важна уÑтановка гипервизора на узел, привÑзка IP к узлу и Ñоединение узла Ñ Ñервером ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ CloudStack.

Укажите Ð¸Ð¼Ñ DNS или Ð°Ð´Ñ€ÐµÑ IP, Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ пароль к ОС (обычно root), а также метки Ð´Ð»Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑƒÐ·Ð»Ð¾Ð². -message.desc.primary.storage=ÐšÐ°Ð¶Ð´Ð°Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ð° должна Ñодержать один или неÑколько первичных Ñерверов Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ñ‹Ñ…, и мы добавим первый ÑейчаÑ. ÐŸÐµÑ€Ð²Ð¸Ñ‡Ð½Ð°Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ Ñодержит логичеÑкие разделы жеÑткого диÑка Ð´Ð»Ñ Ð²Ñех виртуальных машин, работающих на узлах клаÑтера. ИÑпользуйте любой ÑовмеÑтимый протокол, который поддерживает оÑновные гипервизора. -message.desc.secondary.storage=ÐšÐ°Ð¶Ð´Ð°Ñ Ð·Ð¾Ð½Ð° должна обладать Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ одним Ñервером NFS или дополнительным хранилищем и их надо добавить в первую очередь. Дополнительное хранилище предназначено Ð´Ð»Ñ Ñ…Ñ€Ð°Ð½ÐµÐ½Ð¸Ñ ÑˆÐ°Ð±Ð»Ð¾Ð½Ð¾Ð² Ð’Ðœ, образов ISO и Ñнимков Ð’Ðœ. Этот Ñервер должен быть доÑтупен Ð´Ð»Ñ Ð²Ñех узлов зоны.

ПредоÑтавить IP-Ð°Ð´Ñ€ÐµÑ Ð¸ путь. -label.launch.zone=ЗапуÑтить зону -message.please.wait.while.zone.is.being.created=Подождите, ÑоздаетÑÑ Ð·Ð¾Ð½Ð°. Это может занÑÑ‚ÑŒ некоторое времÑ... - -label.load.balancing=БаланÑировка нагрузки -label.static.nat.enabled=СтатичеÑкий NAT включен -label.zones=Зоны -label.view.more=ПроÑмотреть больше -label.number.of.zones=КоличеÑтво зон -label.number.of.pods=КоличеÑтво Ñтендов -label.number.of.clusters=КоличеÑтво клаÑтеров -label.number.of.hosts=КоличеÑтво узлов -label.total.hosts=Ð’Ñего узлов -label.total.CPU=Ð’Ñего процеÑÑоров -label.total.memory=Ð’Ñего памÑти -label.total.storage=Ð’Ñего хранилищ -label.purpose=Ðазначение - - - - -label.action.migrate.router=ПеренеÑти роутер -label.action.migrate.router.processing=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ñ€Ð¾ÑƒÑ‚ÐµÑ€Ð°... -message.migrate.router.confirm=Подтвердите, что вы дейÑтвительно хотите перенеÑти роутер в узел -label.migrate.router.to=ПеренеÑти роутер в - -label.action.migrate.systemvm=ПеренеÑти ÑиÑтемную Ð’Ðœ -label.action.migrate.systemvm.processing=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ ÑиÑтемной Ð’Ðœ... -message.migrate.systemvm.confirm=Подтвердите, что вы дейÑтвительно хотите перенеÑти роутер в узел -label.migrate.systemvm.to=ПеренеÑти ÑиÑтемную Ð’Ðœ в - - -mode=Режим -side.by.side=Бок-о-Бок -inline=Ð’Ñтроенный - -extractable=Извлекаемый - -label.ocfs2=OCFS2 - -label.action.edit.host=Редактировать узел - -network.rate=СкороÑÑ‚ÑŒ Ñети - -ICMP.type=Тип ICMP -ICMP.code=Код ICMP - -image.directory=Каталог Ñ Ð¾Ð±Ñ€Ð°Ð·Ð°Ð¼Ð¸ - -label.action.create.template.from.vm=Создать шаблон из Ð’Ðœ -label.action.create.template.from.volume=Создать шаблон из тома - -message.vm.create.template.confirm=Создание шаблона автоматичеÑки перезагрузит Ð’Ðœ - -label.action.manage.cluster=Управление клаÑтером -message.action.manage.cluster=Подтвердите, что вы дейÑтвительно хотите перевеÑти клаÑтер в режим обÑлуживаниÑ. -label.action.manage.cluster.processing=Переход клаÑтера в режим обÑлуживаниÑ... - -label.action.unmanage.cluster=ПеревеÑти клаÑтер в обычный режим -message.action.unmanage.cluster=Подтвердите, что вы дейÑтвительно хотите перевеÑти клаÑтер в обычный режим. -label.action.unmanage.cluster.processing=Переход клаÑтера в обычный режим... - -label.allocation.state=СоÑтоÑние раÑÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ -managed.state=СоÑтоÑние обÑÐ»ÑƒÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ - -label.default.use=По умолчанию -label.host.tags=Метки узла - -label.cidr=CIDR -label.cidr.list=CIDR иÑточника - -label.storage.tags=Метки хранилища - -label.redundant.router=Резервной роутер -label.is.redundant.router=Резервной - -force.delete=Принудительно удалить -force.delete.domain.warning=Внимание\: При выборе Ñтого варианта приведет к удалению вÑех дочерних доменов и вÑе ÑвÑзанные Ñ Ð½Ð¸Ð¼Ð¸ аккаунтов и их реÑурÑов. - -force.remove=Принудительно удалить -force.remove.host.warning=Внимание\: При выборе Ñтой опции будет вызыван CloudStack Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð¾Ð¹ оÑтановики вÑех виртуальных машин, прежде чем Ñнимать Ñтот узел из клаÑтера.. - -force.stop=Принудительно оÑтановить -force.stop.instance.warning=Внимание\: ÐŸÑ€Ð¸Ð½ÑƒÐ´Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð¾Ñтановка должна применÑÑ‚ÑŒÑÑ Ð² ÑамуюпоÑледнюю очередь. Ð’Ñ‹ можете потерÑÑ‚ÑŒ данные или получить неожиданное поведение/ÑоÑтоÑние виртуальной машины. - -label.PreSetup=ÐŸÑ€ÐµÐ´Ð²Ð°Ñ€Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ Ð½Ð°Ñтройка -label.SR.name = SR Name-Label -label.SharedMountPoint=ОткрытаÑТочкаДоÑтупа -label.clvm=CLVM -label.volgroup=Группа тома -label.VMFS.datastore=Хранилище VMFS - -label.network.device=Сетевое уÑтройÑтво -label.add.network.device=Добавить Ñетевое уÑтройÑтво -label.network.device.type=Тип Ñетевого уÑтройÑтва -label.DHCP.server.type=Тип Ñервера DHCP -label.Pxe.server.type=Тип Ñервера PXE -label.PING.storage.IP=IP Ð°Ð´Ñ€ÐµÑ PING-хранилища -label.PING.dir=Каталог PING -label.TFTP.dir=Каталог TFTP -label.PING.CIFS.username=Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ PING CIFS -label.PING.CIFS.password=Пароль PING CIFS -label.CPU.cap=CPU Cap - - -label.action.enable.zone=Включить зону -label.action.enable.zone.processing=Включение зоны... -message.action.enable.zone=Потдтвердите, что вы дейÑтвительно хотите включить Ñту зону -label.action.disable.zone=Выключить зону -label.action.disable.zone.processing=Выключение зоны... -message.action.disable.zone=Подтвердите, что вы дейÑтвительно хотите выключить Ñту зону - -label.action.enable.pod=Включить Ñтенд -label.action.enable.pod.processing=Включение Ñтенда.. -message.action.enable.pod=Подтвердите, что вы дейÑтвительно хотите включить Ñтот Ñтенд. -label.action.disable.pod=Выключить Ñтенд -label.action.disable.pod.processing=Выключение Ñтенда. -message.action.disable.pod=Подтвердите, что вы дейÑтвительно хотите выключить Ñту зону. - -label.action.enable.cluster=Включить клаÑтер -label.action.enable.cluster.processing=Включение клаÑтера... -message.action.enable.cluster=Подтвердите, что вы дейÑтвительно хотите включить Ñтот клаÑтер. -label.action.disable.cluster=Выключить клаÑтер -label.action.disable.cluster.processing=Выключение клаÑтера... -message.action.disable.cluster=Подтвердите, что вы дейÑтвительно хотите выключить Ñтот клаÑтер. - -label.account.id=ID учётной запиÑи -label.account.name=Ð˜Ð¼Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑи -label.account.specific=Специфика аккауннта -label.account=Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ -label.accounts=Учётные запиÑи -label.acquire.new.ip=Получить новый IP -label.show.ingress.rule=Показать входное правило -label.hide.ingress.rule=Скрыть входное правило -label.action.attach.disk.processing=Прикрепление диÑка... -label.action.attach.disk=Прикрепить диÑк -label.action.attach.iso.processing=Прикрепление ISO... -label.action.attach.iso=Прикрепить ISO -label.action.cancel.maintenance.mode.processing=Отмена режима обÑлуживаниÑ... -label.action.cancel.maintenance.mode=Отменить режим обÑÐ»ÑƒÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ -label.action.change.password=Изменить пароль -label.action.change.service.processing=Изменение Ñлужбы... -label.action.change.service=Изменить Ñлужбу -label.action.copy.ISO.processing=Копирование ISO... -label.action.copy.ISO=Копировать ISO -label.action.copy.template.processing=Копирование шаблона... -label.action.copy.template=Копировать шаблон -label.action.create.template.processing=Создание шаблона... -label.action.create.template=Создать шаблон -label.action.create.vm.processing=Создание Ð’Ðœ... -label.action.create.vm=Создать Ð’Ðœ -label.action.create.volume.processing=Создание тома... -label.action.create.volume=Создать том -label.action.delete.IP.range.processing=Удаление диапазона IP... -label.action.delete.IP.range=Удалить диапазон IP -label.action.delete.ISO.processing=Удаление ISO... -label.action.delete.ISO=Удалить ISO -label.action.delete.account.processing=Удаление учётной запиÑи... -label.action.delete.account=Удалить учётную запиÑÑŒ -label.action.delete.cluster.processing=Удаление клаÑтера... -label.action.delete.cluster=Удалить клаÑтер -label.action.delete.disk.offering.processing=Удаление диÑкового реÑурÑа... -label.action.delete.disk.offering=Удалить диÑковый реÑÑƒÑ€Ñ - -label.action.update.resource.count=Обновить Ñчётчик реÑурÑов -label.action.update.resource.count.processing=Обновление Ñчетчика реÑурÑов... - -label.action.delete.domain=Удалить домен -label.action.delete.domain.processing=Удаление домена... - -label.action.delete.firewall.processing=Удаление фаервола... -label.action.delete.firewall=Удалить правило фаервола -label.action.delete.ingress.rule.processing=Удаление входного правила... -label.action.delete.ingress.rule=Удалить входное правило -label.action.delete.load.balancer.processing=Удаление баланÑировки нагрузки... -label.action.delete.load.balancer=Удалить правило баланÑировки нагрузки -label.action.edit.network.processing=Редактирование Ñети... -label.action.edit.network=Редактировать Ñеть -label.action.delete.network.processing=Удаление Ñети... -label.action.delete.network=Удалить Ñеть -label.action.delete.pod.processing=Удаление Ñтенда... -label.action.delete.pod=Удалить Ñтенд -label.action.delete.primary.storage.processing=Удаление оÑновного хранилища... -label.action.delete.primary.storage=Удалить оÑновное хранилище -label.action.delete.secondary.storage.processing=Удаление дополнительного хранилища... -label.action.delete.secondary.storage=Удалить дополнительное хранилище -label.action.delete.security.group.processing=Удаление группы безопаÑноÑти... -label.action.delete.security.group=Удалить группу безопаÑноÑти -label.action.delete.service.offering.processing=Удаление Ñлужебного реÑурÑа... -label.action.delete.service.offering=Удалить Ñлужебный реÑÑƒÑ€Ñ -label.action.delete.snapshot.processing=Удаление Ñнимка... -label.action.delete.snapshot=Удалить Ñнимок -label.action.delete.template.processing=Удаление шаблона... -label.action.delete.template=Удалить шаблон -label.action.delete.user.processing=Удаление пользователÑ... -label.action.delete.user=Удалить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ -label.action.delete.volume.processing=Удаление тома... -label.action.delete.volume=Удалить том -label.action.delete.zone.processing=Удаление зоны... -label.action.delete.zone=Удалить зону -label.action.destroy.instance.processing=Уничтожение машины... -label.action.destroy.instance=Уничтожить машину -label.action.destroy.systemvm.processing=Уничтожение ÑиÑтемного Ð’Ðœ... -label.action.destroy.systemvm=Уничтожить ÑиÑтемный Ð’Ðœ -label.action.detach.disk.processing=Открепление диÑка... -label.action.detach.disk=Открепить диÑк -label.action.detach.iso.processing=Открепление ISO -label.action.detach.iso=Открепить ISO -label.action.disable.account.processing=Выключение учётной запиÑи -label.action.disable.account=Выключить учётную запиÑÑŒ -label.action.disable.static.NAT.processing=Выключение Ñтатичного NAT... -label.action.disable.static.NAT=Выключить Ñтатичный NAT -label.action.disable.user.processing=Выключение Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ -label.action.disable.user=Выключить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ -label.action.download.ISO=Загрузить ISO -label.action.download.template=Загрузить шаблон -label.action.download.volume.processing=Загрузка тома... -label.action.download.volume=Загрузить том -label.action.edit.ISO=Редактировать ISO -label.action.edit.account=Редактировать учётную запиÑÑŒ -label.action.edit.disk.offering=Редактировать диÑковый реÑÑƒÑ€Ñ -label.action.edit.domain=Редактировать домен -label.action.edit.global.setting=Редактировать глобальные наÑтройки -label.action.edit.instance=Редактировать машину -label.action.edit.network.offering=Редактировать Ñетевой реÑÑƒÑ€Ñ -label.action.edit.pod=Редактировать Ñтенд -label.action.edit.primary.storage=Редактировать оÑновное хранилище -label.action.edit.resource.limits=Редактировать пределы реÑурÑов -label.action.edit.service.offering=Редактировать Ñлужебный реÑÑƒÑ€Ñ -label.action.edit.template=Редактировать шаблон -label.action.edit.user=Редактировать Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ -label.action.edit.zone=Редактировать зону -label.action.enable.account.processing=Включение аккаунта... -label.action.enable.account=Включить учётную запиÑÑŒ -label.action.enable.maintenance.mode.processing=Включение режима обÑлуживаниÑ... -label.action.enable.maintenance.mode=Включить режим обÑÐ»ÑƒÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ -label.action.enable.static.NAT.processing=Включение Ñтатичного NAT.. -label.action.enable.static.NAT=Включить Ñтатичный NAT -label.action.enable.user.processing=Включение пользователÑ... -label.action.enable.user=Включить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ -label.action.force.reconnect.processing=Переподключение... -label.action.force.reconnect=Принудительно переподключить -label.action.generate.keys.processing=Создание ключей... -label.action.generate.keys=Создать ключи -label.action.lock.account.processing=Ð‘Ð»Ð¾ÐºÐ¸Ñ€Ð¾Ð²Ð°Ð½Ð¸Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð¾Ð¹ запиÑи -label.action.lock.account=Заблокировать учётную запиÑÑŒ -label.action.migrate.instance=ПеренеÑти машину -label.action.migrate.instance.processing=ÐŸÐµÑ€ÐµÐ½Ð¾Ñ Ð¼Ð°ÑˆÐ¸Ð½Ñ‹...... -label.action.reboot.instance.processing=Перезагрузка машины... -label.action.reboot.instance=Перезагрузить машину -label.action.reboot.router.processing=Перезагрузка роутера... -label.action.reboot.router=Перезагрузить роутер -label.action.reboot.systemvm.processing=Перезагрузка ÑиÑтемной Ð’Ðœ -label.action.reboot.systemvm=ПерезапуÑтить ÑиÑтемную Ð’Ðœ -label.action.recurring.snapshot=ПовторÑемые Ñнимки -label.action.release.ip.processing=ОÑвобождение IP... -label.action.release.ip=ОÑвободить IP -label.action.remove.host.processing=Удаление узла... -label.action.remove.host=Удалить узел -label.action.reset.password.processing=Ð¡Ð±Ñ€Ð¾Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ... -label.action.reset.password=СброÑить пароль -label.action.resource.limits=Пределы реÑурÑов -label.action.restore.instance.processing=ВоÑÑтановление машины... -label.action.restore.instance=ВоÑÑтановить машину -label.action.start.instance.processing=ЗапуÑк машины... -label.action.start.instance=ЗапуÑтить машину -label.action.start.router.processing=ЗапуÑк роутера -label.action.start.router=ЗапуÑтить роутер -label.action.start.systemvm.processing=ЗапуÑк ÑиÑтемной Ð’Ðœ... -label.action.start.systemvm=ЗапуÑтить ÑиÑтемную Ð’Ðœ -label.action.stop.instance.processing=ОÑтановка машины... -label.action.stop.instance=ОÑтановить машину -label.action.stop.router.processing=ОÑтановка роутера... -label.action.stop.router=ОÑтановить роутер -label.action.stop.systemvm.processing=ОÑтановка ÑиÑтемной Ð’Ðœ... -label.action.stop.systemvm=ОÑтановить ÑиÑтемной Ð’Ðœ -label.action.take.snapshot.processing=Получение Ñнимка... -label.action.take.snapshot=Получить Ñнимок... -label.action.update.OS.preference.processing=Обновление параметров ОС... -label.action.update.OS.preference=Обновить параметры ОС -label.actions=ДейÑÑ‚Ð²Ð¸Ñ -label.active.sessions=Ðктивные ÑеÑÑии -label.add.account=Добавить аккаунт -label.add.by.cidr=Добавить к CIDR -label.add.by.group=Добавить к группе -label.add.cluster=Добавить клаÑтер -label.add.direct.iprange=Добавить диапазон прÑмых IP -label.add.disk.offering=Ðовый диÑковый реÑÑƒÑ€Ñ -label.add.domain=Добавить домен -label.add.firewall=Добавить правило фаервола. -label.add.host=Добавить узел -label.add.ingress.rule=Ðовое входное правило -label.add.ip.range=Добавить диапазон IP -label.add.load.balancer=Добавить баланÑировку нагрузки -label.add.more=Добавить что-то еще -label.add.network=Добавить Ñеть -label.add.pod=Добавить Ñтенд -label.add.primary.storage=Добавить оÑновное хранилище -label.add.secondary.storage=Добавить дополнительное хранилище -label.add.security.group=Добавить группу безопаÑноÑти -label.add.service.offering=Ðовый ÑиÑтемный реÑÑƒÑ€Ñ -label.add.template=Добавить шаблон -label.add.user=Добавить Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ -label.add.vlan=Добавить VLAN -label.add.volume=Добавить том -label.add.zone=Добавить зону -label.add=Добавить -label.adding.cluster=Добавление клаÑтера -label.adding.failed=Ðе удалоÑÑŒ добавить -label.adding.pod=Добавление Ñтенда -label.adding.processing=Добавление... -label.adding.succeeded=Добавление завершено уÑпешно -label.adding.user=Добавление Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ -label.adding.zone=Добавление зоны -label.adding=Добавление зоны -label.additional.networks=Дополнительные Ñети -label.admin.accounts=ÐдминиÑтраторÑкие учётные запиÑи -label.admin=ÐдминиÑтратор -label.advanced.mode=Продвинутый режим -label.advanced.search=РаÑширенный поиÑк -label.advanced=Продвинутый -label.alert=Тревога -label.algorithm=Ðлгоритм -label.allocated=РаÑпределено -label.api.key=Ключ API -label.assign.to.load.balancer=Включение машины в ÑиÑтему баланÑировки нагрузки -label.assign=ПриÑвоить -label.associated.network.id=СвÑзанный ID Ñети -label.attached.iso=Прикрепленный ISO -label.availability.zone=ДоÑтупноÑÑ‚ÑŒ зоны -label.availability=ДоÑтупноÑÑ‚ÑŒ -label.available.public.ips=ДоÑтупные публичные IP-адреÑа -label.available=ДоÑтупно -label.back=Ðазад -label.basic.mode=ПроÑто режим -label.bootable=Загружаемый -label.broadcast.domain.type=Тип широковещательного домена -label.by.account=По учётной запиÑи -label.by.availability=По доÑтупноÑти -label.by.domain=До домену -label.by.end.date=По завершению -label.by.level=По уровню -label.by.pod=По Ñтенду -label.by.role=По роли -label.by.start.date=По началу -label.by.state=По ÑоÑтоÑнию -label.by.traffic.type=По типу трафика -label.by.type.id=По типу ID -label.by.type=По типу -label.by.zone=По зоне -label.bytes.received=Байт получен -label.bytes.sent=Байт отправлено -label.cancel=Отмена -label.certificate=Сертификат -label.privatekey=ЧаÑтный ключ PKCS\#8 -label.domain.suffix=Ð¡ÑƒÑ„Ñ„Ð¸ÐºÑ Ð´Ð¾Ð¼ÐµÐ½Ð° DNS (нпр. xyz.com) -label.character=Символов -label.cidr.account=CIDR или ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ/группа безопаÑноÑти -label.close=Закрыть -label.cloud.console=КонÑоль ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¾Ð±Ð»Ð°ÐºÐ¾Ð¼ -label.cloud.managed=Панель ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ -label.cluster.type=Тип клаÑтера -label.cluster=КлаÑтер -label.code=Код -label.confirmation=Подтверждение -label.cpu.allocated.for.VMs=РаÑпределено ЦПУ Ð´Ð»Ñ Ð’Ðœ -label.cpu.allocated=РаÑпределено ЦПУ -label.cpu.utilized=ИÑпользование CPU -label.cpu=CPU -label.created=Создано -label.cross.zones=Общие Ð´Ð»Ñ Ð·Ð¾Ð½ -label.custom.disk.size=Свой размер диÑка -label.daily=Ежедневно -label.data.disk.offering=Данные диÑка -label.date=Дата -label.day.of.month=День меÑÑца -label.day.of.week=День недели -label.delete=Удалить -label.deleting.failed=Ðе удалоÑÑŒ удалить -label.deleting.processing=Удаление... -label.description=ОпиÑание -label.detaching.disk=Открепление диÑка -label.details=Детали -label.device.id=ID уÑтройÑтва -label.disabled=Выключено -label.disabling.vpn.access=Выключение доÑтупа к VPN -label.disk.allocated=РаÑпределено диÑкового проÑтранÑтва -label.disk.offering=ДиÑковый реÑÑƒÑ€Ñ -label.disk.size.gb=Размер диÑка (в ГБ) -label.disk.size=Размер диÑка -label.disk.total=Ð’Ñего в диÑках -label.disk.volume=Том диÑка -label.display.text=Отображаемый текÑÑ‚ -label.dns.1=DNS 1 -label.dns.2=DNS 2 -label.domain.admin=ÐдминиÑтратор домена -label.domain.id=ID домена -label.domain.name=Ð˜Ð¼Ñ Ð´Ð¾Ð¼ÐµÐ½Ð° -label.domain=Домен -label.double.quotes.are.not.allowed=Двойные кавычки запрещены -label.download.progress=Ð¡Ñ‚Ð°Ñ‚ÑƒÑ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ -label.edit=Редактировать -label.email=E-mail -label.enabling.vpn.access=Включение доÑтупа к VPN -label.enabling.vpn=Включение VPN -label.end.port=Конечный порт -label.endpoint.or.operation=ÐšÐ¾Ð½ÐµÑ‡Ð½Ð°Ñ Ñ‚Ð¾Ñ‡ÐºÐ° или Ð¾Ð¿ÐµÑ€Ð°Ñ†Ð¸Ñ -label.error.code=Код ошибки -label.error=Ошибка -label.esx.host=Узел ESX/ESXi -label.example=Пример -label.failed=Ðеудачно -label.featured=ПредÑтавленный -label.firewall=Фаервол -label.first.name=Ð˜Ð¼Ñ -label.format=Формат -label.friday=ПÑтница -label.full=Полный -label.gateway=Шлюз -label.general.alerts=Общие тревоги -label.generating.url=Создание URL -label.go.step.2=Перейти к шагу 2 -label.go.step.3=Перейти к шагу 3 -label.go.step.4=Перейти к шагу 4 -label.go.step.5=Перейти к шагу 5 -label.group.optional=Группа (опционально) -label.group=Группа -label.guest.cidr=ГоÑтевой CIDR -label.guest.gateway=Шлюз -label.guest.ip.range=Диапазон IP-адреÑов -label.guest.ip=ГоÑтевые IP-адреÑа -label.guest.netmask=ГоÑÑ‚ÐµÐ²Ð°Ñ ÑÐµÑ‚ÐµÐ²Ð°Ñ Ð¼Ð°Ñка -label.ha.enabled=HA включен -label.help=Помощь -label.host.alerts=Тревоги узла -label.host.name=Ð˜Ð¼Ñ ÑƒÐ·Ð»Ð° -label.host=Узел -label.hosts=Узлы -label.hourly=ЧаÑÐ¾Ð²Ð°Ñ -label.hypervisor.type=Тип гипервизора -label.hypervisor=Гипервизор -label.id=ID -label.info=Ð˜Ð½Ñ„Ð¾Ñ€Ð¼Ð°Ñ†Ð¸Ñ -label.ingress.rule=Внутринее правило -label.initiated.by=Пользователь -label.instance.limits=Пределы машины -label.instance.name=Ð˜Ð¼Ñ Ð¼Ð°ÑˆÐ¸Ð½Ñ‹ -label.instance=Машина -label.instances=Машины -label.internal.dns.1=Внутренний DNS 1 -label.internal.dns.2=Внутренний DNS 2 -label.interval.type=Тип диапазона -label.invalid.integer=Ðеправильное целое чиÑло -label.invalid.number=Ðеправильное чиÑло -label.ip.address=IP-Ð°Ð´Ñ€ÐµÑ -label.ip.allocations=РаÑÐ¿Ñ€ÐµÐ´ÐµÐ»ÐµÐ½Ð¸Ñ IP -label.ip.limits=Пределы публичных IP -label.ip.or.fqdn=IP или FQDN -label.ip.range=Диапазон IP -label.ip=IP -label.ips=IP -label.is.default=По умолчанию -label.is.shared=общие -label.is.system=ЕÑÑ‚ÑŒ ÑиÑтема -label.iscsi=iSCSI -label.iso.boot=Загрузка ISO -label.iso=ISO -label.isolation.mode=Режим изолÑции -label.keep=Хранить -label.lang.chinese=КитайÑкий (упрощённый) -label.lang.english=ÐнглийÑкий -label.lang.japanese=ЯпонÑкий -label.lang.korean=корейÑкий -label.lang.spanish=ИÑпанÑкий -label.last.disconnected=ПоÑледнее Ñоединение -label.last.name=ПоÑледнее Ð¸Ð¼Ñ -label.level=Уровень -label.linklocal.ip=Локальный IP Ð°Ð´Ñ€ÐµÑ -label.load.balancer=БаланÑировка нагрузки -label.loading=Загрузка -label.local=Локальный -# label.local.storage.enabled=Local storage enabled -label.login=Вход -label.logout=Выход -label.lun=LUN -label.manage=Управление -label.maximum=МакÑимум -label.memory.allocated=РаÑпределено памÑти -label.memory.total=Ð’Ñего памÑти -label.memory.used=ИÑпользованной памÑти -label.memory=ПамÑÑ‚ÑŒ -label.menu.accounts=Учётные запиÑи -label.menu.alerts=Тревоги -label.menu.all.accounts=Ð’Ñе учётные запиÑи -label.menu.all.instances=Ð’Ñе машины -label.menu.community.isos=ISO-ÑообщеÑтва -label.menu.community.templates=Шаблоны ÑообщеÑтва -label.menu.configuration=ÐšÐ¾Ð½Ñ„Ð¸Ð³ÑƒÑ€Ð°Ñ†Ð¸Ñ -label.menu.dashboard=Ð“Ð»Ð°Ð²Ð½Ð°Ñ -label.menu.destroyed.instances=Уничтоженные машины -label.menu.disk.offerings=ÐŸÑ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ð´Ð¸Ñков -label.menu.domains=Домены -label.menu.events=Ð¡Ð¾Ð±Ñ‹Ñ‚Ð¸Ñ -label.menu.featured.isos=Рекомендуемые ISO -label.menu.featured.templates=Рекомендуемые шаблоны -label.menu.global.settings=Глобальные наÑтройки -label.menu.instances=Машины -label.menu.ipaddresses=IP-адреÑа -label.menu.isos=ISO -label.menu.my.accounts=Мои учётные запиÑи -label.menu.my.instances=Мои машины -label.menu.my.isos=Мои ISO -label.menu.my.templates=Мои шаблоны -label.menu.network.offerings=ÐŸÑ€ÐµÐ´Ð»Ð¾Ð¶ÐµÐ½Ð¸Ñ Ñети -label.menu.network=Сеть -label.menu.physical.resources=ФизичеÑкие реÑурÑÑ‹ -label.menu.running.instances=Запущенные машины -label.menu.security.groups=Группы безопаÑноÑти -label.menu.service.offerings=УÑлуги -label.menu.snapshots=Снимки -label.menu.stopped.instances=ОÑтановленные машины -label.menu.storage=Хранилище -label.menu.system.vms=СиÑтемные Ð’Ðœ -label.menu.system=СиÑтема -label.menu.templates=Шаблоны -label.menu.virtual.appliances=Виртуальные уÑтройÑтва -label.menu.virtual.resources=Виртуальные реÑурÑÑ‹ -label.menu.volumes=Тома -label.migrate.instance.to=ПеренеÑти машину в -label.minimum=Минимум -label.minute.past.hour=Минута -label.monday=Понедельник -label.monthly=Каждый меÑÑц -label.more.templates=Больше шаблонов -label.my.account=ÐœÐ¾Ñ ÑƒÑ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ -label.name.optional=Ð˜Ð¼Ñ (необÑзательно) -label.name=Ð˜Ð¼Ñ -label.netmask=Ð¡ÐµÑ‚ÐµÐ²Ð°Ñ Ð¼Ð°Ñка -label.network.desc=ОпиÑание Ñети -label.network.domain=Домен Ñети -label.network.id=ID Ñети -label.network.name=Ð˜Ð¼Ñ Ñети -label.network.offering.display.text=Ñеть, обеÑпечивающую Отображение текÑта -label.network.offering.id=Ñеть, обеÑпечивающую ID -label.network.offering.name=Ñеть, обеÑпечивающую Ð˜Ð¼Ñ -label.network.offering=Сетевой реÑÑƒÑ€Ñ -label.network.rate=СкороÑÑ‚ÑŒ Ñети -label.network.read=Прочитано через Ñеть -label.network.type=Тип Ñети -label.network.write=ЗапиÑано через Ñеть -label.network=Сеть -label.new.password=Ðовый пароль -label.next=Следующий -label.nfs.server=Сервер NFS -label.nfs.storage=Хранилище NFS -label.nfs=NFS -label.nics=Сетевые уÑтройÑтва (NIC) -label.no.actions=Ðет доÑтупных операций -label.no.alerts=Тревог не получено -label.no.errors=Ошибок не получено -label.no.isos=Ðет доÑтупных ISO -label.no.items=Ðет доÑтупных Ñлементов -label.no.security.groups=Ðет доÑтупных групп безопаÑноÑÑ‚ÑŒ -label.no.thanks=Ðет, ÑпаÑибо -label.no=Ðет -label.none=Ðет -label.not.found=Ðе найдено -label.num.cpu.cores=Кол. CPU -label.numretries=КоличеÑтво попыток -label.offer.ha=ПредоÑÑ‚. HA -label.optional=ÐеобÑзательно -label.os.preference=ÐŸÑ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚Ð¸Ñ‚ÐµÐ»ÑŒÐ½Ð°Ñ ÐžÐ¡ -label.os.type=Тип ОС -label.owned.public.ips=СобÑтвенные публичные IP-адреÑа -label.owner.account=Ð£Ñ‡Ñ‘Ñ‚Ð½Ð°Ñ Ð·Ð°Ð¿Ð¸ÑÑŒ владельца -label.owner.domain=Домен владельца -label.parent.domain=РодительÑкий домен -label.password.enabled=Пароль включен -label.password=Пароль -label.path=Путь -label.please.wait=Подождите -label.pod=Стенд -label.port.forwarding=ÐŸÑ€Ð¾Ð±Ñ€Ð¾Ñ Ð¿Ð¾Ñ€Ñ‚Ð¾Ð² -label.port.range=Диапазон портов -label.prev=Предыдуший -label.primary.allocated=РаÑпределение оÑновного хранилища -label.primary.network=ОÑÐ½Ð¾Ð²Ð½Ð°Ñ Ñеть -label.primary.storage=ОÑновное хранилище -label.primary.used=ИÑпользование оÑновного хранилища -label.private.interface=ЧаÑтный Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ -label.private.ip.range=Диапазон чаÑтных IP -label.private.ip=ЧаÑтный IP-Ð°Ð´Ñ€ÐµÑ -label.private.ips=ЧаÑтные IP-адреÑа -label.private.port=ЧаÑтный порт -label.private.zone=ЧаÑÑ‚Ð½Ð°Ñ Ð·Ð¾Ð½Ð° -label.protocol=Протокол -label.public.interface=Публичный Ð¸Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ -label.public.ip=Публичный IP-Ð°Ð´Ñ€ÐµÑ -label.public.ips=Публичные IP-адреÑа -label.public.port=Публичный порт -label.public.zone=ÐŸÑƒÐ±Ð»Ð¸Ñ‡Ð½Ð°Ñ Ð·Ð¾Ð½Ð° -label.public=Публичный -label.recent.errors=Полученные ошибки -label.refresh=Обновить -label.related=СвÑзанный -label.remove.from.load.balancer=Удалить машину Ñ Ð±Ð°Ð»Ð°Ð½Ñировки нагрузки -label.removing.user=Удаление Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ -label.required=ТребуетÑÑ -label.reserved.system.ip=Зарезервированный ÑиÑтемный IP -label.resource.limits=Пределы реÑурÑов -label.resource=РеÑÑƒÑ€Ñ -label.resources=РеÑурÑÑ‹ -label.role=Роль -label.root.disk.offering=РеÑÑƒÑ€Ñ ÐºÐ¾Ñ€Ð½ÐµÐ²Ð¾Ð³Ð¾ диÑка -label.running.vms=Запущенные Ð’Ðœ -label.saturday=Суббота -label.save=Сохранить -label.saving.processing=Сохранение... -label.scope=Сфера -label.search=ПоиÑк -label.secondary.storage=Дополнительное хранилище -label.secondary.used=ИÑпользование дополнительного хранилища -label.secret.key=Секретный ключ -label.security.group.name=Ð˜Ð¼Ñ Ð³Ñ€ÑƒÐ¿Ð¿Ñ‹ безопаÑноÑти -label.security.group=Группа безопаÑноÑти -label.security.groups.enabled=Группы безопаÑноÑти включены -label.security.groups=Группы безопаÑноÑти -label.sent=Отправлено -label.server=Сервер -label.service.offering=Служебный реÑÑƒÑ€Ñ -label.system.service.offering=СиÑтемный реÑÑƒÑ€Ñ -label.session.expired=Ð’Ñ€ÐµÐ¼Ñ ÑеÑÑии вышло -label.shared=ОбщедоÑтупный -label.size=Размер -label.snapshot.limits=Пределы Ñнимков -label.snapshot.name=Ð˜Ð¼Ñ Ñнимка -label.snapshot.s=Снимок/Ñнимки -label.snapshot.schedule=ÐаÑтройка повторÑемых Ñнимков -label.snapshot=Снимок -label.snapshots=Снимки -label.source.nat=NAT-иÑточник -label.specify.vlan=Укажите VLAN -label.start.port=Ðачальный порт -label.state=СоÑтоÑние -label.static.nat.to=Статичный NAT к -label.static.nat=Статичный NAT -label.statistics=СтатиÑтика -label.status=Ð¡Ñ‚Ð°Ñ‚ÑƒÑ -label.step.1.title=Шаг 1\: Выберите шаблон -label.step.1=Шаг 1 -label.step.2.title=Шаг 2\: СиÑтемный реÑÑƒÑ€Ñ -label.step.2=Шаг 2 -label.step.3.title=Шаг 3\: Выберите диÑковый реÑÑƒÑ€Ñ -label.step.3=Шаг 3 -label.step.4.title=Step 4\: Сеть -label.step.4=Шаг 4 -label.step.5.title=Step 5\: Обзор -label.step.5=Шаг 5 -label.stopped.vms=ОÑтановленные Ð’Ðœ -label.storage.type=Тип хранилища -label.storage=Хранилище -label.submit=Опубликовать -label.submitted.by=[Опубликовано\: ] -label.succeeded=УÑпешно -label.sunday=ВоÑкреÑенье -label.system.capacity=МощноÑÑ‚ÑŒ ÑиÑтемы -label.system.vm.type=Тип ÑиÑтемной Ð’Ðœ -label.system.vm=СиÑÑ‚ÐµÐ¼Ð½Ð°Ñ Ð’Ðœ -label.system.vms=СиÑтемные Ð’Ðœ -label.tagged=С меткой -label.tags=Метки -label.target.iqn=Целевой IQN -label.template.limits=Пределы шаблона -label.template=Шаблон -label.theme.default=Ð¡Ñ‚Ð°Ð½Ð´Ð°Ñ€Ñ‚Ð½Ð°Ñ Ñ‚ÐµÐ¼Ð° -label.theme.grey=Ð¡ÐµÑ€Ð°Ñ Ñ‚ÐµÐ¼Ð° -label.theme.lightblue=Ð“Ð¾Ð»ÑƒÐ±Ð°Ñ Ñ‚ÐµÐ¼Ð° -label.thursday=Четверг -label.time.zone=ЧаÑовой поÑÑ -label.time=Ð’Ñ€ÐµÐ¼Ñ -label.timeout.in.second = Ð’Ñ€ÐµÐ¼Ñ Ð¾Ð¶Ð¸Ð´Ð°Ð½Ð¸Ðµ (Ñек.) -label.timezone=ЧаÑовой поÑÑ -label.total.cpu=Ð’Ñего CPU -label.total.vms=Ð’Ñего Ð’Ðœ -label.traffic.type=Тип трафика -label.tuesday=Вторник -label.type.id=ID типа -label.type=Тип -label.unavailable=Ðе доÑтупно -label.unlimited=БеÑконечно -label.untagged=Без метки -label.update.ssl.cert=Обновить Ñертификаты SSL -label.update.ssl=Обновить Ñертификаты SSL -label.updating=Обновление -label.url=URL -label.usage.interface=Ð˜Ð½Ñ‚ÐµÑ€Ñ„ÐµÐ¹Ñ Ð¸ÑÐ¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ð½Ð¸Ñ -label.used=ИÑпользовано -label.user=Пользователь -label.username=Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ -label.users=Пользователи -label.value=Значение -label.vcenter.cluster=КлаÑтер vCenter -label.vcenter.datacenter=ЦОД vCenter -label.vcenter.datastore=Хранилище vCenter -label.vcenter.host=Узел vCenter -label.vcenter.password=Пароль vCenter -label.vcenter.username=Ð˜Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ vCenter -label.version=ВерÑÐ¸Ñ -label.virtual.appliance=Виртуальное уÑтройÑтво -label.virtual.appliances=Виртуальное уÑтройÑтва -label.virtual.network=Ð’Ð¸Ñ€Ñ‚ÑƒÐ°Ð»ÑŒÐ½Ð°Ñ Ñеть -label.vlan.id=ID VLAN -label.vlan.range=Диапазон VLAN -label.vm.add=Добавить машины -label.vm.destroy=Уничтожить -label.vm.reboot=Перезагрузить -label.vm.start=ЗапуÑтить -label.vm.stop=ОÑтановить -label.vmfs=VMFS -label.vms=Ð’Ðœ -label.volume.limits=Пределы томов -label.volume.name=Ð˜Ð¼Ñ Ñ‚Ð¾Ð¼Ð° -label.volume=Том -label.volumes=Томы -label.vsphere.managed=ОбÑлуживание vSphere -label.waiting=Ожидание -label.warn=Внимание -label.wednesday=Среда -label.weekly=Еженедельно -label.welcome.cloud.console=Добро пожаловать на панель ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ -label.welcome=Добро пожаловать -label.yes=Да -label.zone.id=ID зоны -label.zone.step.1.title=Шаг 1\: Выберите Ñеть -label.zone.step.2.title=Step 2\: Добавьте зону -label.zone.step.3.title=Step 3\: Добавьте Ñтенд -label.zone.step.4.title=Step 4\: Добавьте диапазон IP-адреÑов -label.zone.wide=Ð’Ñей зоны -label.zone=Зона - -#Messages -message.acquire.public.ip=ПожалуйÑта, выберите зону, из которой вы хотите приобреÑти новый IP. -message.action.cancel.maintenance.mode=Подтвердите, что вы дейÑтвительно хотите отменить режим обÑлуживаниÑ. -message.action.cancel.maintenance=Узел уÑпешно вышел из режима обÑлуживаниÑ. Этль процеÑÑ Ð¼Ð¾Ð¶ÐµÑ‚ длитьÑÑ Ð½ÐµÑколько минут. -message.action.delete.ISO.for.all.zones=Это ISO, иÑпользуемый вÑеми зонами. Подтвердите, что вы дейÑтвительно хотите удалить его Ñо вÑех зон. -message.action.delete.ISO=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот ISO. -message.action.delete.cluster=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот клаÑтер. -message.action.delete.disk.offering=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот диÑковый реÑурÑ. -message.action.delete.domain=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот домен. -message.action.delete.external.firewall=Подтвердите, что вы дейÑтвительно хотите удалить внешний фаервол. Внимание\: еÑли вы планируете вернутьÑÑ Ðº Ñтому внешнему фаерволу обратно, вам придетÑÑ ÑброÑить информацию об иÑпользовании в уÑтройÑтве. -message.action.delete.external.load.balancer=Подтвердите, что вы дейÑтвительно хотите удалить внешнюю баланÑировку нагрузки. Внимание\: еÑли вы планируете вернутьÑÑ Ðº Ñтой внешней баланÑировке, вам придетÑÑ ÑброÑить информацию об иÑпользовании в уÑтройÑтве. -message.action.delete.ingress.rule=Подтвердите, что вы дейÑтвительно хотите удалить Ñто входное правило. -message.action.delete.network=Подтвердите, что вы дейÑтвительно хотите удалить Ñту Ñеть. -message.action.delete.pod=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот Ñтенд. -message.action.delete.primary.storage=Подтвердите, что вы дейÑтвительно хотите удалить Ñто оÑновное хранилище. -message.action.delete.secondary.storage=Подтвердите, что вы дейÑтвительно хотите удалить Ñто дополнительное хранилище. -message.action.delete.security.group=Подтвердите, что вы дейÑтвительно хотите удалить Ñту группу безопаÑноÑти. -message.action.delete.service.offering=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот Ñлужебный реÑурÑ. -message.action.delete.snapshot=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот Ñнимок. -message.action.delete.template.for.all.zones=Шаблон иÑпользуетÑÑ Ð²Ð¾ вÑех зонах. Подтвердите, что вы хотите удалить его Ñо вÑех зон. -message.action.delete.template=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот шаблон. -message.action.delete.volume=Подтвердите, что вы дейÑтвительно хотите удалить Ñтот том. -message.action.delete.zone=Подтвердите, что вы дейÑтвительно хотите удалить Ñту зону. -message.action.destroy.instance=Подтвердите, что вы дейÑтвительно хотите уничтожить Ñту машину. -message.action.destroy.systemvm=Подтвердите, что вы дейÑтвительно хотите удалить Ñто оÑновное хранилище. -message.action.disable.static.NAT=Подтвердите, что вы дейÑтвительно хотите отключить Ñтатичный NAT. -message.action.enable.maintenance=Узел уÑпешно вошел в режим обÑлуживаниÑ. ДлительноÑÑ‚ÑŒ Ñтого процеÑÑа завиÑит от количеÑтва запущенных Ð’Ðœ в Ñтом узле и обычно равна неÑкольким минутам. -message.action.force.reconnect=Узел уÑпешно переподключилÑÑ. Этот процеÑÑ Ð¼Ð¾Ð¶ÐµÑ‚ длитьÑÑ Ð½ÐµÑколько минут. -message.action.host.enable.maintenance.mode=Включение режима обÑÐ»ÑƒÐ¶Ð¸Ð²Ð°Ð½Ð¸Ñ Ð½Ð° узле приведет к переноÑу запущенных виртуальных машин на другие доÑтупные узлы. -message.action.instance.reset.password=Подтвердите, что вы дейÑтвительно хотите изменить пароль root Ñтой Ð’Ðœ. -message.action.primarystorage.enable.maintenance.mode=Внимание\: при переходе оÑновного хранилища в режим обÑлуживаниÑ, вÑе Ð’Ðœ будут оÑтановлены. Хотите продолжить? -message.action.reboot.instance=Подтвердите, что вы дейÑтвительно хотите перезагрузить Ñту машину. -message.action.reboot.systemvm=Подтвердите, что вы дейÑтвительно хотите перезагрузить Ñтот ÑиÑтемный Ð’Ðœ. -message.action.release.ip=Подтвердите, что вы дейÑтвительно хотите оÑвободить Ñтот IP-адреÑ. -message.action.remove.host=Удаление поÑледнего/единÑтвенного Ñервера в клаÑтере и Ð¿Ð¾Ð²Ñ‚Ð¾Ñ€Ð½Ð°Ñ ÐµÐ³Ð¾ уÑтановка приведет уничтожению рабочего окружениÑ/базы данных на Ñервере и Ñделае гоÑтевые машины непригодными к иÑпользованию. -message.action.restore.instance=Подтвердите, что вы дейÑтвительно хотите воÑÑтановить Ñту машину. -message.action.start.instance=Подтвердите, что вы дейÑтвительно хотите запуÑтить Ñту машину. -message.action.start.router=Подтвердите, что вы дейÑтвительно хотите запуÑтить Ñтот роутер. -message.action.start.systemvm=Подтвердите, что вы дейÑтвительно хотите запуÑтить Ñту ÑиÑтемную Ð’Ðœ. -message.action.stop.instance=Подтвердите, что вы дейÑтвительно хотите оÑтановить Ñту машину. -message.action.stop.systemvm=Подтвердите, что вы дейÑтвительно хотите оÑтановить Ñту ÑиÑтемную Ð’Ðœ. -message.action.take.snapshot=Подтвердите, что вы дейÑтвительно хотите получить Ñнимок Ñтого тома. -message.add.cluster.zone=Добавить гипервизора ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÐ»Ð°Ñтером Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ -message.add.cluster=Добавить гипервизор ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ ÐºÐ»Ð°Ñтером Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ , модуль -message.add.disk.offering=ПожалуйÑта, укажите Ñледующие параметры, чтобы добавить новое предложение диÑка -message.add.firewall=Добавить фаервол в зону -message.add.host=Укажите Ñледующие параметры Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ узла. -message.add.ip.range.direct.network=Добавить IP-диапазона Ñети в зоне -message.add.ip.range.to.pod=

Добавить диапазон IP-адреÑов в Ñтенд\:

-message.add.ip.range=Добавить диапазон IP-адреÑов в публичную Ñеть зоны -message.add.load.balancer=Добавить баланÑировку нагрузки в зону -message.add.network=Добавить новую Ñеть Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹\: -message.add.pod=Добавить новый Ñтенд Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ -message.add.primary.storage=Добавить оÑновное хранилище Ð´Ð»Ñ Ð·Ð¾Ð½Ñ‹ , Ñтенда -message.add.primary=Укажите Ñледующие параметры Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ оÑновного хранилища -message.add.secondary.storage=Добавить хранилище в зону -message.add.service.offering=Укажите Ñледующие параметры Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ ÑиÑтемного реÑурÑа. -message.add.template=Укажите Ñледующие параметры Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ шаблона -message.add.volume=Укажите Ñледующие параметры Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ тома -message.additional.networks.desc=ПожалуйÑта, выберите дополнительные Ñети, куда вашы Ñервера будут подключены. -message.advanced.mode.desc=Выберите Ñту модель Ñети, еÑли вы хотите включить поддержку VLAN. Эта ÑÐµÑ‚ÐµÐ²Ð°Ñ Ð¼Ð¾Ð´ÐµÐ»ÑŒ обеÑпечивает макÑимальную гибкоÑÑ‚ÑŒ в предоÑтавлении админиÑтраторам Ð´Ð»Ñ Ð¿Ñ€ÐµÐ´Ð¾ÑÑ‚Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»ÑŒÑких предложений Ñети, такие как межÑетевой Ñкран, VPN, или поддержка баланÑировки нагрузки, а также позволÑет прÑмое против виртуальных Ñетей. -message.advanced.security.group=Выберите Ñтот параметр, еÑли вы хотите иÑпользовать группы безопаÑноÑти, обеÑпечить изолÑцию Ñервера. -message.advanced.virtual=Выберите Ñтот параметр, еÑли вы хотите иÑпользовать вÑей зоны Ñети VLAN, чтобы обеÑпечить изолÑцию Ñервера. -message.allow.vpn.access=ПожалуйÑта, введите Ð¸Ð¼Ñ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð¸ пароль пользователÑ, который вы хотите добавить Ð´Ð»Ñ VPN-доÑтупа. -message.attach.iso.confirm=ПожалуйÑта, подтвердите, что вы хотите прикрепить ISO в Ñтот Ñервер. -message.attach.volume=ПожалуйÑта, укажите Ñледующие данные, что бы увеличить меÑто. Ð”Ð»Ñ Windows, нужно перезагружать Ñервер -message.basic.mode.desc=Выберите Ñту модель Ñети, еÑли вы *not* хотите, чтобы была Ð»ÑŽÐ±Ð°Ñ Ð¿Ð¾Ð´Ð´ÐµÑ€Ð¶ÐºÐ° VLAN. Ð’Ñем виртуальным машинам, Ñозданные по Ñтой модели Ñети будет назначен IP напрÑмую из Ñети и группы безопаÑноÑти, которые иÑпользуютÑÑ Ð´Ð»Ñ Ð¾Ð±ÐµÑÐ¿ÐµÑ‡ÐµÐ½Ð¸Ñ Ð±ÐµÐ·Ð¾Ð¿Ð°ÑноÑти и Ñегрегации. -message.change.offering.confirm=ПожалуйÑта, подтвердите, что вы хотите изменить Ñлужбу Ñ€Ð°Ð·Ð¼ÐµÑ‰ÐµÐ½Ð¸Ñ Ñтого VM. -message.copy.iso.confirm=ПожалуйÑта, подтвердите, что вы хотите Ñкопировать ISO до -message.copy.template=Копировать шаблон XXX из зоны в -message.create.template.vm=Создать шаблон виртуальной машины -message.create.template.volume=ПожалуйÑта, укажите Ñледующую информацию, прежде чем Ñоздавать шаблон диÑка объемом\: . Создание шаблона может варьироватьÑÑ Ð¾Ñ‚ неÑкольких минут до дольше в завиÑимоÑти от размера тома. -message.delete.account=ПожалуйÑта, подтвердите, что вы хотите удалить Ñтот аккаунт. -message.detach.iso.confirm=ПожалуйÑта, подтвердите, что вы хотите отделить ISO от Ñтого виртуального Ñервера. -message.disable.account=ПожалуйÑта, подтвердите, что вы хотите отключить Ñту учетную запиÑÑŒ. При отключении аккаунта, вÑе пользователи Ð´Ð»Ñ Ñтой учетной запиÑи не будут иметь доÑтуп к Ñвоим реÑурÑам облака. Ð’Ñе виртуальные машины будут немедленно закрыты. -message.disable.vpn.access=ПожалуйÑта, подтвердите, что вы хотите отключить VPN доÑтуп -message.download.ISO=ПожалуйÑта, нажмите 00000 Ñкачать образ -message.download.template=Ðажмите 00000Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ -message.download.volume=Ðажмите 00000 Ð´Ð»Ñ Ð·Ð°Ð³Ñ€ÑƒÐ·ÐºÐ¸ тома -message.edit.confirm=ПожалуйÑта, подтвердите, прежде чем нажать "Сохранить". -message.edit.limits=Укажите пределы Ð´Ð»Ñ Ñ€ÐµÑурÑов. Значение "-1" означает отÑутÑтвие предела Ð¿Ð¾Ñ‚Ñ€ÐµÐ±Ð»ÐµÐ½Ð¸Ñ Ð´Ð°Ð½Ð½Ð¾Ð³Ð¾ реÑурÑа. -message.enable.account=Подтвердите, что вы дейÑтвительно хотите включить Ñту учётную запиÑÑŒ. -message.enable.vpn.access=Ð¡ÐµÐ¹Ñ‡Ð°Ñ VPN Ð´Ð»Ñ Ñтого IP-aдреÑа выключен. Желаете включить VPN-доÑтуп? -message.enabled.vpn.ip.sec=Ваш IPSec pre-shared ключ -message.enabled.vpn=Ваш VPN доÑтуп в наÑтоÑщее Ð²Ñ€ÐµÐ¼Ñ Ð²ÐºÐ»ÑŽÑ‡ÐµÐ½ и могут быть доÑтупны через IP -message.launch.vm.on.private.network=Хотите запуÑтить Ð’Ðœ в вашей чаÑтной выделенной Ñети? -message.lock.account=Подтвердите, что вы дейÑтвительно хотите заблокировать Ñту учётную запиÑÑŒ. Ð’Ñе пользователи в таких учётных запиÑÑÑ… потерÑÑŽÑ‚ возможноÑÑ‚ÑŒ управлÑÑ‚ÑŒ Ñвоими облачными реÑурÑами. Эти реÑурÑÑ‹ оÑтанутÑÑ Ð´Ð¾Ñтупны Ð´Ð»Ñ Ð´Ñ€ÑƒÐ³Ð¸Ñ… учётных запиÑей. -message.migrate.instance.confirm=Подтвердите, что вы дейÑтвительно хотите перенеÑти виртуальную машину. -message.new.user=Введите информацию Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ð¿Ð¾Ð»ÑŒÐ·Ð¾Ð²Ð°Ñ‚ÐµÐ»Ñ Ð² учётную запиÑÑŒ. -message.no.network.support.configuration.not.true=Ðи в одной зоне нет групп безопаÑноÑти. ПоÑтому дополнительные Ñетевые возможноÑти недоÑтупны. Перейдите к шагу 5. -message.no.network.support=Выбранный гипервизор (vSphere) не обладает дополнительными Ñетевыми возмодноÑÑ‚Ñми. Перейдите к шагу 5. -message.number.clusters=

\# of КлаÑтеры

-message.number.hosts=

\# of Узлы

-message.number.pods=

\# of Стенды

-message.number.storage=

\# of Тома оÑновного хранилища

-message.number.zones=

\# of Зоны

-message.remove.vpn.access=Подтвердите, что вы дейÑтвительно хотите удалить доÑтуп к VPN Ð´Ð»Ñ Ñтого пользователÑ. -message.restart.mgmt.server=ПожалуйÑта, перезагрузите Ñервер(Ñ‹) ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¸Ð½ÑÑ‚Ð¸Ñ Ð½Ð¾Ð²Ñ‹Ñ… наÑтроек. -message.restart.mgmt.usage.server=ПожалуйÑта, перезагрузите Ñервер Ð´Ð»Ñ Ð²ÑÑ‚ÑƒÐ¿Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ñ‹Ñ… параметров в Ñилу. -message.security.group.usage=(иÑпользуйте Ctrl-клик, чтобы выбрать вÑе ÑоответÑтвующие группы безопаÑноÑти) -message.snapshot.schedule=Ð’Ñ‹ можете наÑтроить повторÑющиеÑÑ Ñнимоки, Ð²Ñ‹Ð±Ð¸Ñ€Ð°Ñ Ð¸Ð· доÑтупных вариантов ниже и применив политику Ð¿Ñ€ÐµÐ´Ð¿Ð¾Ñ‡Ñ‚ÐµÐ½Ð¸Ñ -message.step.1.continue=Выберите шаблон или ISO Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ. -message.step.1.desc=ПожалуйÑта, выберите шаблон Ð´Ð»Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ñервера. Ð’Ñ‹ можете также выбрать пуÑтой шаблон, из которого образ ISO может быть уÑтановлен на. -message.step.2.continue=Выберите Ñлужебный реÑÑƒÑ€Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ. -message.step.2.desc= -message.step.3.continue=Выберите диÑковый реÑÑƒÑ€Ñ Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ. -message.step.3.desc= -message.step.4.continue=Выберите Ñ…Ð¾Ñ‚Ñ Ð±Ñ‹ одну Ñеть Ð´Ð»Ñ Ð¿Ñ€Ð¾Ð´Ð¾Ð»Ð¶ÐµÐ½Ð¸Ñ. -message.step.4.desc=Выберите оÑновную Ñеть, к которой будет подключена машина. -message.update.os.preference=ПожалуйÑта, выберите ОС Ð´Ð»Ñ Ñтого хоÑта. Ð’Ñе виртуальные ÑкземплÑры Ñ Ð°Ð½Ð°Ð»Ð¾Ð³Ð¸Ñ‡Ð½Ñ‹Ð¼Ð¸ предпочтениÑми впервые будет выделено на Ñтот узел, прежде чем выбрать другую. -message.update.ssl=ПожалуйÑта, отправьте новый ÑовмеÑтимый X.509 SSL Ñертификат Ð´Ð»Ñ Ð¾Ð±Ð½Ð¾Ð²Ð»ÐµÐ½Ð¸Ñ Ð´Ð»Ñ ÐºÐ°Ð¶Ð´Ð¾Ð¹ конÑоли виртуальных прокÑи, например\: -message.virtual.network.desc=выделенной виртуальной Ñети Ð´Ð»Ñ Ð²Ð°ÑˆÐµÐ¹ учетной запиÑи. Широковещательный домен находитÑÑ Ð²Ð½ÑƒÑ‚Ñ€Ð¸ VLAN и веÑÑŒ внешний доÑтуп к Ñети направлÑетÑÑ Ð¿ÑƒÑ‚ÐµÐ¼ виртуального маршрутизатора. -message.volume.create.template.confirm=Подтвердите, что вы дейÑтвительно хотите Ñоздать шаблон Ñтого тома. Это процеÑÑ Ð¼Ð¾Ð¶ÐµÑ‚ продлитьÑÑ Ð½ÐµÑколько минут в завиÑимоÑти от размера тома. -message.zone.step.1.desc=Выберите тип Ñети Ñтой зоны. -message.zone.step.2.desc=Введите необходимую информацию Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð¹ зоны -message.zone.step.3.desc=Введите необходимую информацию Ð´Ð»Ñ Ð´Ð¾Ð±Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½Ð¾Ð²Ð¾Ð³Ð¾ Ñтенда -message.apply.snapshot.policy=Политики Ñтого Ñнимка были уÑпешно обновлены. -message.disable.snapshot.policy=Политики Ñтого Ñнимка были уÑпешно отключены. -message.action.change.service.warning.for.instance=Ð”Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ñ‚ÐµÐºÑƒÑ‰ÐµÐ³Ð¾ Ñлужебного реÑурÑа ваша машина должна быть оÑтановлена. -message.action.change.service.warning.for.router=\n -message.action.reset.password.warning=Машина должна быть оÑтановлена Ð´Ð»Ñ Ð¸Ð·Ð¼ÐµÐ½ÐµÐ½Ð¸Ñ Ð¿Ð°Ñ€Ð¾Ð»Ñ -message.action.reset.password.off=Ðа данный момент машина не поддерживает данную функцию - -#Errors -error.login=Ваше имÑ/пароль не Ñовпадает Ñ Ð²Ð°ÑˆÐ¸Ð¼Ð¸ запиÑÑми. -error.menu.select=Ðе удаетÑÑ Ð²Ñ‹Ð¿Ð¾Ð»Ð½Ð¸Ñ‚ÑŒ дейÑтвие из-за отÑутÑÑ‚Ð²Ð¸Ñ Ð²Ñ‹Ð±Ñ€Ð°Ð½Ñ‹Ñ… пунктов. -error.mgmt.server.inaccessible=Сервер ÑƒÐ¿Ñ€Ð°Ð²Ð»ÐµÐ½Ð¸Ñ Ð½ÐµÐ´Ð¾Ñтупна. Попробуйте обратитьÑÑ Ðº нему позже. -error.session.expired=Ваша ÑеÑÑÐ¸Ñ Ð±Ñ‹Ð»Ð° завершена -error.unresolved.internet.name=Ваше интернет-Ð¸Ð¼Ñ Ð¾Ð¿Ñ€ÐµÐ´ÐµÐ»Ð¸Ñ‚ÑŒ не удалоÑÑŒ - -#resizeVolumes -label.resize.new.size=New Size(GB) -label.action.resize.volume=Resize Volume -label.action.resize.volume.processing=Resizing Volume.... -label.resize.new.offering.id=New Offering -label.resize.shrink.ok=Shrink OK - +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +changed.item.properties=\u041f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u0430 \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u044b +confirm.enable.swift=\u0417\u0430\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u043d\u0438\u0436\u0435\u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0434\u043b\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438 Swift +error.could.not.enable.zone=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0437\u043e\u043d\u0443 +error.installWizard.message=\u0427\u0442\u043e-\u0442\u043e \u043d\u0435 \u0442\u0430\u043a. \u0412\u0435\u0440\u043d\u0438\u0442\u0435\u0441\u044c \u043d\u0430\u0437\u0430\u0434 \u0438 \u0438\u0441\u043f\u0440\u0430\u0432\u044c\u0442\u0435 \u043e\u0448\u0438\u0431\u043a\u0438. +error.invalid.username.password=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u0456\u0439 \u043b\u043e\u0433\u0438\u043d \u0438\u043b\u0438 \u043f\u0430\u0440\u043e\u043b\u044c +error.login=\u0412\u0430\u0448\u0435 \u0438\u043c\u044f/\u043f\u0430\u0440\u043e\u043b\u044c \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u0435\u0442 \u0441 \u0432\u0430\u0448\u0438\u043c\u0438 \u0437\u0430\u043f\u0438\u0441\u044f\u043c\u0438. +error.menu.select=\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u0432\u044b\u043f\u043e\u043b\u043d\u0438\u0442\u044c \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0435 \u0438\u0437-\u0437\u0430 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u044f \u0432\u044b\u0431\u0440\u0430\u043d\u044b\u0445 \u043f\u0443\u043d\u043a\u0442\u043e\u0432. +error.mgmt.server.inaccessible=\u0421\u0435\u0440\u0432\u0435\u0440 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430. \u041f\u043e\u043f\u0440\u043e\u0431\u0443\u0439\u0442\u0435 \u043e\u0431\u0440\u0430\u0442\u0438\u0442\u044c\u0441\u044f \u043a \u043d\u0435\u043c\u0443 \u043f\u043e\u0437\u0436\u0435. +error.password.not.match=\u041f\u0430\u0440\u043e\u043b\u0438 \u043d\u0435 \u0441\u043e\u0432\u043f\u0430\u0434\u0430\u044e\u0442 +error.please.specify.physical.network.tags=\u0421\u0435\u0442\u044c \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u0439 \u043d\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u0430, \u043f\u043e\u043a\u0430 \u0432\u044b \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u0442\u0435\u0433\u0438 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u043e\u0439 \u0441\u0435\u0442\u0438. +error.session.expired=\u0412\u0430\u0448\u0430 \u0441\u0435\u0441\u0441\u0438\u044f \u0431\u044b\u043b\u0430 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0430 +error.something.went.wrong.please.correct.the.following=\u0427\u0442\u043e-\u0442\u043e \u043d\u0435 \u0442\u0430\u043a, \u0438\u0441\u043f\u0440\u0430\u0432\u044c\u0442\u0435 \u043e\u0448\u0438\u0431\u043a\u0438 +error.unable.to.reach.management.server=\u041d\u0435 \u0443\u0434\u0430\u0435\u0442\u0441\u044f \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0441\u0435\u0440\u0432\u0435\u0440\u0443 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f +error.unresolved.internet.name=\u0412\u0430\u0448\u0435 \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442-\u0438\u043c\u044f \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0438\u0442\u044c \u043d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c +extractable=\u0418\u0437\u0432\u043b\u0435\u043a\u0430\u0435\u043c\u044b\u0439 +force.delete.domain.warning=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435\: \u041f\u0440\u0438 \u0432\u044b\u0431\u043e\u0440\u0435 \u044d\u0442\u043e\u0433\u043e \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u0430 \u043f\u0440\u0438\u0432\u0435\u0434\u0435\u0442 \u043a \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u044e \u0432\u0441\u0435\u0445 \u0434\u043e\u0447\u0435\u0440\u043d\u0438\u0445 \u0434\u043e\u043c\u0435\u043d\u043e\u0432 \u0438 \u0432\u0441\u0435 \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0435 \u0441 \u043d\u0438\u043c\u0438 \u0430\u043a\u043a\u0430\u0443\u043d\u0442\u043e\u0432 \u0438 \u0438\u0445 \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432. +force.delete=\u041f\u0440\u0438\u043d\u0443\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c +force.remove.host.warning=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435\: \u041f\u0440\u0438 \u0432\u044b\u0431\u043e\u0440\u0435 \u044d\u0442\u043e\u0439 \u043e\u043f\u0446\u0438\u0438 \u0431\u0443\u0434\u0435\u0442 \u0432\u044b\u0437\u044b\u0432\u0430\u043d CloudStack \u0434\u043b\u044f \u043f\u0440\u0438\u043d\u0443\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0439 \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u043a\u0438 \u0432\u0441\u0435\u0445 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043c\u0430\u0448\u0438\u043d, \u043f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u0441\u043d\u0438\u043c\u0430\u0442\u044c \u044d\u0442\u043e\u0442 \u0443\u0437\u0435\u043b \u0438\u0437 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430.. +force.remove=\u041f\u0440\u0438\u043d\u0443\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0443\u0434\u0430\u043b\u0438\u0442\u044c +force.stop.instance.warning=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435\: \u041f\u0440\u0438\u043d\u0443\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u043f\u0440\u0438\u043c\u0435\u043d\u044f\u0442\u044c\u0441\u044f \u0432 \u0441\u0430\u043c\u0443\u044e\u043f\u043e\u0441\u043b\u0435\u0434\u043d\u044e\u044e \u043e\u0447\u0435\u0440\u0435\u0434\u044c. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u043e\u0442\u0435\u0440\u044f\u0442\u044c \u0434\u0430\u043d\u043d\u044b\u0435 \u0438\u043b\u0438 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043d\u0435\u043e\u0436\u0438\u0434\u0430\u043d\u043d\u043e\u0435 \u043f\u043e\u0432\u0435\u0434\u0435\u043d\u0438\u0435/\u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u043e\u0439 \u043c\u0430\u0448\u0438\u043d\u044b. +force.stop=\u041f\u0440\u0438\u043d\u0443\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c +ICMP.code=\u041a\u043e\u0434 ICMP +ICMP.type=\u0422\u0438\u043f ICMP +image.directory=\u041a\u0430\u0442\u0430\u043b\u043e\u0433 \u0441 \u043e\u0431\u0440\u0430\u0437\u0430\u043c\u0438 +inline=\u0412\u0441\u0442\u0440\u043e\u0435\u043d\u043d\u044b\u0439 +instances.actions.reboot.label=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +label.accept.project.invitation=\u041f\u0440\u0438\u043d\u044f\u0442\u044c \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u0435 \u043d\u0430 \u043f\u0440\u043e\u0435\u043a\u0442 +label.account.and.security.group=\u0410\u043a\u043a\u0430\u0443\u043d\u0442, \u0433\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 +label.account.id=ID \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 +label.account.name=\u0418\u043c\u044f \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 +label.account.specific=\u0421\u043f\u0435\u0446\u0438\u0444\u0438\u043a\u0430 \u0430\u043a\u043a\u0430\u0443\u043d\u043d\u0442\u0430 +label.accounts=\u0423\u0447\u0451\u0442\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 +label.account=\u0423\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c +label.acquire.new.ip=\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 IP +label.action.attach.disk.processing=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435 \u0434\u0438\u0441\u043a\u0430... +label.action.attach.disk=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u0438\u0442\u044c \u0434\u0438\u0441\u043a +label.action.attach.iso.processing=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435 ISO... +label.action.attach.iso=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u0438\u0442\u044c ISO +label.action.cancel.maintenance.mode.processing=\u041e\u0442\u043c\u0435\u043d\u0430 \u0440\u0435\u0436\u0438\u043c\u0430 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f... +label.action.cancel.maintenance.mode=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f +label.action.change.password=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c +label.action.change.service.processing=\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u0435 \u0441\u043b\u0443\u0436\u0431\u044b... +label.action.change.service=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u043b\u0443\u0436\u0431\u0443 +label.action.copy.ISO.processing=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 ISO... +label.action.copy.ISO=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c ISO +label.action.copy.template.processing=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u0430... +label.action.copy.template=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d +label.action.create.template.from.vm=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d \u0438\u0437 \u0412\u041c +label.action.create.template.from.volume=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d \u0438\u0437 \u0442\u043e\u043c\u0430 +label.action.create.template.processing=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u0430... +label.action.create.template=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d +label.action.create.vm.processing=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0412\u041c... +label.action.create.vm=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0412\u041c +label.action.create.volume.processing=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0442\u043e\u043c\u0430... +label.action.create.volume=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0442\u043e\u043c +label.action.delete.account.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438... +label.action.delete.account=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c +label.action.delete.cluster.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430... +label.action.delete.cluster=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043a\u043b\u0430\u0441\u0442\u0435\u0440 +label.action.delete.disk.offering.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0434\u0438\u0441\u043a\u043e\u0432\u043e\u0433\u043e \u0440\u0435\u0441\u0443\u0440\u0441\u0430... +label.action.delete.disk.offering=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0438\u0441\u043a\u043e\u0432\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.action.delete.domain.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0434\u043e\u043c\u0435\u043d\u0430... +label.action.delete.domain=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u043e\u043c\u0435\u043d +label.action.delete.firewall.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0444\u0430\u0435\u0440\u0432\u043e\u043b\u0430... +label.action.delete.firewall=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e \u0444\u0430\u0435\u0440\u0432\u043e\u043b\u0430 +label.action.delete.ingress.rule.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0432\u0445\u043e\u0434\u043d\u043e\u0433\u043e \u043f\u0440\u0430\u0432\u0438\u043b\u0430... +label.action.delete.ingress.rule=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u0445\u043e\u0434\u043d\u043e\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.action.delete.IP.range.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430 IP... +label.action.delete.IP.range=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP +label.action.delete.ISO.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 ISO... +label.action.delete.ISO=\u0423\u0434\u0430\u043b\u0438\u0442\u044c ISO +label.action.delete.load.balancer.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438... +label.action.delete.load.balancer=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +label.action.delete.network.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0441\u0435\u0442\u0438... +label.action.delete.network=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0435\u0442\u044c +label.action.delete.nexusVswitch=\u0423\u0434\u0430\u043b\u0438\u0442\u044c NexusVswitch +label.action.delete.physical.network=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u043e\u0439 \u0441\u0435\u0442\u0438 +label.action.delete.pod.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0441\u0442\u0435\u043d\u0434\u0430... +label.action.delete.pod=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0442\u0435\u043d\u0434 +label.action.delete.primary.storage.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430... +label.action.delete.primary.storage=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.action.delete.secondary.storage.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430... +label.action.delete.secondary.storage=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.action.delete.security.group.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0433\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438... +label.action.delete.security.group=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 +label.action.delete.service.offering.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0441\u043b\u0443\u0436\u0435\u0431\u043d\u043e\u0433\u043e \u0440\u0435\u0441\u0443\u0440\u0441\u0430... +label.action.delete.service.offering=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u043b\u0443\u0436\u0435\u0431\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.action.delete.snapshot.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0441\u043d\u0438\u043c\u043a\u0430... +label.action.delete.snapshot=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u043d\u0438\u043c\u043e\u043a +label.action.delete.system.service.offering=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.action.delete.template.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u0430... +label.action.delete.template=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d +label.action.delete.user.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f... +label.action.delete.user=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +label.action.delete.volume.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0442\u043e\u043c\u0430... +label.action.delete.volume=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0442\u043e\u043c +label.action.delete.zone.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0437\u043e\u043d\u044b... +label.action.delete.zone=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0437\u043e\u043d\u0443 +label.action.destroy.instance.processing=\u0423\u043d\u0438\u0447\u0442\u043e\u0436\u0435\u043d\u0438\u0435 \u043c\u0430\u0448\u0438\u043d\u044b... +label.action.destroy.instance=\u0423\u043d\u0438\u0447\u0442\u043e\u0436\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +label.action.destroy.systemvm.processing=\u0423\u043d\u0438\u0447\u0442\u043e\u0436\u0435\u043d\u0438\u0435 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0433\u043e \u0412\u041c... +label.action.destroy.systemvm=\u0423\u043d\u0438\u0447\u0442\u043e\u0436\u0438\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0412\u041c +label.action.detach.disk.processing=\u041e\u0442\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435 \u0434\u0438\u0441\u043a\u0430... +label.action.detach.disk=\u041e\u0442\u043a\u0440\u0435\u043f\u0438\u0442\u044c \u0434\u0438\u0441\u043a +label.action.detach.iso.processing=\u041e\u0442\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435 ISO +label.action.detach.iso=\u041e\u0442\u043a\u0440\u0435\u043f\u0438\u0442\u044c ISO +label.action.disable.account.processing=\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 +label.action.disable.account=\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c +label.action.disable.cluster.processing=\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430... +label.action.disable.cluster=\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043a\u043b\u0430\u0441\u0442\u0435\u0440 +label.action.disable.nexusVswitch=\u041e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c NexusVswitch +label.action.disable.physical.network=\u041e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0443\u044e \u0441\u0435\u0442\u044c +label.action.disable.pod.processing=\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0441\u0442\u0435\u043d\u0434\u0430. +label.action.disable.pod=\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0441\u0442\u0435\u043d\u0434 +label.action.disable.static.NAT.processing=\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0441\u0442\u0430\u0442\u0438\u0447\u043d\u043e\u0433\u043e NAT... +label.action.disable.static.NAT=\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0441\u0442\u0430\u0442\u0438\u0447\u043d\u044b\u0439 NAT +label.action.disable.user.processing=\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +label.action.disable.user=\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +label.action.disable.zone.processing=\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0437\u043e\u043d\u044b... +label.action.disable.zone=\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0437\u043e\u043d\u0443 +label.action.download.ISO=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c ISO +label.action.download.template=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d +label.action.download.volume.processing=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0442\u043e\u043c\u0430... +label.action.download.volume=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0442\u043e\u043c +label.action.edit.account=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c +label.action.edit.disk.offering=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0438\u0441\u043a\u043e\u0432\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.action.edit.domain=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u043e\u043c\u0435\u043d +label.action.edit.global.setting=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0433\u043b\u043e\u0431\u0430\u043b\u044c\u043d\u044b\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 +label.action.edit.host=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0443\u0437\u0435\u043b +label.action.edit.instance=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +label.action.edit.ISO=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c ISO +label.action.edit.network.offering=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.action.edit.network.processing=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 \u0441\u0435\u0442\u0438... +label.action.edit.network=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0435\u0442\u044c +label.action.edit.pod=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u0442\u0435\u043d\u0434 +label.action.edit.primary.storage=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.action.edit.resource.limits=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u0440\u0435\u0434\u0435\u043b\u044b \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432 +label.action.edit.service.offering=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0441\u043b\u0443\u0436\u0435\u0431\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.action.edit.template=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d +label.action.edit.user=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +label.action.edit.zone=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0437\u043e\u043d\u0443 +label.action.enable.account.processing=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0430\u043a\u043a\u0430\u0443\u043d\u0442\u0430... +label.action.enable.account=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c +label.action.enable.cluster.processing=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430... +label.action.enable.cluster=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043a\u043b\u0430\u0441\u0442\u0435\u0440 +label.action.enable.maintenance.mode.processing=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0440\u0435\u0436\u0438\u043c\u0430 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f... +label.action.enable.maintenance.mode=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f +label.action.enable.nexusVswitch=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c NexusVswitch +label.action.enable.physical.network=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0443\u044e \u0441\u0435\u0442\u044c +label.action.enable.pod.processing=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0441\u0442\u0435\u043d\u0434\u0430.. +label.action.enable.pod=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0441\u0442\u0435\u043d\u0434 +label.action.enable.static.NAT.processing=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0441\u0442\u0430\u0442\u0438\u0447\u043d\u043e\u0433\u043e NAT.. +label.action.enable.static.NAT=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0441\u0442\u0430\u0442\u0438\u0447\u043d\u044b\u0439 NAT +label.action.enable.user.processing=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f... +label.action.enable.user=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +label.action.enable.zone.processing=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0437\u043e\u043d\u044b... +label.action.enable.zone=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0437\u043e\u043d\u0443 +label.action.force.reconnect.processing=\u041f\u0435\u0440\u0435\u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435... +label.action.force.reconnect=\u041f\u0440\u0438\u043d\u0443\u0434\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u043f\u0435\u0440\u0435\u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c +label.action.generate.keys.processing=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u043a\u043b\u044e\u0447\u0435\u0439... +label.action.generate.keys=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043a\u043b\u044e\u0447\u0438 +label.action.list.nexusVswitch=\u041b\u0438\u0441\u0442 NexusVswitch +label.action.lock.account.processing=\u0411\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 +label.action.lock.account=\u0417\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c +label.action.manage.cluster.processing=\u041f\u0435\u0440\u0435\u0445\u043e\u0434 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430 \u0432 \u0440\u0435\u0436\u0438\u043c \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f... +label.action.manage.cluster=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u043e\u043c +label.action.migrate.instance.processing=\u041f\u0435\u0440\u0435\u043d\u043e\u0441 \u043c\u0430\u0448\u0438\u043d\u044b...... +label.action.migrate.instance=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u043c\u0430\u0448\u0438\u043d\u0443 +label.action.migrate.router.processing=\u041f\u0435\u0440\u0435\u043d\u043e\u0441 \u0440\u043e\u0443\u0442\u0435\u0440\u0430... +label.action.migrate.router=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u0440\u043e\u0443\u0442\u0435\u0440 +label.action.migrate.systemvm.processing=\u041f\u0435\u0440\u0435\u043d\u043e\u0441 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0439 \u0412\u041c... +label.action.migrate.systemvm=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0443\u044e \u0412\u041c +label.action.reboot.instance.processing=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u043c\u0430\u0448\u0438\u043d\u044b... +label.action.reboot.instance=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +label.action.reboot.router.processing=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0440\u043e\u0443\u0442\u0435\u0440\u0430... +label.action.reboot.router=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u0440\u043e\u0443\u0442\u0435\u0440 +label.action.reboot.systemvm.processing=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0430 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0439 \u0412\u041c +label.action.reboot.systemvm=\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0443\u044e \u0412\u041c +label.action.recurring.snapshot=\u041f\u043e\u0432\u0442\u043e\u0440\u044f\u0435\u043c\u044b\u0435 \u0441\u043d\u0438\u043c\u043a\u0438 +label.action.register.iso=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f ISO +label.action.register.template=\u0420\u0435\u0433\u0438\u0441\u0442\u0440\u0430\u0446\u0438\u044f \u0448\u0430\u0431\u043b\u043e\u043d\u0430 +label.action.release.ip.processing=\u041e\u0441\u0432\u043e\u0431\u043e\u0436\u0434\u0435\u043d\u0438\u0435 IP... +label.action.release.ip=\u041e\u0441\u0432\u043e\u0431\u043e\u0434\u0438\u0442\u044c IP +label.action.remove.host.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u0443\u0437\u043b\u0430... +label.action.remove.host=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0443\u0437\u0435\u043b +label.action.reset.password.processing=\u0421\u0431\u0440\u043e\u0441 \u043f\u0430\u0440\u043e\u043b\u044f... +label.action.reset.password=\u0421\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c +label.action.resize.volume.processing=Resizing Volume.... +label.action.resize.volume=Resize Volume +label.action.resource.limits=\u041f\u0440\u0435\u0434\u0435\u043b\u044b \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432 +label.action.restore.instance.processing=\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043c\u0430\u0448\u0438\u043d\u044b... +label.action.restore.instance=\u0412\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +label.action.start.instance.processing=\u0417\u0430\u043f\u0443\u0441\u043a \u043c\u0430\u0448\u0438\u043d\u044b... +label.action.start.instance=\u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +label.action.start.router.processing=\u0417\u0430\u043f\u0443\u0441\u043a \u0440\u043e\u0443\u0442\u0435\u0440\u0430 +label.action.start.router=\u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0440\u043e\u0443\u0442\u0435\u0440 +label.action.start.systemvm.processing=\u0417\u0430\u043f\u0443\u0441\u043a \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0439 \u0412\u041c... +label.action.start.systemvm=\u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0443\u044e \u0412\u041c +label.action.stop.instance.processing=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u043c\u0430\u0448\u0438\u043d\u044b... +label.action.stop.instance=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +label.action.stop.router.processing=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u0440\u043e\u0443\u0442\u0435\u0440\u0430... +label.action.stop.router=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0440\u043e\u0443\u0442\u0435\u0440 +label.action.stop.systemvm.processing=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0439 \u0412\u041c... +label.action.stop.systemvm=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0439 \u0412\u041c +label.actions=\u0414\u0435\u0439\u0441\u0442\u0432\u0438\u044f +label.action.take.snapshot.processing=\u041f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u0435 \u0441\u043d\u0438\u043c\u043a\u0430... +label.action.take.snapshot=\u041f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0441\u043d\u0438\u043c\u043e\u043a... +label.action.unmanage.cluster.processing=\u041f\u0435\u0440\u0435\u0445\u043e\u0434 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430 \u0432 \u043e\u0431\u044b\u0447\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c... +label.action.unmanage.cluster=\u041f\u0435\u0440\u0435\u0432\u0435\u0441\u0442\u0438 \u043a\u043b\u0430\u0441\u0442\u0435\u0440 \u0432 \u043e\u0431\u044b\u0447\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c +label.action.update.OS.preference.processing=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u041e\u0421... +label.action.update.OS.preference=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u041e\u0421 +label.action.update.resource.count.processing=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u0447\u0435\u0442\u0447\u0438\u043a\u0430 \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432... +label.action.update.resource.count=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0447\u0451\u0442\u0447\u0438\u043a \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432 +label.activate.project=\u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u043f\u0440\u043e\u0435\u043a\u0442 +label.active.sessions=\u0410\u043a\u0442\u0438\u0432\u043d\u044b\u0435 \u0441\u0435\u0441\u0441\u0438\u0438 +label.add.accounts.to=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 +label.add.accounts=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0430\u043a\u043a\u0430\u0443\u043d\u0442\u044b +label.add.account.to.project=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0430\u043a\u043a\u0430\u0443\u043d\u0442 \u0432 \u043f\u0440\u043e\u0435\u043a\u0442 +label.add.account=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0430\u043a\u043a\u0430\u0443\u043d\u0442 +label.add.by.cidr=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a CIDR +label.add.by.group=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a \u0433\u0440\u0443\u043f\u043f\u0435 +label.add.by=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c +label.add.cluster=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043a\u043b\u0430\u0441\u0442\u0435\u0440 +label.add.compute.offering=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432\u044b\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u044f \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u0435 +label.add.direct.iprange=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u043f\u0440\u044f\u043c\u044b\u0445 IP +label.add.disk.offering=\u041d\u043e\u0432\u044b\u0439 \u0434\u0438\u0441\u043a\u043e\u0432\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.add.domain=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u043e\u043c\u0435\u043d +label.add.egress.rule=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432\u044b\u0445\u043e\u0434\u043d\u043e\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.add.F5.device=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c F5 \u0443\u0441\u0442\u0440\u043e\u0439\u0432\u043e +label.add.firewall=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e \u0444\u0430\u0435\u0440\u0432\u043e\u043b\u0430. +label.add.guest.network=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0433\u043e\u0441\u0442\u0435\u0432\u0443\u044e \u0441\u0435\u0442\u044c +label.add.host=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0443\u0437\u0435\u043b +label.adding.cluster=\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430 +label.adding.failed=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c +label.adding.pod=\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0441\u0442\u0435\u043d\u0434\u0430 +label.adding.processing=\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435... +label.add.ingress.rule=\u041d\u043e\u0432\u043e\u0435 \u0432\u0445\u043e\u0434\u043d\u043e\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.adding.succeeded=\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e \u0443\u0441\u043f\u0435\u0448\u043d\u043e +label.adding=\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0437\u043e\u043d\u044b +label.adding.user=\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +label.adding.zone=\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0437\u043e\u043d\u044b +label.add.ip.range=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP +label.additional.networks=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0441\u0435\u0442\u0438 +label.add.load.balancer=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0443 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +label.add.more=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0447\u0442\u043e-\u0442\u043e \u0435\u0449\u0435 +label.add.netScaler.device=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c Netscaler \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e +label.add.network.device=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0435\u0442\u0435\u0432\u043e\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e +label.add.network.offering=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.add.network=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0435\u0442\u044c +label.add.new.F5=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 F5 +label.add.new.NetScaler=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 NetScaler +label.add.new.SRX=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 SRX +label.add.physical.network=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0443\u044e \u0441\u0435\u0442\u044c +label.add.pod=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0442\u0435\u043d\u0434 +label.add.primary.storage=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.add.resources=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432 +label.add.rule=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.add.secondary.storage=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.add.security.group=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u0443 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 +label.add.service.offering=\u041d\u043e\u0432\u044b\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.add.SRX.device=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c SRX \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e +label.add.static.nat.rule=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e \u0441\u0442\u0430\u0442\u0438\u0447\u043d\u043e\u0433\u043e NAT +label.add.system.service.offering=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.add.template=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d +label.add.to.group=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u0433\u0440\u0443\u043f\u043f\u0443 +label.add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c +label.add.user=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +label.add.vlan=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c VLAN +label.add.vms.to.lb=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0412\u041c \u0432 \u043f\u0440\u0430\u0432\u0438\u043b\u043e \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +label.add.vms=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0412\u041c +label.add.vm=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0412\u041c +label.add.volume=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0442\u043e\u043c +label.add.vpn.user=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f VPN +label.add.zone=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0437\u043e\u043d\u0443 +label.admin.accounts=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0441\u043a\u0438\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 +label.admin=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440 +label.advanced.mode=\u041f\u0440\u043e\u0434\u0432\u0438\u043d\u0443\u0442\u044b\u0439 \u0440\u0435\u0436\u0438\u043c +label.advanced.search=\u0420\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u044b\u0439 \u043f\u043e\u0438\u0441\u043a +label.advanced=\u041f\u0440\u043e\u0434\u0432\u0438\u043d\u0443\u0442\u044b\u0439 +label.agent.password=\u041f\u0430\u0440\u043e\u043b\u044c \u0430\u0433\u0435\u043d\u0442\u0430 +label.agent.username=\u0418\u043c\u044f \u0430\u0433\u0435\u043d\u0442\u0430 +label.agree=\u0421\u043e\u0433\u043b\u0430\u0441\u0435\u043d +label.alert=\u0422\u0440\u0435\u0432\u043e\u0433\u0430 +label.algorithm=\u0410\u043b\u0433\u043e\u0440\u0438\u0442\u043c +label.allocated=\u0420\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e +label.allocation.state=\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0440\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u044f +label.api.key=\u041a\u043b\u044e\u0447 API +label.apply=\u041f\u0440\u0438\u043c\u0435\u043d\u0438\u0442\u044c +label.assign.to.load.balancer=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043c\u0430\u0448\u0438\u043d\u044b \u0432 \u0441\u0438\u0441\u0442\u0435\u043c\u0443 \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +label.assign=\u041f\u0440\u0438\u0441\u0432\u043e\u0438\u0442\u044c +label.associated.network.id=\u0421\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0439 ID \u0441\u0435\u0442\u0438 +label.attached.iso=\u041f\u0440\u0438\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u043d\u044b\u0439 ISO +label.availability=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u043e\u0441\u0442\u044c +label.availability.zone=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u043e\u0441\u0442\u044c \u0437\u043e\u043d\u044b +label.available.public.ips=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0435 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 +label.available=\u0414\u043e\u0441\u0442\u0443\u043f\u043d\u043e +label.back=\u041d\u0430\u0437\u0430\u0434 +label.bandwidth=\u041f\u0440\u043e\u043f\u0443\u0441\u043a\u043d\u0430\u044f \u0441\u043f\u043e\u0441\u043e\u0431\u043d\u043e\u0441\u0442\u044c +label.basic.mode=\u041f\u0440\u043e\u0441\u0442\u043e \u0440\u0435\u0436\u0438\u043c +label.basic=\u041f\u0440\u043e\u0441\u0442\u043e\u0439 +label.bootable=\u0417\u0430\u0433\u0440\u0443\u0436\u0430\u0435\u043c\u044b\u0439 +label.broadcast.domain.range=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0448\u0438\u0440\u043e\u043a\u043e\u0432\u0435\u0449\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0434\u043e\u043c\u0435\u043d\u0430 +label.broadcast.domain.type=\u0422\u0438\u043f \u0448\u0438\u0440\u043e\u043a\u043e\u0432\u0435\u0449\u0430\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0434\u043e\u043c\u0435\u043d\u0430 +label.by.account=\u041f\u043e \u0443\u0447\u0451\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 +label.by.availability=\u041f\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e\u0441\u0442\u0438 +label.by.domain=\u0414\u043e \u0434\u043e\u043c\u0435\u043d\u0443 +label.by.end.date=\u041f\u043e \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0438\u044e +label.by.level=\u041f\u043e \u0443\u0440\u043e\u0432\u043d\u044e +label.by.pod=\u041f\u043e \u0441\u0442\u0435\u043d\u0434\u0443 +label.by.role=\u041f\u043e \u0440\u043e\u043b\u0438 +label.by.start.date=\u041f\u043e \u043d\u0430\u0447\u0430\u043b\u0443 +label.by.state=\u041f\u043e \u0441\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u044e +label.bytes.received=\u0411\u0430\u0439\u0442 \u043f\u043e\u043b\u0443\u0447\u0435\u043d +label.bytes.sent=\u0411\u0430\u0439\u0442 \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043e +label.by.traffic.type=\u041f\u043e \u0442\u0438\u043f\u0443 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 +label.by.type.id=\u041f\u043e \u0442\u0438\u043f\u0443 ID +label.by.type=\u041f\u043e \u0442\u0438\u043f\u0443 +label.by.zone=\u041f\u043e \u0437\u043e\u043d\u0435 +label.cancel=\u041e\u0442\u043c\u0435\u043d\u0430 +label.capacity=\u041c\u043e\u0449\u043d\u043e\u0441\u0442\u044c +label.certificate=\u0421\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 +label.change.service.offering=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u043b\u0443\u0436\u0435\u0431\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.change.value=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 +label.character=\u0421\u0438\u043c\u0432\u043e\u043b\u043e\u0432 +label.checksum=\u041f\u0440\u043e\u0432\u0435\u0440\u0438\u0442\u044c MD5 \u0441\u0443\u043c\u043c\u0443 +label.cidr.account=CIDR \u0438\u043b\u0438 \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c/\u0433\u0440\u0443\u043f\u043f\u0430 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 +label.cidr=CIDR +label.cidr.list=CIDR \u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430 +label.clean.up=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c +label.clear.list=\u041e\u0447\u0438\u0441\u0442\u0438\u0442\u044c \u0441\u043f\u0438\u0441\u043e\u043a +label.close=\u0417\u0430\u043a\u0440\u044b\u0442\u044c +label.cloud.console=\u041a\u043e\u043d\u0441\u043e\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043e\u0431\u043b\u0430\u043a\u043e\u043c +label.cloud.managed=\u041f\u0430\u043d\u0435\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f +label.cluster.name=\u0418\u043c\u044f \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430 +label.clusters=\u041a\u043b\u0430\u0441\u0442\u0435\u0440\u044b +label.cluster.type=\u0422\u0438\u043f \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430 +label.cluster=\u041a\u043b\u0430\u0441\u0442\u0435\u0440 +label.clvm=CLVM +label.code=\u041a\u043e\u0434 +label.community=\u0421\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u043e +label.compute.and.storage=\u0412\u044b\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u044f \u0438 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.compute.offerings=\u0412\u044b\u0447\u0438\u0441\u043b\u0438\u0442\u044c \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u0439 +label.compute.offering=\u0412\u044b\u0447\u0438\u0441\u043b\u0438\u0442\u044c \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u0435 +label.compute=\u0412\u044b\u0447\u0438\u0441\u043b\u0435\u043d\u0438\u0435 +label.configuration=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f +label.configure=\u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c +label.confirmation=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u0435 +label.confirm.password=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u043f\u0430\u0440\u043e\u043b\u044c +label.congratulations=\u041f\u043e\u0437\u0434\u0440\u0430\u0432\u043b\u044f\u0435\u043c\! +label.conserve.mode=\u042d\u043a\u043e\u043d\u043e\u043c\u0438\u0447\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c +label.console.proxy=\u041f\u0440\u043e\u043a\u0441\u0438 +label.continue.basic.install=\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c \u043f\u0440\u043e\u0441\u0442\u0443\u044e \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0443 +label.continue=\u041f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c +label.corrections.saved=\u0418\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u044b +label.cpu.allocated.for.VMs=\u0420\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e \u0426\u041f\u0423 \u0434\u043b\u044f \u0412\u041c +label.cpu.allocated=\u0420\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e \u0426\u041f\u0423 +label.CPU.cap=CPU Cap +label.cpu=CPU +label.cpu.mhz=CPU (\u0432 \u041c\u0433\u0446) +label.cpu.utilized=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 CPU +label.created.by.system=\u0421\u043e\u0437\u0434\u0430\u043d\u043e \u0441\u0438\u0441\u0442\u0435\u043c\u043e\u0439 +label.created=\u0421\u043e\u0437\u0434\u0430\u043d\u043e +label.create.project=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u043f\u0440\u043e\u0435\u043a\u0442 +label.create.template=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d +label.cross.zones=\u041e\u0431\u0449\u0438\u0435 \u0434\u043b\u044f \u0437\u043e\u043d +label.custom.disk.size=\u0421\u0432\u043e\u0439 \u0440\u0430\u0437\u043c\u0435\u0440 \u0434\u0438\u0441\u043a\u0430 +label.daily=\u0415\u0436\u0435\u0434\u043d\u0435\u0432\u043d\u043e +label.data.disk.offering=\u0414\u0430\u043d\u043d\u044b\u0435 \u0434\u0438\u0441\u043a\u0430 +label.date=\u0414\u0430\u0442\u0430 +label.day.of.month=\u0414\u0435\u043d\u044c \u043c\u0435\u0441\u044f\u0446\u0430 +label.day.of.week=\u0414\u0435\u043d\u044c \u043d\u0435\u0434\u0435\u043b\u0438 +label.decline.invitation=\u041e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u0435 +label.dedicated=\u0412\u044b\u0434\u0435\u043b\u0435\u043d\u043d\u044b\u0439 +label.default=\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e +label.default.use=\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e +label.default.view=\u041e\u0431\u044b\u0447\u043d\u044b\u0439 \u0432\u0438\u0434 +label.delete.F5=\u0423\u0434\u0430\u043b\u0438\u0442\u044c F5 +label.delete.NetScaler=\u0423\u0434\u0430\u043b\u0438\u0442\u044c NetScaler +label.delete.project=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u043e\u0435\u043a\u0442 +label.delete.SRX=\u0423\u0434\u0430\u043b\u0438\u0442\u044c SRX +label.delete=\u0423\u0434\u0430\u043b\u0438\u0442\u044c +label.delete.vpn.user=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f VPN +label.deleting.failed=\u041d\u0435 \u0443\u0434\u0430\u043b\u043e\u0441\u044c \u0443\u0434\u0430\u043b\u0438\u0442\u044c +label.deleting.processing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435... +label.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 +label.destination.physical.network.id=ID \u0446\u0435\u043b\u0435\u0432\u043e\u0439 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u043e\u0439 \u0441\u0435\u0442\u0438 +label.destination.zone=\u0426\u0435\u043b\u0435\u0432\u0430\u044f \u0437\u043e\u043d\u0430 +label.destroy.router=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u043e\u0443\u0442\u0435\u0440 +label.destroy=\u0423\u043d\u0438\u0447\u0442\u043e\u0436\u0438\u0442\u044c +label.detaching.disk=\u041e\u0442\u043a\u0440\u0435\u043f\u043b\u0435\u043d\u0438\u0435 \u0434\u0438\u0441\u043a\u0430 +label.details=\u0414\u0435\u0442\u0430\u043b\u0438 +label.device.id=ID \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 +label.devices=\u0423\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e +label.dhcp=DHCP +label.DHCP.server.type=\u0422\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 DHCP +label.direct.ips=\u041f\u0440\u044f\u043c\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 +label.disabled=\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043e +label.disable.provider=\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0430 +label.disable.vpn=\u0412\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c VPN +label.disabling.vpn.access=\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043a VPN +label.disk.allocated=\u0420\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e \u0434\u0438\u0441\u043a\u043e\u0432\u043e\u0433\u043e \u043f\u0440\u043e\u0441\u0442\u0440\u0430\u043d\u0441\u0442\u0432\u0430 +label.disk.offering=\u0414\u0438\u0441\u043a\u043e\u0432\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.disk.size.gb=\u0420\u0430\u0437\u043c\u0435\u0440 \u0434\u0438\u0441\u043a\u0430 (\u0432 \u0413\u0411) +label.disk.size=\u0420\u0430\u0437\u043c\u0435\u0440 \u0434\u0438\u0441\u043a\u0430 +label.disk.total=\u0412\u0441\u0435\u0433\u043e \u0432 \u0434\u0438\u0441\u043a\u0430\u0445 +label.disk.volume=\u0422\u043e\u043c \u0434\u0438\u0441\u043a\u0430 +label.display.name=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u043e\u0435 \u0438\u043c\u044f +label.display.text=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u044b\u0439 \u0442\u0435\u043a\u0441\u0442 +label.dns.1=DNS 1 +label.dns.2=DNS 2 +label.domain.admin=\u0410\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440 \u0434\u043e\u043c\u0435\u043d\u0430 +label.domain.id=ID \u0434\u043e\u043c\u0435\u043d\u0430 +label.domain.name=\u0418\u043c\u044f \u0434\u043e\u043c\u0435\u043d\u0430 +label.domain.router=\u041c\u0430\u0448\u0440\u0443\u0442\u0438\u0437\u0430\u0442\u043e\u0440 +label.domain.suffix=\u0421\u0443\u0444\u0444\u0438\u043a\u0441 \u0434\u043e\u043c\u0435\u043d\u0430 DNS (\u043d\u043f\u0440. xyz.com) +label.domain=\u0414\u043e\u043c\u0435\u043d +label.done=\u0413\u043e\u0442\u043e\u0432\u043e +label.double.quotes.are.not.allowed=\u0414\u0432\u043e\u0439\u043d\u044b\u0435 \u043a\u0430\u0432\u044b\u0447\u043a\u0438 \u0437\u0430\u043f\u0440\u0435\u0449\u0435\u043d\u044b +label.download.progress=\u0421\u0442\u0430\u0442\u0443\u0441 \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +label.drag.new.position=\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u043d\u0430 \u043d\u043e\u0432\u0443\u044e \u043f\u043e\u0437\u0438\u0446\u0438\u044e +label.edit.lb.rule=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c LB \u043f\u0440\u0430\u0432\u0438\u043b\u0430 +label.edit.network.details=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0435\u0442\u0430\u043b\u0438 \u0441\u0435\u0442\u0438 +label.edit.project.details=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0434\u0435\u0442\u0430\u043b\u0438 \u043f\u0440\u043e\u0435\u043a\u0442\u0430 +label.edit.traffic.type=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0442\u0438\u043f \u0442\u0440\u0430\u0444\u0438\u043a\u0430 +label.edit=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c +label.egress.rule=\u0412\u044b\u0445\u043e\u0434\u043d\u043e\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.elastic.IP=\u0413\u0438\u0431\u043a\u0438\u0439 IP +label.elastic.LB=\u0413\u0438\u0431\u043a\u0438\u0439 LB +label.elastic=\u0413\u0438\u0431\u043a\u0438\u0439 +label.email=E-mail +label.enable.provider=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0430 +label.enable.swift=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c Swift +label.enable.vpn=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c VPN +label.enabling.vpn.access=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043a VPN +label.enabling.vpn=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 VPN +label.end.IP=\u041a\u043e\u043d\u0435\u0447\u043d\u044b\u0439 IP +label.endpoint.or.operation=\u041a\u043e\u043d\u0435\u0447\u043d\u0430\u044f \u0442\u043e\u0447\u043a\u0430 \u0438\u043b\u0438 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u044f +label.end.port=\u041a\u043e\u043d\u0435\u0447\u043d\u044b\u0439 \u043f\u043e\u0440\u0442 +label.end.reserved.system.IP=\u041a\u043e\u043d\u0435\u0447\u043d\u044b\u0439 \u0437\u0430\u0440\u0435\u0437\u0435\u0440\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 IP-\u0430\u0434\u0440\u0435\u0441 +label.end.vlan=\u041a\u043e\u043d\u0435\u0447\u043d\u044b\u0439 VLAN +label.enter.token=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0442\u0430\u043b\u043e\u043d +label.error.code=\u041a\u043e\u0434 \u043e\u0448\u0438\u0431\u043a\u0438 +label.error=\u041e\u0448\u0438\u0431\u043a\u0430 +label.esx.host=\u0423\u0437\u0435\u043b ESX/ESXi +label.example=\u041f\u0440\u0438\u043c\u0435\u0440 +label.f5=F5 +label.failed=\u041d\u0435\u0443\u0434\u0430\u0447\u043d\u043e +label.featured=\u041f\u0440\u0435\u0434\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u043d\u044b\u0439 +label.fetch.latest=\u0412\u044b\u0431\u043e\u0440\u043a\u0430 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0445 +label.filterBy=\u0424\u0438\u043b\u044c\u0442\u0440\u043e\u0432\u0430\u0442\u044c +label.firewall=\u0424\u0430\u0435\u0440\u0432\u043e\u043b +label.first.name=\u0418\u043c\u044f +label.format=\u0424\u043e\u0440\u043c\u0430\u0442 +label.friday=\u041f\u044f\u0442\u043d\u0438\u0446\u0430 +label.full.path=\u041f\u043e\u043b\u043d\u044b\u0439 \u043f\u0443\u0442\u044c +label.full=\u041f\u043e\u043b\u043d\u044b\u0439 +label.gateway=\u0428\u043b\u044e\u0437 +label.general.alerts=\u041e\u0431\u0449\u0438\u0435 \u0442\u0440\u0435\u0432\u043e\u0433\u0438 +label.generating.url=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 URL +label.go.step.2=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0448\u0430\u0433\u0443 2 +label.go.step.3=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0448\u0430\u0433\u0443 3 +label.go.step.4=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0448\u0430\u0433\u0443 4 +label.go.step.5=\u041f\u0435\u0440\u0435\u0439\u0442\u0438 \u043a \u0448\u0430\u0433\u0443 5 +label.group.optional=\u0413\u0440\u0443\u043f\u043f\u0430 (\u043e\u043f\u0446\u0438\u043e\u043d\u0430\u043b\u044c\u043d\u043e) +label.group=\u0413\u0440\u0443\u043f\u043f\u0430 +label.guest.cidr=\u0413\u043e\u0441\u0442\u0435\u0432\u043e\u0439 CIDR +label.guest.end.ip=\u041a\u043e\u043d\u0435\u0447\u043d\u044b\u0439 \u0433\u043e\u0441\u0442\u0435\u0432\u043e\u0439 IP. +label.guest.gateway=\u0428\u043b\u044e\u0437 +label.guest.ip.range=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP-\u0430\u0434\u0440\u0435\u0441\u043e\u0432 +label.guest.ip=\u0413\u043e\u0441\u0442\u0435\u0432\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 +label.guest.netmask=\u0413\u043e\u0441\u0442\u0435\u0432\u0430\u044f \u0441\u0435\u0442\u0435\u0432\u0430\u044f \u043c\u0430\u0441\u043a\u0430 +label.guest.networks=\u0413\u043e\u0441\u0442\u0435\u0432\u044b\u0435 \u0441\u0435\u0442\u0438 +label.guest.start.ip=\u041d\u0430\u0447\u0430\u043b\u044c\u043d\u044b\u0439 \u0433\u043e\u0441\u0442\u0435\u0432\u043e\u0439 IP +label.guest.traffic=\u0413\u043e\u0441\u0442\u0435\u0432\u043e\u0439 \u0442\u0440\u0430\u0444\u0438\u043a +label.guest.type=\u0422\u0438\u043f \u0433\u043e\u0441\u0442\u044f +label.guest=\u0413\u043e\u0441\u0442\u044c +label.ha.enabled=HA \u0432\u043a\u043b\u044e\u0447\u0435\u043d +label.help=\u041f\u043e\u043c\u043e\u0449\u044c +label.hide.ingress.rule=\u0421\u043a\u0440\u044b\u0442\u044c \u0432\u0445\u043e\u0434\u043d\u043e\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.hints=\u041f\u043e\u0434\u0441\u043a\u0430\u0437\u043a\u0438 +label.host.alerts=\u0422\u0440\u0435\u0432\u043e\u0433\u0438 \u0443\u0437\u043b\u0430 +label.host.MAC=MAC \u0443\u0437\u043b\u0430 +label.host.name=\u0418\u043c\u044f \u0443\u0437\u043b\u0430 +label.hosts=\u0423\u0437\u043b\u044b +label.host.tags=\u041c\u0435\u0442\u043a\u0438 \u0443\u0437\u043b\u0430 +label.host=\u0423\u0437\u0435\u043b +label.hourly=\u0427\u0430\u0441\u043e\u0432\u0430\u044f +label.hypervisor.capabilities=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440\u0430 +label.hypervisor.type=\u0422\u0438\u043f \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440\u0430 +label.hypervisor=\u0413\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440 +label.hypervisor.version=\u0412\u0435\u0440\u0441\u0438\u044f \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440\u0430 +label.id=ID +label.info=\u0418\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044f +label.ingress.rule=\u0412\u043d\u0443\u0442\u0440\u0438\u043d\u0435\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.initiated.by=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c +label.installWizard.addClusterIntro.subtitle=\u0427\u0442\u043e \u0442\u0430\u043a\u043e\u0435 "\u041a\u043b\u0430\u0441\u0442\u0435\u0440"? +label.installWizard.addClusterIntro.title=\u0414\u0430\u0432\u0430\u0439\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043c \u043a\u043b\u0430\u0441\u0442\u0435\u0440 +label.installWizard.addHostIntro.subtitle=\u0427\u0442\u043e \u0442\u0430\u043a\u043e\u0435 "\u0423\u0437\u0435\u043b"? +label.installWizard.addHostIntro.title=\u0414\u0430\u0432\u0430\u0439\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043c \u0443\u0437\u0435\u043b +label.installWizard.addPodIntro.subtitle=\u0427\u0442\u043e \u0442\u0430\u043a\u043e\u0435 "\u0421\u0442\u0435\u043d\u0434"? +label.installWizard.addPodIntro.title=\u0414\u0430\u0432\u0430\u0439\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043c \u0441\u0442\u0435\u043d\u0434 +label.installWizard.addPrimaryStorageIntro.subtitle=\u0427\u0442\u043e \u0442\u0430\u043a\u043e\u0435 "\u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435"? +label.installWizard.addPrimaryStorageIntro.title=\u0414\u0430\u0432\u0430\u0439\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043c \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.installWizard.addSecondaryStorageIntro.subtitle=\u0427\u0442\u043e \u0442\u0430\u043a\u043e\u0435 "\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435"? +label.installWizard.addSecondaryStorageIntro.title=\u0414\u0430\u0432\u0430\u0439\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043c \u0434\u043e\u043f\u043e\u043b\u044c\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435. +label.installWizard.addZoneIntro.subtitle=\u0427\u0442\u043e \u0442\u0430\u043a\u043e\u0435 "\u0417\u043e\u043d\u0430"? +label.installWizard.addZoneIntro.title=\u0414\u0430\u0432\u0430\u0439\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u043c \u0437\u043e\u043d\u0443 +label.installWizard.addZone.title=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0437\u043e\u043d\u0443 +label.installWizard.click.launch=\u041a\u043b\u0438\u043a\u043d\u0438\u0442\u0435 \u043d\u0430 \u043a\u043d\u043e\u043f\u043a\u0443 \u0437\u0430\u043f\u0443\u0441\u043a\u0430 +label.installWizard.subtitle=\u042d\u0442\u043e \u0440\u0443\u043a\u043e\u0432\u043e\u0434\u0441\u0442\u0432\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442 \u0432\u0430\u0448 CloudStack. +label.installWizard.title=\u0417\u0434\u0440\u0430\u0432\u0441\u0442\u0432\u0443\u0439\u0442\u0435 \u0438 \u0434\u043e\u0431\u0440\u043e \u043f\u043e\u0436\u0430\u043b\u043e\u0432\u0430\u0442\u044c \u0432 CloudStack\! +label.instance.limits=\u041f\u0440\u0435\u0434\u0435\u043b\u044b \u043c\u0430\u0448\u0438\u043d\u044b +label.instance.name=\u0418\u043c\u044f \u043c\u0430\u0448\u0438\u043d\u044b +label.instances=\u041c\u0430\u0448\u0438\u043d\u044b +label.instance=\u041c\u0430\u0448\u0438\u043d\u0430 +label.internal.dns.1=\u0412\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0438\u0439 DNS 1 +label.internal.dns.2=\u0412\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0438\u0439 DNS 2 +label.internal.name=\u0412\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0435\u0435 \u0438\u043c\u044f +label.interval.type=\u0422\u0438\u043f \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430 +label.introduction.to.cloudstack=\u0412\u0432\u0435\u0434\u0435\u043d\u0438\u0435 \u0432 CloudStack +label.invalid.integer=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0435 \u0446\u0435\u043b\u043e\u0435 \u0447\u0438\u0441\u043b\u043e +label.invalid.number=\u041d\u0435\u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e\u0435 \u0447\u0438\u0441\u043b\u043e +label.invitations=\u041f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u044f +label.invited.accounts=\u041f\u0440\u0438\u0433\u043b\u0430\u0448\u0451\u043d\u043d\u044b\u0435 \u0443\u0447\u0435\u0442\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 +label.invite.to=\u041f\u0440\u0438\u0433\u043b\u0430\u0441\u0438\u0442\u044c +label.invite=\u041f\u0440\u0438\u0433\u043b\u0430\u0441\u0438\u0442\u044c +label.ip.address=IP-\u0430\u0434\u0440\u0435\u0441 +label.ipaddress=IP-\u0430\u0434\u0440\u0435\u0441 +label.ip.allocations=\u0420\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u044f IP +label.ip=IP +label.ip.limits=\u041f\u0440\u0435\u0434\u0435\u043b\u044b \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0445 IP +label.ip.or.fqdn=IP \u0438\u043b\u0438 FQDN +label.ip.ranges=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u044b IP +label.ip.range=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP +label.ips=IP +label.iscsi=iSCSI +label.is.default=\u041f\u043e \u0443\u043c\u043e\u043b\u0447\u0430\u043d\u0438\u044e +label.iso.boot=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 ISO +label.iso=ISO +label.isolated.networks=\u0418\u0437\u043e\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0435 \u0441\u0435\u0442\u0438 +label.isolation.method=\u041c\u0435\u0442\u043e\u0434 \u0438\u0437\u043e\u043b\u044f\u0446\u0438\u0438 +label.isolation.mode=\u0420\u0435\u0436\u0438\u043c \u0438\u0437\u043e\u043b\u044f\u0446\u0438\u0438 +label.is.redundant.router=\u0420\u0435\u0437\u0435\u0440\u0432\u043d\u043e\u0439 +label.is.shared=\u043e\u0431\u0449\u0438\u0435 +label.is.system=\u0415\u0441\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u0430 +label.item.listing=\u0421\u043f\u0438\u0441\u043e\u043a \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 +label.keep=\u0425\u0440\u0430\u043d\u0438\u0442\u044c +label.keyboard.type=\u0422\u0438\u043f \u043a\u043b\u0430\u0432\u0438\u0430\u0442\u0443\u0440\u044b +label.key=\u041a\u043b\u044e\u0447 +label.kvm.traffic.label=\u041c\u0435\u0442\u043a\u0430 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 KVM +label.label=\u041c\u0435\u0442\u043a\u0430 +label.lang.chinese=\u041a\u0438\u0442\u0430\u0439\u0441\u043a\u0438\u0439 (\u0443\u043f\u0440\u043e\u0449\u0451\u043d\u043d\u044b\u0439) +label.lang.english=\u0410\u043d\u0433\u043b\u0438\u0439\u0441\u043a\u0438\u0439 +label.lang.japanese=\u042f\u043f\u043e\u043d\u0441\u043a\u0438\u0439 +label.lang.korean=\u043a\u043e\u0440\u0435\u0439\u0441\u043a\u0438\u0439 +label.lang.spanish=\u0418\u0441\u043f\u0430\u043d\u0441\u043a\u0438\u0439 +label.last.disconnected=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0435 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 +label.last.name=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0435 \u0438\u043c\u044f +label.latest.events=\u041f\u043e\u0441\u043b\u0435\u0434\u043d\u0438\u0438 \u0441\u043e\u0431\u044b\u0442\u0438\u044f +label.launch=\u0417\u0430\u043f\u0443\u0441\u043a +label.launch.vm=\u0417\u0430\u043f\u0443\u0441\u043a \u0412\u041c +label.launch.zone=\u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0437\u043e\u043d\u0443 +label.LB.isolation=\u0418\u0437\u043e\u043b\u044f\u0446\u0438\u044f LB +label.least.connections=Least connections +label.level=\u0423\u0440\u043e\u0432\u0435\u043d\u044c +label.linklocal.ip=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 IP \u0430\u0434\u0440\u0435\u0441 +label.load.balancer=\u0411\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0430 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +label.load.balancing.policies=\u041f\u043e\u043b\u0438\u0442\u0438\u043a\u0438 \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +label.load.balancing=\u0411\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0430 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +label.loading=\u0417\u0430\u0433\u0440\u0443\u0437\u043a\u0430 +label.local.storage=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.local=\u041b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 +label.login=\u0412\u0445\u043e\u0434 +label.logout=\u0412\u044b\u0445\u043e\u0434 +label.lun=LUN +label.LUN.number=LUN \# +label.make.project.owner=\u0421\u0434\u0435\u043b\u0430\u0442\u044c \u0430\u043a\u043a\u0430\u0443\u043d\u0442 \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0435\u043c \u043f\u0440\u043e\u0435\u043a\u0442\u0430 +label.management.ips=\u041f\u0430\u043d\u0435\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f IP \u0430\u0434\u0440\u0435\u0441\u0441\u0430\u043c\u0438 +label.management=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 +label.manage.resources=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u0430\u043c\u0438 +label.manage=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 +label.max.guest.limit=\u041f\u0440\u0435\u0434\u0435\u043b \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u0430 \u0433\u043e\u0441\u0442\u0435\u0439 +label.maximum=\u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c +label.max.networks=\u041c\u0430\u043a\u0441\u0438\u043c\u0443\u043c \u0441\u0435\u0442\u0435\u0439 +label.max.public.ips=\u041c\u0430\u043a\u0441. \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0445 IP +label.max.snapshots=\u041c\u0430\u043a\u0441. \u0441\u043d\u0438\u043c\u043a\u043e\u0432 +label.max.templates=\u041c\u0430\u043a\u0441. \u0448\u0430\u0431\u043b\u043e\u043d\u043e\u0432 +label.max.vms=\u041c\u0430\u043a\u0441. \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0445 \u0412\u041c +label.max.volumes=\u041c\u0430\u043a\u0441. \u0442\u043e\u043c\u043e\u0432 +label.may.continue=\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c. +label.memory.allocated=\u0420\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e \u043f\u0430\u043c\u044f\u0442\u0438 +label.memory.mb=\u041f\u0430\u043c\u044f\u0442\u044c (\u0432 \u041c\u0411) +label.memory.total=\u0412\u0441\u0435\u0433\u043e \u043f\u0430\u043c\u044f\u0442\u0438 +label.memory=\u041f\u0430\u043c\u044f\u0442\u044c +label.memory.used=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u043d\u043e\u0439 \u043f\u0430\u043c\u044f\u0442\u0438 +label.menu.accounts=\u0423\u0447\u0451\u0442\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 +label.menu.alerts=\u0422\u0440\u0435\u0432\u043e\u0433\u0438 +label.menu.all.accounts=\u0412\u0441\u0435 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 +label.menu.all.instances=\u0412\u0441\u0435 \u043c\u0430\u0448\u0438\u043d\u044b +label.menu.community.isos=ISO-\u0441\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u0430 +label.menu.community.templates=\u0428\u0430\u0431\u043b\u043e\u043d\u044b \u0441\u043e\u043e\u0431\u0449\u0435\u0441\u0442\u0432\u0430 +label.menu.configuration=\u041a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044f +label.menu.dashboard=\u0413\u043b\u0430\u0432\u043d\u0430\u044f +label.menu.destroyed.instances=\u0423\u043d\u0438\u0447\u0442\u043e\u0436\u0435\u043d\u043d\u044b\u0435 \u043c\u0430\u0448\u0438\u043d\u044b +label.menu.disk.offerings=\u041f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0434\u0438\u0441\u043a\u043e\u0432 +label.menu.domains=\u0414\u043e\u043c\u0435\u043d\u044b +label.menu.events=\u0421\u043e\u0431\u044b\u0442\u0438\u044f +label.menu.featured.isos=\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u043c\u044b\u0435 ISO +label.menu.featured.templates=\u0420\u0435\u043a\u043e\u043c\u0435\u043d\u0434\u0443\u0435\u043c\u044b\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u044b +label.menu.global.settings=\u0413\u043b\u043e\u0431\u0430\u043b\u044c\u043d\u044b\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 +label.menu.infrastructure=\u0418\u043d\u0444\u043e\u0440\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430 +label.menu.instances=\u041c\u0430\u0448\u0438\u043d\u044b +label.menu.ipaddresses=IP-\u0430\u0434\u0440\u0435\u0441\u0430 +label.menu.isos=ISO +label.menu.my.accounts=\u041c\u043e\u0438 \u0443\u0447\u0451\u0442\u043d\u044b\u0435 \u0437\u0430\u043f\u0438\u0441\u0438 +label.menu.my.instances=\u041c\u043e\u0438 \u043c\u0430\u0448\u0438\u043d\u044b +label.menu.my.isos=\u041c\u043e\u0438 ISO +label.menu.my.templates=\u041c\u043e\u0438 \u0448\u0430\u0431\u043b\u043e\u043d\u044b +label.menu.network.offerings=\u041f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u044f \u0441\u0435\u0442\u0438 +label.menu.network=\u0421\u0435\u0442\u044c +label.menu.physical.resources=\u0424\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0438\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u044b +label.menu.running.instances=\u0417\u0430\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u0435 \u043c\u0430\u0448\u0438\u043d\u044b +label.menu.security.groups=\u0413\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 +label.menu.service.offerings=\u0423\u0441\u043b\u0443\u0433\u0438 +label.menu.snapshots=\u0421\u043d\u0438\u043c\u043a\u0438 +label.menu.stopped.instances=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u043c\u0430\u0448\u0438\u043d\u044b +label.menu.storage=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.menu.system.service.offerings=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u044b +label.menu.system=\u0421\u0438\u0441\u0442\u0435\u043c\u0430 +label.menu.system.vms=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435 \u0412\u041c +label.menu.templates=\u0428\u0430\u0431\u043b\u043e\u043d\u044b +label.menu.virtual.appliances=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 +label.menu.virtual.resources=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u044b +label.menu.volumes=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u044f +label.migrate.instance.to.host=\u041f\u0435\u0440\u0435\u043d\u043e\u0441 \u043c\u0430\u0448\u0438\u043d\u044b \u043d\u0430 \u0434\u0440\u0443\u0433\u043e\u0439 \u0443\u0437\u0435\u043b +label.migrate.instance.to.ps=\u041f\u0435\u0440\u0435\u043d\u043e\u0441 \u043c\u0430\u0448\u0438\u043d\u044b \u043d\u0430 \u0434\u0440\u0443\u0433\u043e\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.migrate.instance.to=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u043c\u0430\u0448\u0438\u043d\u0443 \u0432 +label.migrate.router.to=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u0440\u043e\u0443\u0442\u0435\u0440 \u0432 +label.migrate.systemvm.to=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0443\u044e \u0412\u041c \u0432 +label.migrate.volume=\u041f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u0442\u043e\u043c \u0432 \u0434\u0440\u0443\u0433\u043e\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.minimum=\u041c\u0438\u043d\u0438\u043c\u0443\u043c +label.minute.past.hour=\u041c\u0438\u043d\u0443\u0442\u0430 +label.monday=\u041f\u043e\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u0438\u043a +label.monthly=\u041a\u0430\u0436\u0434\u044b\u0439 \u043c\u0435\u0441\u044f\u0446 +label.more.templates=\u0411\u043e\u043b\u044c\u0448\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u043e\u0432 +label.move.down.row=\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u043d\u0430 \u043e\u0434\u043d\u0443 \u0441\u0442\u0440\u043e\u043a\u0443 \u043d\u0438\u0436\u0435 +label.move.to.top=\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u043d\u0430 \u0441\u0430\u043c\u044b\u0439 \u0432\u0435\u0440\u0445 +label.move.up.row=\u041f\u0435\u0440\u0435\u043c\u0435\u0441\u0442\u0438\u0442\u044c \u043d\u0430 \u043e\u0434\u043d\u0443 \u0441\u0442\u0440\u043e\u043a\u0443 \u0432\u044b\u0448\u0435 +label.my.account=\u041c\u043e\u044f \u0443\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c +label.my.network=\u041c\u043e\u044f \u0441\u0435\u0442\u044c +label.my.templates=\u041c\u043e\u0438 \u0448\u0430\u0431\u043b\u043e\u043d\u044b +label.name.optional=\u0418\u043c\u044f (\u043d\u0435\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e) +label.name=\u0418\u043c\u044f +label.nat.port.range=NAT \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u043f\u043e\u0440\u0442\u043e\u0432 +label.netmask=\u0421\u0435\u0442\u0435\u0432\u0430\u044f \u043c\u0430\u0441\u043a\u0430 +label.netScaler=NetScaler +label.network.desc=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u0441\u0435\u0442\u0438 +label.network.device.type=\u0422\u0438\u043f \u0441\u0435\u0442\u0435\u0432\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 +label.network.device=\u0421\u0435\u0442\u0435\u0432\u043e\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e +label.network.domain.text=\u0422\u0435\u043a\u0441\u0442 \u0434\u043e\u043c\u0435\u043d\u0430 \u0441\u0435\u0442\u0438 +label.network.domain=\u0414\u043e\u043c\u0435\u043d \u0441\u0435\u0442\u0438 +label.network.id=ID \u0441\u0435\u0442\u0438 +label.networking.and.security=\u0421\u0435\u0442\u044c \u0438 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u044c +label.network.label.display.for.blank.value=\u0418\u0441\u043f. \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0439 \u0448\u043b\u044e\u0437 +label.network.name=\u0418\u043c\u044f \u0441\u0435\u0442\u0438 +label.network.offering.display.text=\u0441\u0435\u0442\u044c, \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u044e\u0449\u0443\u044e \u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0435\u043d\u0438\u0435 \u0442\u0435\u043a\u0441\u0442\u0430 +label.network.offering.id=\u0441\u0435\u0442\u044c, \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u044e\u0449\u0443\u044e ID +label.network.offering.name=\u0441\u0435\u0442\u044c, \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u044e\u0449\u0443\u044e \u0418\u043c\u044f +label.network.offering=\u0421\u0435\u0442\u0435\u0432\u044b\u0435 \u0443\u0441\u043b\u0443\u0433\u0438 +label.network.rate=\u0421\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0441\u0435\u0442\u0438 +label.network.read=\u041f\u0440\u043e\u0447\u0438\u0442\u0430\u043d\u043e \u0447\u0435\u0440\u0435\u0437 \u0441\u0435\u0442\u044c +label.network.service.providers=\u041f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0438 \u0441\u0435\u0442\u0435\u0432\u044b\u0445 \u0441\u043b\u0443\u0436\u0431 +label.networks=\u0421\u0435\u0442\u0438 +label.network.type=\u0422\u0438\u043f \u0441\u0435\u0442\u0438 +label.network=\u0421\u0435\u0442\u044c +label.network.write=\u0417\u0430\u043f\u0438\u0441\u0430\u043d\u043e \u0447\u0435\u0440\u0435\u0437 \u0441\u0435\u0442\u044c +label.new.password=\u041d\u043e\u0432\u044b\u0439 \u043f\u0430\u0440\u043e\u043b\u044c +label.new.project=\u041d\u043e\u0432\u044b\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 +label.new=\u0421\u043e\u0437\u0434\u0430\u0442\u044c +label.new.vm=\u041d\u043e\u0432\u0430\u044f \u0412\u041c +label.next=\u0421\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0439 +label.nexusVswitch=Nexus Vswitch +label.nfs=NFS +label.nfs.server=\u0421\u0435\u0440\u0432\u0435\u0440 NFS +label.nfs.storage=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 NFS +label.nic.adapter.type=\u0422\u0438\u043f \u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u043a\u0430\u0440\u0442\u044b (NIC) +label.nics=\u0421\u0435\u0442\u0435\u0432\u044b\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 (NIC) +label.no.actions=\u041d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u043e\u043f\u0435\u0440\u0430\u0446\u0438\u0439 +label.no.alerts=\u0422\u0440\u0435\u0432\u043e\u0433 \u043d\u0435 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043e +label.no.data=\u041d\u0435\u0442 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u0438 \u0434\u043b\u044f \u043f\u043e\u043a\u0430\u0437\u0430 +label.no.errors=\u041e\u0448\u0438\u0431\u043e\u043a \u043d\u0435 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u043e +label.no.isos=\u041d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 ISO +label.no.items=\u041d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u044d\u043b\u0435\u043c\u0435\u043d\u0442\u043e\u0432 +label.none=\u041d\u0435\u0442 +label.no.security.groups=\u041d\u0435\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u0433\u0440\u0443\u043f\u043f \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u044c +label.not.found=\u041d\u0435 \u043d\u0430\u0439\u0434\u0435\u043d\u043e +label.no.thanks=\u041d\u0435\u0442, \u0441\u043f\u0430\u0441\u0438\u0431\u043e +label.notifications=\u041e\u043f\u043e\u0432\u0435\u0449\u0435\u043d\u0438\u044f +label.no=\u041d\u0435\u0442 +label.number.of.clusters=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u043e\u0432 +label.number.of.hosts=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0443\u0437\u043b\u043e\u0432 +label.number.of.pods=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0441\u0442\u0435\u043d\u0434\u043e\u0432 +label.number.of.system.vms=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0441\u0438\u0441\u0442\u0435\u043c\u044b \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043c\u0430\u0448\u0438\u043d +label.number.of.virtual.routers=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043c\u0430\u0440\u0448\u0440\u0443\u0442\u0438\u0437\u0430\u0442\u043e\u0440\u043e\u0432 +label.number.of.zones=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u0437\u043e\u043d +label.num.cpu.cores=\u041a\u043e\u043b. CPU +label.numretries=\u041a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u043e \u043f\u043e\u043f\u044b\u0442\u043e\u043a +label.ocfs2=OCFS2 +label.offer.ha=\u041f\u0440\u0435\u0434\u043e\u0441\u0442. HA +label.ok=OK +label.optional=\u041d\u0435\u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e +label.order=\u041e\u0447\u0435\u0440\u0435\u0434\u044c +label.os.preference=\u041f\u0440\u0435\u0434\u043f\u043e\u0447\u0442\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u041e\u0421 +label.os.type=\u0422\u0438\u043f \u041e\u0421 +label.owned.public.ips=\u0421\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u044b\u0435 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 +label.owner.account=\u0423\u0447\u0451\u0442\u043d\u0430\u044f \u0437\u0430\u043f\u0438\u0441\u044c \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0430 +label.owner.domain=\u0414\u043e\u043c\u0435\u043d \u0432\u043b\u0430\u0434\u0435\u043b\u044c\u0446\u0430 +label.parent.domain=\u0420\u043e\u0434\u0438\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0439 \u0434\u043e\u043c\u0435\u043d +label.password.enabled=\u041f\u0430\u0440\u043e\u043b\u044c \u0432\u043a\u043b\u044e\u0447\u0435\u043d +label.password=\u041f\u0430\u0440\u043e\u043b\u044c +label.path=\u041f\u0443\u0442\u044c +label.physical.network.ID=ID \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u043e\u0439 \u0441\u0435\u0442\u0438 +label.physical.network=\u0424\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0438\u0435 \u0441\u0435\u0442\u0438 +label.PING.CIFS.password=\u041f\u0430\u0440\u043e\u043b\u044c PING CIFS +label.PING.CIFS.username=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f PING CIFS +label.PING.dir=\u041a\u0430\u0442\u0430\u043b\u043e\u0433 PING +label.PING.storage.IP=IP \u0430\u0434\u0440\u0435\u0441 PING-\u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +label.please.specify.netscaler.info=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 NetScaler +label.please.wait=\u041f\u043e\u0434\u043e\u0436\u0434\u0438\u0442\u0435 +label.pod.name=\u0418\u043c\u044f \u0441\u0442\u0435\u043d\u0434\u0430 +label.pods=\u0421\u0442\u0435\u043d\u0434\u044b +label.pod=\u0421\u0442\u0435\u043d\u0434 +label.port.forwarding.policies=\u041f\u043e\u043b\u0438\u0442\u0438\u043a\u0438 \u043f\u0440\u043e\u0431\u0440\u043e\u0441\u0430 \u043f\u043e\u0440\u0442\u043e\u0432 +label.port.forwarding=\u041f\u0440\u043e\u0431\u0440\u043e\u0441 \u043f\u043e\u0440\u0442\u043e\u0432 +label.port.range=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u043f\u043e\u0440\u0442\u043e\u0432 +label.PreSetup=\u041f\u0440\u0435\u0434\u0432\u0430\u0440\u0438\u0442\u0435\u043b\u044c\u043d\u0430\u044f \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 +label.previous=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0449\u0438\u0439 +label.prev=\u041f\u0440\u0435\u0434\u044b\u0434\u0443\u0448\u0438\u0439 +label.primary.allocated=\u0420\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +label.primary.network=\u041e\u0441\u043d\u043e\u0432\u043d\u0430\u044f \u0441\u0435\u0442\u044c +label.primary.storage.count=\u041f\u0435\u0440\u0432\u0438\u0447\u043d\u044b\u0439 \u0430\u0440\u0445\u0438\u0432 \u0434\u043b\u044f \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f +label.primary.storage=\u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.primary.used=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +label.private.interface=\u0427\u0430\u0441\u0442\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 +label.private.ip.range=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0447\u0430\u0441\u0442\u043d\u044b\u0445 IP +label.private.ips=\u0427\u0430\u0441\u0442\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 +label.private.ip=\u0427\u0430\u0441\u0442\u043d\u044b\u0439 IP-\u0430\u0434\u0440\u0435\u0441 +label.privatekey=\u0427\u0430\u0441\u0442\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 PKCS\#8 +label.private.network=\u0427\u0430\u0441\u0442\u043d\u0430\u044f \u0441\u0435\u0442\u044c +label.private.port=\u0427\u0430\u0441\u0442\u043d\u044b\u0439 \u043f\u043e\u0440\u0442 +label.private.zone=\u0427\u0430\u0441\u0442\u043d\u0430\u044f \u0437\u043e\u043d\u0430 +label.project.dashboard=\u041f\u0430\u043d\u0435\u043b\u044c \u043f\u0440\u043e\u0435\u043a\u0442\u0430 +label.project.id=ID \u043f\u0440\u043e\u0435\u043a\u0442\u0430 +label.project.invite=\u041f\u0440\u0438\u0433\u043b\u0430\u0441\u0438\u0442\u044c \u0432 \u043f\u0440\u043e\u0435\u043a\u0442 +label.project.name=\u0418\u043c\u044f \u043f\u0440\u043e\u0435\u043a\u0442\u0430 +label.projects=\u041f\u0440\u043e\u0435\u043a\u0442\u044b +label.project=\u041f\u0440\u043e\u0435\u043a\u0442 +label.project.view=\u041f\u0440\u043e\u0435\u043a\u0442\u044b +label.protocol=\u041f\u0440\u043e\u0442\u043e\u043a\u043e\u043b +label.providers=\u041f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0438 +label.public.interface=\u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 +label.public.ips=\u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 +label.public.ip=\u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 IP-\u0430\u0434\u0440\u0435\u0441 +label.public.network=\u041f\u0443\u0431\u043b\u0438\u0447\u043d\u0430\u044f \u0441\u0435\u0442\u044c +label.public.port=\u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 \u043f\u043e\u0440\u0442 +label.public.traffic=\u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 \u0442\u0440\u0430\u0444\u0438\u043a +label.public=\u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 +label.public.zone=\u041f\u0443\u0431\u043b\u0438\u0447\u043d\u0430\u044f \u0437\u043e\u043d\u0430 +label.purpose=\u041d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 +label.Pxe.server.type=\u0422\u0438\u043f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 PXE +label.reboot=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c +label.recent.errors=\u041f\u043e\u043b\u0443\u0447\u0435\u043d\u043d\u044b\u0435 \u043e\u0448\u0438\u0431\u043a\u0438 +label.redundant.router.capability=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \u0440\u0435\u0437\u0435\u0440\u0432\u043d\u043e\u0433\u043e \u0440\u043e\u0443\u0442\u0435\u0440\u0430 +label.redundant.router=\u0420\u0435\u0437\u0435\u0440\u0432\u043d\u043e\u0439 \u0440\u043e\u0443\u0442\u0435\u0440 +label.redundant.state=\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0440\u0435\u0437\u0435\u0440\u0432\u0430 +label.refresh=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c +label.related=\u0421\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0439 +label.remind.later=\u041f\u0440\u0435\u0434\u0443\u043f\u0440\u0435\u0434\u0438\u0442\u044c \u043f\u043e\u0437\u0436\u0435 +label.remove.egress.rule=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u044b\u0445\u043e\u0434\u043d\u043e\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.remove.from.load.balancer=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 \u0441 \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +label.remove.ingress.rule=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u0445\u043e\u0434\u043d\u043e\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.remove.ip.range=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP +label.remove.pf=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e \u043f\u0440\u043e\u0431\u0440\u043e\u0441\u0430 \u043f\u043e\u0440\u0442\u0430 +label.remove.project.account=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c \u043f\u0440\u043e\u0435\u043a\u0442\u0430 +label.remove.rule=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.remove.static.nat.rule=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u043f\u0440\u0430\u0432\u0438\u043b\u043e \u0441\u0442\u0430\u0442\u0438\u0447\u043d\u043e\u0433\u043e NAT +label.remove.vm.from.lb=\u0423\u0434\u0430\u043b\u0438\u0442\u044c \u0412\u041c \u0441 \u043f\u0440\u0430\u0432\u0438\u043b\u0430 \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +label.removing=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 +label.removing.user=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +label.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f +label.reserved.system.gateway=\u0417\u0430\u0440\u0435\u0437\u0435\u0440\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0448\u043b\u044e\u0437 +label.reserved.system.ip=\u0417\u0430\u0440\u0435\u0437\u0435\u0440\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 IP +label.reserved.system.netmask=\u0417\u0430\u0440\u0435\u0437\u0435\u0440\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u0430\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0430\u044f \u043c\u0430\u0441\u043a\u0430 +label.resize.new.offering.id=New Offering +label.resize.new.size=New Size(GB) +label.resize.shrink.ok=Shrink OK +label.resource.limits=\u041f\u0440\u0435\u0434\u0435\u043b\u044b \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432 +label.resource.state=\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432 +label.resources=\u0420\u0435\u0441\u0443\u0440\u0441\u044b +label.resource=\u0420\u0435\u0441\u0443\u0440\u0441 +label.restart.network=\u041f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u0435\u0442\u044c +label.restart.required=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a +label.review=\u041e\u0431\u0437\u043e\u0440 +label.revoke.project.invite=\u041e\u0442\u043e\u0437\u0432\u0430\u0442\u044c \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u0435 +label.role=\u0420\u043e\u043b\u044c +label.root.disk.controller=\u041a\u043e\u043d\u0442\u0440\u043e\u043b\u043b\u0435\u0440 \u043a\u043e\u0440\u043d\u0435\u0432\u043e\u0433\u043e \u0434\u0438\u0441\u043a\u0430 +label.root.disk.offering=\u0420\u0435\u0441\u0443\u0440\u0441 \u043a\u043e\u0440\u043d\u0435\u0432\u043e\u0433\u043e \u0434\u0438\u0441\u043a\u0430 +label.round.robin=Round-robin +label.rules=\u041f\u0440\u0430\u0432\u0438\u043b\u0430 +label.running.vms=\u0417\u0430\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u0435 \u0412\u041c +label.s3.secret_key=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 +label.saturday=\u0421\u0443\u0431\u0431\u043e\u0442\u0430 +label.save.and.continue=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c \u0438 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c +label.save=\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c +label.saving.processing=\u0421\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u0438\u0435... +label.scope=\u041e\u0445\u0432\u0430\u0442 +label.search=\u041f\u043e\u0438\u0441\u043a +label.secondary.storage.count=\u0412\u0442\u043e\u0440\u0438\u0447\u043d\u044b\u0439 \u0430\u0440\u0445\u0438\u0432 \u0434\u043b\u044f \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f +label.secondary.storage=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.secondary.storage.vm=\u0412\u0442\u043e\u0440\u0438\u0447\u043d\u044b\u0439 \u0444\u0430\u0439\u043b\u043e\u0432\u044b\u0439 \u0441\u0435\u0440\u0432\u0435\u0440 +label.secondary.used=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +label.secret.key=\u0421\u0435\u043a\u0440\u0435\u0442\u043d\u044b\u0439 \u043a\u043b\u044e\u0447 +label.security.group.name=\u0418\u043c\u044f \u0433\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 +label.security.groups.enabled=\u0413\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 \u0432\u043a\u043b\u044e\u0447\u0435\u043d\u044b +label.security.groups=\u0413\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 +label.security.group=\u0413\u0440\u0443\u043f\u043f\u0430 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 +label.select.a.template=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0448\u0430\u0431\u043b\u043e\u043d +label.select.a.zone=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0437\u043e\u043d\u0443 +label.select.instance.to.attach.volume.to=\u0412\u044b\u0431\u0438\u0440\u0438\u0442\u0435 \u0441\u0435\u0440\u0432\u0435\u0440 \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043e\u0431\u044c\u0435\u043c\u0430 +label.select.instance=\u0412\u044b\u0431\u0438\u0440\u0438\u0442\u0435 \u0441\u0435\u0440\u0432\u0435\u0440 +label.select.iso.or.template=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 ISO \u0438\u043b\u0438 \u0448\u0430\u0431\u043b\u043e\u043d +label.select.offering=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u0435 +label.select.project=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043f\u0440\u043e\u0435\u043a\u0442 +label.select=\u0412\u044b\u0431\u0440\u0430\u0442\u044c +label.select-view=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0432\u0438\u0434 +label.select.vm.for.static.nat=\u0412\u044b\u0431\u043e\u0440 VM \u0434\u043b\u044f NAT +label.sent=\u041e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043e +label.server=\u0421\u0435\u0440\u0432\u0435\u0440 +label.service.capabilities=\u0412\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \u0441\u043b\u0443\u0436\u0431\u044b +label.service.offering=\u0421\u043b\u0443\u0436\u0435\u0431\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.session.expired=\u0412\u0440\u0435\u043c\u044f \u0441\u0435\u0441\u0441\u0438\u0438 \u0432\u044b\u0448\u043b\u043e +label.setup.network=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0441\u0435\u0442\u0438 +label.setup=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 +label.set.up.zone.type=\u041d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0442\u0438\u043f \u0437\u043e\u043d\u044b +label.setup.zone=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0437\u043e\u043d\u044b +label.SharedMountPoint=\u041e\u0442\u043a\u0440\u044b\u0442\u0430\u044f\u0422\u043e\u0447\u043a\u0430\u0414\u043e\u0441\u0442\u0443\u043f\u0430 +label.shared=\u041e\u0431\u0449\u0438\u0439 +label.show.ingress.rule=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u0432\u0445\u043e\u0434\u043d\u043e\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u043e +label.shutdown.provider=\u041e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0430 +label.size=\u0420\u0430\u0437\u043c\u0435\u0440 +label.skip.guide=\u042f \u0443\u0436\u0435 \u0432\u0435\u043b\u0438\u043a\u0438\u0439 \u043c\u0430\u0441\u0442\u0435\u0440 CloudStack, \u043f\u0440\u043e\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u044d\u0442\u043e \u0440\u0443\u043a\u043e\u0432\u043e\u0434\u0441\u0442\u0432\u043e +label.snapshot.limits=\u041f\u0440\u0435\u0434\u0435\u043b\u044b \u0441\u043d\u0438\u043c\u043a\u043e\u0432 +label.snapshot.name=\u0418\u043c\u044f \u0441\u043d\u0438\u043c\u043a\u0430 +label.snapshot.schedule=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u043e\u0432\u0442\u043e\u0440\u044f\u0435\u043c\u044b\u0445 \u0441\u043d\u0438\u043c\u043a\u043e\u0432 +label.snapshots=\u0421\u043d\u0438\u043c\u043a\u0438 +label.snapshot.s=\u0421\u043d\u0438\u043c\u043e\u043a/\u0441\u043d\u0438\u043c\u043a\u0438 +label.snapshot=\u0421\u043d\u0438\u043c\u043e\u043a +label.source.nat=Source NAT +label.source=\u0418\u0441\u0442\u043e\u0447\u043d\u0438\u043a +label.specify.IP.ranges=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP-\u0430\u0434\u0440\u0435\u0441\u043e\u0432 +label.specify.vlan=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 VLAN +label.SR.name = SR Name-Label +label.srx=SRX +label.start.IP=\u041d\u0430\u0447\u0430\u043b\u044c\u043d\u044b\u0439 IP +label.start.port=\u041d\u0430\u0447\u0430\u043b\u044c\u043d\u044b\u0439 \u043f\u043e\u0440\u0442 +label.start.reserved.system.IP=\u041d\u0430\u0447\u0430\u043b\u044c\u043d\u044b\u0439 \u0437\u0430\u0440\u0435\u0437\u0435\u0440\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043d\u044b\u0439 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 IP-\u0430\u0434\u0440\u0435\u0441 +label.start.vlan=\u041d\u0430\u0447\u0430\u043b\u044c\u043d\u044b\u0439 VLAN +label.state=\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 +label.static.nat.enabled=\u0421\u0442\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 NAT \u0432\u043a\u043b\u044e\u0447\u0435\u043d +label.static.nat.to=\u0421\u0442\u0430\u0442\u0438\u0447\u043d\u044b\u0439 NAT \u043a +label.static.nat=\u0421\u0442\u0430\u0442\u0438\u0447\u043d\u044b\u0439 NAT +label.static.nat.vm.details=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 NAT \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043c\u0430\u0448\u0438\u043d +label.statistics=\u0421\u0442\u0430\u0442\u0438\u0441\u0442\u0438\u043a\u0430 +label.status=\u0421\u0442\u0430\u0442\u0443\u0441 +label.step.1.title=\u0428\u0430\u0433 1\: \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0448\u0430\u0431\u043b\u043e\u043d +label.step.1=\u0428\u0430\u0433 1 +label.step.2.title=\u0428\u0430\u0433 2\: \u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.step.2=\u0428\u0430\u0433 2 +label.step.3.title=\u0428\u0430\u0433 3\: \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u0438\u0441\u043a\u043e\u0432\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.step.3=\u0428\u0430\u0433 3 +label.step.4.title=Step 4\: \u0421\u0435\u0442\u044c +label.step.4=\u0428\u0430\u0433 4 +label.step.5.title=Step 5\: \u041e\u0431\u0437\u043e\u0440 +label.step.5=\u0428\u0430\u0433 5 +label.stickiness=\u041b\u0438\u043f\u043a\u0438\u0439 +label.sticky.cookie-name=Cookie \u0438\u043c\u044f +label.sticky.domain=\u0414\u043e\u043c\u0435\u043d +label.sticky.expire=\u0418\u0441\u0442\u0435\u043a\u0430\u0435\u0442 +label.sticky.holdtime=\u0432\u0440\u0435\u043c\u044f \u0443\u0434\u0435\u0440\u0436\u0430\u043d\u0438\u044f +label.sticky.indirect=\u041a\u043e\u0441\u0432\u0435\u043d\u043d\u044b\u0439 +label.sticky.length=\u0414\u043b\u0438\u043d\u0430 +label.sticky.mode=\u0420\u0435\u0436\u0438\u043c +label.sticky.nocache=\u041d\u0435\u0442 \u043a\u044d\u0448\u0430 +label.sticky.postonly=\u0421\u043e\u043e\u0431\u0449\u0435\u043d\u0438\u0435 \u0442\u043e\u043b\u044c\u043a\u043e +label.sticky.prefix=\u041f\u0440\u0435\u0444\u0438\u043a\u0441 +label.sticky.request-learn=\u0422\u0440\u0435\u0431\u0443\u0435\u0442\u0441\u044f \u0438\u0437\u0443\u0447\u0435\u043d\u0438\u0435. +label.sticky.tablesize=\u0420\u0430\u0437\u043c\u0435\u0440 \u0442\u0430\u0431\u043b\u0438\u0446\u044b +label.stopped.vms=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u0412\u041c +label.stop=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c +label.storage.tags=\u041c\u0435\u0442\u043a\u0438 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +label.storage.traffic=\u0422\u0440\u0430\u0444\u0438\u043a \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +label.storage.type=\u0422\u0438\u043f \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +label.storage=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +label.subdomain.access=\u0414\u043e\u0441\u0442\u0443\u043f \u043a \u043f\u043e\u0434\u0434\u043e\u043c\u0435\u043d\u0443 +label.submitted.by=[\u041e\u043f\u0443\u0431\u043b\u0438\u043a\u043e\u0432\u0430\u043d\u043e\: ] +label.submit=\u041e\u043f\u0443\u0431\u043b\u0438\u043a\u043e\u0432\u0430\u0442\u044c +label.succeeded=\u0423\u0441\u043f\u0435\u0448\u043d\u043e +label.sunday=\u0412\u043e\u0441\u043a\u0440\u0435\u0441\u0435\u043d\u044c\u0435 +label.supported.services=\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043c\u044b\u0435 \u0441\u043b\u0443\u0436\u0431\u044b +label.supported.source.NAT.type=\u041f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u043c\u044b\u0435 \u0442\u0438\u043f\u044b NAT-\u0438\u0441\u0442\u043e\u0447\u043d\u0438\u043a\u0430 +label.suspend.project=\u041f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u0440\u043e\u0435\u043a\u0442 +label.system.capacity=\u041c\u043e\u0449\u043d\u043e\u0441\u0442\u044c \u0441\u0438\u0441\u0442\u0435\u043c\u044b +label.system.offering=\u0421\u0438\u0441\u0442\u0435\u043c\u0430 \u0440\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u044f +label.system.service.offering=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 +label.system.vms=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0435 \u0412\u041c +label.system.vm.type=\u0422\u0438\u043f \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0439 \u0412\u041c +label.system.vm=\u0421\u0438\u0441\u0442\u0435\u043c\u043d\u0430\u044f \u0412\u041c +label.system.wide.capacity=\u041e\u0431\u0449\u0435\u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0433\u043e \u043f\u043e\u0442\u0435\u043d\u0446\u0438\u0430\u043b\u0430 +label.tagged=\u0421 \u043c\u0435\u0442\u043a\u043e\u0439 +label.tags=\u041c\u0435\u0442\u043a\u0438 +label.target.iqn=\u0426\u0435\u043b\u0435\u0432\u043e\u0439 IQN +label.task.completed=\u0417\u0430\u0434\u0430\u0447\u0430 \u0432\u044b\u043f\u043e\u043b\u043d\u0435\u043d\u0430 +label.template.limits=\u041f\u0440\u0435\u0434\u0435\u043b\u044b \u0448\u0430\u0431\u043b\u043e\u043d\u0430 +label.template=\u0428\u0430\u0431\u043b\u043e\u043d +label.TFTP.dir=\u041a\u0430\u0442\u0430\u043b\u043e\u0433 TFTP +label.theme.default=\u0421\u0442\u0430\u043d\u0434\u0430\u0440\u0442\u043d\u0430\u044f \u0442\u0435\u043c\u0430 +label.theme.grey=\u0421\u0435\u0440\u0430\u044f \u0442\u0435\u043c\u0430 +label.theme.lightblue=\u0413\u043e\u043b\u0443\u0431\u0430\u044f \u0442\u0435\u043c\u0430 +label.thursday=\u0427\u0435\u0442\u0432\u0435\u0440\u0433 +label.timeout.in.second = \u0412\u0440\u0435\u043c\u044f \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u0435 (\u0441\u0435\u043a.) +label.timeout=\u0412\u0440\u0435\u043c\u044f \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u044f +label.time=\u0412\u0440\u0435\u043c\u044f +label.time.zone=\u0427\u0430\u0441\u043e\u0432\u043e\u0439 \u043f\u043e\u044f\u0441 +label.timezone=\u0427\u0430\u0441\u043e\u0432\u043e\u0439 \u043f\u043e\u044f\u0441 +label.token=\u0422\u0430\u043b\u043e\u043d +label.total.cpu=\u0412\u0441\u0435\u0433\u043e CPU +label.total.CPU=\u0412\u0441\u0435\u0433\u043e CPU +label.total.hosts=\u0412\u0441\u0435\u0433\u043e \u0443\u0437\u043b\u043e\u0432 +label.total.memory=\u0412\u0441\u0435\u0433\u043e \u043f\u0430\u043c\u044f\u0442\u0438 +label.total.of.ip=\u0412\u0441\u0435\u0433\u043e IP-\u0430\u0434\u0440\u0435\u0441\u043e\u0432 +label.total.of.vm=\u0412\u0441\u0435\u0433\u043e \u0412\u041c +label.total.storage=\u0412\u0441\u0435\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449 +label.total.vms=\u0412\u0441\u0435\u0433\u043e \u0412\u041c +label.traffic.label=\u0422\u0440\u0430\u0444\u0438\u043a +label.traffic.types=\u0422\u0438\u043f\u044b \u0442\u0440\u0430\u0444\u0438\u043a\u0430 +label.traffic.type=\u0422\u0438\u043f \u0442\u0440\u0430\u0444\u0438\u043a\u0430 +label.tuesday=\u0412\u0442\u043e\u0440\u043d\u0438\u043a +label.type.id=ID \u0442\u0438\u043f\u0430 +label.type=\u0422\u0438\u043f +label.unavailable=\u041d\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u043e +label.unlimited=\u0411\u0435\u0441\u043a\u043e\u043d\u0435\u0447\u043d\u043e +label.untagged=\u0411\u0435\u0437 \u043c\u0435\u0442\u043a\u0438 +label.update.project.resources=\u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0440\u0435\u0441\u0443\u0440\u0441\u044b \u043f\u0440\u043e\u0435\u043a\u0442\u0430 +label.update.ssl.cert= \u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u044b SSL +label.update.ssl= \u041e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u044b SSL +label.updating=\u041e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u0435 +label.upload=\u0417\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c +label.upload.volume=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043e\u0431\u044a\u0435\u043c +label.url=URL +label.usage.interface=\u0418\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f +label.used=\u0418\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u043e +label.username=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f +label.users=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 +label.user=\u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c +label.value=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 +label.vcdcname=\u0418\u043c\u044f vCenter DC +label.vcenter.cluster=\u041a\u043b\u0430\u0441\u0442\u0435\u0440 vCenter +label.vcenter.datacenter=\u0426\u041e\u0414 vCenter +label.vcenter.datastore=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 vCenter +label.vcenter.host=\u0423\u0437\u0435\u043b vCenter +label.vcenter.password=\u041f\u0430\u0440\u043e\u043b\u044c vCenter +label.vcenter.username=\u0418\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f vCenter +label.vcipaddress=vCenter IP \u0410\u0434\u0440\u0435\u0441\u0441 +label.version=\u0412\u0435\u0440\u0441\u0438\u044f +label.view.all=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0432\u0441\u0451 +label.view.console=\u041f\u043e\u043a\u0430\u0437\u0430\u0442\u044c \u043a\u043e\u043d\u0441\u043e\u043b\u044c +label.viewing=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440 +label.view.more=\u041f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0435\u0442\u044c \u0431\u043e\u043b\u044c\u0448\u0435 +label.view=\u0412\u0438\u0434 +label.virtual.appliances=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 +label.virtual.appliance=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u043e\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u043e +label.virtual.machines=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u043c\u0430\u0448\u0438\u043d\u044b +label.virtual.network=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u0430\u044f \u0441\u0435\u0442\u044c +label.virtual.routers=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0439 \u0440\u043e\u0443\u0442\u0435\u0440 +label.virtual.router=\u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0439 \u0440\u043e\u0443\u0442\u0435\u0440 +label.vlan.id=ID VLAN +label.vlan.range=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d VLAN +label.vlan=VLAN +label.vm.add=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u044b +label.vm.destroy=\u0423\u043d\u0438\u0447\u0442\u043e\u0436\u0438\u0442\u044c +label.vm.display.name=\u041e\u0442\u043e\u0431\u0440\u0430\u0436\u0430\u0435\u043c\u043e\u0435 \u0438\u043c\u044f \u0412\u041c +label.VMFS.datastore=\u0425\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 VMFS +label.vmfs=VMFS +label.vm.name=\u0418\u043c\u044f VM +label.vm.reboot=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c +label.vmsnapshot.type=\u0422\u0438\u043f +label.vm.start=\u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c +label.vm.state=\u0421\u0442\u0430\u0442\u0443\u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 +label.vm.stop=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c +label.vms=\u0412\u041c +label.vmware.traffic.label=\u041c\u0435\u0442\u043a\u0430 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 VMware +label.volgroup=\u0413\u0440\u0443\u043f\u043f\u0430 \u0442\u043e\u043c\u0430 +label.volume.limits=\u041f\u0440\u0435\u0434\u0435\u043b\u044b \u0442\u043e\u043c\u043e\u0432 +label.volume.name=\u0418\u043c\u044f \u0442\u043e\u043c\u0430 +label.volumes=\u0417\u043d\u0430\u0447\u0435\u043d\u0438\u044f +label.volume=\u0422\u043e\u043c +label.vpn=VPN +label.vsmctrlvlanid=\u0423\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u0435 VLAN ID +label.vsmpktvlanid=\u041f\u0430\u043a\u0435\u0442 VLAN ID +label.vsmstoragevlanid=\u0425\u0440\u0430\u043d\u0435\u043d\u0438\u0435 VLAN ID +label.vsphere.managed=\u041e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u0435 vSphere +label.waiting=\u041e\u0436\u0438\u0434\u0430\u043d\u0438\u0435 +label.warn=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435 +label.wednesday=\u0421\u0440\u0435\u0434\u0430 +label.weekly=\u0415\u0436\u0435\u043d\u0435\u0434\u0435\u043b\u044c\u043d\u043e +label.welcome.cloud.console=\u0414\u043e\u0431\u0440\u043e \u043f\u043e\u0436\u0430\u043b\u043e\u0432\u0430\u0442\u044c \u043d\u0430 \u043f\u0430\u043d\u0435\u043b\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f +label.welcome=\u0414\u043e\u0431\u0440\u043e \u043f\u043e\u0436\u0430\u043b\u043e\u0432\u0430\u0442\u044c +label.what.is.cloudstack=\u0427\u0442\u043e \u0442\u0430\u043a\u043e\u0435 CloudStack? +label.xen.traffic.label=\u041c\u0435\u0442\u043a\u0430 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 XenServer +label.yes=\u0414\u0430 +label.zone.details=\u041f\u043e\u0434\u0440\u043e\u0431\u043d\u043e\u0441\u0442\u0438 \u0437\u043e\u043d\u044b +label.zone.id=ID \u0437\u043e\u043d\u044b +label.zone.name=\u0418\u043c\u044f \u0437\u043e\u043d\u044b +label.zone.step.1.title=\u0428\u0430\u0433 1\: \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u0435\u0442\u044c +label.zone.step.2.title=Step 2\: \u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 \u0437\u043e\u043d\u0443 +label.zone.step.3.title=Step 3\: \u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 \u0441\u0442\u0435\u043d\u0434 +label.zone.step.4.title=Step 4\: \u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP-\u0430\u0434\u0440\u0435\u0441\u043e\u0432 +label.zones=\u0417\u043e\u043d\u044b +label.zone.type=\u0422\u0438\u043f \u0437\u043e\u043d\u044b +label.zone=\u0417\u043e\u043d\u0430 +label.zone.wide=\u0412\u0441\u0435\u0439 \u0437\u043e\u043d\u044b +managed.state=\u0421\u043e\u0441\u0442\u043e\u044f\u043d\u0438\u0435 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f +message.acquire.new.ip=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c "\u0431\u0435\u043b\u044b\u0439" IP \u0434\u043b\u044f \u044d\u0442\u043e\u0439 \u0441\u0435\u0442\u0438. +message.acquire.public.ip=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0437\u043e\u043d\u0443, \u0438\u0437 \u043a\u043e\u0442\u043e\u0440\u043e\u0439 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u0438\u043e\u0431\u0440\u0435\u0441\u0442\u0438 \u043d\u043e\u0432\u044b\u0439 IP. +message.action.cancel.maintenance.mode=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u0440\u0435\u0436\u0438\u043c \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f. +message.action.cancel.maintenance=\u0423\u0437\u0435\u043b \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0432\u044b\u0448\u0435\u043b \u0438\u0437 \u0440\u0435\u0436\u0438\u043c\u0430 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f. \u042d\u0442\u043b\u044c \u043f\u0440\u043e\u0446\u0435\u0441\u0441 \u043c\u043e\u0436\u0435\u0442 \u0434\u043b\u0438\u0442\u044c\u0441\u044f \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043c\u0438\u043d\u0443\u0442. +message.action.change.service.warning.for.instance=\u0414\u043b\u044f \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u0442\u0435\u043a\u0443\u0449\u0435\u0433\u043e \u0441\u043b\u0443\u0436\u0435\u0431\u043d\u043e\u0433\u043e \u0440\u0435\u0441\u0443\u0440\u0441\u0430 \u0432\u0430\u0448\u0430 \u043c\u0430\u0448\u0438\u043d\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0431\u044b\u0442\u044c \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430. +message.action.change.service.warning.for.router=\u0414\u043b\u044f \u0440\u043e\u0443\u0442\u0435\u0440 \u0442\u0435\u043a\u0443\u0449\u0435\u0433\u043e \u0441\u043b\u0443\u0436\u0435\u0431\u043d\u043e\u0433\u043e \u0440\u0435\u0441\u0443\u0440\u0441\u0430 \u0432\u0430\u0448\u0430 \u043c\u0430\u0448\u0438\u043d\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0431\u044b\u0442\u044c \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430. +message.action.delete.cluster=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u043a\u043b\u0430\u0441\u0442\u0435\u0440. +message.action.delete.disk.offering=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0434\u0438\u0441\u043a\u043e\u0432\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441. +message.action.delete.domain=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0434\u043e\u043c\u0435\u043d. +message.action.delete.external.firewall=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u043d\u0435\u0448\u043d\u0438\u0439 \u0444\u0430\u0435\u0440\u0432\u043e\u043b. \u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435\: \u0435\u0441\u043b\u0438 \u0432\u044b \u043f\u043b\u0430\u043d\u0438\u0440\u0443\u0435\u0442\u0435 \u0432\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043a \u044d\u0442\u043e\u043c\u0443 \u0432\u043d\u0435\u0448\u043d\u0435\u043c\u0443 \u0444\u0430\u0435\u0440\u0432\u043e\u043b\u0443 \u043e\u0431\u0440\u0430\u0442\u043d\u043e, \u0432\u0430\u043c \u043f\u0440\u0438\u0434\u0435\u0442\u0441\u044f \u0441\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043e\u0431 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438 \u0432 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0435. +message.action.delete.external.load.balancer=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0432\u043d\u0435\u0448\u043d\u044e\u044e \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0443 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438. \u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435\: \u0435\u0441\u043b\u0438 \u0432\u044b \u043f\u043b\u0430\u043d\u0438\u0440\u0443\u0435\u0442\u0435 \u0432\u0435\u0440\u043d\u0443\u0442\u044c\u0441\u044f \u043a \u044d\u0442\u043e\u0439 \u0432\u043d\u0435\u0448\u043d\u0435\u0439 \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0435, \u0432\u0430\u043c \u043f\u0440\u0438\u0434\u0435\u0442\u0441\u044f \u0441\u0431\u0440\u043e\u0441\u0438\u0442\u044c \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u043e\u0431 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438 \u0432 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0435. +message.action.delete.ingress.rule=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e \u0432\u0445\u043e\u0434\u043d\u043e\u0435 \u043f\u0440\u0430\u0432\u0438\u043b\u043e. +message.action.delete.ISO.for.all.zones=\u042d\u0442\u043e ISO, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0439 \u0432\u0441\u0435\u043c\u0438 \u0437\u043e\u043d\u0430\u043c\u0438. \u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0435\u0433\u043e \u0441\u043e \u0432\u0441\u0435\u0445 \u0437\u043e\u043d. +message.action.delete.ISO=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 ISO. +message.action.delete.network=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u0443 \u0441\u0435\u0442\u044c. +message.action.delete.nexusVswitch=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e nexusVswitch. +message.action.delete.physical.network=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0443\u044e \u0441\u0435\u0442\u044c +message.action.delete.pod=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0441\u0442\u0435\u043d\u0434. +message.action.delete.primary.storage=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435. +message.action.delete.secondary.storage=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435. +message.action.delete.security.group=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u0443 \u0433\u0440\u0443\u043f\u043f\u0443 \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438. +message.action.delete.service.offering=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0441\u043b\u0443\u0436\u0435\u0431\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441. +message.action.delete.snapshot=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0441\u043d\u0438\u043c\u043e\u043a. +message.action.delete.system.service.offering=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0440\u0435\u0441\u0443\u0440\u0441 \u0434\u043b\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0445 \u0441\u043b\u0443\u0436\u0431. +message.action.delete.template.for.all.zones=\u0428\u0430\u0431\u043b\u043e\u043d \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0432\u043e \u0432\u0441\u0435\u0445 \u0437\u043e\u043d\u0430\u0445. \u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0435\u0433\u043e \u0441\u043e \u0432\u0441\u0435\u0445 \u0437\u043e\u043d. +message.action.delete.template=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0448\u0430\u0431\u043b\u043e\u043d. +message.action.delete.volume=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0442\u043e\u043c. +message.action.delete.zone=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u0443 \u0437\u043e\u043d\u0443. +message.action.destroy.instance=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u043d\u0438\u0447\u0442\u043e\u0436\u0438\u0442\u044c \u044d\u0442\u0443 \u043c\u0430\u0448\u0438\u043d\u0443. +message.action.destroy.systemvm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435. +message.action.disable.cluster=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u043a\u043b\u0430\u0441\u0442\u0435\u0440. +message.action.disable.nexusVswitch=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u0443 nexusVswitch. +message.action.disable.physical.network=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u0443 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0443\u044e \u0441\u0435\u0442\u044c. +message.action.disable.pod=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u0443 \u0437\u043e\u043d\u0443. +message.action.disable.static.NAT=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0441\u0442\u0430\u0442\u0438\u0447\u043d\u044b\u0439 NAT. +message.action.disable.zone=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u0443 \u0437\u043e\u043d\u0443 +message.action.download.iso=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u044d\u0442\u043e\u0442 ISO. +message.action.download.template=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0448\u0430\u0431\u043b\u043e\u043d. +message.action.enable.cluster=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u043a\u043b\u0430\u0441\u0442\u0435\u0440. +message.action.enable.maintenance=\u0423\u0437\u0435\u043b \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u0432\u043e\u0448\u0435\u043b \u0432 \u0440\u0435\u0436\u0438\u043c \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f. \u0414\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0441\u0442\u044c \u044d\u0442\u043e\u0433\u043e \u043f\u0440\u043e\u0446\u0435\u0441\u0441\u0430 \u0437\u0430\u0432\u0438\u0441\u0438\u0442 \u043e\u0442 \u043a\u043e\u043b\u0438\u0447\u0435\u0441\u0442\u0432\u0430 \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u0445 \u0412\u041c \u0432 \u044d\u0442\u043e\u043c \u0443\u0437\u043b\u0435 \u0438 \u043e\u0431\u044b\u0447\u043d\u043e \u0440\u0430\u0432\u043d\u0430 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u043c \u043c\u0438\u043d\u0443\u0442\u0430\u043c. +message.action.enable.nexusVswitch=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u043e nexusVswitch. +message.action.enable.physical.network=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u0443 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0443\u044e \u0441\u0435\u0442\u044c. +message.action.enable.pod=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0441\u0442\u0435\u043d\u0434. +message.action.enable.zone=\u041f\u043e\u0442\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u0443 \u0437\u043e\u043d\u0443 +message.action.force.reconnect=\u0423\u0437\u0435\u043b \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043f\u0435\u0440\u0435\u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u043b\u0441\u044f. \u042d\u0442\u043e\u0442 \u043f\u0440\u043e\u0446\u0435\u0441\u0441 \u043c\u043e\u0436\u0435\u0442 \u0434\u043b\u0438\u0442\u044c\u0441\u044f \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043c\u0438\u043d\u0443\u0442. +message.action.host.enable.maintenance.mode=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u0440\u0435\u0436\u0438\u043c\u0430 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f \u043d\u0430 \u0443\u0437\u043b\u0435 \u043f\u0440\u0438\u0432\u0435\u0434\u0435\u0442 \u043a \u043f\u0435\u0440\u0435\u043d\u043e\u0441\u0443 \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u043d\u044b\u0445 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043c\u0430\u0448\u0438\u043d \u043d\u0430 \u0434\u0440\u0443\u0433\u0438\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0435 \u0443\u0437\u043b\u044b. +message.action.instance.reset.password=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0430\u0440\u043e\u043b\u044c root \u044d\u0442\u043e\u0439 \u0412\u041c. +message.action.manage.cluster=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u0432\u0435\u0441\u0442\u0438 \u043a\u043b\u0430\u0441\u0442\u0435\u0440 \u0432 \u0440\u0435\u0436\u0438\u043c \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f. +message.action.primarystorage.enable.maintenance.mode=\u0412\u043d\u0438\u043c\u0430\u043d\u0438\u0435\: \u043f\u0440\u0438 \u043f\u0435\u0440\u0435\u0445\u043e\u0434\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 \u0432 \u0440\u0435\u0436\u0438\u043c \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u043d\u0438\u044f, \u0432\u0441\u0435 \u0412\u041c \u0431\u0443\u0434\u0443\u0442 \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u044b. \u0425\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0438\u0442\u044c? +message.action.reboot.instance=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u044d\u0442\u0443 \u043c\u0430\u0448\u0438\u043d\u0443. +message.action.reboot.router=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0440\u043e\u0443\u0442\u0435\u0440. +message.action.reboot.systemvm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0439 \u0412\u041c. +message.action.release.ip=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0441\u0432\u043e\u0431\u043e\u0434\u0438\u0442\u044c \u044d\u0442\u043e\u0442 IP-\u0430\u0434\u0440\u0435\u0441. +message.action.remove.host=\u0423\u0434\u0430\u043b\u0435\u043d\u0438\u0435 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u0433\u043e/\u0435\u0434\u0438\u043d\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0432 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0435 \u0438 \u043f\u043e\u0432\u0442\u043e\u0440\u043d\u0430\u044f \u0435\u0433\u043e \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u043f\u0440\u0438\u0432\u0435\u0434\u0435\u0442 \u0443\u043d\u0438\u0447\u0442\u043e\u0436\u0435\u043d\u0438\u044e \u0440\u0430\u0431\u043e\u0447\u0435\u0433\u043e \u043e\u043a\u0440\u0443\u0436\u0435\u043d\u0438\u044f/\u0431\u0430\u0437\u044b \u0434\u0430\u043d\u043d\u044b\u0445 \u043d\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0435 \u0438 \u0441\u0434\u0435\u043b\u0430\u0435 \u0433\u043e\u0441\u0442\u0435\u0432\u044b\u0435 \u043c\u0430\u0448\u0438\u043d\u044b \u043d\u0435\u043f\u0440\u0438\u0433\u043e\u0434\u043d\u044b\u043c\u0438 \u043a \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044e. +message.action.reset.password.off=\u041d\u0430 \u0434\u0430\u043d\u043d\u044b\u0439 \u043c\u043e\u043c\u0435\u043d\u0442 \u043c\u0430\u0448\u0438\u043d\u0430 \u043d\u0435 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u0434\u0430\u043d\u043d\u0443\u044e \u0444\u0443\u043d\u043a\u0446\u0438\u044e +message.action.reset.password.warning=\u041c\u0430\u0448\u0438\u043d\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0431\u044b\u0442\u044c \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0430 \u0434\u043b\u044f \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043f\u0430\u0440\u043e\u043b\u044f +message.action.restore.instance=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u044d\u0442\u0443 \u043c\u0430\u0448\u0438\u043d\u0443. +message.action.start.instance=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u044d\u0442\u0443 \u043c\u0430\u0448\u0438\u043d\u0443. +message.action.start.router=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0440\u043e\u0443\u0442\u0435\u0440. +message.action.start.systemvm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u044d\u0442\u0443 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0443\u044e \u0412\u041c. +message.action.stop.instance=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u044d\u0442\u0443 \u043c\u0430\u0448\u0438\u043d\u0443. +message.action.stop.router=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0440\u043e\u0443\u0442\u0435\u0440. +message.action.stop.systemvm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u044d\u0442\u0443 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u0443\u044e \u0412\u041c. +message.action.take.snapshot=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u043e\u043b\u0443\u0447\u0438\u0442\u044c \u0441\u043d\u0438\u043c\u043e\u043a \u044d\u0442\u043e\u0433\u043e \u0442\u043e\u043c\u0430. +message.action.unmanage.cluster=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u0432\u0435\u0441\u0442\u0438 \u043a\u043b\u0430\u0441\u0442\u0435\u0440 \u0432 \u043e\u0431\u044b\u0447\u043d\u044b\u0439 \u0440\u0435\u0436\u0438\u043c. +message.activate.project=\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u043f\u0440\u043e\u0435\u043a\u0442? +message.add.cluster=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u043e\u043c \u0434\u043b\u044f \u0437\u043e\u043d\u044b , \u043c\u043e\u0434\u0443\u043b\u044c +message.add.cluster.zone=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440\u0430 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u043e\u043c \u0434\u043b\u044f \u0437\u043e\u043d\u044b +message.add.disk.offering=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u043a\u0430\u0436\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b, \u0447\u0442\u043e\u0431\u044b \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u043e\u0435 \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u0434\u0438\u0441\u043a\u0430 +message.add.domain=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043f\u043e\u0434\u0434\u043e\u043c\u0435\u043d, \u0433\u0434\u0435 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0432\u0430\u0448 \u0434\u043e\u043c\u0435\u043d +message.add.firewall=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0444\u0430\u0435\u0440\u0432\u043e\u043b \u0432 \u0437\u043e\u043d\u0443 +message.add.guest.network=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0433\u043e\u0441\u0442\u0435\u0432\u0443\u044e \u0441\u0435\u0442\u044c +message.add.host=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u0443\u0437\u043b\u0430. +message.adding.host=\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0443\u0437\u043b\u0430 +message.adding.Netscaler.device=\u0414\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 NetScaler +message.adding.Netscaler.provider=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c Netscaler +message.add.ip.range.direct.network=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c IP-\u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430 \u0441\u0435\u0442\u0438 \u0432 \u0437\u043e\u043d\u0435 +message.add.ip.range.to.pod=

\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP-\u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u0432 \u0441\u0442\u0435\u043d\u0434\:

+message.add.ip.range=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP-\u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u0432 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u0443\u044e \u0441\u0435\u0442\u044c \u0437\u043e\u043d\u044b +message.additional.networks.desc=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0441\u0435\u0442\u0438, \u043a\u0443\u0434\u0430 \u0432\u0430\u0448\u044b \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u0431\u0443\u0434\u0443\u0442 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u044b. +message.add.load.balancer=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0443 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0432 \u0437\u043e\u043d\u0443 +message.add.load.balancer.under.ip=\u041f\u0440\u0430\u0432\u0438\u043b\u043e \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0431\u044b\u043b \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0432 IP\: +message.add.network=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u0443\u044e \u0441\u0435\u0442\u044c \u0434\u043b\u044f \u0437\u043e\u043d\u044b\: +message.add.pod.during.zone.creation=\u041a\u0430\u0436\u0434\u0430\u044f \u0437\u043e\u043d\u0430 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u0441\u0442\u0435\u043d\u0434\u043e\u0432, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0432\u044b \u0441\u0435\u0439\u0447\u0430\u0441 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u043f\u0435\u0440\u0432\u044b\u043c. \u0421\u0442\u0435\u043d\u0434 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0443\u0437\u043b\u044b \u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u044b \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0431\u0443\u0434\u0443\u0442 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u044b \u0432 \u043f\u043e\u0441\u043b\u0435\u0434\u043d\u0435\u043c \u0448\u0430\u0433\u0435. \u0414\u043b\u044f \u043d\u0430\u0447\u0430\u043b\u0430 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0440\u0435\u0437\u0435\u0440\u0432\u043d\u044b\u0445 \u0430\u0434\u0440\u0435\u0441\u043e\u0432 IP \u0434\u043b\u044f \u0432\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0435\u0439 \u0441\u0435\u0442\u0438 \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f. \u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0440\u0435\u0437\u0435\u0440\u0432\u043d\u044b\u0445 IP \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0443\u043d\u0438\u043a\u0430\u043b\u044c\u043d\u044b\u043c \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0439 \u0437\u043e\u043d\u044b \u043e\u0431\u043b\u0430\u043a\u0430. +message.add.pod=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043d\u043e\u0432\u044b\u0439 \u0441\u0442\u0435\u043d\u0434 \u0434\u043b\u044f \u0437\u043e\u043d\u044b +message.add.primary.storage=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u0434\u043b\u044f \u0437\u043e\u043d\u044b , \u0441\u0442\u0435\u043d\u0434\u0430 +message.add.primary=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +message.add.secondary.storage=\u0414\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u0432 \u0437\u043e\u043d\u0443 +message.add.service.offering=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0433\u043e \u0440\u0435\u0441\u0443\u0440\u0441\u0430. +message.add.system.service.offering=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u0440\u0435\u0441\u0443\u0440\u0441\u0430 \u0434\u043b\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0445 \u0441\u043b\u0443\u0436\u0431. +message.add.template=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u0448\u0430\u0431\u043b\u043e\u043d\u0430 +message.add.volume=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u044b \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u0442\u043e\u043c\u0430 +message.advanced.mode.desc=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u044d\u0442\u0443 \u043c\u043e\u0434\u0435\u043b\u044c \u0441\u0435\u0442\u0438, \u0435\u0441\u043b\u0438 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0443 VLAN. \u042d\u0442\u0430 \u0441\u0435\u0442\u0435\u0432\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u0435\u0442 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u0433\u0438\u0431\u043a\u043e\u0441\u0442\u044c \u0432 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0438 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0430\u043c \u0434\u043b\u044f \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c\u0441\u043a\u0438\u0445 \u043f\u0440\u0435\u0434\u043b\u043e\u0436\u0435\u043d\u0438\u0439 \u0441\u0435\u0442\u0438, \u0442\u0430\u043a\u0438\u0435 \u043a\u0430\u043a \u043c\u0435\u0436\u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u044d\u043a\u0440\u0430\u043d, VPN, \u0438\u043b\u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438, \u0430 \u0442\u0430\u043a\u0436\u0435 \u043f\u043e\u0437\u0432\u043e\u043b\u044f\u0435\u0442 \u043f\u0440\u044f\u043c\u043e\u0435 \u043f\u0440\u043e\u0442\u0438\u0432 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u0441\u0435\u0442\u0435\u0439. +message.advanced.security.group=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u044d\u0442\u043e\u0442 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440, \u0435\u0441\u043b\u0438 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0433\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438, \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0442\u044c \u0438\u0437\u043e\u043b\u044f\u0446\u0438\u044e \u0441\u0435\u0440\u0432\u0435\u0440\u0430. +message.advanced.virtual=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u044d\u0442\u043e\u0442 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440, \u0435\u0441\u043b\u0438 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432\u0441\u0435\u0439 \u0437\u043e\u043d\u044b \u0441\u0435\u0442\u0438 VLAN, \u0447\u0442\u043e\u0431\u044b \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0442\u044c \u0438\u0437\u043e\u043b\u044f\u0446\u0438\u044e \u0441\u0435\u0440\u0432\u0435\u0440\u0430. +message.after.enable.swift=Swift \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d. \u041f\u0440\u0438\u043c\u0435\u0447\u0430\u043d\u0438\u0435\: \u0415\u0441\u043b\u0438 \u0432\u044b \u043f\u043e\u043a\u0438\u043d\u0435\u0442\u0435 \u044d\u0442\u0443 \u0441\u0442\u0440\u0430\u043d\u0438\u0446\u0443, \u0432\u0430\u043c \u043d\u0435 \u043f\u0440\u0438\u0434\u0435\u0442\u0441\u044f \u043d\u0430\u0441\u0442\u0440\u0430\u0438\u0432\u0430\u0442\u044c Swift \u0441\u043d\u043e\u0432\u0430 +message.alert.state.detected=\u041e\u0431\u043d\u0430\u0440\u0443\u0436\u0435\u043d \u0441\u0438\u0433\u043d\u0430\u043b \u0442\u0440\u0435\u0432\u043e\u0433\u0438 +message.allow.vpn.access=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438 \u043f\u0430\u0440\u043e\u043b\u044c \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0434\u043b\u044f VPN-\u0434\u043e\u0441\u0442\u0443\u043f\u0430. +message.apply.snapshot.policy=\u041f\u043e\u043b\u0438\u0442\u0438\u043a\u0438 \u044d\u0442\u043e\u0433\u043e \u0441\u043d\u0438\u043c\u043a\u0430 \u0431\u044b\u043b\u0438 \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u044b. +message.attach.iso.confirm=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u0438\u043a\u0440\u0435\u043f\u0438\u0442\u044c ISO \u0432 \u044d\u0442\u043e\u0442 \u0441\u0435\u0440\u0432\u0435\u0440. +message.attach.volume=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u043a\u0430\u0436\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u0434\u0430\u043d\u043d\u044b\u0435, \u0447\u0442\u043e \u0431\u044b \u0443\u0432\u0435\u043b\u0438\u0447\u0438\u0442\u044c \u043c\u0435\u0441\u0442\u043e. \u0414\u043b\u044f Windows, \u043d\u0443\u0436\u043d\u043e \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0436\u0430\u0442\u044c \u0441\u0435\u0440\u0432\u0435\u0440 +message.basic.mode.desc=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u044d\u0442\u0443 \u043c\u043e\u0434\u0435\u043b\u044c \u0441\u0435\u0442\u0438, \u0435\u0441\u043b\u0438 \u0432\u044b *not* \u0445\u043e\u0442\u0438\u0442\u0435, \u0447\u0442\u043e\u0431\u044b \u0431\u044b\u043b\u0430 \u043b\u044e\u0431\u0430\u044f \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 VLAN. \u0412\u0441\u0435\u043c \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u043c \u043c\u0430\u0448\u0438\u043d\u0430\u043c, \u0441\u043e\u0437\u0434\u0430\u043d\u043d\u044b\u0435 \u043f\u043e \u044d\u0442\u043e\u0439 \u043c\u043e\u0434\u0435\u043b\u0438 \u0441\u0435\u0442\u0438 \u0431\u0443\u0434\u0435\u0442 \u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d IP \u043d\u0430\u043f\u0440\u044f\u043c\u0443\u044e \u0438\u0437 \u0441\u0435\u0442\u0438 \u0438 \u0433\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u0442\u0441\u044f \u0434\u043b\u044f \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u044f \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 \u0438 \u0441\u0435\u0433\u0440\u0435\u0433\u0430\u0446\u0438\u0438. +message.change.offering.confirm=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0438\u0437\u043c\u0435\u043d\u0438\u0442\u044c \u0441\u043b\u0443\u0436\u0431\u0443 \u0440\u0430\u0437\u043c\u0435\u0449\u0435\u043d\u0438\u044f \u044d\u0442\u043e\u0433\u043e VM. +message.change.password=\u0418\u0437\u043c\u0435\u043d\u0438\u0442\u0435 \u0432\u0430\u0448 \u043f\u0430\u0440\u043e\u043b\u044c. +message.configure.all.traffic.types=\u0423 \u0432\u0430\u0441 \u0435\u0441\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0438\u0445 \u0441\u0435\u0442\u0435\u0439, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u043c\u0435\u0442\u043a\u0438 \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u0442\u0438\u043f\u0430 \u0442\u0440\u0430\u0444\u0438\u043a\u0430, \u043d\u0430\u0436\u0430\u0432 \u043d\u0430 \u043a\u043d\u043e\u043f\u043a\u0443 \u0418\u0437\u043c\u0435\u043d\u0438\u0442\u044c. +message.configuring.guest.traffic=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0433\u043e\u0441\u0442\u0435\u0432\u043e\u0433\u043e \u0442\u0440\u0430\u0444\u0438\u043a\u0430 +message.configuring.physical.networks=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0438\u0445 \u0441\u0435\u0442\u0435\u0439 +message.configuring.public.traffic=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e\u0433\u043e \u0442\u0440\u0430\u0444\u0438\u043a\u0430 +message.configuring.storage.traffic=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +message.confirm.action.force.reconnect=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0438\u0442\u044c\u0441\u044f \u043a \u0443\u0437\u043b\u0443 +message.confirm.delete.F5=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c F5 +message.confirm.delete.NetScaler=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c NetScaler +message.confirm.delete.SRX=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c SRX +message.confirm.destroy.router=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0440\u043e\u0443\u0442\u0435\u0440 +message.confirm.disable.provider=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0430 +message.confirm.enable.provider=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0430 +message.confirm.join.project=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435 \u043f\u0440\u0438\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u043a \u043f\u0440\u043e\u0435\u043a\u0442\u0443. +message.confirm.remove.IP.range=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP. +message.confirm.shutdown.provider=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0430 +message.copy.iso.confirm=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0441\u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c ISO \u0434\u043e +message.copy.template=\u041a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d XXX \u0438\u0437 \u0437\u043e\u043d\u044b \u0432 +message.create.template=\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d\u043d? +message.create.template.vm=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u043e\u0439 \u043c\u0430\u0448\u0438\u043d\u044b +message.create.template.volume=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u043a\u0430\u0436\u0438\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e, \u043f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d \u0434\u0438\u0441\u043a\u0430 \u043e\u0431\u044a\u0435\u043c\u043e\u043c\: . \u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u0430 \u043c\u043e\u0436\u0435\u0442 \u0432\u0430\u0440\u044c\u0438\u0440\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u043e\u0442 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u0445 \u043c\u0438\u043d\u0443\u0442 \u0434\u043e \u0434\u043e\u043b\u044c\u0448\u0435 \u0432 \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u0438 \u043e\u0442 \u0440\u0430\u0437\u043c\u0435\u0440\u0430 \u0442\u043e\u043c\u0430. +message.creating.cluster=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430 +message.creating.guest.network=\u0421\u043e\u0437\u0434\u0430\u0442\u044c \u0433\u043e\u0441\u0442\u0435\u0432\u0443\u044e \u0441\u0435\u0442\u044c +message.creating.physical.networks=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0438\u0445 \u0441\u0435\u0442\u0435\u0439 +message.creating.pod=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0441\u0442\u0435\u043d\u0434\u0430 +message.creating.primary.storage=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +message.creating.secondary.storage=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 +message.creating.zone=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0437\u043e\u043d\u044b +message.decline.invitation=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u043c\u0435\u043d\u0438\u0442\u044c \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u0435 \u043d\u0430 \u043f\u0440\u043e\u0435\u043a\u0442. +message.delete.account=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0430\u043a\u043a\u0430\u0443\u043d\u0442. +message.delete.project=\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u043f\u0440\u043e\u0435\u043a\u0442? +message.delete.user=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. +message.desc.advanced.zone=\u0414\u043b\u044f \u0431\u043e\u043b\u0435\u0435 \u0441\u043b\u043e\u0436\u043d\u044b\u0445 \u0441\u0435\u0442\u0435\u0432\u044b\u0445 \u0442\u043e\u043f\u043e\u043b\u043e\u0433\u0438\u0439. \u042d\u0442\u0430 \u0441\u0435\u0442\u0435\u0432\u0430\u044f \u043c\u043e\u0434\u0435\u043b\u044c \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u0435\u0442 \u043c\u0430\u043a\u0441\u0438\u043c\u0430\u043b\u044c\u043d\u0443\u044e \u0433\u0438\u0431\u043a\u043e\u0441\u0442\u044c \u0432 \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u0438\u0438 \u0433\u043e\u0441\u0442\u0435\u0432\u043e\u0439 \u0441\u0435\u0442\u0438 \u0438 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u0443\u0441\u043b\u0443\u0433, \u0442\u0430\u043a\u0438\u0445 \u043a\u0430\u043a \u043c\u0435\u0436\u0441\u0435\u0442\u0435\u0432\u043e\u0439 \u044d\u043a\u0440\u0430\u043d, VPN, \u0438\u043b\u0438 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u043a\u0430 \u0431\u0430\u043b\u0430\u043d\u0441\u0438\u0440\u043e\u0432\u043a\u0438 \u043d\u0430\u0433\u0440\u0443\u0437\u043a\u0438. +message.desc.basic.zone=\u041f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0435\u0434\u0438\u0441\u0442\u0432\u0435\u043d\u043d\u0443\u044e \u0441\u0435\u0442\u044c, \u0433\u0434\u0435 \u043a\u0430\u0436\u0434\u0430\u044f \u0412\u041c \u0438\u043c\u0435\u0435\u0442 \u00ab\u0431\u0435\u043b\u044b\u0439\u00bb IP-\u0430\u0434\u0440\u0435\u0441 \u0441\u0435\u0442\u0438. \u0418\u0437\u043e\u043b\u044f\u0446\u0438\u0438 \u0433\u043e\u0441\u0442\u0435\u0439 \u043c\u043e\u0436\u043d\u043e \u0434\u043e\u0431\u0438\u0442\u044c\u0441\u044f \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435\u043c \u0441\u0435\u0442\u0438 3-\u0433\u043e \u0443\u0440\u043e\u0432\u043d\u044f, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u0433\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 (\u0444\u0438\u043b\u044c\u0442\u0440\u0430\u0446\u0438\u044f IP-\u0432\u0434\u0440\u0435\u0441\u043e\u0432) +message.desc.cluster=\u041a\u0430\u0436\u0434\u044b\u0439 \u0441\u0442\u0435\u043d\u0434 \u0434\u043e\u043b\u0436\u0435\u043d \u0438\u043c\u0435\u0442\u044c \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u043e\u0432, \u043f\u0435\u0440\u0432\u044b\u0439 \u0438\u0437 \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u0432\u044b \u0441\u0435\u0439\u0447\u0430\u0441 \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435. \u041a\u043b\u0430\u0441\u0442\u0435\u0440 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0433\u0440\u0443\u043f\u043f\u0443 \u0443\u0437\u043b\u043e\u0432. \u0423\u0437\u043b\u044b \u0432 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0435 \u0438\u043c\u0435\u044e\u0442 \u043e\u0434\u0438\u043d\u0430\u043a\u043e\u0432\u043e\u0435 \u043e\u0431\u043e\u0440\u0443\u0434\u043e\u0432\u0430\u043d\u0438\u0435, \u0437\u0430\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f \u0447\u0435\u0440\u0435\u0437 \u043e\u0434\u0438\u043d \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440, \u043d\u0430\u0445\u043e\u0434\u044f\u0442\u0441\u044f \u0432 \u043e\u0434\u043d\u043e\u0439 \u0441\u0435\u0442\u0438 \u0438 \u0438\u043c\u0435\u044e\u0442 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u043e\u0434\u043d\u043e\u043c\u0443 \u0438 \u0442\u043e\u043c\u0443 \u0436\u0435 \u043e\u0442\u043a\u0440\u044b\u0442\u043e\u043c\u0443 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0443. \u041a\u0430\u0436\u0434\u044b\u0439 \u043a\u043b\u0430\u0441\u0442\u0435\u0440 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u0431\u043e\u043b\u0435\u0435 \u0443\u0437\u043b\u043e\u0432, \u0430 \u0442\u0430\u043a\u0436\u0435 \u0438\u0435\u0442\u044c \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043e\u0441\u043d\u043e\u0432\u043d\u044b\u0445 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449. +message.desc.host=\u041a\u0430\u0436\u0434\u044b\u0439 \u043a\u043b\u0430\u0441\u0442\u0435\u0440 \u0434\u043e\u043b\u0436\u0435\u043d \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c \u043e\u0434\u0438\u043d \u0443\u0437\u0435\u043b (\u043a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440) \u0434\u043b\u044f \u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0412\u041c, \u043f\u0435\u0440\u0432\u044b\u0439 \u0438\u0437 \u043a\u043b\u0430\u0441\u0442\u0435\u0440 \u0432\u044b \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u0441\u0435\u0439\u0447\u0430\u0441. \u0414\u043b\u044f \u0440\u0430\u0431\u043e\u0442\u044b \u0443\u0437\u043b\u0430 \u0432 CloudStack \u0432\u0430\u0436\u043d\u0430 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0430 \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440\u0430 \u043d\u0430 \u0443\u0437\u0435\u043b, \u043f\u0440\u0438\u0432\u044f\u0437\u043a\u0430 IP \u043a \u0443\u0437\u043b\u0443 \u0438 \u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0435 \u0443\u0437\u043b\u0430 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f CloudStack.

\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0438\u043c\u044f DNS \u0438\u043b\u0438 \u0430\u0434\u0440\u0435\u0441 IP, \u0438\u043c\u044f \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0438 \u043f\u0430\u0440\u043e\u043b\u044c \u043a \u041e\u0421 (\u043e\u0431\u044b\u0447\u043d\u043e root), \u0430 \u0442\u0430\u043a\u0436\u0435 \u043c\u0435\u0442\u043a\u0438 \u0434\u043b\u044f \u0433\u0440\u0443\u043f\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0443\u0437\u043b\u043e\u0432. +message.desc.primary.storage=\u041a\u0430\u0436\u0434\u0430\u044f \u0433\u0440\u0443\u043f\u043f\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043f\u0435\u0440\u0432\u0438\u0447\u043d\u044b\u0445 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u0432 \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445, \u0438 \u043c\u044b \u0434\u043e\u0431\u0430\u0432\u0438\u043c \u043f\u0435\u0440\u0432\u044b\u0439 \u0441\u0435\u0439\u0447\u0430\u0441. \u041f\u0435\u0440\u0432\u0438\u0447\u043d\u0430\u044f \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u043b\u043e\u0433\u0438\u0447\u0435\u0441\u043a\u0438\u0435 \u0440\u0430\u0437\u0434\u0435\u043b\u044b \u0436\u0435\u0441\u0442\u043a\u043e\u0433\u043e \u0434\u0438\u0441\u043a\u0430 \u0434\u043b\u044f \u0432\u0441\u0435\u0445 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043c\u0430\u0448\u0438\u043d, \u0440\u0430\u0431\u043e\u0442\u0430\u044e\u0449\u0438\u0445 \u043d\u0430 \u0443\u0437\u043b\u0430\u0445 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430. \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 \u043b\u044e\u0431\u043e\u0439 \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u043c\u044b\u0439 \u043f\u0440\u043e\u0442\u043e\u043a\u043e\u043b, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u043f\u043e\u0434\u0434\u0435\u0440\u0436\u0438\u0432\u0430\u0435\u0442 \u043e\u0441\u043d\u043e\u0432\u043d\u044b\u0435 \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440\u0430. +message.desc.secondary.storage=\u041a\u0430\u0436\u0434\u0430\u044f \u0437\u043e\u043d\u0430 \u0434\u043e\u043b\u0436\u043d\u0430 \u043e\u0431\u043b\u0430\u0434\u0430\u0442\u044c \u0445\u043e\u0442\u044f \u0431\u044b \u043e\u0434\u043d\u0438\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c NFS \u0438\u043b\u0438 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435\u043c \u0438 \u0438\u0445 \u043d\u0430\u0434\u043e \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u044c \u0432 \u043f\u0435\u0440\u0432\u0443\u044e \u043e\u0447\u0435\u0440\u0435\u0434\u044c. \u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u043f\u0440\u0435\u0434\u043d\u0430\u0437\u043d\u0430\u0447\u0435\u043d\u043e \u0434\u043b\u044f \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0448\u0430\u0431\u043b\u043e\u043d\u043e\u0432 \u0412\u041c, \u043e\u0431\u0440\u0430\u0437\u043e\u0432 ISO \u0438 \u0441\u043d\u0438\u043c\u043a\u043e\u0432 \u0412\u041c. \u042d\u0442\u043e\u0442 \u0441\u0435\u0440\u0432\u0435\u0440 \u0434\u043e\u043b\u0436\u0435\u043d \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u0435\u043d \u0434\u043b\u044f \u0432\u0441\u0435\u0445 \u0443\u0437\u043b\u043e\u0432 \u0437\u043e\u043d\u044b.

\u041f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u0438\u0442\u044c IP-\u0430\u0434\u0440\u0435\u0441 \u0438 \u043f\u0443\u0442\u044c. +message.desc.zone=layer 3 +message.detach.disk=\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u0438\u0441\u043e\u0435\u0434\u0438\u043d\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0434\u0438\u0441\u043a? +message.detach.iso.confirm=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u0434\u0435\u043b\u0438\u0442\u044c ISO \u043e\u0442 \u044d\u0442\u043e\u0433\u043e \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430. +message.disable.account=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u0443 \u0443\u0447\u0435\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c. \u041f\u0440\u0438 \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0438 \u0430\u043a\u043a\u0430\u0443\u043d\u0442\u0430, \u0432\u0441\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 \u0434\u043b\u044f \u044d\u0442\u043e\u0439 \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438 \u043d\u0435 \u0431\u0443\u0434\u0443\u0442 \u0438\u043c\u0435\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0441\u0432\u043e\u0438\u043c \u0440\u0435\u0441\u0443\u0440\u0441\u0430\u043c \u043e\u0431\u043b\u0430\u043a\u0430. \u0412\u0441\u0435 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u043c\u0430\u0448\u0438\u043d\u044b \u0431\u0443\u0434\u0443\u0442 \u043d\u0435\u043c\u0435\u0434\u043b\u0435\u043d\u043d\u043e \u0437\u0430\u043a\u0440\u044b\u0442\u044b. +message.disable.snapshot.policy=\u041f\u043e\u043b\u0438\u0442\u0438\u043a\u0438 \u044d\u0442\u043e\u0433\u043e \u0441\u043d\u0438\u043c\u043a\u0430 \u0431\u044b\u043b\u0438 \u0443\u0441\u043f\u0435\u0448\u043d\u043e \u043e\u0442\u043a\u043b\u044e\u0447\u0435\u043d\u044b. +message.disable.user=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. +message.disable.vpn.access=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u043a\u043b\u044e\u0447\u0438\u0442\u044c VPN \u0434\u043e\u0441\u0442\u0443\u043f +message.disable.vpn=\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u044b\u043a\u043b\u044e\u0447\u0438\u0442\u044c VPN? +message.download.ISO=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043d\u0430\u0436\u043c\u0438\u0442\u0435 00000 \u0441\u043a\u0430\u0447\u0430\u0442\u044c \u043e\u0431\u0440\u0430\u0437 +message.download.template=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 00000\u0434\u043b\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 +message.download.volume.confirm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u044d\u0442\u043e\u0442 \u0442\u043e\u043c +message.download.volume=\u041d\u0430\u0436\u043c\u0438\u0442\u0435 00000 \u0434\u043b\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0442\u043e\u043c\u0430 +message.edit.account=\u0420\u0435\u0434\u0430\u043a\u0442\u0438\u0440\u043e\u0432\u0430\u0442\u044c (\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 "-1" \u043f\u043e\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u0435 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u0439 \u0434\u043b\u044f \u0440\u0435\u0441\u0443\u0440\u0441\u0430) +message.edit.confirm=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u043f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u043d\u0430\u0436\u0430\u0442\u044c "\u0421\u043e\u0445\u0440\u0430\u043d\u0438\u0442\u044c". +message.edit.limits=\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043f\u0440\u0435\u0434\u0435\u043b\u044b \u0434\u043b\u044f \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432. \u0417\u043d\u0430\u0447\u0435\u043d\u0438\u0435 "-1" \u043e\u0437\u043d\u0430\u0447\u0430\u0435\u0442 \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0438\u0435 \u043f\u0440\u0435\u0434\u0435\u043b\u0430 \u043f\u043e\u0442\u0440\u0435\u0431\u043b\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u043e\u0433\u043e \u0440\u0435\u0441\u0443\u0440\u0441\u0430. +message.edit.traffic.type=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u043a\u0430\u0436\u0438\u0442\u0435 \u0442\u0440\u0430\u0444\u0438\u043a \u043c\u0435\u0442\u043a\u0438 \u0432\u044b \u0445\u043e\u0442\u0438\u0442\u0435, \u0441\u0432\u044f\u0437\u0430\u043d\u043d\u044b\u0445 \u0441 \u044d\u0442\u0438\u043c \u0442\u0438\u043f\u043e\u043c \u0442\u0440\u0430\u0444\u0438\u043a\u0430. +message.enable.account=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u0443 \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c. +message.enabled.vpn.ip.sec=\u0412\u0430\u0448 IPSec pre-shared \u043a\u043b\u044e\u0447 +message.enabled.vpn=\u0412\u0430\u0448 VPN \u0434\u043e\u0441\u0442\u0443\u043f \u0432 \u043d\u0430\u0441\u0442\u043e\u044f\u0449\u0435\u0435 \u0432\u0440\u0435\u043c\u044f \u0432\u043a\u043b\u044e\u0447\u0435\u043d \u0438 \u043c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0447\u0435\u0440\u0435\u0437 IP +message.enable.user=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. +message.enable.vpn.access=\u0421\u0435\u0439\u0447\u0430\u0441 VPN \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e IP-a\u0434\u0440\u0435\u0441\u0430 \u0432\u044b\u043a\u043b\u044e\u0447\u0435\u043d. \u0416\u0435\u043b\u0430\u0435\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c VPN-\u0434\u043e\u0441\u0442\u0443\u043f? +message.enable.vpn=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0442\u043a\u0440\u044b\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u043a VPN \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e IP-\u0430\u0434\u0440\u0435\u0441\u0430. +message.enabling.security.group.provider=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435 \u043f\u043e\u0441\u0442\u0430\u0432\u0449\u0438\u043a\u0430 \u0437\u0430\u0441\u0438\u0449\u0435\u043d\u043e\u0439 \u0441\u0435\u0442\u0438 +message.enabling.zone=\u0412\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u0437\u043e\u043d\u0443 +message.enter.token=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043a\u043b\u044e\u0447, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0432\u044b \u043f\u043e\u043b\u0443\u0447\u0438\u043b\u0438 \u0432 \u043f\u0440\u0438\u0433\u043b\u0430\u0441\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u043c \u043f\u0438\u0441\u044c\u043c\u0435 +message.generate.keys=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u043d\u043e\u0432\u044b\u0435 \u043a\u043b\u044e\u0447\u0438 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. +message.guest.traffic.in.advanced.zone=\u0413\u043e\u0441\u0442\u0435\u0432\u043e\u0439 \u0442\u0440\u0430\u0444\u0438\u043a \u0441\u0435\u0442\u0438 \u0441\u0432\u044f\u0437\u0438 \u043c\u0435\u0436\u0434\u0443 \u043a\u043e\u043d\u0435\u0447\u043d\u044b\u043c\u0438 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f\u043c\u0438 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043c\u0430\u0448\u0438\u043d. \u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0438\u0434\u0435\u043d\u0442\u0438\u0444\u0438\u043a\u0430\u0442\u043e\u0440\u043e\u0432 VLAN \u043f\u0440\u043e\u0432\u043e\u0434\u0438\u0442\u044c \u0433\u043e\u0441\u0442\u044f \u0442\u0440\u0430\u0444\u0438\u043a \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0439 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u043e\u0439 \u0441\u0435\u0442\u0438. +message.guest.traffic.in.basic.zone=\u0413\u043e\u0441\u0442\u0435\u0432\u043e\u0439 \u0442\u0440\u0430\u0444\u0438\u043a \u0433\u0435\u043d\u0435\u0440\u0438\u0440\u0443\u0435\u0442\u0441\u044f \u043f\u0440\u0438 \u043e\u0431\u0449\u0435\u043d\u0438\u0438 \u043c\u0435\u0436\u0434\u0443 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u043c\u0438 \u043c\u0430\u0448\u0438\u043d\u0430\u043c\u0438. \u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0430\u0434\u0440\u0435\u0441\u043e\u0432 IP, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 CloudStack \u0441\u043c\u043e\u0436\u0435\u0442 \u0432\u044b\u0434\u0435\u043b\u0438\u0442\u044c \u0434\u043b\u044f \u0412\u041c. \u0423\u0431\u0435\u0434\u0438\u0442\u0435\u0441\u044c, \u0447\u0442\u043e \u044d\u0442\u043e\u0442 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u043d\u0435 \u043f\u0435\u0440\u0435\u043a\u0440\u0435\u0449\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u0441 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u043e\u043c \u0440\u0435\u0437\u0435\u0440\u0432\u043d\u044b\u0445 \u0430\u0434\u0440\u0435\u0441\u043e\u0432. +message.installWizard.click.retry=\u041a\u043b\u0438\u043a\u043d\u0438\u0442\u0435, \u0447\u0442\u043e\u0431\u044b \u043f\u043e\u0432\u0442\u043e\u0440\u0438\u0442\u044c \u0437\u0430\u043f\u0443\u0441\u043a. +message.installWizard.copy.whatIsACluster=\u041a\u043b\u0430\u0441\u0442\u0435\u0440 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u0433\u0440\u0443\u043f\u043f\u044b \u0443\u0437\u043b\u043e\u0432. \u0423\u0437\u043b\u044b \u0432 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0435 \u0438\u043c\u0435\u044e\u0442 \u043e\u0434\u0438\u043d\u0430\u043a\u043e\u0432\u043e\u0435 \u043e\u0431\u043e\u0440\u0443\u0434\u043e\u0432\u0430\u043d\u0438\u0435, \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u044b \u0432 \u043e\u0434\u0438\u043d\u0430\u043a\u043e\u0432\u043e\u043c \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u0435\u0440\u0435, \u043d\u0430\u0445\u043e\u0434\u044f\u0442\u0441\u044f \u0432 \u043e\u0434\u043d\u043e\u0439 \u043f\u043e\u0434\u0441\u0435\u0442\u0438 \u0438 \u0438\u043c\u0435\u044e\u0442 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u043e\u0434\u043d\u043e\u043c\u0443 \u0438 \u0442\u043e\u043c\u0443 \u0436\u0435 \u043e\u0431\u0449\u0435\u043c\u0443 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0443. \u0412\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u043c\u0430\u0448\u0438\u043d\u044b \u043c\u043e\u0433\u0443\u0442 \u0431\u044b\u0442\u044c \u043f\u0435\u0440\u0435\u043d\u0435\u0441\u0435\u043d\u044b "\u0432\u0436\u0438\u0432\u0443\u044e" \u0441 \u043e\u0434\u043d\u043e\u0433\u043e \u0443\u0437\u043b\u0430 \u043d\u0430 \u0434\u0440\u0443\u0433\u043e\u0439 \u0432 \u043f\u0440\u0435\u0434\u0435\u043b\u0430\u0445 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430, \u0431\u0435\u0437 \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0438 \u0441\u043b\u0443\u0436\u0431 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0435\u043c. \u041a\u043b\u0430\u0441\u0442\u0435\u0440 - \u0442\u0440\u0435\u0442\u044c\u044f \u043f\u043e \u0440\u0430\u0437\u043c\u0435\u0440\u043d\u043e\u0441\u0442\u0438 \u0435\u0434\u0438\u043d\u0438\u0446\u0430 \u0432 \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0435 CloudStack&\#8482;. \u041a\u043b\u0430\u0441\u0442\u0435\u0440\u044b \u0440\u0430\u0441\u043f\u043e\u043e\u0433\u0430\u044e\u0442\u0441\u044f \u0432 \u0441\u0442\u0435\u043d\u0434\u0430\u0445, \u0430 \u0441\u0442\u0435\u043d\u0434\u044b - \u0432 \u0437\u043e\u043d\u0430\u0445.

CloudStack&\#8482; \u0440\u0430\u0437\u0440\u0435\u0448\u0430\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u043e\u0432, \u043d\u043e \u043f\u0440\u0438 \u043f\u0440\u043e\u0441\u0442\u043e\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0435 \u044d\u0442\u0430 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u043e\u0442\u0441\u0443\u0442\u0441\u0442\u0432\u0443\u0435\u0442. +message.installWizard.copy.whatIsAHost=\u0423\u0437\u0435\u043b - \u044d\u0442\u043e \u043e\u0442\u0434\u0435\u043b\u044c\u043d\u044b\u0439 \u043a\u043e\u043c\u043f\u044c\u044e\u0442\u0435\u0440. \u0423\u0437\u043b\u044b \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u044e\u0442 \u0432\u044b\u0447\u0438\u0441\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0440\u0435\u0441\u0443\u0440\u0441\u044b \u0434\u043b\u044f \u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u0433\u043e\u0441\u0442\u0435\u0432\u044b\u0445 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043c\u0430\u0448\u0438\u043d. \u041a\u0430\u0436\u0434\u044b\u0439 \u0443\u0437\u0435\u043b \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440 \u0434\u043b\u044f \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0412\u041c (\u043a\u0440\u043e\u043c\u0435 \u0443\u0437\u043b\u043e\u0432 BareMetal, \u043e\u043d\u0438 \u044f\u0432\u043b\u044f\u044e\u0442\u0441\u044f \u0438\u0441\u043a\u043b\u044e\u0447\u0435\u043d\u0438\u0435\u043c \u0438\u0437 \u043f\u0440\u0430\u0432\u0438\u043b \u0438 \u0440\u0430\u0441\u0441\u043c\u0430\u0442\u0440\u0438\u0432\u0430\u0435\u0442\u0441\u044f \u0432 \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u043c \u0440\u0443\u043a\u043e\u0432\u043e\u0434\u0441\u0442\u0432\u0435 \u043f\u043e \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0435). \u041d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u044d\u0442\u043e Linux-\u0441\u0435\u0440\u0432\u0435\u0440 \u0441 KVM, \u0441\u0435\u0440\u0432\u0435\u0440 Citrix XenServer \u0438\u043b\u0438 \u0441\u0435\u0440\u0432\u0435\u0440 ESXI. \u041f\u0440\u0438 \u043f\u0440\u043e\u0441\u0442\u043e\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0435 \u0432\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043e\u0434\u0438\u043d \u0443\u0437\u0435\u043b \u0441 XenServer.

\u0423\u0437\u0435\u043b - \u044d\u0442\u043e \u043d\u0430\u0438\u043c\u0435\u043d\u044c\u0448\u0430\u044f \u0435\u0434\u0438\u043d\u0438\u0446\u0430 \u0432 \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0435 CloudStack&\#8482;, \u0434\u0430\u043b\u0435\u0435 \u0443\u0437\u043b\u044b \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0433\u0430\u044e\u0442\u0441\u044f \u0432 \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430\u0445, \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u044b - \u0432 \u0441\u0442\u0435\u043d\u0434\u0430\u0445, \u0441\u0442\u0435\u043d\u0434\u044b - \u0432 \u0437\u043e\u043d\u0430\u0445. +message.installWizard.copy.whatIsAPod=\u0421\u0442\u0435\u043d\u0434, \u043a\u0430\u043a \u043f\u0440\u0430\u0432\u0438\u043b\u043e, \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u044f\u0435\u0442 \u043e\u0434\u043d\u0443 \u0441\u0442\u043e\u0439\u043a\u0443 \u0441 \u043c\u0430\u0448\u0438\u043d\u0430\u043c\u0438. \u0423\u0437\u043b\u044b \u0432 \u043e\u0434\u043d\u043e\u043c \u0441\u0442\u0435\u043d\u0434\u0435 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u044b \u0432 \u043e\u0434\u043d\u043e\u0439 \u043f\u043e\u0434\u0441\u0435\u0442\u0438.

\u0421\u0442\u0435\u043d\u0434 - \u0432\u0442\u043e\u0440\u0430\u044f \u043f\u043e \u0440\u0430\u0437\u043c\u0435\u0440\u043d\u043e\u0441\u0442\u0438 \u0435\u0434\u0438\u043d\u0438\u0446\u0430 \u0432 \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0435 CloudStack&\#8482;. \u0421\u0442\u0435\u043d\u0434\u044b \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0433\u0430\u044e\u0442\u0441\u044f \u0432 \u0437\u043e\u043d\u0430\u0445. \u041a\u0430\u0436\u0434\u0430\u044f \u0437\u043e\u043d\u0430 \u043c\u043e\u0436\u0435\u0442 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0441\u0442\u0435\u043d\u0434\u043e\u0432, \u043d\u043e \u043f\u0440\u0438 \u043f\u0440\u043e\u0441\u0442\u043e\u0439 \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043a\u0435 \u0432 \u0437\u043e\u043d\u0435 \u043c\u043e\u0436\u043d\u043e \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u043b\u0438\u0448\u044c \u043e\u0434\u0438\u043d \u0441\u0442\u0435\u043d\u0434. +message.installWizard.copy.whatIsAZone=\u0417\u043e\u043d\u0430 - \u044d\u0442\u043e \u043d\u0430\u0438\u0431\u043e\u043b\u0435\u0435 \u043a\u0440\u0443\u043f\u043d\u0430\u044f \u043e\u0440\u0433\u0430\u043d\u0438\u0437\u0430\u0446\u0438\u043e\u043d\u043d\u0430\u044f \u0435\u0434\u0438\u043d\u0438\u0446\u0430 \u0432 \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0435 CloudStack&\#8482;. \u0417\u043e\u043d\u0430 \u043e\u0431\u044b\u0447\u043d\u043e \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0435\u0434\u0438\u043d\u0438\u0447\u043d\u043e\u043c\u0443 \u0426\u041e\u0414, \u0445\u043e\u0442\u044f \u0438\u043c\u0435\u0435\u0442\u0441\u044f \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0437\u043e\u043d \u0432 \u043f\u0440\u0435\u0434\u0435\u043b\u0430\u0445 \u043e\u0434\u043d\u043e\u0433\u043e \u0426\u041e\u0414. \u041e\u0441\u043d\u043e\u0432\u043d\u044b\u043c \u043f\u0440\u0435\u0438\u043c\u0443\u0449\u0435\u0441\u0442\u0432\u043e\u043c \u043f\u043e\u0441\u0442\u0440\u043e\u0435\u043d\u0438\u044f \u0438\u043d\u0444\u0440\u0430\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u044b \u0441 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0435 \u0437\u043e\u043d \u044f\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0435\u043d\u0438\u0435 \u0438\u0437\u043e\u043b\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u044f \u0438 \u0438\u0437\u0431\u044b\u0442\u043e\u0447\u043d\u043e\u0441\u0442\u0438. \u041d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, \u043a\u0430\u0436\u0434\u0430\u044f \u0437\u043e\u043d\u0430 \u043c\u043e\u0436\u0435\u0442 \u0438\u043c\u0435\u0442\u044c \u0441\u0432\u043e\u0439 \u0431\u043b\u043e\u043a \u043f\u0438\u0442\u0430\u043d\u0438\u044f \u0438 \u0441\u0435\u0442\u044c, \u0430 \u0441\u0430\u043c\u0438 \u0437\u043e\u043d\u044b \u043c\u043e\u0433\u0443\u0442 \u0448\u0438\u0440\u043e\u043a\u043e \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u044b \u0433\u0435\u043e\u0433\u0440\u0430\u0444\u0438\u0447\u0435\u0441\u043a\u0438. +message.installWizard.copy.whatIsCloudStack=CloudStack&\#8482 - \u044d\u0442\u043e \u043f\u0440\u043e\u0433\u0440\u0430\u043c\u043c\u043d\u0430\u044f \u043f\u043b\u0430\u0444\u0442\u043e\u0440\u043c\u0430 \u0434\u043b\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0445, \u0447\u0430\u0441\u0442\u043d\u044b\u0445 \u0438 \u0433\u0438\u0431\u0440\u0438\u0434\u043d\u044b\u0445 \u043e\u0431\u043b\u0430\u043a\u043e\u0432 \u043f\u043e \u0441\u0445\u0435\u043c\u0435 \u00ab\u0418\u043d\u0444\u0440\u0430\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0430 \u043a\u0430\u043a \u0441\u0435\u0440\u0432\u0438\u0441\u00bb (IaaS). CloudStack&\#8482 \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0435\u0442 \u0441\u0435\u0442\u044c\u044e, \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435\u043c \u0438 \u0432\u044b\u0447\u0438\u0441\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c\u0438 \u0443\u0437\u043b\u0430\u043c\u0438, \u0432\u0445\u043e\u0434\u044f\u0449\u0438\u0435 \u0432 \u043e\u0431\u043b\u0430\u0447\u043d\u0443\u044e \u0438\u043d\u0444\u0440\u0430\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440\u0443. \u0413\u043b\u0430\u0432\u043d\u044b\u043c \u043e\u0431\u0440\u0430\u0437\u043e\u043c, CloudStack&\#8482 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u0434\u043b\u044f \u0440\u0430\u0437\u0432\u0435\u0440\u0442\u044b\u0432\u0430\u043d\u0438\u044f, \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u043e\u0439 \u0441\u043b\u043e\u0436\u043d\u044b\u0445 \u043e\u0431\u043b\u0430\u0447\u043d\u044b\u0445 \u0440\u0435\u0448\u0435\u043d\u0438\u0439.

CloudStack&\#8482 \u0440\u0435\u0430\u043b\u0438\u0437\u0443\u0435\u0442 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0435 \u043a\u0430\u043a \u0443\u0441\u043b\u0443\u0433\u0438 \u0446\u0435\u043b\u043e\u0433\u043e \u0446\u0435\u043d\u0442\u0440\u0430 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438 \u0434\u0430\u043d\u043d\u044b\u0445 \u0441 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u044b\u043c\u0438 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u0430\u043c\u0438 \u0434\u043b\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u0441\u043b\u043e\u0436\u043d\u044b\u0445 \u0438\u043d\u0444\u0440\u0430\u0441\u0442\u0440\u0443\u043a\u0442\u0443\u0440 \u043d\u0430 \u043e\u0441\u043d\u043e\u0432\u0435 \u043e\u0431\u043b\u0430\u043a\u0430. \u041c\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0432\u044b\u0431\u0440\u0430\u0442\u044c \u043c\u0435\u0436\u0434\u0443 \u0441\u0432\u043e\u0431\u043e\u0434\u043d\u043e\u0439 \u0438 \u0411\u0435\u0437\u043d\u0435\u0441-\u0432\u0435\u0440\u0441\u0438\u044f\u043c\u0438, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u043f\u043e\u0447\u0442\u0438 \u043d\u0438\u0447\u0435\u043c \u043d\u0435 \u043e\u0442\u043b\u0438\u0447\u0430\u044e\u0442\u0441\u044f. +message.installWizard.copy.whatIsPrimaryStorage=CloudStack&\#8482; - \u044d\u0442\u043e \u043e\u0431\u043b\u0430\u0447\u043d\u0430\u044f \u043f\u043b\u0430\u0442\u0444\u043e\u0440\u043c\u0430, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u044e\u0449\u0430\u044f \u0434\u0432\u0430 \u0442\u0438\u043f\u0430 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430\: \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0438 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435. \u0412 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449 \u043c\u043e\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c iSCSI \u0438\u043b\u0438 NFS-\u0441\u0435\u0440\u0432\u0435\u0440, \u0430 \u0442\u0430\u043a\u0436\u0435 \u043b\u043e\u043a\u0430\u043b\u044c\u043d\u044b\u0439 \u0434\u0438\u0441\u043a.

\u041e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u043f\u0440\u0438\u0432\u044f\u0437\u0430\u043d\u043e \u043a \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0443 \u0438 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0434\u0438\u0441\u043a\u043e\u0432\u044b\u0435 \u0442\u043e\u043c\u0430 \u043a\u0430\u0436\u0434\u043e\u0439 \u0412\u041c, \u0437\u0430\u043f\u0443\u0449\u0435\u043d\u043d\u043e\u0439 \u0432 \u0443\u0437\u043b\u0430\u0445 \u044d\u0442\u043e\u0433\u043e \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430. \u041a\u0430\u043a \u043f\u0440\u0430\u0432\u0438\u043b\u043e, \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u0440\u0430\u0437\u043c\u0435\u0449\u0430\u0435\u0442\u0441\u044f \u0432 \u0441\u0430\u043c\u0438\u0445 \u0443\u0437\u043b\u0430\u0445. +message.installWizard.copy.whatIsSecondaryStorage=\u0414\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 \u043f\u0440\u0438\u0432\u044f\u0437\u0430\u043d\u043e \u043a \u0437\u043e\u043d\u0435 \u0438 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u0435\:
  • \u0428\u0430\u0431\u043b\u043e\u043d\u044b - \u043e\u0431\u0440\u0430\u0437\u044b \u041e\u0421, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u043c\u043e\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0434\u043b\u044f \u0437\u0430\u0433\u0440\u0443\u0437\u043a\u0438 \u0412\u041c \u0438 \u0441\u043e\u0434\u0435\u0440\u0436\u0430\u0449\u0438\u0435 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e, \u0442\u0430\u043a\u0443\u044e \u043a\u0430\u043a \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u043f\u0440\u0438\u043b\u043e\u0436\u0435\u043d\u0438\u044f.
  • \u041e\u0431\u0440\u0430\u0437\u044b ISO - \u044d\u0442\u043e \u0437\u0430\u0433\u0440\u0443\u0437\u043e\u0447\u043d\u044b\u0435 \u0438\u043b\u0438 \u043d\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043e\u0447\u043d\u044b\u0435 \u043e\u0431\u0440\u0430\u0437\u044b \u041e\u0421
  • \u0421\u043d\u0438\u043c\u043a\u0438 \u0434\u0438\u0441\u043a\u043e\u0432\u044b\u0445 \u0442\u043e\u043c\u043e\u0432 - \u0441\u043e\u0445\u0440\u0430\u043d\u0435\u043d\u043d\u044b\u0435 \u043a\u043e\u043f\u0438\u0438 \u0434\u0430\u043d\u043d\u044b\u0445 \u0412\u041c, \u043a\u043e\u0442\u043e\u0440\u044b\u0445 \u043c\u043e\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0434\u043b\u044f \u0432\u043e\u0441\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0434\u0430\u043d\u043d\u044b\u0445 \u0438\u043b\u0438 \u0434\u043b\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u0448\u0430\u0431\u043b\u043e\u043d\u0430
+message.installWizard.now.building=\u0412\u0430\u0448\u0435 \u043e\u0431\u043b\u0430\u043a\u043e \u0441\u043e\u0437\u0434\u0430\u0451\u0442\u0441\u044f... +message.installWizard.tooltip.addCluster.name=\u0418\u043c\u044f \u043a\u043b\u0430\u0441\u0442\u0435\u0440\u0430. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0441\u0430\u043c\u0438 \u0432\u044b\u0431\u0440\u0430\u0442\u044c \u0438\u043c\u044f, \u043d\u0435 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0439 Cloudstack. +message.installWizard.tooltip.addHost.hostname=\u0418\u043c\u044f DNS \u0438\u043b\u0438 IP-\u0430\u0434\u0440\u0435\u0441 \u0443\u0437\u043b\u0430. +message.installWizard.tooltip.addHost.password=\u042d\u0442\u043e\u0442 \u043f\u0430\u0440\u043e\u043b\u044c \u0434\u043b\u044f \u0432\u044b\u0448\u0435\u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f (\u0441 \u0432\u0430\u0448\u0435\u0433\u043e XenServer) +message.installWizard.tooltip.addHost.username=\u041e\u0431\u044b\u0447\u043d\u043e root. +message.installWizard.tooltip.addPod.name=\u0418\u043c\u044f \u0441\u0442\u0435\u043d\u0434\u0430 +message.installWizard.tooltip.addPod.reservedSystemEndIp=\u042d\u0442\u043e \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP \u0447\u0430\u0441\u0442\u043d\u043e\u0439 \u0441\u0435\u0442\u0438, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f CloudStack \u0434\u043b\u044f \u0412\u041c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 \u0438 \u043a\u043e\u043d\u0441\u043e\u043b\u044c\u043d\u043e\u0433\u043e \u043f\u0440\u043e\u043a\u0441\u0438. \u042d\u0442\u0438 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u043e\u043b\u0443\u0447\u0430\u044e\u0442\u0441\u044f \u0438\u0437 \u0441\u0435\u0442\u0438 \u0432\u044b\u0447\u0438\u0441\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0445 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u0432. +message.installWizard.tooltip.addPod.reservedSystemGateway=\u0428\u043b\u044e\u0437 \u0434\u043b\u044f \u0443\u0437\u043b\u043e\u0432 \u044d\u0442\u043e\u0433\u043e \u0441\u0442\u0435\u043d\u0434\u0430. +message.installWizard.tooltip.addPod.reservedSystemNetmask=\u0421\u0435\u0442\u0435\u0432\u0430\u044f \u043c\u0430\u0441\u043a\u0430 \u043f\u043e\u0434\u0441\u0435\u0442\u0438 \u0434\u043b\u044f \u0433\u043e\u0441\u0442\u0435\u0439. +message.installWizard.tooltip.addPod.reservedSystemStartIp=\u042d\u0442\u043e \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP \u0447\u0430\u0441\u0442\u043d\u043e\u0439 \u0441\u0435\u0442\u0438, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f CloudStack \u0434\u043b\u044f \u0412\u041c \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430 \u0438 \u043a\u043e\u043d\u0441\u043e\u043b\u044c\u043d\u043e\u0433\u043e \u043f\u0440\u043e\u043a\u0441\u0438. \u042d\u0442\u0438 \u0430\u0434\u0440\u0435\u0441\u0430 \u043f\u043e\u043b\u0443\u0447\u0430\u044e\u0442\u0441\u044f \u0438\u0437 \u0441\u0435\u0442\u0438 \u0432\u044b\u0447\u0438\u0441\u043b\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0445 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u0432. +message.installWizard.tooltip.addPrimaryStorage.name=\u0418\u043c\u044f \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430. +message.installWizard.tooltip.addPrimaryStorage.path=(\u0434\u043b\u044f NFS) \u0412 NFS \u044d\u0442\u043e \u043f\u0443\u0442\u044c \u044d\u043a\u043f\u043e\u0440\u0442\u0430 \u0441\u0435\u0440\u0432\u0435\u0440\u0430. \u041f\u0443\u0442\u044c (\u0434\u043b\u044f \u041e\u0442\u043a\u0440\u044b\u0442\u043e\u0439\u0422\u043e\u0447\u043a\u0438\u0414\u043e\u0441\u0442\u0443\u043f\u0430). \u0412 KVM \u044d\u0442\u043e \u043f\u0443\u0442\u044c \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0433\u043e \u0443\u0437\u043b\u0430, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0443\u043a\u0430\u0437\u044b\u0432\u0430\u0435\u0442 \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u0438\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430. \u041d\u0430\u043f\u0440\u0438\u043c\u0435\u0440, "/mnt/primary". +message.installWizard.tooltip.addPrimaryStorage.server=(\u0434\u043b\u044f NFS, iSCSI \u0438\u043b\u0438 PreSetup) IP-\u0430\u0434\u0440\u0435\u0441 \u0438\u043b\u0438 \u0438\u043c\u044f DNS \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430. +message.installWizard.tooltip.addSecondaryStorage.nfsServer=IP-\u0430\u0434\u0440\u0435\u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u0430 NFS, \u0433\u0434\u0435 \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435 +message.installWizard.tooltip.addSecondaryStorage.path=\u041f\u0443\u0442\u044c \u044d\u043a\u0441\u043f\u043e\u0440\u0442\u0430, \u0440\u0430\u0441\u043f\u043e\u043b\u043e\u0436\u0435\u043d\u043d\u044b\u0439 \u043d\u0430 \u0432\u044b\u0448\u0435\u0443\u043a\u0430\u0437\u0430\u043d\u043d\u043e\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0435. +message.installWizard.tooltip.addZone.dns1=\u042d\u0442\u043e c\u0435\u0440\u0432\u0435\u0440\u044b DNS \u0434\u043b\u044f \u0433\u043e\u0441\u0442\u0435\u0432\u044b\u0445 \u0412\u041c \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u042d\u0442\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u044b \u0431\u0443\u0434\u0443\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0447\u0435\u0440\u0435\u0437 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0432\u044b \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u043f\u043e\u0437\u0436\u0435. \u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430, \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u0432 \u0437\u043e\u043d\u0435, \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u043c\u0435\u0442\u044c \u043c\u0430\u0440\u0448\u0440\u0443\u0442 \u043a \u044d\u0442\u0438\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0430\u043c DNS. +message.installWizard.tooltip.addZone.dns2=\u042d\u0442\u043e c\u0435\u0440\u0432\u0435\u0440\u044b DNS \u0434\u043b\u044f \u0433\u043e\u0441\u0442\u0435\u0432\u044b\u0445 \u0412\u041c \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u042d\u0442\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u044b \u0431\u0443\u0434\u0443\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0447\u0435\u0440\u0435\u0437 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u0432\u044b \u0434\u043e\u0431\u0430\u0432\u0438\u0442\u0435 \u043f\u043e\u0437\u0436\u0435. \u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430, \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u043d\u044b\u0435 \u0432 \u0437\u043e\u043d\u0435, \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u043c\u0435\u0442\u044c \u043c\u0430\u0440\u0448\u0440\u0443\u0442 \u043a \u044d\u0442\u0438\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0430\u043c DNS. +message.installWizard.tooltip.addZone.internaldns1=\u042d\u0442\u043e c\u0435\u0440\u0432\u0435\u0440\u044b DNS \u0434\u043b\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0445 \u0412\u041c \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u042d\u0442\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u044b \u0431\u0443\u0434\u0443\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0447\u0435\u0440\u0435\u0437 \u0447\u0430\u0441\u0442\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0439 \u0412\u041c. \u0427\u0430\u0441\u0442\u043d\u044b\u0439 IP-\u0430\u0434\u0440\u0435\u0441, \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u043d\u044b\u0439 \u0432 \u0441\u0442\u0435\u043d\u0434\u0435, \u0434\u043e\u043b\u0436\u0435\u043d \u0438\u043c\u0435\u0442\u044c \u043c\u0430\u0440\u0448\u0440\u0443\u0442 \u043a \u044d\u0442\u0438\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0430\u043c DNS. +message.installWizard.tooltip.addZone.internaldns2=\u042d\u0442\u043e c\u0435\u0440\u0432\u0435\u0440\u044b DNS \u0434\u043b\u044f \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u044b\u0445 \u0412\u041c \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u042d\u0442\u0438 \u0441\u0435\u0440\u0432\u0435\u0440\u044b \u0431\u0443\u0434\u0443\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0447\u0435\u0440\u0435\u0437 \u0447\u0430\u0441\u0442\u043d\u044b\u0439 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441 \u0441\u0438\u0441\u0442\u0435\u043c\u043d\u043e\u0439 \u0412\u041c. \u0427\u0430\u0441\u0442\u043d\u044b\u0439 IP-\u0430\u0434\u0440\u0435\u0441, \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u043d\u044b\u0439 \u0432 \u0441\u0442\u0435\u043d\u0434\u0435, \u0434\u043e\u043b\u0436\u0435\u043d \u0438\u043c\u0435\u0442\u044c \u043c\u0430\u0440\u0448\u0440\u0443\u0442 \u043a \u044d\u0442\u0438\u043c \u0441\u0435\u0440\u0432\u0435\u0440\u0430\u043c DNS. +message.installWizard.tooltip.addZone.name=\u0418\u043c\u044f \u0437\u043e\u043d\u044b +message.installWizard.tooltip.configureGuestTraffic.description=\u041e\u043f\u0438\u0441\u0430\u043d\u0438\u0435 \u044d\u0442\u043e\u0439 \u0441\u0435\u0442\u0438 +message.installWizard.tooltip.configureGuestTraffic.guestEndIp=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP-\u0430\u0434\u0440\u0435\u0441\u043e\u0432, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0431\u0443\u0434\u0443\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0434\u043b\u044f \u0433\u043e\u0441\u0442\u0435\u0439 \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u041f\u0440\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438 \u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0435\u0442\u0435\u0432\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 (NIC) \u044d\u0442\u0438 \u0430\u0434\u0440\u0435\u0441\u0430 \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u0432 \u043f\u043e\u0434\u0441\u0435\u0442\u0438 (CIDR) \u0441\u0442\u0435\u043d\u0434\u0430. +message.installWizard.tooltip.configureGuestTraffic.guestGateway=\u0428\u043b\u044e\u0437 \u0434\u043b\u044f \u0433\u043e\u0441\u0442\u044f\u043c\u0438 +message.installWizard.tooltip.configureGuestTraffic.guestNetmask=\u0421\u0435\u0442\u0435\u0432\u0430\u044f \u043c\u0430\u0441\u043a\u0430 \u043f\u043e\u0434\u0441\u0435\u0442\u0438 \u0434\u043b\u044f \u0433\u043e\u0441\u0442\u0435\u0439. +message.installWizard.tooltip.configureGuestTraffic.guestStartIp=\u0414\u0438\u0430\u043f\u0430\u0437\u043e\u043d IP-\u0430\u0434\u0440\u0435\u0441\u043e\u0432, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0431\u0443\u0434\u0443\u0442 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0434\u043b\u044f \u0433\u043e\u0441\u0442\u0435\u0439 \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u041f\u0440\u0438 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u0438 \u043e\u0434\u043d\u043e\u0433\u043e \u0441\u0435\u0442\u0435\u0432\u043e\u0433\u043e \u0443\u0441\u0442\u0440\u043e\u0439\u0441\u0442\u0432\u0430 (NIC) \u044d\u0442\u0438 \u0430\u0434\u0440\u0435\u0441\u0430 \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u0432 \u043f\u043e\u0434\u0441\u0435\u0442\u0438 (CIDR) \u0441\u0442\u0435\u043d\u0434\u0430. +message.installWizard.tooltip.configureGuestTraffic.name=\u0418\u043c\u044f \u044d\u0442\u043e\u0439 \u0441\u0435\u0442\u0438 +message.instanceWizard.noTemplates=\u0412\u044b \u043d\u0435 \u0438\u043c\u0435\u0435\u0442\u0435 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u0448\u0430\u0431\u043b\u043e\u043d\u043e\u0432; \u0434\u043b\u044f \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u043a\u0430 \u043c\u0430\u0448\u0438\u043d\u044b \u0434\u043e\u0431\u0430\u0432\u044c\u0442\u0435 \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u0432\u044b\u0439 \u0448\u0430\u0431\u043b\u043e\u043d. +message.ip.address.changed=\u0412\u0430\u0448\u0438 IP-\u0430\u0434\u0440\u0435\u0441\u0430 \u043c\u043e\u0433\u043b\u0438 \u0431\u044b\u0442\u044c \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u044b, \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u043f\u0438\u0441\u043e\u043a \u0430\u0434\u0440\u0435\u0441\u043e\u0432? \u041f\u043e\u043c\u043d\u0438\u0442\u0435, \u0447\u0442\u043e \u0432 \u044d\u0442\u043e\u043c \u0441\u043b\u0443\u0447\u0430\u0435 \u043e\u0431\u043b\u0430\u0441\u0442\u044c \u0434\u0435\u0442\u0430\u043b\u0435\u0439 \u0431\u0443\u0434\u0435\u0442 \u0437\u0430\u043a\u0440\u044b\u0442\u0430. +message.iso.desc=\u041e\u0431\u0440\u0430\u0437 \u0434\u0438\u0441\u043a\u0430 \u0441\u043e\u0434\u0435\u0440\u0436\u0438\u0442 \u0437\u0430\u0433\u0440\u0443\u0437\u043e\u0447\u043d\u044b\u0435 \u0438\u043b\u0438 \u043d\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u043e\u0447\u043d\u044b\u0435 \u0434\u0430\u043d\u043d\u044b\u0435 \u0434\u043b\u044f \u041e\u0421. +message.join.project=\u0422\u0435\u043f\u0435\u0440\u044c \u0432\u044b \u043f\u0440\u0438\u0441\u043e\u0435\u0434\u0438\u043d\u0435\u043d\u044b \u043a \u043f\u0440\u043e\u0435\u043a\u0442\u0443. \u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 "\u041f\u0440\u043e\u0435\u043a\u0442\u043d\u044b\u0439 \u0432\u0438\u0434" \u0434\u043b\u044f \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430 \u043f\u0440\u043e\u0435\u043a\u0442\u0430. +message.launch.vm.on.private.network=\u0425\u043e\u0442\u0438\u0442\u0435 \u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0412\u041c \u0432 \u0432\u0430\u0448\u0435\u0439 \u0447\u0430\u0441\u0442\u043d\u043e\u0439 \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u043d\u043e\u0439 \u0441\u0435\u0442\u0438? +message.launch.zone=\u0417\u043e\u043d\u0430 \u0433\u043e\u0442\u043e\u0432\u0430 \u043a \u0437\u0430\u043f\u0443\u0441\u043a\u0443, \u043f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043a \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c\u0443 \u0448\u0430\u0433\u0443. +message.lock.account=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0437\u0430\u0431\u043b\u043e\u043a\u0438\u0440\u043e\u0432\u0430\u0442\u044c \u044d\u0442\u0443 \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c. \u0412\u0441\u0435 \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u0438 \u0432 \u0442\u0430\u043a\u0438\u0445 \u0443\u0447\u0451\u0442\u043d\u044b\u0445 \u0437\u0430\u043f\u0438\u0441\u044f\u0445 \u043f\u043e\u0442\u0435\u0440\u044f\u044e\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0443\u043f\u0440\u0430\u0432\u043b\u044f\u0442\u044c \u0441\u0432\u043e\u0438\u043c\u0438 \u043e\u0431\u043b\u0430\u0447\u043d\u044b\u043c\u0438 \u0440\u0435\u0441\u0443\u0440\u0441\u0430\u043c\u0438. \u042d\u0442\u0438 \u0440\u0435\u0441\u0443\u0440\u0441\u044b \u043e\u0441\u0442\u0430\u043d\u0443\u0442\u0441\u044f \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b \u0434\u043b\u044f \u0434\u0440\u0443\u0433\u0438\u0445 \u0443\u0447\u0451\u0442\u043d\u044b\u0445 \u0437\u0430\u043f\u0438\u0441\u0435\u0439. +message.migrate.instance.confirm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u0443\u044e \u043c\u0430\u0448\u0438\u043d\u0443. +message.migrate.instance.to.host=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u043c\u0430\u0448\u0438\u043d\u0443 \u043d\u0430 \u0434\u0440\u0443\u0433\u043e\u0439 \u0443\u0437\u0435\u043b. +message.migrate.instance.to.ps=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u043c\u0430\u0448\u0438\u043d\u0443 \u043d\u0430 \u0434\u0440\u0443\u0433\u043e\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435. +message.migrate.router.confirm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u0440\u043e\u0443\u0442\u0435\u0440 \u0432 \u0443\u0437\u0435\u043b +message.migrate.systemvm.confirm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u0440\u043e\u0443\u0442\u0435\u0440 \u0432 \u0443\u0437\u0435\u043b +message.migrate.volume=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u043d\u0435\u0441\u0442\u0438 \u0442\u043e\u043c \u0432 \u0434\u0440\u0443\u0433\u043e\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0435 \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0435. +message.new.user=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f \u0432 \u0443\u0447\u0451\u0442\u043d\u0443\u044e \u0437\u0430\u043f\u0438\u0441\u044c. +message.no.network.support.configuration.not.true=\u041d\u0438 \u0432 \u043e\u0434\u043d\u043e\u0439 \u0437\u043e\u043d\u0435 \u043d\u0435\u0442 \u0433\u0440\u0443\u043f\u043f \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438. \u041f\u043e\u044d\u0442\u043e\u043c\u0443 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0435 \u0441\u0435\u0442\u0435\u0432\u044b\u0435 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u0438 \u043d\u0435\u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b. \u041f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043a \u0448\u0430\u0433\u0443 5. +message.no.network.support=\u0412\u044b\u0431\u0440\u0430\u043d\u043d\u044b\u0439 \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440 (vSphere) \u043d\u0435 \u043e\u0431\u043b\u0430\u0434\u0430\u0435\u0442 \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u043c\u0438 \u0441\u0435\u0442\u0435\u0432\u044b\u043c\u0438 \u0432\u043e\u0437\u043c\u043e\u0434\u043d\u043e\u0441\u0442\u044f\u043c\u0438. \u041f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043a \u0448\u0430\u0433\u0443 5. +message.no.projects.adminOnly=\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u043e\u0435\u043a\u0442\u043e\u0432.
\u041e\u0431\u0440\u0430\u0442\u0438\u0442\u0435\u0441\u044c \u043a \u0432\u0430\u0448\u0435\u043c\u0443 \u0430\u0434\u043c\u0438\u043d\u0438\u0441\u0442\u0440\u0430\u0442\u043e\u0440\u0443 \u0434\u043b\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u043f\u0440\u043e\u0435\u043a\u0442\u0430. +message.no.projects=\u0423 \u0432\u0430\u0441 \u043d\u0435\u0442 \u043f\u0440\u043e\u0435\u043a\u0442\u043e\u0432.
\u0421\u043e\u0437\u0434\u0430\u0439\u0442\u0435 \u043d\u043e\u0432\u044b\u0439 \u043f\u0440\u043e\u0435\u043a\u0442 \u0432 \u0441\u0435\u043a\u0446\u0438\u0438 "\u041f\u0440\u043e\u0435\u043a\u0442\u044b" +message.number.clusters=

\# of \u041a\u043b\u0430\u0441\u0442\u0435\u0440\u044b

+message.number.hosts=

\# of \u0423\u0437\u043b\u044b

+message.number.pods=

\# of \u0421\u0442\u0435\u043d\u0434\u044b

+message.number.storage=

\# of \u0422\u043e\u043c\u0430 \u043e\u0441\u043d\u043e\u0432\u043d\u043e\u0433\u043e \u0445\u0440\u0430\u043d\u0438\u043b\u0438\u0449\u0430

+message.number.zones=

\# of \u0417\u043e\u043d\u044b

+message.pending.projects.1=\u0412 \u043e\u0436\u0438\u0434\u0430\u043d\u0438\u0438 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0438\u0435 \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u044f\: +message.pending.projects.2=\u0414\u043b\u044f \u043f\u0440\u043e\u0441\u043c\u043e\u0442\u0440\u0430 \u043f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043a \u0440\u0430\u0437\u0434\u0435\u043b \u043f\u0440\u043e\u0435\u043a\u0442\u043e\u0432, \u0434\u0430\u043b\u0435\u0435 \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u044f \u0438\u0437 \u0432\u044b\u043f\u0430\u0434\u0430\u044e\u0449\u0435\u0433\u043e \u043c\u0435\u043d\u044e. +message.please.add.at.lease.one.traffic.range=\u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c \u043e\u0434\u0438\u043d \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0434\u043b\u044f \u0442\u0440\u0430\u0444\u0438\u043a\u0430 +message.please.proceed=\u041f\u0435\u0440\u0435\u0439\u0434\u0438\u0442\u0435 \u043a \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0435\u043c\u0443 \u0448\u0430\u0433\u0443 +message.please.select.a.configuration.for.your.zone=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043a\u043e\u043d\u0444\u0438\u0433\u0443\u0440\u0430\u0446\u0438\u044e \u0432\u0430\u0448\u0435\u0439 \u0437\u043e\u043d\u044b +message.please.select.a.different.public.and.management.network.before.removing=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u0440\u0443\u0433\u0443\u044e \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u0443\u044e \u0438 \u043e\u0431\u0441\u043b\u0443\u0436\u0438\u0432\u0430\u044e\u0449\u0443\u044e \u0441\u0435\u0442\u044c \u043f\u0435\u0440\u0435\u0434 \u0443\u0434\u0430\u043b\u0435\u043d\u0438\u0435\u043c +message.please.select.networks=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u0435\u0442\u0438 \u0434\u043b\u044f \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u043e\u0439 \u043c\u0430\u0448\u0438\u043d\u044b +message.please.wait.while.zone.is.being.created=\u041f\u043e\u0434\u043e\u0436\u0434\u0438\u0442\u0435, \u0441\u043e\u0437\u0434\u0430\u0435\u0442\u0441\u044f \u0437\u043e\u043d\u0430. \u042d\u0442\u043e \u043c\u043e\u0436\u0435\u0442 \u0437\u0430\u043d\u044f\u0442\u044c \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u043e\u0435 \u0432\u0440\u0435\u043c\u044f... +message.project.invite.sent=\u041f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u0435 \u0431\u044b\u043b\u043e \u043e\u0442\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044e; \u043e\u043d \u0431\u0443\u0434\u0435\u0442 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d \u0432 \u043f\u0440\u043e\u0435\u043a\u0442 \u043f\u043e\u0441\u043b\u0435 \u043f\u043e\u0434\u0442\u0432\u0435\u0440\u0436\u0434\u0435\u043d\u0438\u044f \u043f\u0440\u0438\u0433\u043b\u0430\u0448\u0435\u043d\u0438\u044f. +message.public.traffic.in.advanced.zone=\u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 \u0442\u0440\u0430\u0444\u0438\u043a \u0433\u0435\u043d\u0435\u0440\u0438\u0440\u0443\u0435\u0442\u0441\u044f \u043f\u0440\u0438 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0412\u041c \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043a \u0418\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0443. \u041f\u0443\u0431\u043b\u0438\u0447\u043d\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0435 IP \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u044b. \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u043c\u043e\u0436\u0435\u0442 \u0438\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c CloudStack UI \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f IP \u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f NAT, \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u043c\u044b\u0439 \u0434\u043b\u044f \u043e\u0431\u0449\u0435\u043d\u0438\u044f \u043c\u0435\u0436\u0434\u0443 \u0433\u043e\u0441\u0442\u0435\u0432\u043e\u0439 \u0438 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e\u0439 \u0441\u0435\u0442\u044c\u044e.

\u0423\u043a\u0430\u0436\u0438\u0442\u0435 \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c \u043e\u0434\u0438\u043d \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d \u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u0434\u043b\u044f \u0438\u043d\u0442\u0435\u0440\u043d\u0435\u0442-\u0442\u0440\u0430\u0444\u0438\u043a\u0430. +message.public.traffic.in.basic.zone=\u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0439 \u0442\u0440\u0430\u0444\u0438\u043a \u0433\u0435\u043d\u0435\u0440\u0438\u0440\u0443\u0435\u0442\u0441\u044f \u043f\u0440\u0438 \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0412\u041c \u0434\u043e\u0441\u0442\u0443\u043f\u0430 \u043a \u0418\u043d\u0442\u0435\u0440\u043d\u0435\u0442\u0443 \u0438\u043b\u0438 \u043f\u0440\u0438 \u043f\u0440\u0435\u0434\u043e\u0441\u0442\u0430\u0432\u043b\u0435\u043d\u0438\u0438 \u043a\u043b\u0438\u0435\u043d\u0442\u0430\u043c \u0441\u043b\u0443\u0436\u0431 \u0447\u0435\u0440\u0435\u0437 \u0418\u043d\u0442\u0435\u0440\u043d\u0435\u0442. \u041f\u0443\u0431\u043b\u0438\u0447\u043d\u043e \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0435 IP \u0434\u043e\u043b\u0436\u043d\u044b \u0431\u044b\u0442\u044c \u043e\u0431\u044f\u0437\u0430\u0442\u0435\u043b\u044c\u043d\u043e \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u044b. \u041f\u0440\u0438 \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u0438 \u0412\u041c, \u0430\u0434\u0440\u0435\u0441 \u0438\u0437 \u0434\u0438\u0430\u043f\u0430\u0437\u043e\u043d\u0430 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0445 Ip \u043f\u0440\u0438\u0432\u044f\u0436\u0435\u0442\u0441\u044f \u043a \u043c\u0430\u0448\u0438\u043d\u0435 \u0432 \u0434\u043e\u043f\u043e\u043b\u043d\u0435\u043d\u0438\u0435 \u0433\u043e\u0441\u0442\u0435\u0432\u043e\u0433\u043e \u0430\u0434\u0440\u0435\u0441\u0430 IP. \u0421\u0442\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438\u0439 1-1 NAT \u0434\u043e\u043b\u0436\u0435\u043d \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c\u0441\u044f \u043d\u0430 \u0440\u0430\u0431\u043e\u0442\u0443 \u043c\u0435\u0436\u0434\u0443 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e\u0439 \u0438 \u0433\u043e\u0441\u0442\u0435\u0432\u043e\u0439 \u0441\u0435\u0442\u044c\u044e. \u041f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044c \u0442\u0430\u043a\u0436\u0435 \u0438\u043c\u0435\u0435\u0442 \u0432\u043e\u0437\u043c\u043e\u0436\u043d\u043e\u0441\u0442\u044c \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c CloudStack UI \u0434\u043b\u044f \u043f\u043e\u043b\u0443\u0447\u0435\u043d\u0438\u044f \u0434\u043e\u043f\u043e\u043b\u043d\u0438\u0442\u0435\u043b\u044c\u043d\u044b\u0445 \u0430\u0434\u0440\u0435\u0441\u043e\u0432 \u0434\u043b\u044f \u0440\u0435\u0430\u043b\u0438\u0437\u0430\u0446\u0438\u0438 \u0441\u0442\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u043e\u0433\u043e NAT \u043c\u0435\u0436\u0434\u0443 \u043c\u0430\u0448\u0438\u043d\u0430\u043c\u0438 \u0438 \u043f\u0443\u0431\u043b\u0438\u0447\u043d\u043e\u0439 \u0441\u0435\u0442\u044c\u044e. +message.remove.vpn.access=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0443\u0434\u0430\u043b\u0438\u0442\u044c \u0434\u043e\u0441\u0442\u0443\u043f \u043a VPN \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u0435\u043b\u044f. +message.reset.password.warning.notPasswordEnabled=\u0428\u0430\u0431\u043b\u043e\u043d \u0434\u043b\u044f \u044d\u0442\u043e\u0439 \u043c\u0430\u0448\u0438\u043d\u044b \u0441\u043e\u0437\u0434\u0430\u043d \u0431\u0435\u0437 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u043d\u0438\u044f \u043f\u0430\u0440\u043e\u043b\u044f +message.reset.password.warning.notStopped=\u0414\u043b\u044f \u0438\u0437\u043c\u0435\u043d\u0435\u043d\u0438\u044f \u043f\u0430\u0440\u043e\u043b\u044f \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +message.restart.mgmt.server=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u0435 \u0441\u0435\u0440\u0432\u0435\u0440(\u044b) \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043f\u0440\u0438\u043d\u044f\u0442\u0438\u044f \u043d\u043e\u0432\u044b\u0445 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043a. +message.restart.mgmt.usage.server=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u0435 \u0441\u0435\u0440\u0432\u0435\u0440 \u0434\u043b\u044f \u0432\u0441\u0442\u0443\u043f\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u044b\u0445 \u043f\u0430\u0440\u0430\u043c\u0435\u0442\u0440\u043e\u0432 \u0432 \u0441\u0438\u043b\u0443. +message.restart.network=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0435\u0440\u0435\u0437\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u0441\u0435\u0442\u044c. +message.security.group.usage=(\u0438\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0439\u0442\u0435 Ctrl-\u043a\u043b\u0438\u043a, \u0447\u0442\u043e\u0431\u044b \u0432\u044b\u0431\u0440\u0430\u0442\u044c \u0432\u0441\u0435 \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u044e\u0449\u0438\u0435 \u0433\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438) +message.select.a.zone=\u0417\u043e\u043d\u0430 \u043e\u0431\u044b\u0447\u043d\u043e \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0435\u0434\u0438\u043d\u0438\u0447\u043d\u043e\u043c\u0443 \u0446\u0435\u043d\u0442\u0440\u0443 \u043e\u0431\u0440\u0430\u0431\u043e\u0442\u043a\u0438 \u0434\u0430\u043d\u043d\u044b\u0445. \u041d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0437\u043e\u043d\u044b\u043f\u043e\u043c\u043e\u0433\u0430\u044e\u0442 \u0441\u043e\u0437\u0434\u0430\u0432\u0430\u0442\u044c \u0431\u043e\u043b\u0435\u0435 \u043d\u0430\u0434\u0435\u0436\u043d\u044b\u0435 \u043e\u0431\u043b\u0430\u043a\u0430, \u043e\u0431\u0435\u0441\u043f\u0435\u0447\u0438\u0432\u0430\u044f \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0443\u044e \u0438\u0437\u043e\u043b\u044f\u0446\u0438\u044e \u0438 \u0438\u0437\u0431\u044b\u0442\u043e\u0447\u043d\u043e\u0441\u0442\u044c. +message.select.instance=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u0435\u0440\u0432\u0435\u0440. +message.select.iso=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u0431\u0440\u0430\u0437 ISO \u0434\u043b\u044f \u043d\u043e\u0432\u043e\u0439 \u0412\u041c +message.select.item=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u044d\u043b\u0435\u043c\u0435\u043d\u0442 +message.select.security.groups=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0433\u0440\u0443\u043f\u043f\u0443/\u0433\u0440\u0443\u043f\u043f\u044b \u0431\u0435\u0437\u043e\u043f\u0430\u0441\u043d\u043e\u0441\u0442\u0438 \u0434\u043b\u044f \u043d\u043e\u0432\u043e\u0439 \u0412\u041c +message.select.template=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0448\u0430\u0431\u043b\u043e\u043d \u0434\u043b\u044f \u043d\u043e\u0432\u043e\u0439 \u0412\u041c +message.setup.physical.network.during.zone.creation.basic=\u041f\u0440\u0438 \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u0432 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0437\u043e\u043d\u0443, \u0432\u044b \u043c\u043e\u0436\u0438\u0442\u0435 \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u043e\u0434\u043d\u0443 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0443\u044e \u0441\u0435\u0442\u044c, \u043a\u043e\u0442\u043e\u0440\u0430\u044f \u0441\u043e\u043e\u0442\u0432\u0435\u0441\u0442\u0432\u0443\u0435\u0442 NIC \u043d\u0430 \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440. \u0421\u0435\u0442\u044c \u043e\u0441\u0443\u0449\u0435\u0441\u0442\u0432\u043b\u044f\u0435\u0442 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0432\u0438\u0434\u043e\u0432 \u0442\u0440\u0430\u0444\u0438\u043a\u0430.

\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0442\u0430\u043a\u0436\u0435 \u043f\u0435\u0440\u0435\u0442\u0430\u0441\u043a\u0438\u0432\u0430\u0442\u044c drag and drop \u0434\u0440\u0443\u0433\u0438\u0435 \u0442\u0438\u043f\u044b \u0442\u0440\u0430\u0444\u0438\u043a\u0430 \u043d\u0430 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0438\u0435 \u0441\u0435\u0442\u0438. +message.setup.physical.network.during.zone.creation=\u0412\u043e \u0432\u0440\u0435\u043c\u044f \u0440\u0430\u0441\u0448\u0438\u0440\u0435\u043d\u043d\u043e\u0439 \u043d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0438 \u0437\u043e\u043d\u044b, \u0432\u0430\u043c \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u043e \u0443\u043a\u0430\u0437\u0430\u0442\u044c \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0438\u0445 \u0441\u0435\u0442\u0435\u0439. \u041a\u0430\u0436\u0434\u0430\u044f \u0441\u0435\u0442\u044c \u0441\u043e\u043e\u0442\u0432\u0435\u0442\u0441\u0442\u0432\u0443\u0435\u0442 \u0441\u0435\u0442\u0435\u0432\u043e\u043c\u0443 \u0438\u043d\u0442\u0435\u0440\u0444\u0435\u0439\u0441\u0443 \u0433\u0438\u043f\u0435\u0440\u0432\u0438\u0437\u043e\u0440\u0430. \u041a\u0430\u043a\u0436\u0434\u0430\u044f \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0430\u044f \u0441\u0435\u0442\u044c \u043c\u043e\u0436\u0435\u0442 \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c\u0441\u044f \u0434\u043b\u044f \u043e\u0434\u043d\u043e\u0433\u043e \u0438\u043b\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u0438\u0445 \u0432\u0438\u0434\u043e\u0432 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 \u0441 \u043d\u0435\u043a\u043e\u0442\u043e\u0440\u044b\u043c\u0438 \u043e\u0433\u0440\u0430\u043d\u0438\u0447\u0435\u043d\u0438\u044f\u043c\u0438 \u043f\u0440\u0438 \u043e\u0431\u044a\u0435\u0434\u0438\u043d\u0435\u043d\u0438\u0438 \u0432\u0438\u0434\u043e\u0432 \u0442\u0440\u0430\u0444\u0438\u043a\u0430.

\u041f\u0435\u0440\u0435\u0442\u0430\u0449\u0438\u0442\u0435 \u043e\u0434\u0438\u043d \u0438\u043b\u0438 \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u0432\u0438\u0434\u043e\u0432 \u0442\u0440\u0430\u0444\u0438\u043a\u0430 \u043a \u043a\u0430\u0436\u0434\u043e\u0439 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u043e\u0439 \u0441\u0435\u0442\u0438. +message.setup.successful=\u041d\u0430\u0441\u0442\u0440\u043e\u0439\u043a\u0430 \u043e\u0431\u043b\u0430\u043a\u0430 \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u0430\! +message.snapshot.schedule=\u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u043d\u0430\u0441\u0442\u0440\u043e\u0438\u0442\u044c \u043f\u043e\u0432\u0442\u043e\u0440\u044f\u044e\u0449\u0438\u0435\u0441\u044f \u0441\u043d\u0438\u043c\u043e\u043a\u0438, \u0432\u044b\u0431\u0438\u0440\u0430\u044f \u0438\u0437 \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0445 \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043e\u0432 \u043d\u0438\u0436\u0435 \u0438 \u043f\u0440\u0438\u043c\u0435\u043d\u0438\u0432 \u043f\u043e\u043b\u0438\u0442\u0438\u043a\u0443 \u043f\u0440\u0435\u0434\u043f\u043e\u0447\u0442\u0435\u043d\u0438\u044f +message.specify.url=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0443\u043a\u0430\u0436\u0438\u0442\u0435 URL +message.step.1.continue=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0448\u0430\u0431\u043b\u043e\u043d \u0438\u043b\u0438 ISO \u0434\u043b\u044f \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0435\u043d\u0438\u044f. +message.step.1.desc=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0448\u0430\u0431\u043b\u043e\u043d \u0434\u043b\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430. \u0412\u044b \u043c\u043e\u0436\u0435\u0442\u0435 \u0442\u0430\u043a\u0436\u0435 \u0432\u044b\u0431\u0440\u0430\u0442\u044c \u043f\u0443\u0441\u0442\u043e\u0439 \u0448\u0430\u0431\u043b\u043e\u043d, \u0438\u0437 \u043a\u043e\u0442\u043e\u0440\u043e\u0433\u043e \u043e\u0431\u0440\u0430\u0437 ISO \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0443\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d \u043d\u0430. +message.step.2.continue=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0441\u043b\u0443\u0436\u0435\u0431\u043d\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 \u0434\u043b\u044f \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0435\u043d\u0438\u044f. +message.step.2.desc= +message.step.3.continue=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0434\u0438\u0441\u043a\u043e\u0432\u044b\u0439 \u0440\u0435\u0441\u0443\u0440\u0441 \u0434\u043b\u044f \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0435\u043d\u0438\u044f. +message.step.3.desc= +message.step.4.continue=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0445\u043e\u0442\u044f \u0431\u044b \u043e\u0434\u043d\u0443 \u0441\u0435\u0442\u044c \u0434\u043b\u044f \u043f\u0440\u043e\u0434\u043e\u043b\u0436\u0435\u043d\u0438\u044f. +message.step.4.desc=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u043e\u0441\u043d\u043e\u0432\u043d\u0443\u044e \u0441\u0435\u0442\u044c, \u043a \u043a\u043e\u0442\u043e\u0440\u043e\u0439 \u0431\u0443\u0434\u0435\u0442 \u043f\u043e\u0434\u043a\u043b\u044e\u0447\u0435\u043d\u0430 \u043c\u0430\u0448\u0438\u043d\u0430. +message.storage.traffic=\u0422\u0440\u0430\u0444\u0438\u043a \u043c\u0435\u0436\u0434\u0443 \u0432\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0438\u043c\u0438 \u0440\u0435\u0441\u0443\u0440\u0441\u0430\u043c\u0438 CloudStack, \u0432\u043a\u043b\u044e\u0447\u0430\u044f \u0432\u0441\u0435 \u043a\u043e\u043c\u043f\u043e\u043d\u0435\u043d\u0442\u044b, \u043a\u043e\u0442\u043e\u0440\u044b\u0435 \u0432\u0437\u0430\u0438\u043c\u043e\u0434\u0435\u0439\u0441\u0442\u0432\u0443\u044e\u0442 \u0441 \u0441\u0435\u0440\u0432\u0435\u0440\u043e\u043c \u0443\u043f\u0440\u0430\u0432\u043b\u0435\u043d\u0438\u044f, \u0442\u0430\u043a\u0438\u0435 \u043a\u0430\u043a \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u0445\u043e\u0441\u0442\u044b \u0438 CloudStack \u0441\u0438\u0441\u0442\u0435\u043c\u044b. \u041d\u0430\u0441\u0442\u0440\u043e\u0439\u0442\u0435 \u0442\u0440\u0430\u0444\u0438\u043a \u0445\u0440\u0430\u043d\u0435\u043d\u0438\u044f \u0437\u0434\u0435\u0441\u044c. +message.suspend.project=\u0412\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043f\u0440\u043e\u0435\u043a\u0442? +message.template.desc=\u041e\u0431\u0440\u0430\u0437 \u041e\u0421, \u043a\u043e\u0442\u043e\u0440\u044b\u0439 \u043c\u043e\u0436\u043d\u043e \u0438\u0441\u043f\u043e\u043b\u044c\u0437\u043e\u0432\u0430\u0442\u044c \u0432 \u043a\u0430\u0447\u0435\u0441\u0442\u0432\u0435 \u0437\u0430\u0433\u0440\u0443\u0437\u043e\u0447\u043d\u043e\u0439 \u0432 \u0412\u041c +message.tooltip.dns.1=\u0418\u043c\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 DNS \u0434\u043b\u044f \u0412\u041c \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u043c\u0435\u0442\u044c \u043c\u0430\u0440\u0448\u0440\u0443\u0442 \u0434\u043e \u044d\u0442\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430. +message.tooltip.dns.2=\u0418\u043c\u044f \u0432\u0442\u043e\u0440\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430 DNS \u0434\u043b\u044f \u0412\u041c \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u041f\u0443\u0431\u043b\u0438\u0447\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u043c\u0435\u0442\u044c \u043c\u0430\u0440\u0448\u0440\u0443\u0442 \u0434\u043e \u044d\u0442\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430. +message.tooltip.internal.dns.1=\u0418\u043c\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 DNS \u0434\u043b\u044f \u0432\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0438\u0445 \u0412\u041c CloudStack \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u0427\u0430\u0441\u0442\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 \u0441\u0442\u0435\u043d\u0434\u043e\u0432 \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u043c\u0435\u0442\u044c \u043c\u0430\u0440\u0448\u0440\u0443\u0442 \u0434\u043e \u044d\u0442\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430. +message.tooltip.internal.dns.2=\u0418\u043c\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 DNS \u0434\u043b\u044f \u0432\u043d\u0443\u0442\u0440\u0435\u043d\u043d\u0438\u0445 \u0412\u041c CloudStack \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. \u0427\u0430\u0441\u0442\u043d\u044b\u0435 IP-\u0430\u0434\u0440\u0435\u0441\u0430 \u0441\u0442\u0435\u043d\u0434\u043e\u0432 \u0434\u043e\u043b\u0436\u043d\u044b \u0438\u043c\u0435\u0442\u044c \u043c\u0430\u0440\u0448\u0440\u0443\u0442 \u0434\u043e \u044d\u0442\u043e\u0433\u043e \u0441\u0435\u0440\u0432\u0435\u0440\u0430. +message.tooltip.network.domain=\u0421\u0443\u0444\u0444\u0438\u043a\u0441 DNS \u0434\u043b\u044f \u0441\u043e\u0437\u0434\u0430\u043d\u0438\u044f \u0441\u043e\u0431\u0441\u0442\u0432\u0435\u043d\u043d\u043e\u0433\u043e \u0434\u043e\u043c\u0435\u043d\u043d\u043e\u0433\u043e \u0438\u043c\u0435\u043d\u0438 \u0441\u0435\u0442\u0438, \u0434\u043e\u0441\u0442\u0443\u043f\u043d\u044b\u0439 \u0433\u043e\u0441\u0442\u0435\u0432\u044b\u043c\u0438 \u0412\u041c. +message.tooltip.pod.name=\u0418\u043c\u044f \u0434\u043b\u044f \u0441\u0442\u0435\u043d\u0434\u0430 +message.tooltip.reserved.system.gateway=\u0428\u043b\u044e\u0437 \u0434\u043b\u044f \u0443\u0437\u043b\u043e\u0432 \u044d\u0442\u043e\u0433\u043e \u0441\u0442\u0435\u043d\u0434\u0430 +message.tooltip.reserved.system.netmask=\u041f\u0440\u0435\u0444\u0438\u043a\u0441 \u0441\u0435\u0442\u0438, \u043e\u043f\u0440\u0435\u0434\u0435\u043b\u044f\u044e\u0449\u0438\u0439 \u043f\u043e\u0434\u0441\u0435\u0442\u044c \u0441\u0442\u0435\u043d\u0434\u0430. \u0418\u0441\u043f\u043e\u043b\u044c\u0437\u0443\u0435\u0442\u0441\u044f \u043e\u0431\u043e\u0437\u043d\u0430\u0447\u0435\u043d\u0438\u0435 CIDR. +message.tooltip.zone.name=\u0418\u043c\u044f \u0434\u043b\u044f \u0437\u043e\u043d\u044b +message.update.os.preference=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u0432\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u041e\u0421 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u0445\u043e\u0441\u0442\u0430. \u0412\u0441\u0435 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0435 \u044d\u043a\u0437\u0435\u043c\u043f\u043b\u044f\u0440\u044b \u0441 \u0430\u043d\u0430\u043b\u043e\u0433\u0438\u0447\u043d\u044b\u043c\u0438 \u043f\u0440\u0435\u0434\u043f\u043e\u0447\u0442\u0435\u043d\u0438\u044f\u043c\u0438 \u0432\u043f\u0435\u0440\u0432\u044b\u0435 \u0431\u0443\u0434\u0435\u0442 \u0432\u044b\u0434\u0435\u043b\u0435\u043d\u043e \u043d\u0430 \u044d\u0442\u043e\u0442 \u0443\u0437\u0435\u043b, \u043f\u0440\u0435\u0436\u0434\u0435 \u0447\u0435\u043c \u0432\u044b\u0431\u0440\u0430\u0442\u044c \u0434\u0440\u0443\u0433\u0443\u044e. +message.update.resource.count=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u043e\u0431\u043d\u043e\u0432\u0438\u0442\u044c \u0441\u0447\u0435\u0442\u0447\u0438\u043a \u0440\u0435\u0441\u0443\u0440\u0441\u043e\u0432 \u0434\u043b\u044f \u044d\u0442\u043e\u0433\u043e \u0430\u043a\u043a\u0430\u0443\u043d\u0442\u0430. +message.update.ssl=\u041f\u043e\u0436\u0430\u043b\u0443\u0439\u0441\u0442\u0430, \u043e\u0442\u043f\u0440\u0430\u0432\u044c\u0442\u0435 \u043d\u043e\u0432\u044b\u0439 \u0441\u043e\u0432\u043c\u0435\u0441\u0442\u0438\u043c\u044b\u0439 X.509 SSL \u0441\u0435\u0440\u0442\u0438\u0444\u0438\u043a\u0430\u0442 \u0434\u043b\u044f \u043e\u0431\u043d\u043e\u0432\u043b\u0435\u043d\u0438\u044f \u0434\u043b\u044f \u043a\u0430\u0436\u0434\u043e\u0439 \u043a\u043e\u043d\u0441\u043e\u043b\u0438 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u044b\u0445 \u043f\u0440\u043e\u043a\u0441\u0438, \u043d\u0430\u043f\u0440\u0438\u043c\u0435\u0440\: +message.validate.instance.name=\u0418\u043c\u044f \u0441\u0435\u0440\u0432\u0435\u0440\u0430 \u043d\u0435 \u043c\u043e\u0436\u0435\u0442 \u0431\u044b\u0442\u044c \u0434\u043b\u0438\u043d\u0435\u0435 63 \u0441\u0438\u043c\u0432\u043e\u043b\u0430. \u0422\u043e\u043b\u044c\u043a\u043e ASCII, \u0431\u0443\u043a\u0432\u044b a~z, A~Z, \u0446\u044b\u0444\u0440\u044b 0~9, \u0434\u0435\u0444\u0438\u0441 \u043d\u0435 \u0434\u043e\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f. \u0414\u043e\u043b\u0436\u043d\u0430 \u043d\u0430\u0447\u0438\u043d\u0430\u0442\u044c\u0441\u044f \u0441 \u0431\u0443\u043a\u0432\u044b \u0438 \u0437\u0430\u043a\u0430\u043d\u0447\u0438\u0432\u0430\u0442\u044c\u0441\u044f \u0431\u0443\u043a\u0432\u043e\u0439 \u0438\u043b\u0438 \u0446\u0438\u0444\u0440\u043e\u0439. +message.virtual.network.desc=\u0432\u044b\u0434\u0435\u043b\u0435\u043d\u043d\u043e\u0439 \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u043e\u0439 \u0441\u0435\u0442\u0438 \u0434\u043b\u044f \u0432\u0430\u0448\u0435\u0439 \u0443\u0447\u0435\u0442\u043d\u043e\u0439 \u0437\u0430\u043f\u0438\u0441\u0438. \u0428\u0438\u0440\u043e\u043a\u043e\u0432\u0435\u0449\u0430\u0442\u0435\u043b\u044c\u043d\u044b\u0439 \u0434\u043e\u043c\u0435\u043d \u043d\u0430\u0445\u043e\u0434\u0438\u0442\u0441\u044f \u0432\u043d\u0443\u0442\u0440\u0438 VLAN \u0438 \u0432\u0435\u0441\u044c \u0432\u043d\u0435\u0448\u043d\u0438\u0439 \u0434\u043e\u0441\u0442\u0443\u043f \u043a \u0441\u0435\u0442\u0438 \u043d\u0430\u043f\u0440\u0430\u0432\u043b\u044f\u0435\u0442\u0441\u044f \u043f\u0443\u0442\u0435\u043c \u0432\u0438\u0440\u0442\u0443\u0430\u043b\u044c\u043d\u043e\u0433\u043e \u043c\u0430\u0440\u0448\u0440\u0443\u0442\u0438\u0437\u0430\u0442\u043e\u0440\u0430. +message.vm.create.template.confirm=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0448\u0430\u0431\u043b\u043e\u043d\u0430 \u0430\u0432\u0442\u043e\u043c\u0430\u0442\u0438\u0447\u0435\u0441\u043a\u0438 \u043f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442 \u0412\u041c +message.vm.review.launch=\u041f\u0440\u043e\u0432\u0435\u0440\u044c\u0442\u0435 \u0441\u043b\u0435\u0434\u0443\u044e\u0449\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0438 \u0443\u0434\u043e\u0441\u0442\u043e\u0432\u0435\u0440\u044c\u0442\u0435\u0441\u044c \u0432 \u0442\u043e\u043c, \u0447\u0442\u043e \u0432\u0430\u0448\u0430 \u043c\u0430\u0448\u0438\u043d\u0430 \u043d\u0430\u0441\u0442\u0440\u043e\u0435\u043d\u0430 \u043f\u0440\u0430\u0432\u0438\u043b\u044c\u043d\u043e. +message.volume.create.template.confirm=\u041f\u043e\u0434\u0442\u0432\u0435\u0440\u0434\u0438\u0442\u0435, \u0447\u0442\u043e \u0432\u044b \u0434\u0435\u0439\u0441\u0442\u0432\u0438\u0442\u0435\u043b\u044c\u043d\u043e \u0445\u043e\u0442\u0438\u0442\u0435 \u0441\u043e\u0437\u0434\u0430\u0442\u044c \u0448\u0430\u0431\u043b\u043e\u043d \u044d\u0442\u043e\u0433\u043e \u0442\u043e\u043c\u0430. \u042d\u0442\u043e \u043f\u0440\u043e\u0446\u0435\u0441\u0441 \u043c\u043e\u0436\u0435\u0442 \u043f\u0440\u043e\u0434\u043b\u0438\u0442\u044c\u0441\u044f \u043d\u0435\u0441\u043a\u043e\u043b\u044c\u043a\u043e \u043c\u0438\u043d\u0443\u0442 \u0432 \u0437\u0430\u0432\u0438\u0441\u0438\u043c\u043e\u0441\u0442\u0438 \u043e\u0442 \u0440\u0430\u0437\u043c\u0435\u0440\u0430 \u0442\u043e\u043c\u0430. +message.you.must.have.at.least.one.physical.network=\u0414\u043e\u0431\u0430\u0432\u044c\u0442\u0435 \u043a\u0430\u043a \u043c\u0438\u043d\u0438\u043c\u0443\u043c \u043e\u0434\u043d\u0443 \u0444\u0438\u0437\u0438\u0447\u0435\u0441\u043a\u0443\u044e \u0441\u0435\u0442\u044c +message.Zone.creation.complete=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0437\u043e\u043d\u044b \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e +message.zone.creation.complete.would.you.like.to.enable.this.zone=\u0421\u043e\u0437\u0434\u0430\u043d\u0438\u0435 \u0437\u043e\u043d\u044b \u0437\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e. \u0425\u043e\u0442\u0438\u0442\u0435 \u0432\u043a\u043b\u044e\u0447\u0438\u0442\u044c \u044d\u0442\u0443 \u0437\u043e\u043d\u0443? +message.zone.no.network.selection=\u0412\u044b\u0431\u0440\u0430\u043d\u043d\u0430\u044f \u0437\u043e\u043d\u0430 \u043d\u0435 \u0438\u043c\u0435\u0435\u0442 \u0432\u0430\u0440\u0438\u0430\u043d\u0442\u043e\u0432 \u0434\u043b\u044f \u0432\u044b\u0431\u043e\u0440\u0430 \u0441\u0435\u0442\u0438. +message.zone.step.1.desc=\u0412\u044b\u0431\u0435\u0440\u0438\u0442\u0435 \u0442\u0438\u043f \u0441\u0435\u0442\u0438 \u044d\u0442\u043e\u0439 \u0437\u043e\u043d\u044b. +message.zone.step.2.desc=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0439 \u0437\u043e\u043d\u044b +message.zone.step.3.desc=\u0412\u0432\u0435\u0434\u0438\u0442\u0435 \u043d\u0435\u043e\u0431\u0445\u043e\u0434\u0438\u043c\u0443\u044e \u0438\u043d\u0444\u043e\u0440\u043c\u0430\u0446\u0438\u044e \u0434\u043b\u044f \u0434\u043e\u0431\u0430\u0432\u043b\u0435\u043d\u0438\u044f \u043d\u043e\u0432\u043e\u0433\u043e \u0441\u0442\u0435\u043d\u0434\u0430 +mode=\u0420\u0435\u0436\u0438\u043c +network.rate=\u0421\u043a\u043e\u0440\u043e\u0441\u0442\u044c \u0441\u0435\u0442\u0438 +notification.reboot.instance=\u041f\u0435\u0440\u0435\u0437\u0430\u0433\u0440\u0443\u0437\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +notification.start.instance=\u0417\u0430\u043f\u0443\u0441\u0442\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +notification.stop.instance=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c \u043c\u0430\u0448\u0438\u043d\u0443 +side.by.side=\u0411\u043e\u043a-\u043e-\u0411\u043e\u043a +state.Accepted=\u041f\u0440\u0438\u043d\u044f\u0442\u043e +state.Active=\u0412\u043a\u043b\u044e\u0447\u0435\u043d +state.Allocated=\u0420\u0430\u0441\u043f\u0440\u0435\u0434\u0435\u043b\u0435\u043d\u043e +state.Allocating=\u0412\u044b\u0434\u0435\u043b\u0435\u043d\u0438\u0435 +state.BackedUp=\u0417\u0430\u0440\u0435\u0437\u0435\u0440\u0432\u0438\u0440\u043e\u0432\u0430\u043d\u043e +state.BackingUp=\u0420\u0435\u0437\u0435\u0440\u0432\u043d\u043e\u0435 \u043a\u043e\u043f\u0438\u0440\u043e\u0432\u0430\u043d\u0438\u0435 +state.Completed=\u0417\u0430\u0432\u0435\u0440\u0448\u0435\u043d\u043e +state.Creating=\u0421\u043e\u0437\u0434\u0430\u0435\u0442\u0441\u044f +state.Declined=\u041e\u0442\u043a\u043b\u043e\u043d\u0435\u043d\u043e +state.Destroyed=\u0423\u043d\u0438\u0447\u0442\u043e\u0436\u0435\u043d\u043e +state.Disabled=\u0412\u044b\u043a\u043b\u044e\u0447\u0435\u043d\u043e +state.enabled=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u043e +state.Enabled=\u0412\u043a\u043b\u044e\u0447\u0435\u043d\u043e +state.Error=\u041e\u0448\u0438\u0431\u043a\u0430 +state.Expunging=\u0423\u0434\u0430\u043b\u0451\u043d +state.Migrating=\u041c\u0438\u0433\u0440\u0438\u0440\u0443\u044e\u0449\u0438\u0439 +state.Pending=\u041e\u0436\u0438\u0434\u0430\u0435\u0442\u0441\u044f +state.ready=\u0413\u043e\u0442\u043e\u0432 +state.Ready=\u0413\u043e\u0442\u043e\u0432 +state.Running=\u0417\u0430\u043f\u0443\u0449\u0435\u043d\u043e +state.Starting=\u0417\u0430\u043f\u0443\u0441\u043a\u0430\u0435\u0442\u0441\u044f +state.Stopped=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e +state.Stopping=\u041e\u0441\u0442\u0430\u043d\u043e\u0432\u0438\u0442\u044c +state.Suspended=\u041f\u0440\u0438\u043e\u0441\u0442\u0430\u043d\u043e\u0432\u043b\u0435\u043d\u043e +ui.listView.filters.all=\u0412\u0441\u0435 +ui.listView.filters.mine=\u041c\u043e\u0438 diff --git a/client/WEB-INF/classes/resources/messages_zh_CN.properties b/client/WEB-INF/classes/resources/messages_zh_CN.properties index d49cefacff5..f62439d460d 100644 --- a/client/WEB-INF/classes/resources/messages_zh_CN.properties +++ b/client/WEB-INF/classes/resources/messages_zh_CN.properties @@ -1,1520 +1,1509 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - - -#new labels (begin) ********************************************************************************************** - - -#new labels (end) ************************************************************************************************ - - -#modified labels (begin) ***************************************************************************************** - - -#modified labels (end) ******************************************************************************************* - -label.configure.network.ACLs=é…置网络 ACL -label.network.ACLs=网络 ACL -label.add.network.ACL=添加网络 ACL -label.private.Gateway=专用网关 -label.VPC.router.details=VPC è·¯ç”±å™¨è¯¦ç»†ä¿¡æ¯ -label.VMs.in.tier=层中的 VM - -message.zoneWizard.enable.local.storage=警告: 如果为此区域å¯ç”¨äº†æœ¬åœ°å­˜å‚¨ï¼Œåˆ™å¿…须执行以下æ“作，具体å–决于希望å¯åŠ¨ç³»ç»Ÿ VM çš„ä½ç½®:

1. 如果è¦åœ¨ä¸»å­˜å‚¨ä¸­å¯åŠ¨ç³»ç»Ÿ VM，则需è¦åœ¨åˆ›å»ºåŽå°†ä¸»å­˜å‚¨æ·»åŠ åˆ°æ­¤åŒºåŸŸä¸­ã€‚此外，还必须å¯åŠ¨å¤„于ç¦ç”¨çŠ¶æ€çš„区域。

2. 如果è¦åœ¨æœ¬åœ°å­˜å‚¨ä¸­å¯åŠ¨ç³»ç»Ÿ VM，则需è¦å…ˆå°† system.vm.use.local.storage 设置为 True，然åŽå†å¯ç”¨æ­¤åŒºåŸŸã€‚


是å¦è¦ç»§ç»­? -label.local.storage.enabled=å·²å¯ç”¨æœ¬åœ°å­˜å‚¨ -label.tier.details=å±‚è¯¦ç»†ä¿¡æ¯ -label.edit.tags=编辑标签 -label.network.rate.megabytes=网络速率(MB/秒) -label.action.enable.physical.network=å¯ç”¨ç‰©ç†ç½‘络 -label.action.disable.physical.network=ç¦ç”¨ç‰©ç†ç½‘络 -message.action.enable.physical.network=请确认您确实è¦å¯ç”¨æ­¤ç‰©ç†ç½‘络。 -message.action.disable.physical.network=请确认您确实è¦ç¦ç”¨æ­¤ç‰©ç†ç½‘络。 - -label.select.tier=选择层 -label.add.ACL=添加 ACL -label.remove.ACL=删除 ACL -label.tier=层 -label.network.ACL=网络 ACL -label.network.ACL.total=网络 ACL 总数 -label.add.new.gateway=添加新网关 -message.add.new.gateway.to.vpc=请指定将新网关添加到此 VPC 所需的信æ¯ã€‚ -label.delete.gateway=删除网关 -message.delete.gateway=请确认您确实è¦åˆ é™¤æ­¤ç½‘å…³ -label.CIDR.of.destination.network=目的地网络的 CIDR -label.add.route=添加路由 -label.add.static.route=添加é™æ€è·¯ç”± -label.remove.static.route=删除é™æ€è·¯ç”± -label.site.to.site.VPN=站点到站点 VPN -label.add.VPN.gateway=添加 VPN 网关 -message.add.VPN.gateway=请确认您确实è¦æ·»åŠ  VPN 网关 -label.VPN.gateway=VPN 网关 -label.delete.VPN.gateway=删除 VPN 网关 -message.delete.VPN.gateway=请确认您确实è¦åˆ é™¤æ­¤ VPN 网关 -label.VPN.connection=VPN 连接 -label.IPsec.preshared.key=IPsec 预共享密钥 -label.IKE.policy=IKE ç­–ç•¥ -label.ESP.policy=ESP ç­–ç•¥ -label.create.VPN.connection=创建 VPN 连接 -label.VPN.customer.gateway=VPN 客户网关 -label.CIDR.list=CIDR 列表 -label.IKE.lifetime=IKE 使用期é™(第二阶段) -label.ESP.lifetime=ESP 使用期é™(第二阶段) -label.dead.peer.detection=失效对等体检测 -label.reset.VPN.connection=é‡ç½® VPN 连接 -message.reset.VPN.connection=请确认您确实è¦é‡ç½® VPN 连接 -label.delete.VPN.connection=删除 VPN 连接 -message.delete.VPN.connection=请确认您确实è¦åˆ é™¤ VPN 连接 -label.add.new.tier=添加新层 -label.add.VM.to.tier=å‘层中添加 VM -label.remove.tier=删除层 - -label.local.storage.enabled=å·²å¯ç”¨æœ¬åœ°å­˜å‚¨ -label.associated.network=å…³è”网络 -label.add.port.forwarding.rule=添加端å£è½¬å‘规则 -label.dns=DNS - -label.vpc=VPC -label.vpc.id=VPC ID -label.tier=层 -label.add.vpc=添加 VPC -label.super.cidr.for.guest.networks=æ¥å®¾ç½‘络的超级 CIDR -label.DNS.domain.for.guest.networks=æ¥å®¾ç½‘络的 DNS 域 -label.configure.vpc=é…ç½® VPC -label.edit.vpc=编辑 VPC -label.restart.vpc=é‡æ–°å¯åŠ¨ VPC -message.restart.vpc=请确认您确实è¦é‡æ–°å¯åŠ¨ VPC -label.remove.vpc=删除 VPC -message.remove.vpc=请确认您确实è¦åˆ é™¤ VPC -label.vpn.customer.gateway=VPN 客户网关 -label.add.vpn.customer.gateway=添加 VPN 客户网关 -label.IKE.encryption=IKE 加密算法 -label.IKE.hash=IKE 哈希算法 -label.IKE.DH=IKE DH 算法 -label.ESP.encryption=ESP 加密算法 -label.ESP.hash=ESP 哈希算法 -label.perfect.forward.secrecy=完全正å‘ä¿å¯† -label.IKE.lifetime=IKE 使用期é™(第二阶段) -label.ESP.lifetime=ESP 使用期é™(第二阶段) -label.dead.peer.detection=失效对等体检测 -label.delete.VPN.customer.gateway=删除 VPN 客户网关 -message.delete.VPN.customer.gateway=请确认您确实è¦åˆ é™¤æ­¤ VPN 客户网关 - -label.network.domain.text=网络域 -label.memory.mb=内存(MB) -label.cpu.mhz=CPU (MHz) -message.action.remove.host=请确认您确实è¦åˆ é™¤æ­¤ä¸»æœºã€‚ - -message.action.reboot.router=此虚拟路由器æ供的所有æœåŠ¡éƒ½å°†ä¸­æ–­ã€‚请确认您确实è¦é‡æ–°å¯åŠ¨æ­¤è·¯ç”±å™¨ã€‚ -message.action.stop.router=此虚拟路由器æ供的所有æœåŠ¡éƒ½å°†ä¸­æ–­ã€‚请确认您确实è¦åœæ­¢æ­¤è·¯ç”±å™¨ã€‚ -message.restart.network=此网络æ供的所有æœåŠ¡éƒ½å°†ä¸­æ–­ã€‚请确认您确实è¦é‡æ–°å¯åŠ¨æ­¤ç½‘络。 - - -label.ipaddress=IP åœ°å€ -label.vcdcname=vCenter DC å称 -label.vcipaddress=vCenter IP åœ°å€ -label.vsmctrlvlanid=控制 VLAN ID -label.vsmpktvlanid=æ•°æ®åŒ… VLAN ID -label.vsmstoragevlanid=存储 VLAN ID -label.nexusVswitch=Nexus 1000v -label.action.delete.nexusVswitch=删除 Nexus 1000v -label.action.enable.nexusVswitch=å¯ç”¨ Nexus 1000v -label.action.disable.nexusVswitch=ç¦ç”¨ Nexus 1000v -label.action.list.nexusVswitch=列出 Nexus 1000v -message.action.delete.nexusVswitch=请确认您确实è¦åˆ é™¤æ­¤ Nexus 1000v -message.action.enable.nexusVswitch=请确认您确实è¦å¯ç”¨æ­¤ Nexus 1000v -message.action.disable.nexusVswitch=请确认您确实è¦ç¦ç”¨æ­¤ Nexus 1000v -message.specify.url=请指定 URL -label.select.instance.to.attach.volume.to=选择è¦å°†å·é™„加到的实例 -label.upload=上载 -label.upload.volume=ä¸Šè½½å· -label.virtual.routers=虚拟路由器 -label.primary.storage.count=主存储池 -label.secondary.storage.count=辅助存储池 -label.number.of.system.vms=系统 VM æ•° -label.number.of.virtual.routers=虚拟路由器数 -label.action.register.iso=注册 ISO -label.isolation.method=隔离方法 -label.action.register.template=æ³¨å†Œæ¨¡æ¿ -label.checksum=MD5 校验和 -label.vpn=VPN -label.vlan=VLAN - - -label.management.ips=管ç†ç±» IP åœ°å€ -label.devices=设备 -label.rules=规则 -label.traffic.label=æµé‡æ ‡ç­¾ -label.vm.state=VM çŠ¶æ€ -message.setup.physical.network.during.zone.creation.basic=添加基础区域时，å¯ä»¥è®¾ç½®ä¸€ä¸ªç‰©ç†ç½‘络，此网络应与虚拟机管ç†ç¨‹åºä¸­çš„ NIC 相对应。此网络å¯ä»¥æ‰¿è½½å¤šç§æµé‡ç±»åž‹ã€‚

此外，还å¯ä»¥å°†å…¶ä»–æµé‡ç±»åž‹æ‹–放到此物ç†ç½‘络。 -label.domain.router=域路由器 -label.console.proxy=控制å°ä»£ç† -label.secondary.storage.vm=辅助存储 VM -label.add.netScaler.device=添加 Netscaler 设备 -label.add.F5.device=添加 F5 设备 -label.add.SRX.device=添加 SRX 设备 -label.account.and.security.group=å¸æˆ·ã€å®‰å…¨ç»„ -label.fetch.latest=æå–最新内容 -label.system.offering=系统方案 -message.validate.instance.name=实例å称ä¸å¾—超过 63 个字符。仅å…许使用 ASCII å­—æ¯ a - z 或 A - Zã€æ•°å­— 0 - 9 以åŠè¿žå­—符。实例å称必须以字æ¯å¼€å¤´å¹¶ä»¥å­—æ¯æˆ–数字结æŸã€‚ - - -label.isolated.networks=隔离网络 -label.latest.events=最新事件 -state.Enabled=å·²å¯ç”¨ -label.system.wide.capacity=å…¨ç³»ç»Ÿå®¹é‡ -label.network.service.providers=网络æœåŠ¡æä¾›ç¨‹åº -message.launch.zone=区域已准备就绪，å¯éšæ—¶å¯åŠ¨ï¼›è¯·ç»§ç»­æ‰§è¡Œä¸‹ä¸€æ­¥éª¤ã€‚ -error.unable.to.reach.management.server=无法访问管ç†æœåŠ¡å™¨ -label.internal.name=内部å称 -message.configure.all.traffic.types=您有多个物ç†ç½‘络，请å•å‡»â€œç¼–辑â€æŒ‰é’®ä¸ºæ¯ç§æµé‡ç±»åž‹é…置标签。 -message.edit.traffic.type=请指定您希望与此æµé‡ç±»åž‹å…³è”çš„æµé‡æ ‡ç­¾ã€‚ -label.edit.traffic.type=编辑æµé‡ç±»åž‹ -label.label=标签 -label.max.networks=最大网络数 -error.invalid.username.password=用户å或密ç æ— æ•ˆ -message.enabling.security.group.provider=正在å¯ç”¨å®‰å…¨ç»„æä¾›ç¨‹åº -message.adding.Netscaler.provider=正在添加 Netscaler æä¾›ç¨‹åº -message.creating.guest.network=正在创建æ¥å®¾ç½‘络 -label.action.delete.physical.network=删除物ç†ç½‘络 -message.action.delete.physical.network=请确认您确实è¦åˆ é™¤æ­¤ç‰©ç†ç½‘络 -message.installWizard.copy.whatIsAHost=主机是指一å°è®¡ç®—机。主机æä¾›è¿è¡Œæ¥å®¾è™šæ‹Ÿæœºçš„计算资æºã€‚æ¯å°ä¸»æœºä¸Šéƒ½å®‰è£…有虚拟机管ç†ç¨‹åºè½¯ä»¶ï¼Œç”¨äºŽç®¡ç†æ¥å®¾ VM (裸机主机除外，将在“高级安装指å—â€ä¸­è®¨è®ºè¿™ä¸€ç‰¹æ®Šæ¡ˆä¾‹)。例如，å¯ç”¨äº† KVM çš„ Linux æœåŠ¡å™¨ã€Citrix XenServer æœåŠ¡å™¨å’Œ ESXi æœåŠ¡å™¨éƒ½å¯ç”¨ä½œä¸»æœºã€‚在基本安装中，我们将使用一å°è¿è¡Œ XenServer 的主机。

主机是 CloudStack™ 部署中最å°çš„组织å•ä½ã€‚主机包å«åœ¨ç¾¤é›†ä¸­ï¼Œç¾¤é›†åŒ…å«åœ¨æ供点中，æ供点包å«åœ¨åŒºåŸŸä¸­ã€‚ - - -label.add.compute.offering=添加计算方案 -label.compute.offering=计算方案 -label.compute.offerings=计算方案 -label.select.offering=选择方案 -label.menu.infrastructure=基础架构 -label.sticky.tablesize=è¡¨å¤§å° -label.sticky.expire=过期日期 -label.sticky.cookie-name=Cookie å称 -label.sticky.mode=æ¨¡å¼ -label.sticky.length=长度 -label.sticky.holdtime=æŒç»­æ—¶é—´ -label.sticky.request-learn=request-learn -label.sticky.prefix=prefix -label.sticky.nocache=nocache -label.sticky.indirect=indirect -label.sticky.postonly=postonly -label.sticky.domain=域 -state.Allocating=æ­£åœ¨åˆ†é… -state.Migrating=正在è¿ç§» -error.please.specify.physical.network.tags=网络方案在您为此物ç†ç½‘络指定标签之åŽæ‰å¯ç”¨ã€‚ - - -state.Stopping=正在åœæ­¢ -message.add.load.balancer.under.ip=已在以下 IP 下添加负载平衡器规则: -message.select.instance=请选择一个实例。 -label.select=选择 -label.select.vm.for.static.nat=为é™æ€ NAT 选择 VM -label.select.instance=选择实例 -label.nat.port.range=NAT 端å£èŒƒå›´ -label.static.nat.vm.details=é™æ€ NAT VM 详情 -label.edit.lb.rule=编辑负载平衡器规则 -message.migrate.instance.to.host=请确认您确实è¦å°†å®žä¾‹è¿ç§»åˆ°å…¶ä»–主机。 -label.migrate.instance.to.host=将实例è¿ç§»åˆ°å…¶ä»–主机 -message.migrate.instance.to.ps=请确认您确实è¦å°†å®žä¾‹è¿ç§»åˆ°å…¶ä»–主存储。 -label.migrate.instance.to.ps=将实例è¿ç§»åˆ°å…¶ä»–主存储 -label.corrections.saved=å·²ä¿å­˜ä¿®æ­£ -message.installWizard.copy.whatIsSecondaryStorage=辅助存储与区域相关è”，用于存储以下项目:
  • æ¨¡æ¿ - å¯ç”¨äºŽå¯åŠ¨ VM 并å¯ä»¥åŒ…å«å…¶ä»–é…置信æ¯(例如，已安装的应用程åº)çš„æ“作系统映åƒ
  • ISO æ˜ åƒ - å¯é‡æ–°å¯åŠ¨æˆ–ä¸å¯é‡æ–°å¯åŠ¨çš„æ“作系统映åƒ
  • ç£ç›˜å·å¿«ç…§ - å·²ä¿å­˜çš„ VM æ•°æ®å‰¯æœ¬ï¼Œå¯ç”¨äºŽæ‰§è¡Œæ•°æ®æ¢å¤æˆ–创建新模æ¿
-message.installWizard.copy.whatIsPrimaryStorage=CloudStack™ 云基础架构使用以下两ç§ç±»åž‹çš„存储: 主存储和辅助存储。这两ç§ç±»åž‹çš„存储å¯ä»¥æ˜¯ iSCSI 或 NFS æœåŠ¡å™¨ï¼Œä¹Ÿå¯ä»¥æ˜¯æœ¬åœ°ç£ç›˜ã€‚

主存储与群集相关è”，用于存储该群集中的主机上正在è¿è¡Œçš„所有 VM 对应的æ¯ä¸ªæ¥å®¾ VM çš„ç£ç›˜å·ã€‚主存储æœåŠ¡å™¨é€šå¸¸ä½äºŽé è¿‘主机的ä½ç½®ã€‚ -message.installWizard.copy.whatIsACluster=群集æ供了一ç§ç¼–组主机的方法。群集中的所有主机都具有相åŒçš„硬件，è¿è¡Œç›¸åŒçš„虚拟机管ç†ç¨‹åºï¼Œä½äºŽåŒä¸€å­ç½‘中，并访问相åŒçš„共享存储。å¯ä»¥å®žæ—¶å°†è™šæ‹Ÿæœºå®žä¾‹(VM)从一å°ä¸»æœºè¿ç§»åˆ°åŒä¸€ç¾¤é›†å†…的其他主机，而无需中断å‘用户æä¾›æœåŠ¡ã€‚群集是 CloudStack™ 部署中的第三大组织å•ä½ã€‚群集包å«åœ¨æ供点中，æ供点包å«åœ¨åŒºåŸŸä¸­ã€‚

CloudStack™ å…许云部署中存在多个群集，但对于基本安装，我们åªéœ€è¦ä¸€ä¸ªç¾¤é›†ã€‚ -message.installWizard.copy.whatIsAPod=一个æ供点通常代表一个机架。åŒä¸€æ供点中的主机ä½äºŽåŒä¸€å­ç½‘中。

æ供点是 CloudStack™ 部署中的第二大组织å•ä½ã€‚æ供点包å«åœ¨åŒºåŸŸä¸­ã€‚æ¯ä¸ªåŒºåŸŸä¸­å¯ä»¥åŒ…å«ä¸€ä¸ªæˆ–多个æ供点；在基本安装中，您的区域中将仅包å«ä¸€ä¸ªæ供点。 -message.installWizard.copy.whatIsAZone=区域是 CloudStack™ 部署中最大的组织å•ä½ã€‚虽然å…许一个数æ®ä¸­å¿ƒä¸­å­˜åœ¨å¤šä¸ªåŒºåŸŸï¼Œä½†æ˜¯ä¸€ä¸ªåŒºåŸŸé€šå¸¸ä¸Žä¸€ä¸ªæ•°æ®ä¸­å¿ƒç›¸å¯¹åº”。将基础架构编组到区域中的好处是å¯ä»¥æ供物ç†éš”离和冗余。例如，æ¯ä¸ªåŒºåŸŸéƒ½å¯ä»¥æ‹¥æœ‰å„自的电æºä¾›åº”和网络上行方案，并且å„区域å¯ä»¥åœ¨åœ°ç†ä½ç½®ä¸Šç›¸éš”很远(虽然并éžå¿…须相隔很远)。 -message.installWizard.copy.whatIsCloudStack=CloudStack™ 是一个软件平å°ï¼Œå¯å°†è®¡ç®—资æºé›†ä¸­åœ¨ä¸€èµ·ä»¥æž„建公共ã€ç§æœ‰å’Œæ··åˆåŸºç¡€è®¾æ–½å³æœåŠ¡(IaaS)云。CloudStack™ 负责管ç†ç»„æˆäº‘基础架构的网络ã€å­˜å‚¨å’Œè®¡ç®—节点。使用 CloudStack™ å¯ä»¥éƒ¨ç½²ã€ç®¡ç†å’Œé…置云计算环境。

CloudStack™ 通过扩展商用硬件上è¿è¡Œçš„æ¯ä¸ªè™šæ‹Ÿæœºæ˜ åƒçš„范围，æ供了一个实时å¯ç”¨çš„云基础架构软件堆栈用于以æœåŠ¡æ–¹å¼äº¤ä»˜è™šæ‹Ÿæ•°æ®ä¸­å¿ƒï¼Œå³äº¤ä»˜æž„建ã€éƒ¨ç½²å’Œç®¡ç†å¤šå±‚次和多租户云应用程åºå¿…需的所有组件。开æºç‰ˆæœ¬å’Œ Premium 版本都已å¯ç”¨ï¼Œä¸”æ供的功能几乎完全相åŒã€‚ -message.installWizard.tooltip.addSecondaryStorage.path=导出路径(ä½äºŽä¸Šè¿°æŒ‡å®šæœåŠ¡å™¨ä¸Š) -message.installWizard.tooltip.addSecondaryStorage.nfsServer=托管辅助存储的 NFS æœåŠ¡å™¨çš„ IP åœ°å€ -message.installWizard.tooltip.addPrimaryStorage.path=(适用于 NFS)在 NFS 中，此路径为æœåŠ¡å™¨çš„导出路径。路径(针对 SharedMountPoint)。对于 KVM，此路径为装载了辅助存储的æ¯ä¸ªä¸»æœºä¸Šçš„路径。例如，/mnt/primary。 -message.installWizard.tooltip.addPrimaryStorage.server=(适用于 NFSã€iSCSI 或 PreSetup)存储设备的 IP 地å€æˆ– DNS å称。 -message.installWizard.tooltip.addPrimaryStorage.name=存储设备的å称。 -message.installWizard.tooltip.addHost.password=此为上述用户的密ç (æ¥è‡ª XenServer 安装)。 -message.installWizard.tooltip.addHost.username=通常为 root。 -message.installWizard.tooltip.addHost.hostname=主机的 DNS å称或 IP 地å€ã€‚ -message.installWizard.tooltip.addCluster.name=群集的å称。此å称å¯ä»¥æ˜¯æ‚¨é€‰æ‹©çš„文本，且未由 CloudStack 使用。 -message.installWizard.tooltip.addPod.reservedSystemEndIp=此为 CloudStack 用于管ç†è¾…助存储 VM 和控制å°ä»£ç† VM 的专用网络中的 IP 范围。这些 IP 地å€æ¥è‡ªä¸Žè®¡ç®—æœåŠ¡å™¨ç›¸åŒçš„å­ç½‘。 -message.installWizard.tooltip.addPod.reservedSystemStartIp=此为 CloudStack 用于管ç†è¾…助存储 VM 和控制å°ä»£ç† VM 的专用网络中的 IP 范围。这些 IP 地å€æ¥è‡ªä¸Žè®¡ç®—æœåŠ¡å™¨ç›¸åŒçš„å­ç½‘。 -message.installWizard.tooltip.addPod.reservedSystemNetmask=æ¥å®¾å°†è¦ä½¿ç”¨çš„å­ç½‘上正在使用的网络掩ç ã€‚ -message.installWizard.tooltip.addPod.reservedSystemGateway=该æ供点中的主机网关。 -message.installWizard.tooltip.addPod.name=æ供点的å称 -message.installWizard.tooltip.configureGuestTraffic.guestEndIp=能够分é…给此区域中的æ¥å®¾çš„ IP 地å€èŒƒå›´ã€‚如果使用一个 NIC，这些 IP 应ä½äºŽä¸Žæ供点 CIDR 相åŒçš„ CIDR 中。 -message.installWizard.tooltip.configureGuestTraffic.guestStartIp=能够分é…给此区域中的æ¥å®¾çš„ IP 地å€èŒƒå›´ã€‚如果使用一个 NIC，这些 IP 应ä½äºŽä¸Žæ供点 CIDR 相åŒçš„ CIDR 中。 -message.installWizard.tooltip.configureGuestTraffic.guestNetmask=æ¥å®¾åº”使用的å­ç½‘ä¸Šæ­£åœ¨ä½¿ç”¨çš„ç½‘ç»œæŽ©ç  -message.installWizard.tooltip.configureGuestTraffic.guestGateway=æ¥å®¾åº”使用的网关 -message.installWizard.tooltip.configureGuestTraffic.description=您的网络说明 -message.installWizard.tooltip.configureGuestTraffic.name=您的网络å称 -message.installWizard.tooltip.addZone.internaldns2=这些æœåŠ¡å™¨æ˜¯ä¾›æ­¤åŒºåŸŸä¸­çš„系统 VM 使用的 DNS æœåŠ¡å™¨ï¼Œå°†é€šè¿‡ç³»ç»Ÿ VM 的专用网络接å£è¿›è¡Œè®¿é—®ã€‚您为æ供点æ供的专用 IP 地å€å¿…须路由到在此处指定的 DNS æœåŠ¡å™¨ã€‚ -message.installWizard.tooltip.addZone.internaldns1=这些æœåŠ¡å™¨æ˜¯ä¾›æ­¤åŒºåŸŸä¸­çš„系统 VM 使用的 DNS æœåŠ¡å™¨ï¼Œå°†é€šè¿‡ç³»ç»Ÿ VM 的专用网络接å£è¿›è¡Œè®¿é—®ã€‚您为æ供点æ供的专用 IP 地å€å¿…须路由到在此处指定的 DNS æœåŠ¡å™¨ã€‚ -message.installWizard.tooltip.addZone.dns2=这些æœåŠ¡å™¨æ˜¯ä¾›æ­¤åŒºåŸŸä¸­çš„æ¥å®¾ VM 使用的 DNS æœåŠ¡å™¨ï¼Œå°†é€šè¿‡æ‚¨ç¨åŽè¦æ·»åŠ çš„公用网络进行访问。此区域的公用 IP 地å€å¿…须路由到在此处指定的 DNS æœåŠ¡å™¨ã€‚ -message.installWizard.tooltip.addZone.name=区域å称 -message.installWizard.tooltip.addZone.dns1=这些æœåŠ¡å™¨æ˜¯ä¾›æ­¤åŒºåŸŸä¸­çš„æ¥å®¾ VM 使用的 DNS æœåŠ¡å™¨ï¼Œå°†é€šè¿‡æ‚¨ç¨åŽè¦æ·»åŠ çš„公用网络进行访问。此区域的公用 IP 地å€å¿…须路由到在此处指定的 DNS æœåŠ¡å™¨ã€‚ -message.setup.successful=å·²æˆåŠŸè®¾ç½®äº‘! -label.may.continue=您现在å¯ä»¥ç»§ç»­è¿›è¡Œæ“作。 -error.installWizard.message=出现问题；请返回并更正任何错误 -message.installWizard.now.building=现在正在构建您的云... -message.installWizard.click.retry=请å•å‡»æ­¤æŒ‰é’®é‡æ–°å°è¯•å¯åŠ¨ã€‚ -label.launch=å¯åŠ¨ -label.installWizard.click.launch=请å•å‡»â€œå¯åŠ¨â€æŒ‰é’®ã€‚ -label.congratulations=ç¥è´ºæ‚¨! -label.installWizard.addSecondaryStorageIntro.subtitle=什么是辅助存储? -label.installWizard.addSecondaryStorageIntro.title=添加一个辅助存储 -label.installWizard.addPrimaryStorageIntro.subtitle=什么是主存储? -label.installWizard.addPrimaryStorageIntro.title=添加一个主存储 -label.installWizard.addHostIntro.subtitle=什么是主机? -label.installWizard.addHostIntro.title=添加一个主机 -label.installWizard.addClusterIntro.subtitle=什么是群集? -label.installWizard.addClusterIntro.title=添加一个群集 -label.installWizard.addPodIntro.subtitle=什么是æ供点? -label.installWizard.addPodIntro.title=添加一个æ供点 -label.installWizard.addZone.title=添加区域 -label.installWizard.addZoneIntro.subtitle=什么是区域? -label.installWizard.addZoneIntro.title=添加一个区域 -error.password.not.match=密ç å­—段ä¸ä¸€è‡´ -label.confirm.password=ç¡®è®¤å¯†ç  -message.change.password=请更改您的密ç ã€‚ -label.save.and.continue=ä¿å­˜å¹¶ç»§ç»­ -label.skip.guide=我以å‰ä½¿ç”¨è¿‡ CloudStackï¼Œè·³è¿‡æ­¤æŒ‡å— -label.continue.basic.install=继续执行基本安装 -label.introduction.to.cloudstack=CloudStack™ 简介 -label.what.is.cloudstack=什么是 CloudStack™? -label.hints=æ示 -label.installWizard.subtitle=此教程将帮助您设置 CloudStack™ 安装 -label.continue=继续 -label.installWizard.title=您好，欢迎使用 CloudStack™ -label.agree=åŒæ„ -label.manage.resources=管ç†èµ„æº -label.port.forwarding.policies=端å£è½¬å‘ç­–ç•¥ -label.load.balancing.policies=负载平衡策略 -label.networking.and.security=网络连接与安全 -label.bandwidth=带宽 -label.virtual.machines=虚拟机 -label.compute.and.storage=计算与存储 -label.task.completed=已完æˆä»»åŠ¡ -label.update.project.resources=æ›´æ–°é¡¹ç›®èµ„æº -label.remove.project.account=删除项目å¸æˆ· -label.item.listing=项目列表 -message.select.item=请选择一个项目。 -label.removing=正在删除 -label.invite=邀请 -label.add.by=æ·»åŠ æ–¹å¼ -label.max.vms=最大用户 VM æ•° -label.max.public.ips=最大公用 IP æ•° -label.max.volumes=最大å·æ•° -label.max.snapshots=最大快照数 -label.max.templates=最大模æ¿æ•° -label.project.dashboard=é¡¹ç›®æŽ§åˆ¶æ¿ -label.remind.later=以åŽæ醒我 -label.invited.accounts=已邀请的å¸æˆ· -label.invite.to=邀请加入 -label.add.accounts.to=添加å¸æˆ·è‡³ -label.add.accounts=添加å¸æˆ· -label.project.name=项目å称 -label.create.project=创建项目 -label.networks=网络 -label.launch.vm=å¯åŠ¨ VM -label.new.vm=新建 VM -label.previous=上一步 -label.add.to.group=添加到组 -message.vm.review.launch=请先核对以下信æ¯ï¼Œç¡®è®¤æ‚¨çš„虚拟实例正确无误，然åŽå†å¯åŠ¨ã€‚ -message.select.security.groups=请为您的新 VM 选择安全组 -label.new=新建 -message.please.select.networks=请为您的虚拟机选择网络。 -message.please.proceed=请继续执行下个步骤。 -message.zone.no.network.selection=所选区域无任何网络选项。 -label.no.thanks=ä¸ï¼Œè°¢è°¢ -label.my.templates=æˆ‘çš„æ¨¡æ¿ -message.select.template=请为您的新虚拟实例选择一个模æ¿ã€‚ -message.select.iso=请为您的新虚拟实例选择一个 ISO。 -message.template.desc=å¯ç”¨äºŽå¯åŠ¨ VM çš„æ“ä½œç³»ç»Ÿæ˜ åƒ -message.iso.desc=包å«æ“作系统的数æ®æˆ–å¯å¯åŠ¨ä»‹è´¨çš„ç£ç›˜æ˜ åƒ -label.select.iso.or.template=选择 ISO æˆ–æ¨¡æ¿ -message.select.a.zone=一个区域通常与一个数æ®ä¸­å¿ƒç›¸å¯¹åº”。多个区域å¯ä»¥æ供物ç†éš”离和冗余，有助于使云更加å¯é ã€‚ -label.select.a.zone=选择一个区域 -label.review=核对 -label.select.a.template=é€‰æ‹©ä¸€ä¸ªæ¨¡æ¿ -label.setup=设置 -state.Allocated=å·²åˆ†é… -changed.item.properties=更改项目属性 -label.apply=应用 -label.default=默认值 -label.viewing=正在查看 -label.move.to.top=移至顶部 -label.move.up.row=å‘上移动一行 -label.move.down.row=å‘下移动一行 -label.move.to.bottom=移至底部 -label.drag.new.position=拖动到新ä½ç½® -label.order=æŽ’åº -label.no.data=æ— å¯æ˜¾ç¤ºçš„æ•°æ® -label.change.value=更改值 -label.clear.list=清除列表 -label.full.path=完整路径 -message.add.domain=请指定è¦åœ¨æ­¤åŸŸä¸‹åˆ›å»ºçš„å­åŸŸ -message.delete.user=请确认您确实è¦åˆ é™¤æ­¤ç”¨æˆ·ã€‚ -message.enable.user=请确认您确实è¦å¯ç”¨æ­¤ç”¨æˆ·ã€‚ -message.disable.user=请确认您确实è¦ç¦ç”¨æ­¤ç”¨æˆ·ã€‚ -message.generate.keys=请确认您确实è¦ä¸ºæ­¤ç”¨æˆ·ç”Ÿæˆæ–°å¯†é’¥ã€‚ -message.update.resource.count=请确认您确实è¦æ›´æ–°æ­¤å¸æˆ·çš„资æºæ•°ã€‚ -message.edit.account=编辑(“-1â€è¡¨ç¤ºå¯¹è¦åˆ›å»ºçš„资æºæ•°é‡æ²¡æœ‰ä»»ä½•é™åˆ¶) -label.total.of.vm=总 VM æ•° -label.total.of.ip=总 IP 地å€æ•° -state.enabled=å·²å¯ç”¨ -message.action.download.iso=请确认您确实è¦ä¸‹è½½æ­¤ ISO。 -message.action.download.template=请确认您确实è¦ä¸‹è½½æ­¤æ¨¡æ¿ã€‚ -label.destination.zone=目标区域 -label.keyboard.type=键盘类型 -label.nic.adapter.type=NIC 适é…器类型 -label.root.disk.controller=æ ¹ç£ç›˜æŽ§åˆ¶å™¨ -label.community=社区 -label.remove.egress.rule=删除出å£è§„则 -label.add.egress.rule=添加出å£è§„则 -label.egress.rule=出å£è§„则 -label.remove.ingress.rule=删除入å£è§„则 -label.delete.vpn.user=删除 VPN 用户 -label.add.vpn.user=添加 VPN 用户 -label.remove.pf=删除端å£è½¬å‘规则 -label.remove.vm.from.lb=从负载平衡器规则中删除 VM -label.add.vms.to.lb=å‘负载平衡器规则中添加 VM -label.add.vm=添加 VM -label.remove.static.nat.rule=删除é™æ€ NAT 规则 -label.remove.rule=删除规则 -label.add.static.nat.rule=添加é™æ€ NAT 规则 -label.add.rule=添加规则 -label.configuration=é…ç½® -message.disable.vpn=是å¦ç¡®å®žè¦ç¦ç”¨ VPN? -label.disable.vpn=ç¦ç”¨ VPN -message.enable.vpn=请确认您确实è¦å¯¹æ­¤ IP 地å€å¯ç”¨ VPN 访问。 -label.enable.vpn=å¯ç”¨ VPN -message.acquire.new.ip=请确认您确实è¦ä¸ºæ­¤ç½‘络获å–一个新 IP。 -label.elastic=弹性 -label.my.network=我的网络 -label.add.vms=添加 VM -label.configure=é…ç½® -label.stickiness=粘性 -label.source=æºç®—法 -label.least.connections=最少连接算法 -label.round.robin=轮询算法 -label.restart.required=需è¦é‡æ–°å¯åŠ¨ -label.clean.up=清除 -label.restart.network=é‡æ–°å¯åŠ¨ç½‘络 -label.edit.network.details=编辑网络详情 -label.add.guest.network=添加æ¥å®¾ç½‘络 -label.guest.networks=æ¥å®¾ç½‘络 -message.ip.address.changed=您的 IP 地å€å¯èƒ½å·²å‘生å˜åŒ–；是å¦è¦åˆ·æ–°æ­¤åˆ—表? 请注æ„，刷新此列表时，“详细信æ¯â€çª—格将关闭。 -state.BackingUp=正在备份 -state.BackedUp=已备份 -label.done=å®Œæˆ -label.vm.name=VM å称 -message.migrate.volume=请确认您确实è¦å°†å·è¿ç§»åˆ°å…¶ä»–主存储。 -label.migrate.volume=å°†å·è¿ç§»åˆ°å…¶ä»–主存储 -message.create.template=是å¦ç¡®å®žè¦åˆ›å»ºæ¨¡æ¿? -label.create.template=åˆ›å»ºæ¨¡æ¿ -message.download.volume.confirm=请确认您确实è¦ä¸‹è½½æ­¤å· -message.detach.disk=是å¦ç¡®å®žè¦å–消附加此ç£ç›˜? -state.ready=已就绪 -state.Ready=已就绪 -label.vm.display.name=VM 显示å称 -label.select-view=选择视图 -label.local.storage=本地存储 -label.direct.ips=直接 IP -label.view.all=查看全部 -label.zone.details=区域详情 -message.alert.state.detected=æ£€æµ‹åˆ°è­¦æŠ¥çŠ¶æ€ -state.Starting=正在å¯åŠ¨ -state.Expunging=正在删除 -state.Creating=正在创建 -message.decline.invitation=是å¦ç¡®å®žè¦æ‹’ç»æ­¤é¡¹ç›®é‚€è¯·? -label.decline.invitation=æ‹’ç»é‚€è¯· -message.confirm.join.project=请确认您确实è¦åŠ å…¥æ­¤é¡¹ç›®ã€‚ -message.join.project=您现在已加入了一个项目。请切æ¢åˆ°â€œé¡¹ç›®è§†å›¾â€ä»¥æŸ¥çœ‹é¡¹ç›®ã€‚ -label.accept.project.invitation=接å—项目邀请 -label.token=令牌 -label.project.id=项目 ID -message.enter.token=请输入您在邀请电å­é‚®ä»¶ä¸­æ”¶åˆ°çš„令牌。 -label.enter.token=输入令牌 -state.Accepted=å·²æŽ¥å— -state.Pending=待定 -state.Completed=å·²å®Œæˆ -state.Declined=å·²æ‹’ç» -label.project=项目 -label.invitations=邀请 -label.delete.project=删除项目 -message.delete.project=是å¦ç¡®å®žè¦åˆ é™¤æ­¤é¡¹ç›®? -message.activate.project=是å¦ç¡®å®žè¦æ¿€æ´»æ­¤é¡¹ç›®? -label.activate.project=激活项目 -label.suspend.project=æš‚åœé¡¹ç›® -message.suspend.project=是å¦ç¡®å®žè¦æš‚åœæ­¤é¡¹ç›®? -state.Suspended=å·²æš‚åœ -label.edit.project.details=编辑项目详情 -label.new.project=新建项目 -state.Active=活动 -state.Disabled=å·²ç¦ç”¨ -label.projects=项目 -label.make.project.owner=设为å¸æˆ·é¡¹ç›®æ‰€æœ‰è€… -label.remove.project.account=从项目中删除å¸æˆ· -message.project.invite.sent=å‘é€ç»™ç”¨æˆ·çš„邀请；用户接å—邀请åŽï¼Œå°†åŠ å…¥åˆ°é¡¹ç›®ä¸­ -label.add.account.to.project=å‘项目中添加å¸æˆ· -label.revoke.project.invite=撤销邀请 -label.project.invite=邀请加入项目 -label.select.project=选择项目 -message.no.projects=您没有任何项目。
请从“项目â€éƒ¨åˆ†ä¸­åˆ›å»ºä¸€ä¸ªæ–°é¡¹ç›®ã€‚ -message.no.projects.adminOnly=您没有任何项目。
请è¦æ±‚管ç†å‘˜åˆ›å»ºä¸€ä¸ªæ–°é¡¹ç›®ã€‚ -message.pending.projects.1=您有待定项目邀请: -message.pending.projects.2=è¦æŸ¥çœ‹ï¼Œè¯·è½¬è‡³â€œé¡¹ç›®â€éƒ¨åˆ†ï¼Œç„¶åŽä»Žä¸‹æ‹‰åˆ—表中选择“邀请â€ã€‚ -message.instanceWizard.noTemplates=您没有任何å¯ç”¨æ¨¡æ¿ï¼›è¯·æ·»åŠ ä¸€ä¸ªå…¼å®¹çš„模æ¿ï¼Œç„¶åŽé‡æ–°å¯åŠ¨å®žä¾‹å‘导。 -label.view=查看 -instances.actions.reboot.label=é‡æ–°å¯åŠ¨å®žä¾‹ -label.filterBy=过滤ä¾æ® -label.ok=确定 -notification.reboot.instance=é‡æ–°å¯åŠ¨å®žä¾‹ -notification.start.instance=å¯åŠ¨å®žä¾‹ -notification.stop.instance=åœæ­¢å®žä¾‹ -label.display.name=显示å称 -label.zone.name=区域å称 -ui.listView.filters.all=全部 -ui.listView.filters.mine=本用户 -state.Running=正在è¿è¡Œ -state.Stopped=å·²åœæ­¢ -state.Destroyed=å·²é”€æ¯ -state.Error=错误 -message.reset.password.warning.notPasswordEnabled=创建此实例的模æ¿æ—¶æœªå¯ç”¨å¯†ç  -message.reset.password.warning.notStopped=必须先åœæ­¢æ‚¨çš„实例，æ‰èƒ½å°è¯•æ›´æ”¹å…¶å½“å‰å¯†ç  -label.notifications=通知 -label.default.view=默认视图 -label.project.view=项目视图 - -message.add.system.service.offering=请填写以下数æ®ä»¥æ·»åŠ ä¸€ä¸ªæ–°çš„系统æœåŠ¡æ–¹æ¡ˆã€‚ -message.action.delete.system.service.offering=请确认您确实è¦åˆ é™¤æ­¤ç³»ç»ŸæœåŠ¡æ–¹æ¡ˆã€‚ -label.action.delete.system.service.offering=删除系统æœåŠ¡æ–¹æ¡ˆ -label.hypervisor.capabilities=虚拟机管ç†ç¨‹åºåŠŸèƒ½ -label.hypervisor.version=虚拟机管ç†ç¨‹åºç‰ˆæœ¬ -label.max.guest.limit=最大æ¥å®¾æ•°é™åˆ¶ -label.add.network.offering=添加网络方案 -label.supported.services=支æŒçš„æœåŠ¡ -label.service.capabilities=æœåŠ¡åŠŸèƒ½ -label.guest.type=æ¥å®¾ç±»åž‹ -label.specify.IP.ranges=指定 IP 范围 -label.conserve.mode=ä¿æŠ¤æ¨¡å¼ -label.created.by.system=由系统创建 -label.menu.system.service.offerings=系统方案 -label.add.system.service.offering=添加系统æœåŠ¡æ–¹æ¡ˆ -label.redundant.router.capability=冗余路由器功能 -label.supported.source.NAT.type=支æŒçš„æº NAT 类型 -label.elastic.LB=弹性负载平衡器 -label.LB.isolation=负载平衡器隔离 -label.elastic.IP=弹性 IP -label.network.label.display.for.blank.value=使用默认网关 -label.xen.traffic.label=XenServer æµé‡æ ‡ç­¾ -label.kvm.traffic.label=KVM æµé‡æ ‡ç­¾ -label.vmware.traffic.label=VMware æµé‡æ ‡ç­¾ -label.start.IP=起始 IP -label.end.IP=ç»“æŸ IP -label.remove.ip.range=删除 IP 范围 -label.ip.ranges=IP 范围 -label.start.vlan=起始 VLAN -label.end.vlan=ç»“æŸ VLAN -label.broadcast.domain.range=广播域范围 -label.compute=计算 -message.add.guest.network=请确认您确实è¦æ·»åŠ ä¸€ä¸ªæ¥å®¾ç½‘络 -label.subdomain.access=å­åŸŸè®¿é—® -label.guest.start.ip=æ¥å®¾èµ·å§‹ IP -label.guest.end.ip=æ¥å®¾ç»“æŸ IP -label.virtual.router=虚拟路由器 -label.physical.network.ID=物ç†ç½‘络 ID -label.destination.physical.network.id=目标物ç†ç½‘络 ID -label.dhcp=DHCP -label.destroy.router=销æ¯è·¯ç”±å™¨ -message.confirm.destroy.router=请确认您确实è¦é”€æ¯æ­¤è·¯ç”±å™¨ -label.change.service.offering=更改æœåŠ¡æ–¹æ¡ˆ -label.view.console=æŸ¥çœ‹æŽ§åˆ¶å° -label.redundant.state=å†—ä½™çŠ¶æ€ -label.enable.provider=å¯ç”¨æä¾›ç¨‹åº -message.confirm.enable.provider=请确认您确实è¦å¯ç”¨æ­¤æä¾›ç¨‹åº -label.disable.provider=ç¦ç”¨æä¾›ç¨‹åº -message.confirm.disable.provider=请确认您确实è¦ç¦ç”¨æ­¤æä¾›ç¨‹åº -label.shutdown.provider=关闭æä¾›ç¨‹åº -message.confirm.shutdown.provider=请确认您确实è¦å…³é—­æ­¤æä¾›ç¨‹åº -label.netScaler=NetScaler -label.add.new.NetScaler=添加新 NetScaler -label.capacity=å®¹é‡ -label.dedicated=专用 -label.f5=F5 -label.add.new.F5=添加新 F5 -label.srx=SRX -label.providers=æä¾›ç¨‹åº -label.add.new.SRX=添加新 SRX -label.timeout=超时 -label.public.network=公用网络 -label.private.network=专用网络 -label.enable.swift=å¯ç”¨ SWIFT -confirm.enable.swift=请填写以下信æ¯ä»¥å¯ç”¨å¯¹ SWIFT çš„æ”¯æŒ -message.after.enable.swift=å·²é…ç½® SWIFT。注æ„: 退出此页é¢åŽï¼Œæ‚¨å°†æ— æ³•å†æ¬¡é‡æ–°é…ç½® SWIFT。 -label.key=密钥 -label.delete.NetScaler=删除 NetScaler -message.confirm.delete.NetScaler=请确认您确实è¦åˆ é™¤ NetScaler -label.delete.F5=删除 F5 -message.confirm.delete.F5=请确认您确实è¦åˆ é™¤ F5 -label.delete.SRX=删除 SRX -message.confirm.delete.SRX=请确认您确实è¦åˆ é™¤ SRX -label.pods=æ供点 -label.pod.name=æ供点å称 -label.reserved.system.gateway=预留的系统网关 -label.reserved.system.netmask=é¢„ç•™çš„ç³»ç»Ÿç½‘ç»œæŽ©ç  -label.start.reserved.system.IP=起始预留系统 IP -label.end.reserved.system.IP=结æŸé¢„留系统 IP -label.clusters=群集 -label.cluster.name=群集å称 -label.host.MAC=主机 MAC -label.agent.username=代ç†ç”¨æˆ·å -label.agent.password=代ç†å¯†ç  -message.confirm.action.force.reconnect=请确认您确实è¦å¼ºåˆ¶é‡æ–°è¿žæŽ¥æ­¤ä¸»æœºã€‚ -label.resource.state=资æºçŠ¶æ€ -label.LUN.number=LUN å· -message.confirm.remove.IP.range=请确认您确实è¦åˆ é™¤æ­¤ IP 范围。 -message.tooltip.zone.name=区域å称。 -message.tooltip.dns.1=供区域中的 VM 使用的 DNS æœåŠ¡å™¨å称。区域的公用 IP 地å€å¿…须路由到此æœåŠ¡å™¨ã€‚ -message.tooltip.dns.2=供区域中的 VM 使用的辅助 DNS æœåŠ¡å™¨å称。区域的公用 IP 地å€å¿…须路由到此æœåŠ¡å™¨ã€‚ -message.tooltip.internal.dns.1=供区域中的 CloudStack 内部系统 VM 使用的 DNS æœåŠ¡å™¨å称。æ供点的专用 IP 地å€å¿…须路由到此æœåŠ¡å™¨ã€‚ -message.tooltip.internal.dns.2=供区域中的 CloudStack 内部系统 VM 使用的 DNS æœåŠ¡å™¨å称。æ供点的专用 IP 地å€å¿…须路由到此æœåŠ¡å™¨ã€‚ -message.tooltip.network.domain=DNS åŽç¼€ï¼Œå°†ä¸ºç”±æ¥å®¾ VM 访问的网络创建一个自定义域å。 -message.tooltip.pod.name=æ­¤æ供点的å称。 -message.tooltip.reserved.system.gateway=æ供点中的主机网关。 -message.tooltip.reserved.system.netmask=用于定义æ供点å­ç½‘的网络å‰ç¼€ã€‚请使用 CIDR 符å·ã€‚ -message.creating.zone=正在创建区域 -message.creating.physical.networks=正在创建物ç†ç½‘络 -message.configuring.physical.networks=正在é…置物ç†ç½‘络 -message.adding.Netscaler.device=正在添加 Netscaler 设备 -message.creating.pod=正在创建æ供点 -message.configuring.public.traffic=正在é…置公共æµé‡ -message.configuring.storage.traffic=正在é…置存储æµé‡ -message.configuring.guest.traffic=正在é…ç½®æ¥å®¾æµé‡ -message.creating.cluster=正在创建群集 -message.adding.host=正在添加主机 -message.creating.primary.storage=正在创建主存储 -message.creating.secondary.storage=正在创建辅助存储 -message.Zone.creation.complete=已完æˆåˆ›å»ºåŒºåŸŸ -message.enabling.zone=正在å¯ç”¨åŒºåŸŸ -error.something.went.wrong.please.correct.the.following=出现问题；请更正以下å„项 -error.could.not.enable.zone=无法å¯ç”¨åŒºåŸŸ -message.zone.creation.complete.would.you.like.to.enable.this.zone=已完æˆåˆ›å»ºåŒºåŸŸã€‚是å¦è¦å¯ç”¨æ­¤åŒºåŸŸ? -message.please.add.at.lease.one.traffic.range=请至少添加一个æµé‡èŒƒå›´ã€‚ -message.you.must.have.at.least.one.physical.network=您必须至少拥有一个物ç†ç½‘络 -message.please.select.a.different.public.and.management.network.before.removing=请先选择其他公共管ç†ç½‘络，然åŽå†åˆ é™¤ - -label.zone.type=区域类型 -label.setup.zone=设置区域 -label.setup.network=设置网络 -label.add.resources=æ·»åŠ èµ„æº -label.launch=å¯åŠ¨ -label.set.up.zone.type=设置区域类型 -message.please.select.a.configuration.for.your.zone=请为您的区域选择一ç§é…置。 -message.desc.basic.zone=æ供一个网络，将直接从此网络中为æ¯ä¸ª VM 实例分é…一个 IP。å¯ä»¥é€šè¿‡å®‰å…¨ç»„等第 3 层方å¼æä¾›æ¥å®¾éš”离(IP 地å€æºè¿‡æ»¤)。 -label.basic=基本 -message.desc.advanced.zone=适用于更加å¤æ‚的网络拓扑。此网络模å¼åœ¨å®šä¹‰æ¥å®¾ç½‘络并æ供防ç«å¢™ã€VPN 或负载平衡器支æŒç­‰è‡ªå®šä¹‰ç½‘络方案方é¢æ供了最大的çµæ´»æ€§ã€‚ -label.advanced=高级 -message.desc.zone=区域是 CloudStack 中最大的组织å•ä½ï¼Œä¸€ä¸ªåŒºåŸŸé€šå¸¸ä¸Žä¸€ä¸ªæ•°æ®ä¸­å¿ƒç›¸å¯¹åº”。区域å¯æ供物ç†éš”离和冗余。一个区域由一个或多个æ供点以åŠç”±åŒºåŸŸä¸­çš„所有æ供点共享的一个辅助存储æœåŠ¡å™¨ç»„æˆï¼Œå…¶ä¸­æ¯ä¸ªæ供点中包å«å¤šä¸ªä¸»æœºå’Œä¸»å­˜å‚¨æœåŠ¡å™¨ã€‚ -label.physical.network=物ç†ç½‘络 -label.public.traffic=公共æµé‡ -label.guest.traffic=æ¥å®¾æµé‡ -label.storage.traffic=存储æµé‡ -message.setup.physical.network.during.zone.creation=添加高级区域时，需è¦è®¾ç½®ä¸€ä¸ªæˆ–多个物ç†ç½‘络。æ¯ä¸ªç½‘络都与虚拟机管ç†ç¨‹åºä¸­çš„一个 NIC 相对应。æ¯ä¸ªç‰©ç†ç½‘络中å¯ä»¥åŒ…å«ä¸€ç§æˆ–多ç§æµé‡ç±»åž‹ï¼Œå¹¶å¯¹è¿™äº›æµé‡ç±»åž‹å¯èƒ½çš„组åˆæ–¹å¼è®¾ç½®äº†æŸäº›é™åˆ¶ã€‚

å¯ä»¥å°†ä¸€ç§æˆ–多ç§æµé‡ç±»åž‹æ‹–放到æ¯ä¸ªç‰©ç†ç½‘络中。 -label.add.physical.network=添加物ç†ç½‘络 -label.traffic.types=æµé‡ç±»åž‹ -label.management=ç®¡ç† -label.guest=æ¥å®¾ -label.please.specify.netscaler.info=请指定 Netscaler ä¿¡æ¯ -message.public.traffic.in.advanced.zone=云中的 VM 访问 Internet 时将生æˆå…¬å…±æµé‡ï¼Œä½†å¿…须分é…å¯å…¬å¼€è®¿é—®çš„ IP æ‰èƒ½å®žçŽ°ã€‚最终用户å¯ä»¥ä½¿ç”¨ CloudStack UI 获å–这些 IP，以在其æ¥å®¾ç½‘络与公用网络之间执行 NAT。

请至少为 Internet æµé‡æ供一个 IP 地å€èŒƒå›´ã€‚ -message.public.traffic.in.basic.zone=云中的 VM 访问 Internet 或通过 Internet å‘客户端æä¾›æœåŠ¡æ—¶å°†ç”Ÿæˆå…¬å…±æµé‡ï¼Œä½†å¿…须分é…å¯å…¬å¼€è®¿é—®çš„ IP æ‰èƒ½å®žçŽ°ã€‚创建实例时，将把这一组公用 IP 中的 IP (æ¥å®¾ IP 地å€é™¤å¤–)分é…给此实例。é™æ€ 1-1 NAT 将在公用 IP 与æ¥å®¾ IP 之间自动设置。最终用户还å¯ä»¥ä½¿ç”¨ CloudStack UI 获å–其他 IP，以在其实例与公用 IP 之间执行é™æ€ NAT。 -message.add.pod.during.zone.creation=æ¯ä¸ªåŒºåŸŸä¸­å¿…须包å«ä¸€ä¸ªæˆ–多个æ供点，现在我们将添加第一个æ供点。æ供点中包å«ä¸»æœºå’Œä¸»å­˜å‚¨æœåŠ¡å™¨ï¼Œæ‚¨å°†åœ¨éšåŽçš„æŸä¸ªæ­¥éª¤ä¸­æ·»åŠ è¿™äº›ä¸»æœºå’ŒæœåŠ¡å™¨ã€‚首先，请为 CloudStack 的内部管ç†æµé‡é…置一个预留 IP 地å€èŒƒå›´ã€‚预留的 IP 范围对云中的æ¯ä¸ªåŒºåŸŸæ¥è¯´å¿…须唯一。 -message.guest.traffic.in.advanced.zone=æ¥å®¾ç½‘络æµé‡æ˜¯æŒ‡æœ€ç»ˆç”¨æˆ·è™šæ‹Ÿæœºä¹‹é—´çš„通信。指定一个 VLAN ID 范围å¯ä¼ é€æ¯ä¸ªç‰©ç†ç½‘络的æ¥å®¾æµé‡ã€‚ -message.guest.traffic.in.basic.zone=æ¥å®¾ç½‘络æµé‡æ˜¯æŒ‡æœ€ç»ˆç”¨æˆ·è™šæ‹Ÿæœºä¹‹é—´çš„通信。应指定一个 CloudStack å¯ä»¥åˆ†é…ç»™æ¥å®¾ VM çš„ IP 地å€èŒƒå›´ã€‚请确ä¿æ­¤èŒƒå›´ä¸Žé¢„留的系统 IP 范围ä¸é‡å ã€‚ -message.storage.traffic=CloudStack 内部资æº(包括与管ç†æœåŠ¡å™¨é€šä¿¡çš„任何组件，例如主机和 CloudStack 系统 VM)之间的æµé‡ã€‚请在此处é…置存储æµé‡ã€‚ -message.desc.cluster=æ¯ä¸ªæ供点中必须包å«ä¸€ä¸ªæˆ–多个群集，现在我们将添加第一个群集。群集æ供了一ç§ç¼–组主机的方法。群集中的所有主机都具有相åŒçš„硬件，è¿è¡Œç›¸åŒçš„虚拟机管ç†ç¨‹åºï¼Œä½äºŽç›¸åŒçš„å­ç½‘中，并访问相åŒçš„共享存储。æ¯ä¸ªç¾¤é›†ç”±ä¸€ä¸ªæˆ–多个主机以åŠä¸€ä¸ªæˆ–多个主存储æœåŠ¡å™¨ç»„æˆã€‚ -message.desc.host=æ¯ä¸ªç¾¤é›†ä¸­å¿…须至少包å«ä¸€ä¸ªä¸»æœºä»¥ä¾›æ¥å®¾ VM 在上é¢è¿è¡Œï¼ŒçŽ°åœ¨æˆ‘们将添加第一个主机。è¦ä½¿ä¸»æœºåœ¨ CloudStack 中è¿è¡Œï¼Œå¿…须在此主机上安装虚拟机管ç†ç¨‹åºè½¯ä»¶ï¼Œä¸ºå…¶åˆ†é…一个 IP 地å€ï¼Œå¹¶ç¡®ä¿å°†å…¶è¿žæŽ¥åˆ° CloudStack 管ç†æœåŠ¡å™¨ã€‚

请æ供主机的 DNS 或 IP 地å€ã€ç”¨æˆ·å(通常为 root)和密ç ï¼Œä»¥åŠç”¨äºŽå¯¹ä¸»æœºè¿›è¡Œåˆ†ç±»çš„任何标签。 -message.desc.primary.storage=æ¯ä¸ªç¾¤é›†ä¸­å¿…须包å«ä¸€ä¸ªæˆ–多个主存储æœåŠ¡å™¨ï¼ŒçŽ°åœ¨æˆ‘们将添加第一个主存储æœåŠ¡å™¨ã€‚主存储中包å«åœ¨ç¾¤é›†ä¸­çš„主机上è¿è¡Œçš„所有 VM çš„ç£ç›˜å·ã€‚请使用底层虚拟机管ç†ç¨‹åºæ”¯æŒçš„符åˆæ ‡å‡†çš„å议。 -message.desc.secondary.storage=æ¯ä¸ªåŒºåŸŸä¸­å¿…须至少包å«ä¸€ä¸ª NFS 或辅助存储æœåŠ¡å™¨ï¼ŒçŽ°åœ¨æˆ‘们将添加第一个 NFS 或辅助存储æœåŠ¡å™¨ã€‚辅助存储用于存储 VM 模æ¿ã€ISO 映åƒå’Œ VM ç£ç›˜å·å¿«ç…§ã€‚æ­¤æœåŠ¡å™¨å¿…须对区域中的所有æœåŠ¡å™¨å¯ç”¨ã€‚

请æä¾› IP 地å€å’Œå¯¼å‡ºè·¯å¾„。 -label.launch.zone=å¯åŠ¨åŒºåŸŸ -message.please.wait.while.zone.is.being.created=正在创建区域，请ç¨å€™ï¼›æ­¤æ“作å¯èƒ½éœ€è¦ä¸€æ®µæ—¶é—´æ‰èƒ½å®Œæˆ... - -label.load.balancing=负载平衡 -label.static.nat.enabled=å·²å¯ç”¨é™æ€ NAT -label.zones=区域 -label.view.more=查看更多 -label.number.of.zones=åŒºåŸŸæ•°é‡ -label.number.of.pods=æä¾›ç‚¹æ•°é‡ -label.number.of.clusters=ç¾¤é›†æ•°é‡ -label.number.of.hosts=ä¸»æœºæ•°é‡ -label.total.hosts=总主机数 -label.total.CPU=CPU æ€»é‡ -label.total.memory=å†…å­˜æ€»é‡ -label.total.storage=å­˜å‚¨æ€»é‡ -label.purpose=目的 - - - - -label.action.migrate.router=è¿ç§»è·¯ç”±å™¨ -label.action.migrate.router.processing=正在è¿ç§»è·¯ç”±å™¨... -message.migrate.router.confirm=请确认您è¦å°†è·¯ç”±å™¨è¿ç§»åˆ°çš„主机: -label.migrate.router.to=è¿ç§»è·¯ç”±å™¨è‡³ - -label.action.migrate.systemvm=è¿ç§»ç³»ç»Ÿ VM -label.action.migrate.systemvm.processing=正在è¿ç§»ç³»ç»Ÿ VM... -message.migrate.systemvm.confirm=请确认您è¦å°†ç³»ç»Ÿ VM è¿ç§»åˆ°çš„主机: -label.migrate.systemvm.to=è¿ç§»ç³»ç»Ÿ VM 至 - - -mode=æ¨¡å¼ -side.by.side=并行 -inline=å†…è” - -extractable=å¯æå– - -label.ocfs2=OCFS2 - -label.action.edit.host=编辑主机 - -network.rate=网络速率 - -ICMP.type=ICMP 类型 -ICMP.code=ICMP ä»£ç  - -image.directory=图片目录 - -label.action.create.template.from.vm=基于 VM åˆ›å»ºæ¨¡æ¿ -label.action.create.template.from.volume=基于å·åˆ›å»ºæ¨¡æ¿ - -message.vm.create.template.confirm=创建模æ¿å°†è‡ªåŠ¨é‡æ–°å¯åŠ¨ VM。 - -label.action.manage.cluster=托管群集 -message.action.manage.cluster=请确认您确实è¦æ‰˜ç®¡æ­¤ç¾¤é›†ã€‚ -label.action.manage.cluster.processing=正在托管群集... - -label.action.unmanage.cluster=å–消托管群集 -message.action.unmanage.cluster=请确认您确实è¦å–消托管此群集。 -label.action.unmanage.cluster.processing=正在å–消托管群集... - -label.allocation.state=分é…çŠ¶æ€ -managed.state=æ‰˜ç®¡çŠ¶æ€ - -label.default.use=默认使用 -label.host.tags=主机标签 +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +changed.item.properties=\u66f4\u6539\u9879\u76ee\u5c5e\u6027 +confirm.enable.s3=\u8bf7\u586b\u5199\u4e0b\u5217\u4fe1\u606f\u4ee5\u542f\u7528\u652f\u6301S3\u7684\u4e8c\u7ea7\u5b58\u50a8 +confirm.enable.swift=\u8bf7\u586b\u5199\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u542f\u7528\u5bf9 SWIFT \u7684\u652f\u6301 +error.could.not.enable.zone=\u65e0\u6cd5\u542f\u7528\u533a\u57df +error.installWizard.message=\u51fa\u73b0\u95ee\u9898\uff1b\u8bf7\u8fd4\u56de\u5e76\u66f4\u6b63\u4efb\u4f55\u9519\u8bef +error.invalid.username.password=\u7528\u6237\u540d\u6216\u5bc6\u7801\u65e0\u6548 +error.login=\u60a8\u7684\u7528\u6237\u540d/\u5bc6\u7801\u4e0e\u6211\u4eec\u7684\u8bb0\u5f55\u4e0d\u4e00\u81f4\u3002 +error.menu.select=\u6b63\u5728\u9009\u62e9\u9879\u76ee\uff0c\u65e0\u6cd5\u6267\u884c\u64cd\u4f5c\u3002 +error.mgmt.server.inaccessible=\u65e0\u6cd5\u8bbf\u95ee\u7ba1\u7406\u670d\u52a1\u5668\u3002\u8bf7\u7a0d\u540e\u518d\u8bd5\u3002 +error.password.not.match=\u5bc6\u7801\u5b57\u6bb5\u4e0d\u4e00\u81f4 +error.please.specify.physical.network.tags=\u7f51\u7edc\u65b9\u6848\u5728\u60a8\u4e3a\u6b64\u7269\u7406\u7f51\u7edc\u6307\u5b9a\u6807\u7b7e\u4e4b\u540e\u624d\u53ef\u7528\u3002 +error.session.expired=\u60a8\u7684\u4f1a\u8bdd\u5df2\u8fc7\u671f\u3002 +error.something.went.wrong.please.correct.the.following=\u51fa\u73b0\u95ee\u9898\uff1b\u8bf7\u66f4\u6b63\u4ee5\u4e0b\u5404\u9879 +error.unable.to.reach.management.server=\u65e0\u6cd5\u8bbf\u95ee\u7ba1\u7406\u670d\u52a1\u5668 +error.unresolved.internet.name=\u65e0\u6cd5\u89e3\u6790\u60a8\u7684 Internet \u540d\u79f0\u3002 +extractable=\u53ef\u63d0\u53d6 +force.delete.domain.warning=\u8b66\u544a\: \u9009\u62e9\u6b64\u9009\u9879\u5c06\u5bfc\u81f4\u5220\u9664\u6240\u6709\u5b50\u57df\u4ee5\u53ca\u6240\u6709\u76f8\u5173\u8054\u7684\u5e10\u6237\u53ca\u5176\u8d44\u6e90\u3002 +force.delete=\u5f3a\u5236\u5220\u9664 +force.remove.host.warning=\u8b66\u544a\: \u9009\u62e9\u6b64\u9009\u9879\u5c06\u5bfc\u81f4 CloudStack \u5728\u4ece\u7fa4\u96c6\u4e2d\u79fb\u9664\u6b64\u4e3b\u673a\u4e4b\u524d\uff0c\u5f3a\u5236\u505c\u6b62\u6240\u6709\u6b63\u5728\u8fd0\u884c\u7684\u865a\u62df\u673a\u3002 +force.remove=\u5f3a\u5236\u79fb\u9664 +force.stop.instance.warning=\u8b66\u544a\: \u9664\u975e\u4e07\u4e0d\u5f97\u5df2\uff0c\u5426\u5219\u4e0d\u5e94\u5f3a\u5236\u505c\u6b62\u6b64\u5b9e\u4f8b\u3002\u505c\u6b62\u6b64\u5b9e\u4f8b\u53ef\u80fd\u4f1a\u5bfc\u81f4\u6570\u636e\u4e22\u5931\u4ee5\u53ca\u81f4\u4f7f\u865a\u62df\u673a\u72b6\u6001\u4e0d\u4e00\u81f4\u3002 +force.stop=\u5f3a\u5236\u505c\u6b62 +ICMP.code=ICMP \u4ee3\u7801 +ICMP.type=ICMP \u7c7b\u578b +image.directory=\u56fe\u7247\u76ee\u5f55 +inline=\u5185\u8054 +instances.actions.reboot.label=\u91cd\u65b0\u542f\u52a8\u5b9e\u4f8b +label.accept.project.invitation=\u63a5\u53d7\u9879\u76ee\u9080\u8bf7 +label.account.and.security.group=\u5e10\u6237\u3001\u5b89\u5168\u7ec4 +label.account.id=\u5e10\u6237 ID +label.account.name=\u5e10\u6237\u540d\u79f0 +label.account.specific=\u5e10\u6237\u4e13\u7528 +label.accounts=\u5e10\u53f7 +label.account=\u5e10\u6237 +label.acquire.new.ip=\u83b7\u53d6\u65b0 IP +label.action.attach.disk.processing=\u6b63\u5728\u9644\u52a0\u78c1\u76d8... +label.action.attach.disk=\u9644\u52a0\u78c1\u76d8 +label.action.attach.iso.processing=\u6b63\u5728\u9644\u52a0 ISO... +label.action.attach.iso=\u9644\u52a0 ISO +label.action.cancel.maintenance.mode.processing=\u6b63\u5728\u53d6\u6d88\u7ef4\u62a4\u6a21\u5f0f... +label.action.cancel.maintenance.mode=\u53d6\u6d88\u7ef4\u62a4\u6a21\u5f0f +label.action.change.password=\u66f4\u6539\u5bc6\u7801 +label.action.change.service.processing=\u6b63\u5728\u66f4\u6539\u670d\u52a1... +label.action.change.service=\u66f4\u6539\u670d\u52a1 +label.action.copy.ISO.processing=\u6b63\u5728\u590d\u5236 ISO... +label.action.copy.ISO=\u590d\u5236 ISO +label.action.copy.template.processing=\u6b63\u5728\u590d\u5236\u6a21\u677f... +label.action.copy.template=\u590d\u5236\u6a21\u677f +label.action.create.template.from.vm=\u57fa\u4e8e VM \u521b\u5efa\u6a21\u677f +label.action.create.template.from.volume=\u57fa\u4e8e\u5377\u521b\u5efa\u6a21\u677f +label.action.create.template.processing=\u6b63\u5728\u521b\u5efa\u6a21\u677f... +label.action.create.template=\u521b\u5efa\u6a21\u677f +label.action.create.vm.processing=\u6b63\u5728\u521b\u5efa VM... +label.action.create.vm=\u521b\u5efa VM +label.action.create.volume.processing=\u6b63\u5728\u521b\u5efa\u5377... +label.action.create.volume=\u521b\u5efa\u5377 +label.action.delete.account.processing=\u6b63\u5728\u5220\u9664\u5e10\u6237... +label.action.delete.account=\u5220\u9664\u5e10\u6237 +label.action.delete.cluster.processing=\u6b63\u5728\u5220\u9664\u7fa4\u96c6... +label.action.delete.cluster=\u5220\u9664\u7fa4\u96c6 +label.action.delete.disk.offering.processing=\u6b63\u5728\u5220\u9664\u78c1\u76d8\u65b9\u6848... +label.action.delete.disk.offering=\u5220\u9664\u78c1\u76d8\u65b9\u6848 +label.action.delete.domain.processing=\u6b63\u5728\u5220\u9664\u57df... +label.action.delete.domain=\u5220\u9664\u57df +label.action.delete.firewall.processing=\u6b63\u5728\u5220\u9664\u9632\u706b\u5899... +label.action.delete.firewall=\u5220\u9664\u9632\u706b\u5899\u89c4\u5219 +label.action.delete.ingress.rule.processing=\u6b63\u5728\u5220\u9664\u5165\u53e3\u89c4\u5219... +label.action.delete.ingress.rule=\u5220\u9664\u5165\u53e3\u89c4\u5219 +label.action.delete.IP.range.processing=\u6b63\u5728\u5220\u9664 IP \u8303\u56f4... +label.action.delete.IP.range=\u5220\u9664 IP \u8303\u56f4 +label.action.delete.ISO.processing=\u6b63\u5728\u5220\u9664 ISO... +label.action.delete.ISO=\u5220\u9664 ISO +label.action.delete.load.balancer.processing=\u6b63\u5728\u5220\u9664\u8d1f\u8f7d\u5e73\u8861\u5668... +label.action.delete.load.balancer=\u5220\u9664\u8d1f\u8f7d\u5e73\u8861\u5668\u89c4\u5219 +label.action.delete.network.processing=\u6b63\u5728\u5220\u9664\u7f51\u7edc... +label.action.delete.network=\u5220\u9664\u7f51\u7edc +label.action.delete.nexusVswitch=\u5220\u9664 Nexus 1000v +label.action.delete.physical.network=\u5220\u9664\u7269\u7406\u7f51\u7edc +label.action.delete.pod.processing=\u6b63\u5728\u5220\u9664\u63d0\u4f9b\u70b9... +label.action.delete.pod=\u5220\u9664\u63d0\u4f9b\u70b9 +label.action.delete.primary.storage.processing=\u6b63\u5728\u5220\u9664\u4e3b\u5b58\u50a8... +label.action.delete.primary.storage=\u5220\u9664\u4e3b\u5b58\u50a8 +label.action.delete.secondary.storage.processing=\u6b63\u5728\u5220\u9664\u8f85\u52a9\u5b58\u50a8... +label.action.delete.secondary.storage=\u5220\u9664\u8f85\u52a9\u5b58\u50a8 +label.action.delete.security.group.processing=\u6b63\u5728\u5220\u9664\u5b89\u5168\u7ec4... +label.action.delete.security.group=\u5220\u9664\u5b89\u5168\u7ec4 +label.action.delete.service.offering.processing=\u6b63\u5728\u5220\u9664\u670d\u52a1\u65b9\u6848... +label.action.delete.service.offering=\u5220\u9664\u670d\u52a1\u65b9\u6848 +label.action.delete.snapshot.processing=\u6b63\u5728\u5220\u9664\u5feb\u7167... +label.action.delete.snapshot=\u5220\u9664\u5feb\u7167 +label.action.delete.system.service.offering=\u5220\u9664\u7cfb\u7edf\u670d\u52a1\u65b9\u6848 +label.action.delete.template.processing=\u6b63\u5728\u5220\u9664\u6a21\u677f... +label.action.delete.template=\u5220\u9664\u6a21\u677f +label.action.delete.user.processing=\u6b63\u5728\u5220\u9664\u7528\u6237... +label.action.delete.user=\u5220\u9664\u7528\u6237 +label.action.delete.volume.processing=\u6b63\u5728\u5220\u9664\u5377... +label.action.delete.volume=\u5220\u9664\u5377 +label.action.delete.zone.processing=\u6b63\u5728\u5220\u9664\u533a\u57df... +label.action.delete.zone=\u5220\u9664\u533a\u57df +label.action.destroy.instance.processing=\u6b63\u5728\u9500\u6bc1\u5b9e\u4f8b... +label.action.destroy.instance=\u9500\u6bc1\u5b9e\u4f8b +label.action.destroy.systemvm.processing=\u6b63\u5728\u9500\u6bc1\u7cfb\u7edf VM... +label.action.destroy.systemvm=\u9500\u6bc1\u7cfb\u7edf VM +label.action.detach.disk.processing=\u6b63\u5728\u53d6\u6d88\u9644\u52a0\u78c1\u76d8... +label.action.detach.disk=\u53d6\u6d88\u9644\u52a0\u78c1\u76d8 +label.action.detach.iso.processing=\u6b63\u5728\u53d6\u6d88\u9644\u52a0 ISO... +label.action.detach.iso=\u53d6\u6d88\u9644\u52a0 ISO +label.action.disable.account.processing=\u6b63\u5728\u7981\u7528\u5e10\u6237... +label.action.disable.account=\u7981\u7528\u5e10\u6237 +label.action.disable.cluster.processing=\u6b63\u5728\u7981\u7528\u7fa4\u96c6... +label.action.disable.cluster=\u7981\u7528\u7fa4\u96c6 +label.action.disable.nexusVswitch=\u7981\u7528 Nexus 1000v +label.action.disable.physical.network=\u7981\u7528\u7269\u7406\u7f51\u7edc +label.action.disable.pod.processing=\u6b63\u5728\u7981\u7528\u63d0\u4f9b\u70b9... +label.action.disable.pod=\u7981\u7528\u63d0\u4f9b\u70b9 +label.action.disable.static.NAT.processing=\u6b63\u5728\u7981\u7528\u9759\u6001 NAT... +label.action.disable.static.NAT=\u7981\u7528\u9759\u6001 NAT +label.action.disable.user.processing=\u6b63\u5728\u7981\u7528\u7528\u6237... +label.action.disable.user=\u7981\u7528\u7528\u6237 +label.action.disable.zone.processing=\u6b63\u5728\u7981\u7528\u533a\u57df... +label.action.disable.zone=\u7981\u7528\u533a\u57df +label.action.download.ISO=\u4e0b\u8f7d ISO +label.action.download.template=\u4e0b\u8f7d\u6a21\u677f +label.action.download.volume.processing=\u6b63\u5728\u4e0b\u8f7d\u5377... +label.action.download.volume=\u4e0b\u8f7d\u5377 +label.action.edit.account=\u7f16\u8f91\u5e10\u6237 +label.action.edit.disk.offering=\u7f16\u8f91\u78c1\u76d8\u65b9\u6848 +label.action.edit.domain=\u7f16\u8f91\u57df +label.action.edit.global.setting=\u7f16\u8f91\u5168\u5c40\u8bbe\u7f6e +label.action.edit.host=\u7f16\u8f91\u4e3b\u673a +label.action.edit.instance=\u7f16\u8f91\u5b9e\u4f8b +label.action.edit.ISO=\u7f16\u8f91 ISO +label.action.edit.network.offering=\u7f16\u8f91\u7f51\u7edc\u65b9\u6848 +label.action.edit.network.processing=\u6b63\u5728\u7f16\u8f91\u7f51\u7edc... +label.action.edit.network=\u7f16\u8f91\u7f51\u7edc +label.action.edit.pod=\u7f16\u8f91\u63d0\u4f9b\u70b9 +label.action.edit.primary.storage=\u7f16\u8f91\u4e3b\u5b58\u50a8 +label.action.edit.resource.limits=\u7f16\u8f91\u8d44\u6e90\u9650\u5236 +label.action.edit.service.offering=\u7f16\u8f91\u670d\u52a1\u65b9\u6848 +label.action.edit.template=\u7f16\u8f91\u6a21\u677f +label.action.edit.user=\u7f16\u8f91\u7528\u6237 +label.action.edit.zone=\u7f16\u8f91\u533a\u57df +label.action.enable.account.processing=\u6b63\u5728\u542f\u7528\u5e10\u6237... +label.action.enable.account=\u542f\u7528\u5e10\u6237 +label.action.enable.cluster.processing=\u6b63\u5728\u542f\u7528\u7fa4\u96c6... +label.action.enable.cluster=\u542f\u7528\u7fa4\u96c6 +label.action.enable.maintenance.mode.processing=\u6b63\u5728\u542f\u7528\u7ef4\u62a4\u6a21\u5f0f... +label.action.enable.maintenance.mode=\u542f\u7528\u7ef4\u62a4\u6a21\u5f0f +label.action.enable.nexusVswitch=\u542f\u7528 Nexus 1000v +label.action.enable.physical.network=\u542f\u7528\u7269\u7406\u7f51\u7edc +label.action.enable.pod.processing=\u6b63\u5728\u542f\u7528\u63d0\u4f9b\u70b9... +label.action.enable.pod=\u542f\u7528\u63d0\u4f9b\u70b9 +label.action.enable.static.NAT.processing=\u6b63\u5728\u542f\u7528\u9759\u6001 NAT... +label.action.enable.static.NAT=\u542f\u7528\u9759\u6001 NAT +label.action.enable.user.processing=\u6b63\u5728\u542f\u7528\u7528\u6237... +label.action.enable.user=\u542f\u7528\u7528\u6237 +label.action.enable.zone.processing=\u6b63\u5728\u542f\u7528\u533a\u57df... +label.action.enable.zone=\u542f\u7528\u533a\u57df +label.action.force.reconnect.processing=\u6b63\u5728\u91cd\u65b0\u8fde\u63a5... +label.action.force.reconnect=\u5f3a\u5236\u91cd\u65b0\u8fde\u63a5 +label.action.generate.keys.processing=\u6b63\u5728\u751f\u6210\u5bc6\u94a5... +label.action.generate.keys=\u751f\u6210\u5bc6\u94a5 +label.action.list.nexusVswitch=\u5217\u51fa Nexus 1000v +label.action.lock.account.processing=\u6b63\u5728\u9501\u5b9a\u5e10\u6237... +label.action.lock.account=\u9501\u5b9a\u5e10\u6237 +label.action.manage.cluster.processing=\u6b63\u5728\u6258\u7ba1\u7fa4\u96c6... +label.action.manage.cluster=\u6258\u7ba1\u7fa4\u96c6 +label.action.migrate.instance.processing=\u6b63\u5728\u8fc1\u79fb\u5b9e\u4f8b... +label.action.migrate.instance=\u8fc1\u79fb\u5b9e\u4f8b +label.action.migrate.router.processing=\u6b63\u5728\u8fc1\u79fb\u8def\u7531\u5668... +label.action.migrate.router=\u8fc1\u79fb\u8def\u7531\u5668 +label.action.migrate.systemvm.processing=\u6b63\u5728\u8fc1\u79fb\u7cfb\u7edf VM... +label.action.migrate.systemvm=\u8fc1\u79fb\u7cfb\u7edf VM +label.action.reboot.instance.processing=\u6b63\u5728\u91cd\u65b0\u542f\u52a8\u5b9e\u4f8b... +label.action.reboot.instance=\u91cd\u65b0\u542f\u52a8\u5b9e\u4f8b +label.action.reboot.router.processing=\u6b63\u5728\u91cd\u65b0\u542f\u52a8\u8def\u7531\u5668... +label.action.reboot.router=\u91cd\u65b0\u542f\u52a8\u8def\u7531\u5668 +label.action.reboot.systemvm.processing=\u6b63\u5728\u91cd\u65b0\u542f\u52a8\u7cfb\u7edf VM... +label.action.reboot.systemvm=\u91cd\u65b0\u542f\u52a8\u7cfb\u7edf VM +label.action.recurring.snapshot=\u91cd\u73b0\u5feb\u7167 +label.action.register.iso=\u6ce8\u518c ISO +label.action.register.template=\u6ce8\u518c\u6a21\u677f +label.action.release.ip.processing=\u6b63\u5728\u91ca\u653e IP... +label.action.release.ip=\u91ca\u653e IP +label.action.remove.host.processing=\u6b63\u5728\u5220\u9664\u4e3b\u673a... +label.action.remove.host=\u5220\u9664\u4e3b\u673a +label.action.reset.password.processing=\u6b63\u5728\u91cd\u7f6e\u5bc6\u7801... +label.action.reset.password=\u91cd\u7f6e\u5bc6\u7801 +label.action.resize.volume.processing=Resizing Volume.... +label.action.resize.volume=Resize Volume +label.action.resource.limits=\u8d44\u6e90\u9650\u5236 +label.action.restore.instance.processing=\u6b63\u5728\u8fd8\u539f\u5b9e\u4f8b... +label.action.restore.instance=\u8fd8\u539f\u5b9e\u4f8b +label.action.start.instance.processing=\u6b63\u5728\u542f\u52a8\u5b9e\u4f8b... +label.action.start.instance=\u542f\u52a8\u5b9e\u4f8b +label.action.start.router.processing=\u6b63\u5728\u542f\u52a8\u8def\u7531\u5668... +label.action.start.router=\u542f\u52a8\u8def\u7531\u5668 +label.action.start.systemvm.processing=\u6b63\u5728\u542f\u52a8\u7cfb\u7edf VM... +label.action.start.systemvm=\u542f\u52a8\u7cfb\u7edf VM +label.action.stop.instance.processing=\u6b63\u5728\u505c\u6b62\u5b9e\u4f8b... +label.action.stop.instance=\u505c\u6b62\u5b9e\u4f8b +label.action.stop.router.processing=\u6b63\u5728\u505c\u6b62\u8def\u7531\u5668... +label.action.stop.router=\u505c\u6b62\u8def\u7531\u5668 +label.action.stop.systemvm.processing=\u6b63\u5728\u505c\u6b62\u7cfb\u7edf VM... +label.action.stop.systemvm=\u505c\u6b62\u7cfb\u7edf VM +label.actions=\u64cd\u4f5c +label.action.take.snapshot.processing=\u6b63\u5728\u521b\u5efa\u5feb\u7167... +label.action.take.snapshot=\u521b\u5efa\u5feb\u7167 +label.action.unmanage.cluster.processing=\u6b63\u5728\u53d6\u6d88\u6258\u7ba1\u7fa4\u96c6... +label.action.unmanage.cluster=\u53d6\u6d88\u6258\u7ba1\u7fa4\u96c6 +label.action.update.OS.preference.processing=\u6b63\u5728\u66f4\u65b0\u64cd\u4f5c\u7cfb\u7edf\u9996\u9009\u9879... +label.action.update.OS.preference=\u66f4\u65b0\u64cd\u4f5c\u7cfb\u7edf\u9996\u9009\u9879 +label.action.update.resource.count.processing=\u6b63\u5728\u66f4\u65b0\u8d44\u6e90\u6570\u91cf... +label.action.update.resource.count=\u66f4\u65b0\u8d44\u6e90\u6570\u91cf +label.action.vmsnapshot.create=\u6293\u53d6\u865a\u673a\u5feb\u7167 +label.action.vmsnapshot.delete=\u5220\u9664\u865a\u673a\u5feb\u7167 +label.action.vmsnapshot.revert=\u6062\u590d\u5230\u865a\u673a\u5feb\u7167 +label.activate.project=\u6fc0\u6d3b\u9879\u76ee +label.active.sessions=\u6d3b\u52a8\u4f1a\u8bdd +label.add.accounts.to=\u6dfb\u52a0\u5e10\u6237\u81f3 +label.add.accounts=\u6dfb\u52a0\u5e10\u6237 +label.add.account.to.project=\u5411\u9879\u76ee\u4e2d\u6dfb\u52a0\u5e10\u6237 +label.add.account=\u6dfb\u52a0\u5e10\u6237 +label.add.ACL=\u6dfb\u52a0 ACL +label.add.BigSwitchVns.device=\u6dfb\u52a0BigSwitch Vns\u63a7\u5236\u5668 +label.add.by.cidr=\u6309 CIDR \u6dfb\u52a0 +label.add.by.group=\u6309\u7ec4\u6dfb\u52a0 +label.add.by=\u6dfb\u52a0\u65b9\u5f0f +label.add.cluster=\u6dfb\u52a0\u7fa4\u96c6 +label.add.compute.offering=\u6dfb\u52a0\u8ba1\u7b97\u65b9\u6848 +label.add.direct.iprange=\u6dfb\u52a0\u76f4\u63a5 IP \u8303\u56f4 +label.add.disk.offering=\u6dfb\u52a0\u78c1\u76d8\u65b9\u6848 +label.add.domain=\u6dfb\u52a0\u57df +label.add.egress.rule=\u6dfb\u52a0\u51fa\u53e3\u89c4\u5219 +label.add.F5.device=\u6dfb\u52a0 F5 \u8bbe\u5907 +label.add.firewall=\u6dfb\u52a0\u9632\u706b\u5899\u89c4\u5219 +label.add.guest.network=\u6dfb\u52a0\u6765\u5bbe\u7f51\u7edc +label.add.host=\u6dfb\u52a0\u4e3b\u673a +label.adding.cluster=\u6b63\u5728\u6dfb\u52a0\u7fa4\u96c6 +label.adding.failed=\u6dfb\u52a0\u5931\u8d25 +label.adding.pod=\u6b63\u5728\u6dfb\u52a0\u63d0\u4f9b\u70b9 +label.adding.processing=\u6b63\u5728\u6dfb\u52a0... +label.add.ingress.rule=\u6dfb\u52a0\u5165\u53e3\u89c4\u5219 +label.adding.succeeded=\u5df2\u6210\u529f\u6dfb\u52a0 +label.adding=\u6b63\u5728\u6dfb\u52a0 +label.adding.user=\u6b63\u5728\u6dfb\u52a0\u7528\u6237 +label.adding.zone=\u6b63\u5728\u6dfb\u52a0\u533a\u57df +label.add.ip.range=\u6dfb\u52a0 IP \u8303\u56f4 +label.additional.networks=\u5176\u4ed6\u7f51\u7edc +label.add.load.balancer=\u6dfb\u52a0\u8d1f\u8f7d\u5e73\u8861\u5668 +label.add.more=\u6dfb\u52a0\u66f4\u591a +label.add.netScaler.device=\u6dfb\u52a0 Netscaler \u8bbe\u5907 +label.add.network.ACL=\u6dfb\u52a0\u7f51\u7edc ACL +label.add.network.device=\u6dfb\u52a0\u7f51\u7edc\u8bbe\u5907 +label.add.network.offering=\u6dfb\u52a0\u7f51\u7edc\u65b9\u6848 +label.add.network=\u6dfb\u52a0\u7f51\u7edc +label.add.new.F5=\u6dfb\u52a0\u65b0 F5 +label.add.new.gateway=\u6dfb\u52a0\u65b0\u7f51\u5173 +label.add.new.NetScaler=\u6dfb\u52a0\u65b0 NetScaler +label.add.new.SRX=\u6dfb\u52a0\u65b0 SRX +label.add.new.tier=\u6dfb\u52a0\u65b0\u5c42 +label.add.NiciraNvp.device=\u6dfb\u52a0Nvp\u63a7\u5236\u5668 +label.add.physical.network=\u6dfb\u52a0\u7269\u7406\u7f51\u7edc +label.add.pod=\u6dfb\u52a0\u63d0\u4f9b\u70b9 +label.add.port.forwarding.rule=\u6dfb\u52a0\u7aef\u53e3\u8f6c\u53d1\u89c4\u5219 +label.add.primary.storage=\u6dfb\u52a0\u4e3b\u5b58\u50a8 +label.add.region=\u6dfb\u52a0\u533a\u57df +label.add.resources=\u6dfb\u52a0\u8d44\u6e90 +label.add.route=\u6dfb\u52a0\u8def\u7531 +label.add.rule=\u6dfb\u52a0\u89c4\u5219 +label.add.secondary.storage=\u6dfb\u52a0\u8f85\u52a9\u5b58\u50a8 +label.add.security.group=\u6dfb\u52a0\u5b89\u5168\u7ec4 +label.add.service.offering=\u6dfb\u52a0\u670d\u52a1\u65b9\u6848 +label.add.SRX.device=\u6dfb\u52a0 SRX \u8bbe\u5907 +label.add.static.nat.rule=\u6dfb\u52a0\u9759\u6001 NAT \u89c4\u5219 +label.add.static.route=\u6dfb\u52a0\u9759\u6001\u8def\u7531 +label.add.system.service.offering=\u6dfb\u52a0\u7cfb\u7edf\u670d\u52a1\u65b9\u6848 +label.add.template=\u6dfb\u52a0\u6a21\u677f +label.add.to.group=\u6dfb\u52a0\u5230\u7ec4 +label.add=\u6dfb\u52a0 +label.add.user=\u6dfb\u52a0\u7528\u6237 +label.add.vlan=\u6dfb\u52a0 VLAN +label.add.vms.to.lb=\u5411\u8d1f\u8f7d\u5e73\u8861\u5668\u89c4\u5219\u4e2d\u6dfb\u52a0 VM +label.add.vms=\u6dfb\u52a0 VM +label.add.VM.to.tier=\u5411\u5c42\u4e2d\u6dfb\u52a0 VM +label.add.vm=\u6dfb\u52a0 VM +label.add.volume=\u6dfb\u52a0\u5377 +label.add.vpc=\u6dfb\u52a0 VPC +label.add.vpn.customer.gateway=\u6dfb\u52a0 VPN \u5ba2\u6237\u7f51\u5173 +label.add.VPN.gateway=\u6dfb\u52a0 VPN \u7f51\u5173 +label.add.vpn.user=\u6dfb\u52a0 VPN \u7528\u6237 +label.add.zone=\u6dfb\u52a0\u533a\u57df +label.admin.accounts=\u7ba1\u7406\u5458\u5e10\u6237 +label.admin=\u7ba1\u7406\u5458 +label.advanced.mode=\u9ad8\u7ea7\u6a21\u5f0f +label.advanced.search=\u9ad8\u7ea7\u641c\u7d22 +label.advanced=\u9ad8\u7ea7 +label.agent.password=\u4ee3\u7406\u5bc6\u7801 +label.agent.username=\u4ee3\u7406\u7528\u6237\u540d +label.agree=\u540c\u610f +label.alert=\u8b66\u62a5 +label.algorithm=\u7b97\u6cd5 +label.allocated=\u5df2\u5206\u914d +label.allocation.state=\u5206\u914d\u72b6\u6001 +label.api.key=API \u5bc6\u94a5 +label.apply=\u5e94\u7528 +label.assign.to.load.balancer=\u6b63\u5728\u5c06\u5b9e\u4f8b\u5206\u914d\u7ed9\u8d1f\u8f7d\u5e73\u8861\u5668 +label.assign=\u5206\u914d +label.associated.network.id=\u5df2\u5173\u8054\u7f51\u7edc ID +label.associated.network=\u5173\u8054\u7f51\u7edc +label.attached.iso=\u5df2\u9644\u52a0 ISO +label.author.email=\u4f5c\u8005\u90ae\u7bb1 +label.author.name=\u4f5c\u8005\u59d3\u540d +label.availability=\u53ef\u7528\u6027 +label.availability.zone=\u53ef\u7528\u533a\u57df +label.available.public.ips=\u53ef\u7528\u516c\u7528 IP \u5730\u5740 +label.available=\u53ef\u7528 +label.back=\u8fd4\u56de +label.bandwidth=\u5e26\u5bbd +label.basic.mode=\u57fa\u672c\u6a21\u5f0f +label.basic=\u57fa\u672c +label.bigswitch.controller.address=BigSwitch Vns \u63a7\u5236\u5668\u5730\u5740 +label.bootable=\u53ef\u542f\u52a8 +label.broadcast.domain.range=\u5e7f\u64ad\u57df\u8303\u56f4 +label.broadcast.domain.type=\u5e7f\u64ad\u57df\u7c7b\u578b +label.broadcast.uri=\u5e7f\u64adURI +label.by.account=\u6309\u5e10\u6237 +label.by.availability=\u6309\u53ef\u7528\u6027 +label.by.domain=\u6309\u57df +label.by.end.date=\u6309\u7ed3\u675f\u65e5\u671f +label.by.level=\u6309\u7ea7\u522b +label.by.pod=\u6309\u63d0\u4f9b\u70b9 +label.by.role=\u6309\u89d2\u8272 +label.by.start.date=\u6309\u5f00\u59cb\u65e5\u671f +label.by.state=\u6309\u72b6\u6001 +label.bytes.received=\u63a5\u6536\u7684\u5b57\u8282\u6570 +label.bytes.sent=\u53d1\u9001\u7684\u5b57\u8282\u6570 +label.by.traffic.type=\u6309\u6d41\u91cf\u7c7b\u578b +label.by.type.id=\u6309\u7c7b\u578b ID +label.by.type=\u6309\u7c7b\u578b +label.by.zone=\u6309\u533a\u57df +label.cancel=\u53d6\u6d88 +label.capacity=\u5bb9\u91cf +label.certificate=\u8bc1\u4e66 +label.change.service.offering=\u66f4\u6539\u670d\u52a1\u65b9\u6848 +label.change.value=\u66f4\u6539\u503c +label.character=\u5b57\u7b26 +label.checksum=MD5 \u6821\u9a8c\u548c +label.cidr.account=CIDR \u6216\u5e10\u6237/\u5b89\u5168\u7ec4 label.cidr=CIDR -label.cidr.list=æº CIDR - -label.storage.tags=存储标签 - -label.redundant.router=冗余路由器 -label.is.redundant.router=冗余 - -force.delete=强制删除 -force.delete.domain.warning=警告: 选择此选项将导致删除所有å­åŸŸä»¥åŠæ‰€æœ‰ç›¸å…³è”çš„å¸æˆ·åŠå…¶èµ„æºã€‚ - -force.remove=强制移除 -force.remove.host.warning=警告: 选择此选项将导致 CloudStack 在从群集中移除此主机之å‰ï¼Œå¼ºåˆ¶åœæ­¢æ‰€æœ‰æ­£åœ¨è¿è¡Œçš„虚拟机。 - -force.stop=强制åœæ­¢ -force.stop.instance.warning=警告: 除éžä¸‡ä¸å¾—已，å¦åˆ™ä¸åº”强制åœæ­¢æ­¤å®žä¾‹ã€‚åœæ­¢æ­¤å®žä¾‹å¯èƒ½ä¼šå¯¼è‡´æ•°æ®ä¸¢å¤±ä»¥åŠè‡´ä½¿è™šæ‹ŸæœºçŠ¶æ€ä¸ä¸€è‡´ã€‚ - -label.PreSetup=PreSetup -label.SR.name = SR å称标签 -label.SharedMountPoint=SharedMountPoint +label.CIDR.list=CIDR \u5217\u8868 +label.cidr.list=\u6e90 CIDR +label.CIDR.of.destination.network=\u76ee\u7684\u5730\u7f51\u7edc\u7684 CIDR +label.clean.up=\u6e05\u9664 +label.clear.list=\u6e05\u9664\u5217\u8868 +label.close=\u5173\u95ed +label.cloud.console=\u4e91\u7ba1\u7406\u63a7\u5236\u53f0 +label.cloud.managed=\u7531 Cloud.com \u7ba1\u7406 +label.cluster.name=\u7fa4\u96c6\u540d\u79f0 +label.clusters=\u7fa4\u96c6 +label.cluster.type=\u7fa4\u96c6\u7c7b\u578b +label.cluster=\u7fa4\u96c6 label.clvm=CLVM -label.volgroup=å·ç»„ -label.VMFS.datastore=VMFS æ•°æ®å­˜å‚¨ - -label.network.device=网络设备 -label.add.network.device=添加网络设备 -label.network.device.type=网络设备类型 -label.DHCP.server.type=DHCP æœåŠ¡å™¨ç±»åž‹ -label.Pxe.server.type=Pxe æœåŠ¡å™¨ç±»åž‹ -label.PING.storage.IP=PING 存储 IP -label.PING.dir=PING 目录 -label.TFTP.dir=TFTP 目录 -label.PING.CIFS.username=PING CIFS 用户å -label.PING.CIFS.password=PING CIFS å¯†ç  -label.CPU.cap=CPU ä¸Šé™ - - -label.action.enable.zone=å¯ç”¨åŒºåŸŸ -label.action.enable.zone.processing=正在å¯ç”¨åŒºåŸŸ... -message.action.enable.zone=请确认您确实è¦å¯ç”¨æ­¤åŒºåŸŸã€‚ -label.action.disable.zone=ç¦ç”¨åŒºåŸŸ -label.action.disable.zone.processing=正在ç¦ç”¨åŒºåŸŸ... -message.action.disable.zone=请确认您确实è¦ç¦ç”¨æ­¤åŒºåŸŸã€‚ - -label.action.enable.pod=å¯ç”¨æ供点 -label.action.enable.pod.processing=正在å¯ç”¨æ供点... -message.action.enable.pod=请确认您确实è¦å¯ç”¨æ­¤æ供点。 -label.action.disable.pod=ç¦ç”¨æ供点 -label.action.disable.pod.processing=正在ç¦ç”¨æ供点... -message.action.disable.pod=请确认您确实è¦ç¦ç”¨æ­¤æ供点。 - -label.action.enable.cluster=å¯ç”¨ç¾¤é›† -label.action.enable.cluster.processing=正在å¯ç”¨ç¾¤é›†... -message.action.enable.cluster=请确认您确实è¦å¯ç”¨æ­¤ç¾¤é›†ã€‚ -label.action.disable.cluster=ç¦ç”¨ç¾¤é›† -label.action.disable.cluster.processing=正在ç¦ç”¨ç¾¤é›†... -message.action.disable.cluster=请确认您确实è¦ç¦ç”¨æ­¤ç¾¤é›†ã€‚ - -label.account.id=å¸æˆ· ID -label.account.name=å¸æˆ·å称 -label.account.specific=å¸æˆ·ä¸“用 -label.account=å¸æˆ· -label.accounts=å¸æˆ· -label.acquire.new.ip=获å–æ–° IP -label.show.ingress.rule=显示入å£è§„则 -label.hide.ingress.rule=éšè—å…¥å£è§„则 -label.action.attach.disk.processing=正在附加ç£ç›˜... -label.action.attach.disk=附加ç£ç›˜ -label.action.attach.iso.processing=正在附加 ISO... -label.action.attach.iso=附加 ISO -label.action.cancel.maintenance.mode.processing=正在å–消维护模å¼... -label.action.cancel.maintenance.mode=å–æ¶ˆç»´æŠ¤æ¨¡å¼ -label.action.change.password=æ›´æ”¹å¯†ç  -label.action.change.service.processing=正在更改æœåŠ¡... -label.action.change.service=更改æœåŠ¡ -label.action.copy.ISO.processing=正在å¤åˆ¶ ISO... -label.action.copy.ISO=å¤åˆ¶ ISO -label.action.copy.template.processing=正在å¤åˆ¶æ¨¡æ¿... -label.action.copy.template=å¤åˆ¶æ¨¡æ¿ -label.action.create.template.processing=正在创建模æ¿... -label.action.create.template=åˆ›å»ºæ¨¡æ¿ -label.action.create.vm.processing=正在创建 VM... -label.action.create.vm=创建 VM -label.action.create.volume.processing=正在创建å·... -label.action.create.volume=åˆ›å»ºå· -label.action.delete.IP.range.processing=正在删除 IP 范围... -label.action.delete.IP.range=删除 IP 范围 -label.action.delete.ISO.processing=正在删除 ISO... -label.action.delete.ISO=删除 ISO -label.action.delete.account.processing=正在删除å¸æˆ·... -label.action.delete.account=删除å¸æˆ· -label.action.delete.cluster.processing=正在删除群集... -label.action.delete.cluster=删除群集 -label.action.delete.disk.offering.processing=正在删除ç£ç›˜æ–¹æ¡ˆ... -label.action.delete.disk.offering=删除ç£ç›˜æ–¹æ¡ˆ - -label.action.update.resource.count=更新资æºæ•°é‡ -label.action.update.resource.count.processing=正在更新资æºæ•°é‡... - -label.action.delete.domain=删除域 -label.action.delete.domain.processing=正在删除域... - -label.action.delete.firewall.processing=正在删除防ç«å¢™... -label.action.delete.firewall=删除防ç«å¢™è§„则 -label.action.delete.ingress.rule.processing=正在删除入å£è§„则... -label.action.delete.ingress.rule=删除入å£è§„则 -label.action.delete.load.balancer.processing=正在删除负载平衡器... -label.action.delete.load.balancer=删除负载平衡器规则 -label.action.edit.network.processing=正在编辑网络... -label.action.edit.network=编辑网络 -label.action.delete.network.processing=正在删除网络... -label.action.delete.network=删除网络 -label.action.delete.pod.processing=正在删除æ供点... -label.action.delete.pod=删除æ供点 -label.action.delete.primary.storage.processing=正在删除主存储... -label.action.delete.primary.storage=删除主存储 -label.action.delete.secondary.storage.processing=正在删除辅助存储... -label.action.delete.secondary.storage=删除辅助存储 -label.action.delete.security.group.processing=正在删除安全组... -label.action.delete.security.group=删除安全组 -label.action.delete.service.offering.processing=正在删除æœåŠ¡æ–¹æ¡ˆ... -label.action.delete.service.offering=删除æœåŠ¡æ–¹æ¡ˆ -label.action.delete.snapshot.processing=正在删除快照... -label.action.delete.snapshot=删除快照 -label.action.delete.template.processing=正在删除模æ¿... -label.action.delete.template=åˆ é™¤æ¨¡æ¿ -label.action.delete.user.processing=正在删除用户... -label.action.delete.user=删除用户 -label.action.delete.volume.processing=正在删除å·... -label.action.delete.volume=åˆ é™¤å· -label.action.delete.zone.processing=正在删除区域... -label.action.delete.zone=删除区域 -label.action.destroy.instance.processing=正在销æ¯å®žä¾‹... -label.action.destroy.instance=销æ¯å®žä¾‹ -label.action.destroy.systemvm.processing=正在销æ¯ç³»ç»Ÿ VM... -label.action.destroy.systemvm=销æ¯ç³»ç»Ÿ VM -label.action.detach.disk.processing=正在å–消附加ç£ç›˜... -label.action.detach.disk=å–消附加ç£ç›˜ -label.action.detach.iso.processing=正在å–消附加 ISO... -label.action.detach.iso=å–消附加 ISO -label.action.disable.account.processing=正在ç¦ç”¨å¸æˆ·... -label.action.disable.account=ç¦ç”¨å¸æˆ· -label.action.disable.static.NAT.processing=正在ç¦ç”¨é™æ€ NAT... -label.action.disable.static.NAT=ç¦ç”¨é™æ€ NAT -label.action.disable.user.processing=正在ç¦ç”¨ç”¨æˆ·... -label.action.disable.user=ç¦ç”¨ç”¨æˆ· -label.action.download.ISO=下载 ISO -label.action.download.template=ä¸‹è½½æ¨¡æ¿ -label.action.download.volume.processing=正在下载å·... -label.action.download.volume=ä¸‹è½½å· -label.action.edit.ISO=编辑 ISO -label.action.edit.account=编辑å¸æˆ· -label.action.edit.disk.offering=编辑ç£ç›˜æ–¹æ¡ˆ -label.action.edit.domain=编辑域 -label.action.edit.global.setting=编辑全局设置 -label.action.edit.instance=编辑实例 -label.action.edit.network.offering=编辑网络方案 -label.action.edit.pod=编辑æ供点 -label.action.edit.primary.storage=编辑主存储 -label.action.edit.resource.limits=编辑资æºé™åˆ¶ -label.action.edit.service.offering=编辑æœåŠ¡æ–¹æ¡ˆ -label.action.edit.template=ç¼–è¾‘æ¨¡æ¿ -label.action.edit.user=编辑用户 -label.action.edit.zone=编辑区域 -label.action.enable.account.processing=正在å¯ç”¨å¸æˆ·... -label.action.enable.account=å¯ç”¨å¸æˆ· -label.action.enable.maintenance.mode.processing=正在å¯ç”¨ç»´æŠ¤æ¨¡å¼... -label.action.enable.maintenance.mode=å¯ç”¨ç»´æŠ¤æ¨¡å¼ -label.action.enable.static.NAT.processing=正在å¯ç”¨é™æ€ NAT... -label.action.enable.static.NAT=å¯ç”¨é™æ€ NAT -label.action.enable.user.processing=正在å¯ç”¨ç”¨æˆ·... -label.action.enable.user=å¯ç”¨ç”¨æˆ· -label.action.force.reconnect.processing=正在é‡æ–°è¿žæŽ¥... -label.action.force.reconnect=强制é‡æ–°è¿žæŽ¥ -label.action.generate.keys.processing=正在生æˆå¯†é’¥... -label.action.generate.keys=生æˆå¯†é’¥ -label.action.lock.account.processing=正在é”定å¸æˆ·... -label.action.lock.account=é”定å¸æˆ· -label.action.migrate.instance=è¿ç§»å®žä¾‹ -label.action.migrate.instance.processing=正在è¿ç§»å®žä¾‹... -label.action.reboot.instance.processing=正在é‡æ–°å¯åŠ¨å®žä¾‹... -label.action.reboot.instance=é‡æ–°å¯åŠ¨å®žä¾‹ -label.action.reboot.router.processing=正在é‡æ–°å¯åŠ¨è·¯ç”±å™¨... -label.action.reboot.router=é‡æ–°å¯åŠ¨è·¯ç”±å™¨ -label.action.reboot.systemvm.processing=正在é‡æ–°å¯åŠ¨ç³»ç»Ÿ VM... -label.action.reboot.systemvm=é‡æ–°å¯åŠ¨ç³»ç»Ÿ VM -label.action.recurring.snapshot=é‡çŽ°å¿«ç…§ -label.action.release.ip.processing=正在释放 IP... -label.action.release.ip=释放 IP -label.action.remove.host.processing=正在删除主机... -label.action.remove.host=删除主机 -label.action.reset.password.processing=正在é‡ç½®å¯†ç ... -label.action.reset.password=é‡ç½®å¯†ç  -label.action.resource.limits=资æºé™åˆ¶ -label.action.restore.instance.processing=正在还原实例... -label.action.restore.instance=还原实例 -label.action.start.instance.processing=正在å¯åŠ¨å®žä¾‹... -label.action.start.instance=å¯åŠ¨å®žä¾‹ -label.action.start.router.processing=正在å¯åŠ¨è·¯ç”±å™¨... -label.action.start.router=å¯åŠ¨è·¯ç”±å™¨ -label.action.start.systemvm.processing=正在å¯åŠ¨ç³»ç»Ÿ VM... -label.action.start.systemvm=å¯åŠ¨ç³»ç»Ÿ VM -label.action.stop.instance.processing=正在åœæ­¢å®žä¾‹... -label.action.stop.instance=åœæ­¢å®žä¾‹ -label.action.stop.router.processing=正在åœæ­¢è·¯ç”±å™¨... -label.action.stop.router=åœæ­¢è·¯ç”±å™¨ -label.action.stop.systemvm.processing=正在åœæ­¢ç³»ç»Ÿ VM... -label.action.stop.systemvm=åœæ­¢ç³»ç»Ÿ VM -label.action.take.snapshot.processing=正在创建快照... -label.action.take.snapshot=创建快照 -label.action.update.OS.preference.processing=正在更新æ“作系统首选项... -label.action.update.OS.preference=æ›´æ–°æ“作系统首选项 -label.actions=æ“作 -label.active.sessions=æ´»åŠ¨ä¼šè¯ -label.add.account=添加å¸æˆ· -label.add.by.cidr=按 CIDR 添加 -label.add.by.group=按组添加 -label.add.cluster=添加群集 -label.add.direct.iprange=添加直接 IP 范围 -label.add.disk.offering=添加ç£ç›˜æ–¹æ¡ˆ -label.add.domain=添加域 -label.add.firewall=添加防ç«å¢™è§„则 -label.add.host=添加主机 -label.add.ingress.rule=添加入å£è§„则 -label.add.ip.range=添加 IP 范围 -label.add.load.balancer=添加负载平衡器 -label.add.more=添加更多 -label.add.network=添加网络 -label.add.pod=添加æ供点 -label.add.primary.storage=添加主存储 -label.add.secondary.storage=添加辅助存储 -label.add.security.group=添加安全组 -label.add.service.offering=添加æœåŠ¡æ–¹æ¡ˆ -label.add.template=æ·»åŠ æ¨¡æ¿ -label.add.user=添加用户 -label.add.vlan=添加 VLAN -label.add.volume=æ·»åŠ å· -label.add.zone=添加区域 -label.add=添加 -label.adding.cluster=正在添加群集 -label.adding.failed=添加失败 -label.adding.pod=正在添加æ供点 -label.adding.processing=正在添加... -label.adding.succeeded=å·²æˆåŠŸæ·»åŠ  -label.adding.user=正在添加用户 -label.adding.zone=正在添加区域 -label.adding=正在添加 -label.additional.networks=其他网络 -label.admin.accounts=管ç†å‘˜å¸æˆ· -label.admin=管ç†å‘˜ -label.advanced.mode=é«˜çº§æ¨¡å¼ -label.advanced.search=高级æœç´¢ -label.advanced=高级 -label.alert=警报 -label.algorithm=算法 -label.allocated=å·²åˆ†é… -label.api.key=API 密钥 -label.assign.to.load.balancer=正在将实例分é…给负载平衡器 -label.assign=åˆ†é… -label.associated.network.id=已关è”网络 ID -label.attached.iso=已附加 ISO -label.availability.zone=å¯ç”¨åŒºåŸŸ -label.availability=å¯ç”¨æ€§ -label.available.public.ips=å¯ç”¨å…¬ç”¨ IP åœ°å€ -label.available=å¯ç”¨ -label.back=返回 -label.basic.mode=åŸºæœ¬æ¨¡å¼ -label.bootable=å¯å¯åŠ¨ -label.broadcast.domain.type=广播域类型 -label.by.account=按å¸æˆ· -label.by.availability=按å¯ç”¨æ€§ -label.by.domain=按域 -label.by.end.date=按结æŸæ—¥æœŸ -label.by.level=按级别 -label.by.pod=按æ供点 -label.by.role=按角色 -label.by.start.date=按开始日期 -label.by.state=æŒ‰çŠ¶æ€ -label.by.traffic.type=按æµé‡ç±»åž‹ -label.by.type.id=按类型 ID -label.by.type=按类型 -label.by.zone=按区域 -label.bytes.received=接收的字节数 -label.bytes.sent=å‘é€çš„字节数 -label.cancel=å–消 -label.certificate=è¯ä¹¦ -label.privatekey=PKCS#8 ç§é’¥ -label.domain.suffix=DNS 域åŽç¼€(例如 xyz.com) -label.character=字符 -label.cidr.account=CIDR 或å¸æˆ·/安全组 -label.close=关闭 -label.cloud.console=云管ç†æŽ§åˆ¶å° -label.cloud.managed=ç”± Cloud.com ç®¡ç† -label.cluster.type=群集类型 -label.cluster=群集 -label.code=ä»£ç  -label.confirmation=确认 -label.cpu.allocated.for.VMs=已分é…ç»™ VM çš„ CPU -label.cpu.allocated=已分é…çš„ CPU -label.cpu.utilized=CPU 利用率 +label.code=\u4ee3\u7801 +label.community=\u793e\u533a +label.compute.and.storage=\u8ba1\u7b97\u4e0e\u5b58\u50a8 +label.compute.offerings=\u8ba1\u7b97\u65b9\u6848 +label.compute.offering=\u8ba1\u7b97\u65b9\u6848 +label.compute=\u8ba1\u7b97 +label.configuration=\u4e91\u5e73\u53f0\u914d\u7f6e +label.configure.network.ACLs=\u914d\u7f6e\u7f51\u7edc ACL +label.configure=\u914d\u7f6e +label.configure.vpc=\u914d\u7f6e VPC +label.confirmation=\u786e\u8ba4 +label.confirm.password=\u786e\u8ba4\u5bc6\u7801 +label.congratulations=\u795d\u8d3a\u60a8\! +label.conserve.mode=\u4fdd\u62a4\u6a21\u5f0f +label.console.proxy=\u63a7\u5236\u53f0\u4ee3\u7406 +label.continue.basic.install=\u7ee7\u7eed\u6267\u884c\u57fa\u672c\u5b89\u88c5 +label.continue=\u7ee7\u7eed +label.corrections.saved=\u5df2\u4fdd\u5b58\u4fee\u6b63 +label.cpu.allocated.for.VMs=\u5df2\u5206\u914d\u7ed9 VM \u7684 CPU +label.cpu.allocated=\u5df2\u5206\u914d\u7684 CPU +label.CPU.cap=CPU \u4e0a\u9650 label.cpu=CPU -label.created=创建日期 -label.cross.zones=跨区域 -label.custom.disk.size=自定义ç£ç›˜å¤§å° -label.daily=æ¯å¤©ä¸€æ¬¡ -label.data.disk.offering=æ•°æ®ç£ç›˜æ–¹æ¡ˆ -label.date=日期 -label.day.of.month=日期 -label.day.of.week=星期 -label.delete=删除 -label.deleting.failed=删除失败 -label.deleting.processing=正在删除... -label.description=说明 -label.detaching.disk=正在å–消附加ç£ç›˜ -label.details=è¯¦ç»†ä¿¡æ¯ -label.device.id=设备 ID -label.disabled=å·²ç¦ç”¨ -label.disabling.vpn.access=正在ç¦ç”¨ VPN 访问 -label.disk.allocated=已分é…çš„ç£ç›˜ -label.disk.offering=ç£ç›˜æ–¹æ¡ˆ -label.disk.size.gb=ç£ç›˜å¤§å°(GB) -label.disk.size=ç£ç›˜å¤§å° -label.disk.total=ç£ç›˜æ€»é‡ -label.disk.volume=ç£ç›˜å· -label.display.text=显示文本 +label.cpu.limits=CPU\u9650\u5236 +label.cpu.mhz=CPU (MHz) +label.cpu.utilized=CPU \u5229\u7528\u7387 +label.created.by.system=\u7531\u7cfb\u7edf\u521b\u5efa +label.created=\u521b\u5efa\u65e5\u671f +label.create.project=\u521b\u5efa\u9879\u76ee +label.create.template=\u521b\u5efa\u6a21\u677f +label.create.VPN.connection=\u521b\u5efa VPN \u8fde\u63a5 +label.cross.zones=\u8de8\u533a\u57df +label.custom.disk.size=\u81ea\u5b9a\u4e49\u78c1\u76d8\u5927\u5c0f +label.daily=\u6bcf\u5929\u4e00\u6b21 +label.data.disk.offering=\u6570\u636e\u78c1\u76d8\u65b9\u6848 +label.date=\u65e5\u671f +label.day.of.month=\u65e5\u671f +label.day.of.week=\u661f\u671f +label.dead.peer.detection=\u5931\u6548\u5bf9\u7b49\u4f53\u68c0\u6d4b +label.decline.invitation=\u62d2\u7edd\u9080\u8bf7 +label.dedicated=\u4e13\u7528 +label.default=\u9ed8\u8ba4\u503c +label.default.use=\u9ed8\u8ba4\u4f7f\u7528 +label.default.view=\u9ed8\u8ba4\u89c6\u56fe +label.delete.BigSwitchVns=\u79fb\u9664BigSwitch Vns\u63a7\u5236\u5668 +label.delete.F5=\u5220\u9664 F5 +label.delete.gateway=\u5220\u9664\u7f51\u5173 +label.delete.NetScaler=\u5220\u9664 NetScaler +label.delete.NiciraNvp=\u5220\u9664Nvp\u63a7\u5236\u5668 +label.delete.project=\u5220\u9664\u9879\u76ee +label.delete.SRX=\u5220\u9664 SRX +label.delete=\u5220\u9664 +label.delete.VPN.connection=\u5220\u9664 VPN \u8fde\u63a5 +label.delete.VPN.customer.gateway=\u5220\u9664 VPN \u5ba2\u6237\u7f51\u5173 +label.delete.VPN.gateway=\u5220\u9664 VPN \u7f51\u5173 +label.delete.vpn.user=\u5220\u9664 VPN \u7528\u6237 +label.deleting.failed=\u5220\u9664\u5931\u8d25 +label.deleting.processing=\u6b63\u5728\u5220\u9664... +label.description=\u8bf4\u660e +label.destination.physical.network.id=\u76ee\u6807\u7269\u7406\u7f51\u7edc ID +label.destination.zone=\u76ee\u6807\u533a\u57df +label.destroy.router=\u9500\u6bc1\u8def\u7531\u5668 +label.destroy=\u00e9\u0094\u0080\u00e6\u00af\u0081 +label.detaching.disk=\u6b63\u5728\u53d6\u6d88\u9644\u52a0\u78c1\u76d8 +label.details=\u8be6\u7ec6\u4fe1\u606f +label.device.id=\u8bbe\u5907 ID +label.devices=\u8bbe\u5907 +label.dhcp=DHCP +label.DHCP.server.type=DHCP \u670d\u52a1\u5668\u7c7b\u578b +label.direct.ips=\u76f4\u63a5 IP +label.disabled=\u5df2\u7981\u7528 +label.disable.provider=\u7981\u7528\u63d0\u4f9b\u7a0b\u5e8f +label.disable.vpn=\u7981\u7528 VPN +label.disabling.vpn.access=\u6b63\u5728\u7981\u7528 VPN \u8bbf\u95ee +label.disk.allocated=\u5df2\u5206\u914d\u7684\u78c1\u76d8 +label.disk.offering=\u78c1\u76d8\u65b9\u6848 +label.disk.size.gb=\u78c1\u76d8\u5927\u5c0f(GB) +label.disk.size=\u78c1\u76d8\u5927\u5c0f +label.disk.total=\u78c1\u76d8\u603b\u91cf +label.disk.volume=\u78c1\u76d8\u5377 +label.display.name=\u663e\u793a\u540d\u79f0 +label.display.text=\u663e\u793a\u6587\u672c label.dns.1=DNS 1 label.dns.2=DNS 2 -label.domain.admin=域管ç†å‘˜ -label.domain.id=域 ID -label.domain.name=域å -label.domain=域 -label.double.quotes.are.not.allowed=ä¸å…许使用åŒå¼•å· -label.download.progress=下载进度 -label.edit=编辑 -label.email=电å­é‚®ä»¶ -label.enabling.vpn.access=正在å¯ç”¨ VPN 访问 -label.enabling.vpn=正在å¯ç”¨ VPN -label.end.port=结æŸç«¯å£ -label.endpoint.or.operation=端点或æ“作 -label.error.code=é”™è¯¯ä»£ç  -label.error=错误 -label.esx.host=ESX/ESXi 主机 -label.example=示例 -label.failed=失败 -label.featured=精选 -label.firewall=防ç«å¢™ -label.first.name=åå­— -label.format=æ ¼å¼ -label.friday=星期五 -label.full=满载 -label.gateway=网关 -label.general.alerts=常规警报 -label.generating.url=æ­£åœ¨ç”Ÿæˆ URL -label.go.step.2=转至步骤 2 -label.go.step.3=转至步骤 3 -label.go.step.4=转至步骤 4 -label.go.step.5=转至步骤 5 -label.group.optional=组(å¯é€‰) -label.group=组 -label.guest.cidr=æ¥å®¾ CIDR -label.guest.gateway=æ¥å®¾ç½‘å…³ -label.guest.ip.range=æ¥å®¾ IP 范围 -label.guest.ip=æ¥å®¾ IP åœ°å€ -label.guest.netmask=æ¥å®¾ç½‘ç»œæŽ©ç  -label.ha.enabled=å·²å¯ç”¨é«˜å¯ç”¨æ€§ -label.help=帮助 -label.host.alerts=主机警报 -label.host.name=主机å称 -label.host=主机 -label.hosts=主机 -label.hourly=æ¯å°æ—¶ä¸€æ¬¡ -label.hypervisor.type=虚拟机管ç†ç¨‹åºç±»åž‹ -label.hypervisor=虚拟机管ç†ç¨‹åº +label.dns=DNS +label.DNS.domain.for.guest.networks=\u6765\u5bbe\u7f51\u7edc\u7684 DNS \u57df +label.domain.admin=\u57df\u7ba1\u7406\u5458 +label.domain.id=\u57df ID +label.domain.name=\u57df\u540d +label.domain.router=\u57df\u8def\u7531\u5668 +label.domain.suffix=DNS \u57df\u540e\u7f00(\u4f8b\u5982 xyz.com) +label.domain=\u57df +label.done=\u5b8c\u6210 +label.double.quotes.are.not.allowed=\u4e0d\u5141\u8bb8\u4f7f\u7528\u53cc\u5f15\u53f7 +label.download.progress=\u4e0b\u8f7d\u8fdb\u5ea6 +label.drag.new.position=\u62d6\u52a8\u5230\u65b0\u4f4d\u7f6e +label.edit.lb.rule=\u7f16\u8f91\u8d1f\u8f7d\u5e73\u8861\u5668\u89c4\u5219 +label.edit.network.details=\u7f16\u8f91\u7f51\u7edc\u8be6\u60c5 +label.edit.project.details=\u7f16\u8f91\u9879\u76ee\u8be6\u60c5 +label.edit.tags=\u7f16\u8f91\u6807\u7b7e +label.edit.traffic.type=\u7f16\u8f91\u6d41\u91cf\u7c7b\u578b +label.edit=\u7f16\u8f91 +label.edit.vpc=\u7f16\u8f91 VPC +label.egress.rules=\u51fa\u53e3\u89c4\u5219 +label.egress.rule=\u51fa\u53e3\u89c4\u5219 +label.elastic.IP=\u5f39\u6027 IP +label.elastic.LB=\u5f39\u6027\u8d1f\u8f7d\u5e73\u8861\u5668 +label.elastic=\u5f39\u6027 +label.email=\u7535\u5b50\u90ae\u4ef6 +label.enable.provider=\u542f\u7528\u63d0\u4f9b\u7a0b\u5e8f +label.enable.s3=\u542f\u7528\u652f\u6301S3\u7684\u4e8c\u7ea7\u5b58\u50a8 +label.enable.swift=\u542f\u7528 SWIFT +label.enable.vpn=\u542f\u7528 VPN +label.enabling.vpn.access=\u6b63\u5728\u542f\u7528 VPN \u8bbf\u95ee +label.enabling.vpn=\u6b63\u5728\u542f\u7528 VPN +label.end.IP=\u7ed3\u675f IP +label.endpoint.or.operation=\u7aef\u70b9\u6216\u64cd\u4f5c +label.endpoint=\u7aef\u70b9 +label.end.port=\u7ed3\u675f\u7aef\u53e3 +label.end.reserved.system.IP=\u7ed3\u675f\u9884\u7559\u7cfb\u7edf IP +label.end.vlan=\u7ed3\u675f VLAN +label.enter.token=\u8f93\u5165\u4ee4\u724c +label.error.code=\u9519\u8bef\u4ee3\u7801 +label.error=\u9519\u8bef +label.ESP.encryption=ESP \u52a0\u5bc6\u7b97\u6cd5 +label.ESP.hash=ESP \u54c8\u5e0c\u7b97\u6cd5 +label.ESP.lifetime=ESP \u4f7f\u7528\u671f\u9650(\u7b2c\u4e8c\u9636\u6bb5) +label.ESP.policy=ESP \u7b56\u7565 +label.esx.host=ESX/ESXi \u4e3b\u673a +label.example=\u793a\u4f8b +label.external.link=\u5916\u90e8\u94fe\u63a5 +label.f5=F5 +label.failed=\u5931\u8d25 +label.featured=\u7cbe\u9009 +label.fetch.latest=\u63d0\u53d6\u6700\u65b0\u5185\u5bb9 +label.filterBy=\u8fc7\u6ee4\u4f9d\u636e +label.firewall=\u9632\u706b\u5899 +label.first.name=\u540d\u5b57 +label.format=\u683c\u5f0f +label.friday=\u661f\u671f\u4e94 +label.full.path=\u5b8c\u6574\u8def\u5f84 +label.full=\u6ee1\u8f7d +label.gateway=\u7f51\u5173 +label.general.alerts=\u5e38\u89c4\u8b66\u62a5 +label.generating.url=\u6b63\u5728\u751f\u6210 URL +label.go.step.2=\u8f6c\u81f3\u6b65\u9aa4 2 +label.go.step.3=\u8f6c\u81f3\u6b65\u9aa4 3 +label.go.step.4=\u8f6c\u81f3\u6b65\u9aa4 4 +label.go.step.5=\u8f6c\u81f3\u6b65\u9aa4 5 +label.group.optional=\u7ec4(\u53ef\u9009) +label.group=\u7ec4 +label.guest.cidr=\u6765\u5bbe CIDR +label.guest.end.ip=\u6765\u5bbe\u7ed3\u675f IP +label.guest.gateway=\u6765\u5bbe\u7f51\u5173 +label.guest.ip.range=\u6765\u5bbe IP \u8303\u56f4 +label.guest.ip=\u6765\u5bbe IP \u5730\u5740 +label.guest.netmask=\u6765\u5bbe\u7f51\u7edc\u63a9\u7801 +label.guest.networks=\u6765\u5bbe\u7f51\u7edc +label.guest.start.ip=\u6765\u5bbe\u8d77\u59cb IP +label.guest.traffic=\u6765\u5bbe\u6d41\u91cf +label.guest.type=\u6765\u5bbe\u7c7b\u578b +label.guest=\u6765\u5bbe +label.ha.enabled=\u5df2\u542f\u7528\u9ad8\u53ef\u7528\u6027 +label.help=\u5e2e\u52a9 +label.hide.ingress.rule=\u9690\u85cf\u5165\u53e3\u89c4\u5219 +label.hints=\u63d0\u793a +label.host.alerts=\u4e3b\u673a\u8b66\u62a5 +label.host.MAC=\u4e3b\u673a MAC +label.host.name=\u4e3b\u673a\u540d\u79f0 +label.hosts=\u4e3b\u673a +label.host.tags=\u4e3b\u673a\u6807\u7b7e +label.host=\u4e3b\u673a +label.hourly=\u6bcf\u5c0f\u65f6\u4e00\u6b21 +label.hypervisor.capabilities=\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u529f\u80fd +label.hypervisor.type=\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u7c7b\u578b +label.hypervisor=\u865a\u62df\u673a\u5e73\u53f0 +label.hypervisor.version=\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u7248\u672c label.id=ID -label.info=ä¿¡æ¯ -label.ingress.rule=å…¥å£è§„则 -label.initiated.by=å¯åŠ¨è€… -label.instance.limits=实例é™åˆ¶ -label.instance.name=实例å称 -label.instance=实例 -label.instances=实例 -label.internal.dns.1=内部 DNS 1 -label.internal.dns.2=内部 DNS 2 -label.interval.type=间隔类型 -label.invalid.integer=无效整数 -label.invalid.number=无效数字 -label.ip.address=IP åœ°å€ -label.ip.allocations=IP åˆ†é… -label.ip.limits=公用 IP é™åˆ¶ -label.ip.or.fqdn=IP 或 FQDN -label.ip.range=IP 范围 +label.IKE.DH=IKE DH \u7b97\u6cd5 +label.IKE.encryption=IKE \u52a0\u5bc6\u7b97\u6cd5 +label.IKE.hash=IKE \u54c8\u5e0c\u7b97\u6cd5 +label.IKE.lifetime=IKE \u4f7f\u7528\u671f\u9650(\u7b2c\u4e8c\u9636\u6bb5) +label.IKE.policy=IKE \u7b56\u7565 +label.info=\u4fe1\u606f +label.ingress.rule=\u5165\u53e3\u89c4\u5219 +label.initiated.by=\u542f\u52a8\u8005 +label.installWizard.addClusterIntro.subtitle=\u4ec0\u4e48\u662f\u7fa4\u96c6? +label.installWizard.addClusterIntro.title=\u6dfb\u52a0\u4e00\u4e2a\u7fa4\u96c6 +label.installWizard.addHostIntro.subtitle=\u4ec0\u4e48\u662f\u4e3b\u673a? +label.installWizard.addHostIntro.title=\u6dfb\u52a0\u4e00\u4e2a\u4e3b\u673a +label.installWizard.addPodIntro.subtitle=\u4ec0\u4e48\u662f\u63d0\u4f9b\u70b9? +label.installWizard.addPodIntro.title=\u6dfb\u52a0\u4e00\u4e2a\u63d0\u4f9b\u70b9 +label.installWizard.addPrimaryStorageIntro.subtitle=\u4ec0\u4e48\u662f\u4e3b\u5b58\u50a8? +label.installWizard.addPrimaryStorageIntro.title=\u6dfb\u52a0\u4e00\u4e2a\u4e3b\u5b58\u50a8 +label.installWizard.addSecondaryStorageIntro.subtitle=\u4ec0\u4e48\u662f\u8f85\u52a9\u5b58\u50a8? +label.installWizard.addSecondaryStorageIntro.title=\u6dfb\u52a0\u4e00\u4e2a\u8f85\u52a9\u5b58\u50a8 +label.installWizard.addZoneIntro.subtitle=\u4ec0\u4e48\u662f\u533a\u57df? +label.installWizard.addZoneIntro.title=\u6dfb\u52a0\u4e00\u4e2a\u533a\u57df +label.installWizard.addZone.title=\u6dfb\u52a0\u533a\u57df +label.installWizard.click.launch=\u8bf7\u5355\u51fb\u201c\u542f\u52a8\u201d\u6309\u94ae\u3002 +label.installWizard.subtitle=\u6b64\u6559\u7a0b\u5c06\u5e2e\u52a9\u60a8\u8bbe\u7f6e CloudStack&\#8482 \u5b89\u88c5 +label.installWizard.title=\u60a8\u597d\uff0c\u6b22\u8fce\u4f7f\u7528 CloudStack&\#8482 +label.instance.limits=\u5b9e\u4f8b\u9650\u5236 +label.instance.name=\u5b9e\u4f8b\u540d\u79f0 +label.instances=\u5b9e\u4f8b +label.instance=\u5b9e\u4f8b +label.internal.dns.1=\u5185\u90e8 DNS 1 +label.internal.dns.2=\u5185\u90e8 DNS 2 +label.internal.name=\u5185\u90e8\u540d\u79f0 +label.interval.type=\u95f4\u9694\u7c7b\u578b +label.introduction.to.cloudstack=CloudStack&\#8482 \u7b80\u4ecb +label.invalid.integer=\u65e0\u6548\u6574\u6570 +label.invalid.number=\u65e0\u6548\u6570\u5b57 +label.invitations=\u9080\u8bf7 +label.invited.accounts=\u5df2\u9080\u8bf7\u7684\u5e10\u6237 +label.invite.to=\u9080\u8bf7\u52a0\u5165 +label.invite=\u9080\u8bf7 +label.ip.address=IP \u5730\u5740 +label.ipaddress=IP \u5730\u5740 +label.ip.allocations=IP \u5206\u914d label.ip=IP +label.ip.limits=\u516c\u7528 IP \u9650\u5236 +label.ip.or.fqdn=IP \u6216 FQDN +label.ip.range=IP \u8303\u56f4 +label.ip.ranges=IP \u8303\u56f4 +label.IPsec.preshared.key=IPsec \u9884\u5171\u4eab\u5bc6\u94a5 label.ips=IP -label.is.default=是å¦ä¸ºé»˜è®¤å€¼ -label.is.shared=是å¦å…±äº« -label.is.system=是å¦ä¸ºç³»ç»Ÿ label.iscsi=iSCSI -label.iso.boot=ISO å¯åŠ¨ +label.is.default=\u662f\u5426\u4e3a\u9ed8\u8ba4\u503c +label.iso.boot=ISO \u542f\u52a8 label.iso=ISO -label.isolation.mode=éš”ç¦»æ¨¡å¼ -label.keep=ä¿ç•™ -label.lang.chinese=简体中文 -label.lang.english=英语 -label.lang.japanese=日语 -label.lang.korean=韩国语 -label.lang.spanish=西ç­ç‰™è¯­ -label.last.disconnected=上次断开连接时间 -label.last.name=å§“æ° -label.level=级别 -label.linklocal.ip=链接本地 IP åœ°å€ -label.load.balancer=负载平衡器 -label.loading=正在加载 -label.local=本地 -label.login=登录 -label.logout=注销 +label.isolated.networks=\u9694\u79bb\u7f51\u7edc +label.isolation.method=\u9694\u79bb\u65b9\u6cd5 +label.isolation.mode=\u9694\u79bb\u6a21\u5f0f +label.isolation.uri=\u9694\u79bbURI +label.is.redundant.router=\u5197\u4f59 +label.is.shared=\u662f\u5426\u5171\u4eab +label.is.system=\u662f\u5426\u4e3a\u7cfb\u7edf +label.item.listing=\u9879\u76ee\u5217\u8868 +label.keep=\u4fdd\u7559 +label.keyboard.type=\u952e\u76d8\u7c7b\u578b +label.key=\u5bc6\u94a5 +label.kvm.traffic.label=KVM \u6d41\u91cf\u6807\u7b7e +label.label=\u6807\u7b7e +label.lang.brportugese=\u5df4\u897f\u8461\u8404\u7259\u8bed +label.lang.chinese=\u7b80\u4f53\u4e2d\u6587 +label.lang.english=\u82f1\u8bed +label.lang.french=\u6cd5\u8bed +label.lang.japanese=\u65e5\u8bed +label.lang.korean=\u97e9\u56fd\u8bed +label.lang.russian=\u4fc4\u8bed +label.lang.spanish=\u897f\u73ed\u7259\u8bed +label.last.disconnected=\u4e0a\u6b21\u65ad\u5f00\u8fde\u63a5\u65f6\u95f4 +label.last.name=\u59d3\u6c0f +label.latest.events=\u6700\u65b0\u4e8b\u4ef6 +label.launch=\u542f\u52a8 +label.launch.vm=\u542f\u52a8 VM +label.launch.zone=\u542f\u52a8\u533a\u57df +label.LB.isolation=\u8d1f\u8f7d\u5e73\u8861\u5668\u9694\u79bb +label.least.connections=\u6700\u5c11\u8fde\u63a5\u7b97\u6cd5 +label.level=\u7ea7\u522b +label.linklocal.ip=\u94fe\u63a5\u672c\u5730 IP \u5730\u5740 +label.load.balancer=\u8d1f\u8f7d\u5e73\u8861\u5668 +label.load.balancing.policies=\u8d1f\u8f7d\u5e73\u8861\u7b56\u7565 +label.load.balancing=\u8d1f\u8f7d\u5e73\u8861 +label.loading=\u6b63\u5728\u52a0\u8f7d +label.local.storage.enabled=\u5df2\u542f\u7528\u672c\u5730\u5b58\u50a8 +label.local.storage=\u672c\u5730\u5b58\u50a8 +label.local=\u672c\u5730 +label.login=\u767b\u5f55 +label.logout=\u6ce8\u9500 label.lun=LUN -label.manage=托管 -label.maximum=最大值 -label.memory.allocated=已分é…的内存 -label.memory.total=å†…å­˜æ€»é‡ -label.memory.used=已使用的内存 -label.memory=内存 -label.menu.accounts=å¸æˆ· -label.menu.alerts=警报 -label.menu.all.accounts=所有å¸æˆ· -label.menu.all.instances=所有实例 -label.menu.community.isos=社区 ISO -label.menu.community.templates=ç¤¾åŒºæ¨¡æ¿ -label.menu.configuration=é…ç½® -label.menu.dashboard=æŽ§åˆ¶æ¿ -label.menu.destroyed.instances=已销æ¯çš„实例 -label.menu.disk.offerings=ç£ç›˜æ–¹æ¡ˆ -label.menu.domains=域 -label.menu.events=事件 -label.menu.featured.isos=精选 ISO -label.menu.featured.templates=ç²¾é€‰æ¨¡æ¿ -label.menu.global.settings=全局设置 -label.menu.instances=实例 -label.menu.ipaddresses=IP åœ°å€ +label.LUN.number=LUN \u53f7 +label.make.project.owner=\u8bbe\u4e3a\u5e10\u6237\u9879\u76ee\u6240\u6709\u8005 +label.management.ips=\u7ba1\u7406\u7c7b IP \u5730\u5740 +label.management=\u7ba1\u7406 +label.manage.resources=\u7ba1\u7406\u8d44\u6e90 +label.manage=\u6258\u7ba1 +label.max.cpus=\u6700\u5927CPU\u6838\u5fc3\u6570 +label.max.guest.limit=\u6700\u5927\u6765\u5bbe\u6570\u9650\u5236 +label.maximum=\u6700\u5927\u503c +label.max.memory=\u6700\u5927\u5185\u5b58\u6570(\u5146\u5b57\u8282) +label.max.networks=\u6700\u5927\u7f51\u7edc\u6570 +label.max.primary.storage=\u6700\u5927\u4e3b\u5b58\u50a8(G\u5b57\u8282) +label.max.public.ips=\u6700\u5927\u516c\u7528 IP \u6570 +label.max.secondary.storage=\u6700\u5927\u4e8c\u7ea7\u5b58\u50a8(G\u5b57\u8282) +label.max.snapshots=\u6700\u5927\u5feb\u7167\u6570 +label.max.templates=\u6700\u5927\u6a21\u677f\u6570 +label.max.vms=\u6700\u5927\u7528\u6237 VM \u6570 +label.max.volumes=\u6700\u5927\u5377\u6570 +label.max.vpcs=\u6700\u591aVPC\u5c42\u6570 +label.may.continue=\u60a8\u73b0\u5728\u53ef\u4ee5\u7ee7\u7eed\u8fdb\u884c\u64cd\u4f5c\u3002 +label.memory.allocated=\u5df2\u5206\u914d\u7684\u5185\u5b58 +label.memory.limits=\u5185\u5b58\u9650\u5236(\u5146\u5b57\u8282) +label.memory.mb=\u5185\u5b58(MB) +label.memory.total=\u5185\u5b58\u603b\u91cf +label.memory=\u5185\u5b58 +label.memory.used=\u5df2\u4f7f\u7528\u7684\u5185\u5b58 +label.menu.accounts=\u5e10\u53f7 +label.menu.alerts=\u8b66\u62a5 +label.menu.all.accounts=\u6240\u6709\u5e10\u6237 +label.menu.all.instances=\u6240\u6709\u5b9e\u4f8b +label.menu.community.isos=\u793e\u533a ISO +label.menu.community.templates=\u793e\u533a\u6a21\u677f +label.menu.configuration=\u4e91\u5e73\u53f0\u914d\u7f6e +label.menu.dashboard=\u63a7\u5236\u677f +label.menu.destroyed.instances=\u5df2\u9500\u6bc1\u7684\u5b9e\u4f8b +label.menu.disk.offerings=\u78c1\u76d8\u65b9\u6848 +label.menu.domains=\u57df +label.menu.events=\u4e8b\u4ef6 +label.menu.featured.isos=\u7cbe\u9009 ISO +label.menu.featured.templates=\u7cbe\u9009\u6a21\u677f +label.menu.global.settings=\u5168\u5c40\u8bbe\u7f6e +label.menu.infrastructure=\u57fa\u7840\u67b6\u6784 +label.menu.instances=\u5b9e\u4f8b +label.menu.ipaddresses=IP\u5730\u5740 label.menu.isos=ISO -label.menu.my.accounts=我的å¸æˆ· -label.menu.my.instances=我的实例 -label.menu.my.isos=我的 ISO -label.menu.my.templates=æˆ‘çš„æ¨¡æ¿ -label.menu.network.offerings=网络方案 -label.menu.network=网络 -label.menu.physical.resources=物ç†èµ„æº -label.menu.running.instances=正在è¿è¡Œçš„实例 -label.menu.security.groups=安全组 -label.menu.service.offerings=æœåŠ¡æ–¹æ¡ˆ -label.menu.snapshots=å¿«ç…§ -label.menu.stopped.instances=å·²åœæ­¢çš„实例 -label.menu.storage=存储 -label.menu.system.vms=系统 VM -label.menu.system=系统 -label.menu.templates=æ¨¡æ¿ -label.menu.virtual.appliances=虚拟设备 -label.menu.virtual.resources=è™šæ‹Ÿèµ„æº -label.menu.volumes=å· -label.migrate.instance.to=è¿ç§»å®žä¾‹è‡³ -label.minimum=最å°å€¼ -label.minute.past.hour=分钟时 -label.monday=星期一 -label.monthly=æ¯æœˆä¸€æ¬¡ -label.more.templates=æ›´å¤šæ¨¡æ¿ -label.my.account=我的å¸æˆ· -label.name.optional=å称(å¯é€‰) -label.name=å称 -label.netmask=ç½‘ç»œæŽ©ç  -label.network.desc=网络æè¿° -label.network.domain=网络域 -label.network.id=网络 ID -label.network.name=网络å称 -label.network.offering.display.text=网络方案显示文本 -label.network.offering.id=网络方案 ID -label.network.offering.name=网络方案å称 -label.network.offering=网络方案 -label.network.rate=网络速率 -label.network.read=网络读å–é‡ -label.network.type=网络类型 -label.network.write=ç½‘ç»œå†™å…¥é‡ -label.network=网络 -label.new.password=æ–°å¯†ç  -label.next=下一步 -label.nfs.server=NFS æœåŠ¡å™¨ -label.nfs.storage=NFS 存储 +label.menu.my.accounts=\u6211\u7684\u5e10\u6237 +label.menu.my.instances=\u6211\u7684\u5b9e\u4f8b +label.menu.my.isos=\u6211\u7684 ISO +label.menu.my.templates=\u6211\u7684\u6a21\u677f +label.menu.network.offerings=\u7f51\u7edc\u65b9\u6848 +label.menu.network=\u7f51\u7edc +label.menu.physical.resources=\u7269\u7406\u8d44\u6e90 +label.menu.regions=\u533a\u57df +label.menu.running.instances=\u6b63\u5728\u8fd0\u884c\u7684\u5b9e\u4f8b +label.menu.security.groups=\u5b89\u5168\u5206\u7ec4 +label.menu.service.offerings=\u670d\u52a1\u63d0\u4f9b +label.menu.snapshots=\u5feb\u7167 +label.menu.stopped.instances=\u5df2\u505c\u6b62\u7684\u5b9e\u4f8b +label.menu.storage=\u5b58\u50a8 +label.menu.system.service.offerings=\u7cfb\u7edf\u65b9\u6848 +label.menu.system=\u7cfb\u7edf +label.menu.system.vms=\u7cfb\u7edf VM +label.menu.templates=\u6a21\u677f +label.menu.virtual.appliances=\u865a\u62df\u8bbe\u5907 +label.menu.virtual.resources=\u865a\u62df\u8d44\u6e90 +label.menu.volumes=\u5377 +label.migrate.instance.to.host=\u5c06\u5b9e\u4f8b\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u673a +label.migrate.instance.to.ps=\u5c06\u5b9e\u4f8b\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u5b58\u50a8 +label.migrate.instance.to=\u8fc1\u79fb\u5b9e\u4f8b\u81f3 +label.migrate.router.to=\u8fc1\u79fb\u8def\u7531\u5668\u81f3 +label.migrate.systemvm.to=\u8fc1\u79fb\u7cfb\u7edf VM \u81f3 +label.migrate.to.host=\u8fc1\u79fb\u5230\u4e3b\u673a +label.migrate.to.storage=\u8fc1\u79fb\u5230\u5b58\u50a8 +label.migrate.volume=\u5c06\u5377\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u5b58\u50a8 +label.minimum=\u6700\u5c0f\u503c +label.minute.past.hour=\u5206\u949f\u65f6 +label.monday=\u661f\u671f\u4e00 +label.monthly=\u6bcf\u6708\u4e00\u6b21 +label.more.templates=\u66f4\u591a\u6a21\u677f +label.move.down.row=\u5411\u4e0b\u79fb\u52a8\u4e00\u884c +label.move.to.bottom=\u79fb\u81f3\u5e95\u90e8 +label.move.to.top=\u79fb\u81f3\u9876\u90e8 +label.move.up.row=\u5411\u4e0a\u79fb\u52a8\u4e00\u884c +label.my.account=\u6211\u7684\u5e10\u6237 +label.my.network=\u6211\u7684\u7f51\u7edc +label.my.templates=\u6211\u7684\u6a21\u677f +label.name.optional=\u540d\u79f0(\u53ef\u9009) +label.name=\u540d\u79f0 +label.nat.port.range=NAT \u7aef\u53e3\u8303\u56f4 +label.netmask=\u7f51\u7edc\u63a9\u7801 +label.netScaler=NetScaler +label.network.ACLs=\u7f51\u7edc ACL +label.network.ACL.total=\u7f51\u7edc ACL \u603b\u6570 +label.network.ACL=\u7f51\u7edc ACL +label.network.desc=\u7f51\u7edc\u63cf\u8ff0 +label.network.device.type=\u7f51\u7edc\u8bbe\u5907\u7c7b\u578b +label.network.device=\u7f51\u7edc\u8bbe\u5907 +label.network.domain.text=\u7f51\u7edc\u57df +label.network.domain=\u7f51\u7edc\u57df +label.network.id=\u7f51\u7edc ID +label.networking.and.security=\u7f51\u7edc\u8fde\u63a5\u4e0e\u5b89\u5168 +label.network.label.display.for.blank.value=\u4f7f\u7528\u9ed8\u8ba4\u7f51\u5173 +label.network.name=\u7f51\u7edc\u540d\u79f0 +label.network.offering.display.text=\u7f51\u7edc\u65b9\u6848\u663e\u793a\u6587\u672c +label.network.offering.id=\u7f51\u7edc\u65b9\u6848 ID +label.network.offering.name=\u7f51\u7edc\u65b9\u6848\u540d\u79f0 +label.network.offering=\u7f51\u7edc\u65b9\u6848 +label.network.rate.megabytes=\u7f51\u7edc\u901f\u7387(MB/\u79d2) +label.network.rate=\u7f51\u7edc\u901f\u7387 +label.network.read=\u7f51\u7edc\u8bfb\u53d6\u91cf +label.network.service.providers=\u7f51\u7edc\u670d\u52a1\u63d0\u4f9b\u65b9\u6848 +label.networks=\u7f51\u7edc +label.network.type=\u7f51\u7edc\u7c7b\u578b +label.network=\u7f51\u7edc +label.network.write=\u7f51\u7edc\u5199\u5165\u91cf +label.new.password=\u65b0\u5bc6\u7801 +label.new.project=\u65b0\u5efa\u9879\u76ee +label.new=\u65b0\u5efa +label.new.vm=\u65b0\u5efa VM +label.next=\u4e0b\u4e00\u6b65 +label.nexusVswitch=Nexus 1000v label.nfs=NFS +label.nfs.server=NFS \u670d\u52a1\u5668 +label.nfs.storage=NFS \u5b58\u50a8 +label.nic.adapter.type=NIC \u9002\u914d\u5668\u7c7b\u578b +label.nicira.controller.address=\u63a7\u5236\u5668\u5730\u5740 +label.nicira.l3gatewayserviceuuid=3\u5c42\u7f51\u5173\u670d\u52a1UUID +label.nicira.transportzoneuuid=\u4f20\u8f93\u8d44\u6e90\u57dfUUID label.nics=NIC -label.no.actions=æ— å¯ç”¨æ“作 -label.no.alerts=无最近å‘出的警报 -label.no.errors=无最近出现的错误 -label.no.isos=æ— å¯ç”¨ ISO -label.no.items=æ— å¯ç”¨é¡¹ç›® -label.no.security.groups=æ— å¯ç”¨å®‰å…¨ç»„ -label.no.thanks=ä¸ï¼Œè°¢è°¢ -label.no=å¦ -label.none=æ—  -label.not.found=未找到 -label.num.cpu.cores=CPU 内核数 -label.numretries=é‡è¯•æ¬¡æ•° -label.offer.ha=æ供高å¯ç”¨æ€§ -label.optional=å¯é€‰ -label.os.preference=æ“作系统首选项 -label.os.type=æ“作系统类型 -label.owned.public.ips=拥有的公用 IP 地å€æ•° -label.owner.account=所有者å¸æˆ· -label.owner.domain=所有者域 -label.parent.domain=父域 -label.password.enabled=å·²å¯ç”¨å¯†ç  -label.password=å¯†ç  -label.path=路径 -label.please.wait=请ç¨å€™ -label.pod=æ供点 -label.port.forwarding=端å£è½¬å‘ -label.port.range=端å£èŒƒå›´ -label.prev=上一页 -label.primary.allocated=已分é…的主存储 -label.primary.network=主网络 -label.primary.storage=主存储 -label.primary.used=已使用的主存储 -label.private.interface=ä¸“ç”¨æŽ¥å£ -label.private.ip.range=专用 IP 范围 -label.private.ip=专用 IP åœ°å€ -label.private.ips=专用 IP åœ°å€ -label.private.port=ä¸“ç”¨ç«¯å£ -label.private.zone=专用区域 -label.protocol=åè®® -label.public.interface=å…¬ç”¨æŽ¥å£ -label.public.ip=公用 IP åœ°å€ -label.public.ips=公用 IP åœ°å€ -label.public.port=å…¬ç”¨ç«¯å£ -label.public.zone=公用区域 -label.public=公用 -label.recent.errors=最近出现的错误 -label.refresh=刷新 -label.related=ç›¸å…³è” -label.remove.from.load.balancer=正在从负载平衡器中删除实例 -label.removing.user=正在删除用户 -label.required=必填项 -label.reserved.system.ip=预留的系统 IP -label.resource.limits=资æºé™åˆ¶ -label.resource=èµ„æº -label.resources=èµ„æº -label.role=角色 -label.root.disk.offering=æ ¹ç£ç›˜æ–¹æ¡ˆ -label.running.vms=正在è¿è¡Œçš„ VM -label.saturday=星期六 -label.save=ä¿å­˜ -label.saving.processing=正在ä¿å­˜... -label.scope=范围 -label.search=æœç´¢ -label.secondary.storage=辅助存储 -label.secondary.used=已使用的辅助存储 -label.secret.key=密钥 -label.security.group.name=安全组å称 -label.security.group=安全组 -label.security.groups.enabled=å·²å¯ç”¨å®‰å…¨ç»„ -label.security.groups=安全组 -label.sent=å·²å‘é€ -label.server=æœåŠ¡å™¨ -label.service.offering=æœåŠ¡æ–¹æ¡ˆ -label.system.service.offering=系统æœåŠ¡æ–¹æ¡ˆ -label.session.expired=会è¯å·²è¿‡æœŸ -label.shared=已共享 -label.size=å¤§å° -label.snapshot.limits=å¿«ç…§é™åˆ¶ -label.snapshot.name=å¿«ç…§å称 -label.snapshot.s=å¿«ç…§ -label.snapshot.schedule=设置é‡çŽ°å¿«ç…§ -label.snapshot=å¿«ç…§ -label.snapshots=å¿«ç…§ -label.source.nat=æº NAT -label.specify.vlan=指定 VLAN -label.start.port=èµ·å§‹ç«¯å£ -label.state=çŠ¶æ€ -label.static.nat.to=é™æ€ NAT 目标 -label.static.nat=é™æ€ NAT -label.statistics=ç»Ÿè®¡æ•°æ® -label.status=çŠ¶æ€ -label.step.1.title=步骤 1: é€‰æ‹©ä¸€ä¸ªæ¨¡æ¿ -label.step.1=步骤 1 -label.step.2.title=步骤 2: æœåŠ¡æ–¹æ¡ˆ -label.step.2=步骤 2 -label.step.3.title=步骤 3: 选择一ç§ç£ç›˜æ–¹æ¡ˆ -label.step.3=步骤 3 -label.step.4.title=步骤 4: 网络 -label.step.4=步骤 4 -label.step.5.title=步骤 5: 核对 -label.step.5=步骤 5 -label.stopped.vms=å·²åœæ­¢çš„ VM -label.storage.type=存储类型 -label.storage=存储 -label.submit=æ交 -label.submitted.by=[æ交者: ] -label.succeeded=æˆåŠŸ -label.sunday=星期日 -label.system.capacity=ç³»ç»Ÿå®¹é‡ -label.system.vm.type=系统 VM 类型 -label.system.vm=系统 VM -label.system.vms=系统 VM -label.tagged=已标记 -label.tags=标签 -label.target.iqn=目标 IQN -label.template.limits=模æ¿é™åˆ¶ -label.template=æ¨¡æ¿ -label.theme.default=默认主题 -label.theme.grey=自定义 - ç°è‰² -label.theme.lightblue=自定义 - æ·¡è“色 -label.thursday=星期四 -label.time.zone=时区 -label.time=时间 -label.timeout.in.second = 超时(秒) -label.timezone=时区 -label.total.cpu=CPU æ€»é‡ -label.total.vms=总 VM æ•° -label.traffic.type=æµé‡ç±»åž‹ -label.tuesday=星期二 -label.type.id=类型 ID -label.type=类型 -label.unavailable=ä¸å¯ç”¨ -label.unlimited=æ— é™åˆ¶ -label.untagged=å·²å–消标记 -label.update.ssl.cert=æ›´æ–° SSL è¯ä¹¦ -label.update.ssl=æ›´æ–° SSL è¯ä¹¦ -label.updating=正在更新 -label.url=URL -label.usage.interface=ä½¿ç”¨ç•Œé¢ -label.used=已使用 -label.user=用户 -label.username=用户å -label.users=用户 -label.value=值 -label.vcenter.cluster=vCenter 群集 -label.vcenter.datacenter=vCenter æ•°æ®ä¸­å¿ƒ -label.vcenter.datastore=vCenter æ•°æ®å­˜å‚¨ -label.vcenter.host=vCenter 主机 -label.vcenter.password=vCenter å¯†ç  -label.vcenter.username=vCenter 用户å -label.version=版本 -label.virtual.appliance=虚拟设备 -label.virtual.appliances=虚拟设备 -label.virtual.network=虚拟网络 -label.vlan.id=VLAN ID -label.vlan.range=VLAN 范围 -label.vm.add=添加实例 -label.vm.destroy=é”€æ¯ -label.vm.reboot=é‡æ–°å¯åŠ¨ -label.vm.start=å¯åŠ¨ -label.vm.stop=åœæ­¢ -label.vmfs=VMFS -label.vms=VM -label.volume.limits=å·é™åˆ¶ -label.volume.name=å·å称 -label.volume=å· -label.volumes=å· -label.vsphere.managed=ç”± vSphere ç®¡ç† -label.waiting=正在等待 -label.warn=警告 -label.wednesday=星期三 -label.weekly=æ¯å‘¨ä¸€æ¬¡ -label.welcome.cloud.console=欢迎使用管ç†æŽ§åˆ¶å° -label.welcome=欢迎 -label.yes=是 -label.zone.id=区域 ID -label.zone.step.1.title=步骤 1: 选择一个网络 -label.zone.step.2.title=步骤 2: 添加一个区域 -label.zone.step.3.title=步骤 3: 添加一个æ供点 -label.zone.step.4.title=步骤 4: 添加一个 IP 范围 -label.zone.wide=整个区域 -label.zone=区域 - -#Messages -message.acquire.public.ip=请选择一个è¦ä»Žä¸­èŽ·å–æ–° IP 的区域。 -message.action.cancel.maintenance.mode=请确认您确实è¦å–消此维护。 -message.action.cancel.maintenance=å·²æˆåŠŸå–消维护您的主机。此过程å¯èƒ½éœ€è¦é•¿è¾¾å‡ åˆ†é’Ÿæ—¶é—´ã€‚ -message.action.delete.ISO.for.all.zones=æ­¤ ISO 由所有区域使用。请确认您确实è¦å°†å…¶ä»Žæ‰€æœ‰åŒºåŸŸä¸­åˆ é™¤ã€‚ -message.action.delete.ISO=请确认您确实è¦åˆ é™¤æ­¤ ISO。 -message.action.delete.cluster=请确认您确实è¦åˆ é™¤æ­¤ç¾¤é›†ã€‚ -message.action.delete.disk.offering=请确认您确实è¦åˆ é™¤æ­¤ç£ç›˜æ–¹æ¡ˆã€‚ -message.action.delete.domain=请确认您确实è¦åˆ é™¤æ­¤åŸŸã€‚ -message.action.delete.external.firewall=请确认您确实è¦åˆ é™¤æ­¤å¤–部防ç«å¢™ã€‚警告: 如果您计划é‡æ–°æ·»åŠ åŒä¸€ä¸ªå¤–部防ç«å¢™ï¼Œåˆ™å¿…须在设备上é‡ç½®ä½¿ç”¨æ•°æ®ã€‚ -message.action.delete.external.load.balancer=请确认您确实è¦åˆ é™¤æ­¤å¤–部负载平衡器。警告: 如果您计划é‡æ–°æ·»åŠ åŒä¸€ä¸ªå¤–部负载平衡器，则必须在设备上é‡ç½®ä½¿ç”¨æ•°æ®ã€‚ -message.action.delete.ingress.rule=请确认您确实è¦åˆ é™¤æ­¤å…¥å£è§„则。 -message.action.delete.network=请确认您确实è¦åˆ é™¤æ­¤ç½‘络。 -message.action.delete.pod=请确认您确实è¦åˆ é™¤æ­¤æ供点。 -message.action.delete.primary.storage=请确认您确实è¦åˆ é™¤æ­¤ä¸»å­˜å‚¨ã€‚ -message.action.delete.secondary.storage=请确认您确实è¦åˆ é™¤æ­¤è¾…助存储。 -message.action.delete.security.group=请确认您确实è¦åˆ é™¤æ­¤å®‰å…¨ç»„。 -message.action.delete.service.offering=请确认您确实è¦åˆ é™¤æ­¤æœåŠ¡æ–¹æ¡ˆã€‚ -message.action.delete.snapshot=请确认您确实è¦åˆ é™¤æ­¤å¿«ç…§ã€‚ -message.action.delete.template.for.all.zones=此模æ¿ç”±æ‰€æœ‰åŒºåŸŸä½¿ç”¨ã€‚请确认您确实è¦å°†å…¶ä»Žæ‰€æœ‰åŒºåŸŸä¸­åˆ é™¤ã€‚ -message.action.delete.template=请确认您确实è¦åˆ é™¤æ­¤æ¨¡æ¿ã€‚ -message.action.delete.volume=请确认您确实è¦åˆ é™¤æ­¤å·ã€‚ -message.action.delete.zone=请确认您确实è¦åˆ é™¤æ­¤åŒºåŸŸã€‚ -message.action.destroy.instance=请确认您确实è¦é”€æ¯æ­¤å®žä¾‹ã€‚ -message.action.destroy.systemvm=请确认您确实è¦é”€æ¯æ­¤ç³»ç»Ÿ VM。 -message.action.disable.static.NAT=请确认您确实è¦ç¦ç”¨é™æ€ NAT。 -message.action.enable.maintenance=å·²æˆåŠŸå‡†å¤‡å¥½ç»´æŠ¤æ‚¨çš„主机。此过程å¯èƒ½éœ€è¦é•¿è¾¾å‡ åˆ†é’Ÿæˆ–更长时间，具体å–决于当å‰æ­¤ä¸»æœºä¸Šçš„ VM æ•°é‡ã€‚ -message.action.force.reconnect=å·²æˆåŠŸå¼ºåˆ¶é‡æ–°è¿žæŽ¥æ‚¨çš„主机。此过程å¯èƒ½éœ€è¦é•¿è¾¾å‡ åˆ†é’Ÿæ—¶é—´ã€‚ -message.action.host.enable.maintenance.mode=å¯ç”¨ç»´æŠ¤æ¨¡å¼å°†å¯¼è‡´å°†æ­¤ä¸»æœºä¸Šæ­£åœ¨è¿è¡Œçš„所有实例实时è¿ç§»åˆ°ä»»ä½•å¯ç”¨çš„主机。 -message.action.instance.reset.password=请确认您确实è¦æ›´æ”¹æ­¤è™šæ‹Ÿæœºçš„ ROOT 用户密ç ã€‚ -message.action.primarystorage.enable.maintenance.mode=警告: 将主存储置于维护模å¼å°†å¯¼è‡´ä½¿ç”¨ä¸»å­˜å‚¨ä¸­çš„å·çš„所有 VM åœæ­¢è¿è¡Œã€‚是å¦è¦ç»§ç»­? -message.action.reboot.instance=请确认您确实è¦é‡æ–°å¯åŠ¨æ­¤å®žä¾‹ã€‚ -message.action.reboot.systemvm=请确认您确实è¦é‡æ–°å¯åŠ¨æ­¤ç³»ç»Ÿ VM。 -message.action.release.ip=请确认您确实è¦é‡Šæ”¾æ­¤ IP。 -message.action.restore.instance=请确认您确实è¦è¿˜åŽŸæ­¤å®žä¾‹ã€‚ -message.action.start.instance=请确认您确实è¦å¯åŠ¨æ­¤å®žä¾‹ã€‚ -message.action.start.router=请确认您确实è¦å¯åŠ¨æ­¤è·¯ç”±å™¨ã€‚ -message.action.start.systemvm=请确认您确实è¦å¯åŠ¨æ­¤ç³»ç»Ÿ VM。 -message.action.stop.instance=请确认您确实è¦åœæ­¢æ­¤å®žä¾‹ã€‚ -message.action.stop.systemvm=请确认您确实è¦åœæ­¢æ­¤ç³»ç»Ÿ VM。 -message.action.take.snapshot=请确认您确实è¦åˆ›å»ºæ­¤å·çš„快照。 -message.add.cluster.zone=å‘区域 中添加一个虚拟机管ç†ç¨‹åºæ‰˜ç®¡çš„群集 -message.add.cluster=å‘区域 ã€æ供点 中添加一个虚拟机管ç†ç¨‹åºæ‰˜ç®¡çš„群集 -message.add.disk.offering=请指定以下å‚数以添加一个新的ç£ç›˜æ–¹æ¡ˆ -message.add.firewall=å‘区域中添加一个防ç«å¢™ -message.add.host=请指定以下å‚数以添加一å°æ–°ä¸»æœº -message.add.ip.range.direct.network=å‘区域 中的直接网络 添加一个 IP 范围 -message.add.ip.range.to.pod=

å‘æ供点添加一个 IP 范围:

-message.add.ip.range=å‘区域中的公用网络添加一个 IP 范围 -message.add.load.balancer=å‘区域中添加一个负载平衡器 -message.add.network=为区域添加一个新网络: -message.add.pod=为区域 添加一个新æ供点 -message.add.primary.storage=为区域 ã€æ供点 添加一个新的主存储 -message.add.primary=请指定以下å‚数以添加一个新主存储 -message.add.secondary.storage=为区域 添加一个新存储 -message.add.service.offering=请填写以下数æ®ä»¥æ·»åŠ ä¸€ä¸ªæ–°è®¡ç®—方案。 -message.add.template=请输入以下数æ®ä»¥åˆ›å»ºæ–°æ¨¡æ¿ -message.add.volume=请填写以下数æ®ä»¥æ·»åŠ ä¸€ä¸ªæ–°å·ã€‚ -message.additional.networks.desc=请选择虚拟机è¦è¿žæŽ¥åˆ°çš„其他网络。 -message.advanced.mode.desc=如果您希望å¯ç”¨ VLAN 支æŒï¼Œè¯·é€‰æ‹©æ­¤ç½‘络模å¼ã€‚此网络模å¼åœ¨å…许管ç†å‘˜æ供防ç«å¢™ã€VPN 或负载平衡器支æŒç­‰è‡ªå®šä¹‰ç½‘络方案以åŠå¯ç”¨ç›´æŽ¥ç½‘络连接与虚拟网络连接等方é¢æ供了最大的çµæ´»æ€§ã€‚ -message.advanced.security.group=如果è¦ä½¿ç”¨å®‰å…¨ç»„æä¾›æ¥å®¾ VM 隔离，请选择此模å¼ã€‚ -message.advanced.virtual=如果è¦ä½¿ç”¨æ•´ä¸ªåŒºåŸŸçš„ VLAN æä¾›æ¥å®¾ VM 隔离，请选择此模å¼ã€‚ -message.allow.vpn.access=请输入è¦å…许进行 VPN 访问的用户的用户å和密ç ã€‚ -message.attach.iso.confirm=请确认您确实è¦å°†æ­¤ ISO 附加到此虚拟实例。 -message.attach.volume=请填写以下数æ®ä»¥é™„加一个新å·ã€‚如果è¦å°†ç£ç›˜å·é™„加到基于 Windows 的虚拟机，需è¦é‡æ–°å¯åŠ¨æ­¤å®žä¾‹æ‰èƒ½æ˜¾ç¤ºå·²è¿žæŽ¥çš„ç£ç›˜ã€‚ -message.basic.mode.desc=如果您*ä¸*希望å¯ç”¨ä»»ä½• VLAN 支æŒï¼Œè¯·é€‰æ‹©æ­¤ç½‘络模å¼ã€‚将直接从此网络中为在此网络模å¼ä¸‹åˆ›å»ºçš„所有虚拟机实例分é…一个 IP，并使用安全组æ供安全性和隔离。 -message.change.offering.confirm=请确认您确实è¦æ›´æ”¹æ­¤è™šæ‹Ÿå®žä¾‹çš„æœåŠ¡æ–¹æ¡ˆã€‚ -message.copy.iso.confirm=请确认您确实è¦å°† ISO å¤åˆ¶åˆ° -message.copy.template=å°†æ¨¡æ¿ XXX 从区域 å¤åˆ¶åˆ° -message.create.template.vm=åŸºäºŽæ¨¡æ¿ åˆ›å»º VM -message.create.template.volume=请先指定以下信æ¯ï¼Œç„¶åŽå†åˆ›å»ºç£ç›˜å·çš„模æ¿: 。创建模æ¿å¯èƒ½éœ€è¦å‡ åˆ†é’Ÿåˆ°æ›´é•¿çš„时间，具体å–决于ç£ç›˜å·çš„大å°ã€‚ -message.delete.account=请确认您确实è¦åˆ é™¤æ­¤å¸æˆ·ã€‚ -message.detach.iso.confirm=请确认您确实è¦ä»Žæ­¤è™šæ‹Ÿæœºä¸­å–消附加此 ISO。 -message.disable.account=请确认您确实è¦ç¦ç”¨æ­¤å¸æˆ·ã€‚通过ç¦ç”¨æ­¤å¸æˆ·ï¼Œæ­¤å¸æˆ·çš„所有用户将ä¸å†æœ‰æƒè®¿é—®å„自的云资æºã€‚所有正在è¿è¡Œçš„虚拟机将立å³å…³é—­ã€‚ -message.disable.vpn.access=请确认您确实è¦ç¦ç”¨ VPN 访问。 -message.download.ISO=请å•å‡» 00000 下载 ISO -message.download.template=请å•å‡» 00000 ä¸‹è½½æ¨¡æ¿ -message.download.volume=请å•å‡» 00000 ä¸‹è½½å· -message.edit.confirm=请先确认您所åšçš„更改，然åŽå•å‡»â€œä¿å­˜â€ã€‚ -message.edit.limits=请指定对以下资æºçš„é™åˆ¶ã€‚“-1â€è¡¨ç¤ºä¸é™åˆ¶è¦åˆ›å»ºçš„资æºæ•°ã€‚ -message.enable.account=请确认您确实è¦å¯ç”¨æ­¤å¸æˆ·ã€‚ -message.enable.vpn.access=当å‰å·²å¯¹æ­¤ IP 地å€ç¦ç”¨äº† VPN。是å¦è¦å¯ç”¨ VPN 访问? -message.enabled.vpn.ip.sec=您的 IPSec 预共享密钥 -message.enabled.vpn=您的 VPN 访问功能当å‰å·²å¯ç”¨ï¼Œå¯ä»¥é€šè¿‡ IP 进行访问 -message.launch.vm.on.private.network=是å¦è¦åœ¨æ‚¨çš„ç§äººä¸“用网络中å¯åŠ¨å®žä¾‹? -message.lock.account=请确认您确实è¦é”定此å¸æˆ·ã€‚通过é”定此å¸æˆ·ï¼Œæ­¤å¸æˆ·çš„所有用户将ä¸å†èƒ½å¤Ÿç®¡ç†å„自的云资æºï¼Œä½†ä»ç„¶å¯ä»¥è®¿é—®çŽ°æœ‰èµ„æºã€‚ -message.migrate.instance.confirm=请确认è¦å°†è™šæ‹Ÿå®žä¾‹è¿ç§»åˆ°çš„主机。 -message.new.user=请指定以下信æ¯ä»¥å‘å¸æˆ·ä¸­æ·»åŠ ä¸€ä¸ªæ–°ç”¨æˆ· -message.no.network.support.configuration.not.true=您的所有区域都未å¯ç”¨å®‰å…¨ç»„，因此无其他网络功能。请继续执行步骤 5。 -message.no.network.support=您选择的虚拟机管ç†ç¨‹åº vSphere 没有任何其他网络功能。请继续执行步骤 5。 -message.number.clusters=

群集数

-message.number.hosts=

主机数

-message.number.pods=

æ供点数

-message.number.storage=

主存储å·æ•°

-message.number.zones=

区域数

-message.remove.vpn.access=请确认您确实è¦åˆ é™¤ä»¥ä¸‹ç”¨æˆ·çš„ VPN 访问。 -message.restart.mgmt.server=请é‡æ–°å¯åŠ¨ç®¡ç†æœåŠ¡å™¨ä»¥ä½¿æ‚¨çš„新设置生效。 -message.restart.mgmt.usage.server=请é‡æ–°å¯åŠ¨ç®¡ç†æœåŠ¡å™¨å’Œä½¿ç”¨æœåŠ¡å™¨ä»¥ä½¿æ‚¨çš„新设置生效。 -message.security.group.usage=(æŒ‰ä½ Ctrl 键并å•å‡»é¼ æ ‡å¯é€‰æ‹©æ‰€æœ‰é€‚用的安全组) -message.snapshot.schedule=å¯ä»¥é€šè¿‡ä»Žä»¥ä¸‹å¯ç”¨é€‰é¡¹ä¸­è¿›è¡Œé€‰æ‹©å¹¶åº”用您的策略首选项æ¥è®¾ç½®é‡çŽ°å¿«ç…§è®¡åˆ’ -message.step.1.continue=请选择一个模æ¿æˆ– ISO 以继续 -message.step.1.desc=请为您的新虚拟实例选择一个模æ¿ã€‚还å¯ä»¥é€‰æ‹©ä¸€ä¸ªå¯å°† ISO 映åƒå®‰è£…到其中的空模æ¿ã€‚ -message.step.2.continue=请选择一ç§æœåŠ¡æ–¹æ¡ˆä»¥ç»§ç»­ -message.step.2.desc= -message.step.3.continue=请选择一ç§ç£ç›˜æ–¹æ¡ˆä»¥ç»§ç»­ -message.step.3.desc= -message.step.4.continue=请至少选择一个网络以继续 -message.step.4.desc=请选择虚拟实例è¦è¿žæŽ¥åˆ°çš„主网络。 -message.update.os.preference=请为此主机选择一个æ“作系统首选项。首先将具有相似首选项的所有虚拟实例分é…至此主机，然åŽå†é€‰æ‹©å…¶ä»–实例。 -message.update.ssl=请æ交一个新的 X.509 兼容的 SSL è¯ä¹¦ï¼Œä»¥å°†å…¶æ›´æ–°åˆ°æ¯ä¸ªæŽ§åˆ¶å°ä»£ç†è™šæ‹Ÿå®žä¾‹: -message.virtual.network.desc=您的å¸æˆ·çš„专用虚拟网络。广播域包å«åœ¨ VLAN 中，并且所有公用网络访问都由虚拟路由器路由出去。 -message.volume.create.template.confirm=请确认您确实è¦ä¸ºæ­¤ç£ç›˜å·åˆ›å»ºä¸€ä¸ªæ¨¡æ¿ã€‚创建模æ¿å¯èƒ½éœ€è¦å‡ åˆ†é’Ÿåˆ°æ›´é•¿çš„时间，具体å–决于å·çš„大å°ã€‚ -message.zone.step.1.desc=请为您的区域选择一ç§ç½‘络模å¼ã€‚ -message.zone.step.2.desc=请输入以下信æ¯ä»¥æ·»åŠ ä¸€ä¸ªæ–°åŒºåŸŸ -message.zone.step.3.desc=请输入以下信æ¯ä»¥æ·»åŠ ä¸€ä¸ªæ–°æ供点 -message.apply.snapshot.policy=您已æˆåŠŸæ›´æ–°å½“å‰çš„快照策略。 -message.disable.snapshot.policy=您已æˆåŠŸç¦ç”¨å½“å‰çš„快照策略。 -message.action.change.service.warning.for.instance=必须先ç¦ç”¨æ‚¨çš„实例，然åŽå†å°è¯•æ›´æ”¹å…¶å½“å‰çš„æœåŠ¡æ–¹æ¡ˆã€‚ -message.action.change.service.warning.for.router=必须先åœæ­¢æ‚¨çš„路由器，然åŽå†å°è¯•æ›´æ”¹å…¶å½“å‰çš„æœåŠ¡æ–¹æ¡ˆã€‚ -message.action.reset.password.warning=必须先åœæ­¢æ‚¨çš„实例，然åŽå†å°è¯•æ›´æ”¹å…¶å½“å‰çš„密ç ã€‚ -message.action.reset.password.off=您的实例当å‰ä¸æ”¯æŒæ­¤åŠŸèƒ½ã€‚ - -#Errors -error.login=您的用户å/密ç ä¸Žæˆ‘们的记录ä¸ä¸€è‡´ã€‚ -error.menu.select=正在选择项目，无法执行æ“作。 -error.mgmt.server.inaccessible=无法访问管ç†æœåŠ¡å™¨ã€‚请ç¨åŽå†è¯•ã€‚ -error.session.expired=您的会è¯å·²è¿‡æœŸã€‚ -error.unresolved.internet.name=无法解æžæ‚¨çš„ Internet å称。 - -#resizeVolumes -label.resize.new.size=New Size(GB) -label.action.resize.volume=Resize Volume -label.action.resize.volume.processing=Resizing Volume.... +label.no.actions=\u65e0\u53ef\u7528\u64cd\u4f5c +label.no.alerts=\u65e0\u6700\u8fd1\u53d1\u51fa\u7684\u8b66\u62a5 +label.no.data=\u65e0\u53ef\u663e\u793a\u7684\u6570\u636e +label.no.errors=\u65e0\u6700\u8fd1\u51fa\u73b0\u7684\u9519\u8bef +label.no.isos=\u65e0\u53ef\u7528 ISO +label.no.items=\u65e0\u53ef\u7528\u9879\u76ee +label.none=\u65e0 +label.no.security.groups=\u65e0\u53ef\u7528\u5b89\u5168\u7ec4 +label.not.found=\u672a\u627e\u5230 +label.no.thanks=\u4e0d\uff0c\u8c22\u8c22 +label.notifications=\u901a\u77e5 +label.no=\u5426 +label.number.of.clusters=\u7fa4\u96c6\u6570\u91cf +label.number.of.hosts=\u4e3b\u673a\u6570\u91cf +label.number.of.pods=\u63d0\u4f9b\u70b9\u6570\u91cf +label.number.of.system.vms=\u7cfb\u7edf VM \u6570 +label.number.of.virtual.routers=\u865a\u62df\u8def\u7531\u5668\u6570 +label.number.of.zones=\u533a\u57df\u6570\u91cf +label.num.cpu.cores=CPU \u5185\u6838\u6570 +label.numretries=\u91cd\u8bd5\u6b21\u6570 +label.ocfs2=OCFS2 +label.offer.ha=\u63d0\u4f9b\u9ad8\u53ef\u7528\u6027 +label.ok=\u786e\u5b9a +label.optional=\u53ef\u9009\u7684 +label.order=\u6392\u5e8f +label.os.preference=\u64cd\u4f5c\u7cfb\u7edf\u9996\u9009\u9879 +label.os.type=\u64cd\u4f5c\u7cfb\u7edf\u7c7b\u578b +label.owned.public.ips=\u62e5\u6709\u7684\u516c\u7528 IP \u5730\u5740\u6570 +label.owner.account=\u6240\u6709\u8005\u5e10\u6237 +label.owner.domain=\u6240\u6709\u8005\u57df +label.parent.domain=\u7236\u57df +label.password.enabled=\u5df2\u542f\u7528\u5bc6\u7801 +label.password=\u5bc6\u7801 +label.path=\u8def\u5f84 +label.perfect.forward.secrecy=\u5b8c\u5168\u6b63\u5411\u4fdd\u5bc6 +label.physical.network.ID=\u7269\u7406\u7f51\u7edc ID +label.physical.network=\u7269\u7406\u7f51\u7edc +label.PING.CIFS.password=PING CIFS \u5bc6\u7801 +label.PING.CIFS.username=PING CIFS \u7528\u6237\u540d +label.PING.dir=PING \u76ee\u5f55 +label.PING.storage.IP=PING \u5b58\u50a8 IP +label.please.specify.netscaler.info=\u8bf7\u6307\u5b9a Netscaler \u4fe1\u606f +label.please.wait=\u8bf7\u7a0d\u5019 +label.plugin.details=\u63d2\u4ef6\u8be6\u7ec6\u4fe1\u606f +label.plugins=\u63d2\u4ef6 +label.pod.name=\u63d0\u4f9b\u70b9\u540d\u79f0 +label.pods=\u63d0\u4f9b\u70b9 +label.pod=\u63d0\u4f9b\u70b9 +label.port.forwarding.policies=\u7aef\u53e3\u8f6c\u53d1\u7b56\u7565 +label.port.forwarding=\u7aef\u53e3\u8f6c\u53d1 +label.port.range=\u7aef\u53e3\u8303\u56f4 +label.PreSetup=PreSetup +label.previous=\u4e0a\u4e00\u6b65 +label.prev=\u4e0a\u4e00\u9875 +label.primary.allocated=\u5df2\u5206\u914d\u7684\u4e3b\u5b58\u50a8 +label.primary.network=\u4e3b\u7f51\u7edc +label.primary.storage.count=\u4e3b\u5b58\u50a8\u6c60 +label.primary.storage.limits=\u4e3b\u5b58\u50a8\u9650\u5236(G\u5b57\u8282) +label.primary.storage=\u4e3b\u5b58\u50a8 +label.primary.used=\u5df2\u4f7f\u7528\u7684\u4e3b\u5b58\u50a8 +label.private.Gateway=\u4e13\u7528\u7f51\u5173 +label.private.interface=\u4e13\u7528\u63a5\u53e3 +label.private.ip.range=\u4e13\u7528 IP \u8303\u56f4 +label.private.ips=\u4e13\u7528 IP \u5730\u5740 +label.private.ip=\u4e13\u7528 IP \u5730\u5740 +label.privatekey=PKCS\#8 \u79c1\u94a5 +label.private.network=\u4e13\u7528\u7f51\u7edc +label.private.port=\u4e13\u7528\u7aef\u53e3 +label.private.zone=\u4e13\u7528\u533a\u57df +label.project.dashboard=\u9879\u76ee\u63a7\u5236\u677f +label.project.id=\u9879\u76ee ID +label.project.invite=\u9080\u8bf7\u52a0\u5165\u9879\u76ee +label.project.name=\u9879\u76ee\u540d\u79f0 +label.projects=\u9879\u76ee +label.project=\u9879\u76ee +label.project.view=\u9879\u76ee\u89c6\u56fe +label.protocol=\u534f\u8bae +label.providers=\u63d0\u4f9b\u7a0b\u5e8f +label.public.interface=\u516c\u7528\u63a5\u53e3 +label.public.ips=\u516c\u7528 IP \u5730\u5740 +label.public.ip=\u516c\u7528 IP \u5730\u5740 +label.public.network=\u516c\u7528\u7f51\u7edc +label.public.port=\u516c\u7528\u7aef\u53e3 +label.public.traffic=\u516c\u5171\u6d41\u91cf +label.public=\u516c\u7528 +label.public.zone=\u516c\u7528\u533a\u57df +label.purpose=\u76ee\u7684 +label.Pxe.server.type=Pxe \u670d\u52a1\u5668\u7c7b\u578b +label.quickview=\u5feb\u901f\u67e5\u770b +label.reboot=\u00e9\u0087\u008d\u00e6\u0096\u00b0\u00e5\u0090\u00af\u00e5\u008a\u00a8 +label.recent.errors=\u6700\u8fd1\u51fa\u73b0\u7684\u9519\u8bef +label.redundant.router.capability=\u5197\u4f59\u8def\u7531\u5668\u529f\u80fd +label.redundant.router=\u5197\u4f59\u8def\u7531\u5668 +label.redundant.state=\u5197\u4f59\u72b6\u6001 +label.refresh=\u5237\u65b0 +label.region=\u533a\u57df +label.related=\u76f8\u5173\u8054 +label.remind.later=\u4ee5\u540e\u63d0\u9192\u6211 +label.remove.ACL=\u5220\u9664 ACL +label.remove.egress.rule=\u5220\u9664\u51fa\u53e3\u89c4\u5219 +label.remove.from.load.balancer=\u6b63\u5728\u4ece\u8d1f\u8f7d\u5e73\u8861\u5668\u4e2d\u5220\u9664\u5b9e\u4f8b +label.remove.ingress.rule=\u5220\u9664\u5165\u53e3\u89c4\u5219 +label.remove.ip.range=\u5220\u9664 IP \u8303\u56f4 +label.remove.pf=\u5220\u9664\u7aef\u53e3\u8f6c\u53d1\u89c4\u5219 +label.remove.project.account=\u4ece\u9879\u76ee\u4e2d\u5220\u9664\u5e10\u6237 +label.remove.region=\u79fb\u9664\u533a\u57df +label.remove.rule=\u5220\u9664\u89c4\u5219 +label.remove.static.nat.rule=\u5220\u9664\u9759\u6001 NAT \u89c4\u5219 +label.remove.static.route=\u5220\u9664\u9759\u6001\u8def\u7531 +label.remove.tier=\u5220\u9664\u5c42 +label.remove.vm.from.lb=\u4ece\u8d1f\u8f7d\u5e73\u8861\u5668\u89c4\u5219\u4e2d\u5220\u9664 VM +label.remove.vpc=\u5220\u9664 VPC +label.removing=\u6b63\u5728\u5220\u9664 +label.removing.user=\u6b63\u5728\u5220\u9664\u7528\u6237 +label.required=\u5fc5\u987b\u7684 +label.reserved.system.gateway=\u9884\u7559\u7684\u7cfb\u7edf\u7f51\u5173 +label.reserved.system.ip=\u9884\u7559\u7684\u7cfb\u7edf IP +label.reserved.system.netmask=\u9884\u7559\u7684\u7cfb\u7edf\u7f51\u7edc\u63a9\u7801 +label.reset.VPN.connection=\u91cd\u7f6e VPN \u8fde\u63a5 label.resize.new.offering.id=New Offering +label.resize.new.size=New Size(GB) label.resize.shrink.ok=Shrink OK +label.resource.limits=\u8d44\u6e90\u9650\u5236 +label.resource.state=\u8d44\u6e90\u72b6\u6001 +label.resources=\u8d44\u6e90 +label.resource=\u8d44\u6e90 +label.restart.network=\u91cd\u65b0\u542f\u52a8\u7f51\u7edc +label.restart.required=\u9700\u8981\u91cd\u65b0\u542f\u52a8 +label.restart.vpc=\u91cd\u65b0\u542f\u52a8 VPC +label.restore=\u6062\u590d +label.review=\u6838\u5bf9 +label.revoke.project.invite=\u64a4\u9500\u9080\u8bf7 +label.role=\u89d2\u8272 +label.root.disk.controller=\u6839\u78c1\u76d8\u63a7\u5236\u5668 +label.root.disk.offering=\u6839\u78c1\u76d8\u65b9\u6848 +label.round.robin=\u8f6e\u8be2\u7b97\u6cd5 +label.rules=\u89c4\u5219 +label.running.vms=\u6b63\u5728\u8fd0\u884c\u7684 VM +label.s3.access_key=\u8bbf\u95ee\u952e +label.s3.bucket=Bucket +label.s3.connection_timeout=\u8fde\u63a5\u8d85\u65f6 +label.s3.endpoint=\u7aef\u70b9 +label.s3.max_error_retry=\u6700\u5927\u9519\u8bef\u91cd\u8bd5 +label.s3.secret_key=\u00e5\u00af\u0086\u00e9\u0092\u00a5 +label.s3.socket_timeout=Socket\u8d85\u65f6 +label.s3.use_https=\u4f7f\u7528HTTPS +label.saturday=\u661f\u671f\u516d +label.save.and.continue=\u4fdd\u5b58\u5e76\u7ee7\u7eed +label.save=\u4fdd\u5b58 +label.saving.processing=\u6b63\u5728\u4fdd\u5b58... +label.scope=\u8303\u56f4 +label.search=\u641c\u7d22 +label.secondary.storage.count=\u8f85\u52a9\u5b58\u50a8\u6c60 +label.secondary.storage.limits=\u4e8c\u7ea7\u5b58\u50a8\u9650\u5236(G\u5b57\u8282) +label.secondary.storage=\u4e8c\u7ea7\u5b58\u50a8 +label.secondary.storage.vm=\u8f85\u52a9\u5b58\u50a8 VM +label.secondary.used=\u5df2\u4f7f\u7528\u7684\u8f85\u52a9\u5b58\u50a8 +label.secret.key=\u5bc6\u94a5 +label.security.group.name=\u5b89\u5168\u7ec4\u540d\u79f0 +label.security.groups.enabled=\u5df2\u542f\u7528\u5b89\u5168\u7ec4 +label.security.groups=\u5b89\u5168\u5206\u7ec4 +label.security.group=\u5b89\u5168\u7ec4 +label.select.a.template=\u9009\u62e9\u4e00\u4e2a\u6a21\u677f +label.select.a.zone=\u9009\u62e9\u4e00\u4e2a\u533a\u57df +label.select.instance.to.attach.volume.to=\u9009\u62e9\u8981\u5c06\u5377\u9644\u52a0\u5230\u7684\u5b9e\u4f8b +label.select.instance=\u9009\u62e9\u5b9e\u4f8b +label.select.iso.or.template=\u9009\u62e9 ISO \u6216\u6a21\u677f +label.select.offering=\u9009\u62e9\u65b9\u6848 +label.select.project=\u9009\u62e9\u9879\u76ee +label.select.tier=\u9009\u62e9\u5c42 +label.select=\u9009\u62e9 +label.select-view=\u9009\u62e9\u89c6\u56fe +label.select.vm.for.static.nat=\u4e3a\u9759\u6001 NAT \u9009\u62e9 VM +label.sent=\u5df2\u53d1\u9001 +label.server=\u670d\u52a1\u5668 +label.service.capabilities=\u670d\u52a1\u529f\u80fd +label.service.offering=\u670d\u52a1\u65b9\u6848 +label.session.expired=\u4f1a\u8bdd\u5df2\u8fc7\u671f +label.setup.network=\u8bbe\u7f6e\u7f51\u7edc +label.setup=\u8bbe\u7f6e +label.set.up.zone.type=\u8bbe\u7f6e\u533a\u57df\u7c7b\u578b +label.setup.zone=\u8bbe\u7f6e\u533a\u57df +label.SharedMountPoint=SharedMountPoint +label.shared=\u5df2\u5171\u4eab +label.show.ingress.rule=\u663e\u793a\u5165\u53e3\u89c4\u5219 +label.shutdown.provider=\u5173\u95ed\u63d0\u4f9b\u7a0b\u5e8f +label.site.to.site.VPN=\u7ad9\u70b9\u5230\u7ad9\u70b9 VPN +label.size=\u5927\u5c0f +label.skip.guide=\u6211\u4ee5\u524d\u4f7f\u7528\u8fc7 CloudStack\uff0c\u8df3\u8fc7\u6b64\u6307\u5357 +label.snapshot.limits=\u5feb\u7167\u9650\u5236 +label.snapshot.name=\u5feb\u7167\u540d\u79f0 +label.snapshot.schedule=\u8bbe\u7f6e\u91cd\u73b0\u5feb\u7167 +label.snapshot.s=\u5feb\u7167 +label.snapshots=\u5feb\u7167 +label.snapshot=\u5feb\u7167 +label.source.nat=\u6e90 NAT +label.source=\u6e90\u7b97\u6cd5 +label.specify.IP.ranges=\u6307\u5b9a IP \u8303\u56f4 +label.specify.vlan=\u6307\u5b9a VLAN +label.SR.name = SR \u540d\u79f0\u6807\u7b7e +label.srx=SRX +label.start.IP=\u8d77\u59cb IP +label.start.port=\u8d77\u59cb\u7aef\u53e3 +label.start.reserved.system.IP=\u8d77\u59cb\u9884\u7559\u7cfb\u7edf IP +label.start.vlan=\u8d77\u59cb VLAN +label.state=\u72b6\u6001 +label.static.nat.enabled=\u5df2\u542f\u7528\u9759\u6001 NAT +label.static.nat.to=\u9759\u6001 NAT \u76ee\u6807 +label.static.nat=\u9759\u6001 NAT +label.static.nat.vm.details=\u9759\u6001 NAT VM \u8be6\u60c5 +label.statistics=\u7edf\u8ba1\u6570\u636e +label.status=\u72b6\u6001 +label.step.1.title=\u6b65\u9aa4 1\: \u9009\u62e9\u4e00\u4e2a\u6a21\u677f +label.step.1=\u6b65\u9aa4 1 +label.step.2.title=\u6b65\u9aa4 2\: \u670d\u52a1\u65b9\u6848 +label.step.2=\u6b65\u9aa4 2 +label.step.3.title=\u6b65\u9aa4 3\: \u9009\u62e9\u4e00\u79cd\u78c1\u76d8\u65b9\u6848 +label.step.3=\u6b65\u9aa4 3 +label.step.4.title=\u6b65\u9aa4 4\: \u7f51\u7edc +label.step.4=\u6b65\u9aa4 4 +label.step.5.title=\u6b65\u9aa4 5\: \u6838\u5bf9 +label.step.5=\u6b65\u9aa4 5 +label.stickiness=\u7c98\u6027 +label.sticky.cookie-name=Cookie \u540d\u79f0 +label.sticky.domain=\u57df +label.sticky.expire=\u8fc7\u671f\u65e5\u671f +label.sticky.holdtime=\u6301\u7eed\u65f6\u95f4 +label.sticky.indirect=indirect +label.sticky.length=\u957f\u5ea6 +label.sticky.mode=\u6a21\u5f0f +label.sticky.nocache=nocache +label.sticky.postonly=postonly +label.sticky.prefix=prefix +label.sticky.request-learn=request-learn +label.sticky.tablesize=\u8868\u5927\u5c0f +label.stopped.vms=\u5df2\u505c\u6b62\u7684 VM +label.stop=\u00e5\u0081\u009c\u00e6\u00ad\u00a2 +label.storage.tags=\u5b58\u50a8\u6807\u7b7e +label.storage.traffic=\u5b58\u50a8\u6d41\u91cf +label.storage.type=\u5b58\u50a8\u7c7b\u578b +label.storage=\u5b58\u50a8 +label.subdomain.access=\u5b50\u57df\u8bbf\u95ee +label.submitted.by=[\u63d0\u4ea4\u8005\: ] +label.submit=\u63d0\u4ea4 +label.succeeded=\u6210\u529f +label.sunday=\u661f\u671f\u65e5 +label.super.cidr.for.guest.networks=\u6765\u5bbe\u7f51\u7edc\u7684\u8d85\u7ea7 CIDR +label.supported.services=\u652f\u6301\u7684\u670d\u52a1 +label.supported.source.NAT.type=\u652f\u6301\u7684\u6e90 NAT \u7c7b\u578b +label.suspend.project=\u6682\u505c\u9879\u76ee +label.system.capacity=\u7cfb\u7edf\u5bb9\u91cf +label.system.offering=\u7cfb\u7edf\u65b9\u6848 +label.system.service.offering=\u7cfb\u7edf\u670d\u52a1\u65b9\u6848 +label.system.vms=\u7cfb\u7edf VM +label.system.vm.type=\u7cfb\u7edf VM \u7c7b\u578b +label.system.vm=\u7cfb\u7edf VM +label.system.wide.capacity=\u5168\u7cfb\u7edf\u5bb9\u91cf +label.tagged=\u5df2\u6807\u8bb0 +label.tags=\u6807\u7b7e +label.target.iqn=\u76ee\u6807 IQN +label.task.completed=\u5df2\u5b8c\u6210\u4efb\u52a1 +label.template.limits=\u6a21\u677f\u9650\u5236 +label.template=\u6a21\u677f +label.TFTP.dir=TFTP \u76ee\u5f55 +label.theme.default=\u9ed8\u8ba4\u4e3b\u9898 +label.theme.grey=\u81ea\u5b9a\u4e49 - \u7070\u8272 +label.theme.lightblue=\u81ea\u5b9a\u4e49 - \u6de1\u84dd\u8272 +label.thursday=\u661f\u671f\u56db +label.tier.details=\u5c42\u8be6\u7ec6\u4fe1\u606f +label.tier=\u5c42 +label.timeout.in.second = \u8d85\u65f6(\u79d2) +label.timeout=\u8d85\u65f6 +label.time=\u65f6\u95f4 +label.time.zone=\u65f6\u533a +label.timezone=\u65f6\u533a +label.token=\u4ee4\u724c +label.total.cpu=CPU \u603b\u91cf +label.total.CPU=CPU \u603b\u91cf +label.total.hosts=\u603b\u4e3b\u673a\u6570 +label.total.memory=\u5185\u5b58\u603b\u91cf +label.total.of.ip=\u603b IP \u5730\u5740\u6570 +label.total.of.vm=\u603b VM \u6570 +label.total.storage=\u5b58\u50a8\u603b\u91cf +label.total.vms=\u603b VM \u6570 +label.traffic.label=\u6d41\u91cf\u6807\u7b7e +label.traffic.types=\u6d41\u91cf\u7c7b\u578b +label.traffic.type=\u6d41\u91cf\u7c7b\u578b +label.tuesday=\u661f\u671f\u4e8c +label.type.id=\u7c7b\u578b ID +label.type=\u7c7b\u578b +label.unavailable=\u4e0d\u53ef\u7528 +label.unlimited=\u65e0\u9650\u5236 +label.untagged=\u5df2\u53d6\u6d88\u6807\u8bb0 +label.update.project.resources=\u66f4\u65b0\u9879\u76ee\u8d44\u6e90 +label.update.ssl.cert= \u66f4\u65b0 SSL \u8bc1\u4e66 +label.update.ssl= \u66f4\u65b0 SSL \u8bc1\u4e66 +label.updating=\u6b63\u5728\u66f4\u65b0 +label.upload=\u4e0a\u8f7d +label.upload.volume=\u4e0a\u8f7d\u5377 +label.url=URL +label.usage.interface=\u4f7f\u7528\u754c\u9762 +label.used=\u5df2\u4f7f\u7528 +label.username=\u7528\u6237\u540d +label.users=\u666e\u901a\u7528\u6237 +label.user=\u7528\u6237 +label.use.vm.ip=\u4f7f\u7528\u865a\u673aIP\: +label.value=\u503c +label.vcdcname=vCenter DC \u540d\u79f0 +label.vcenter.cluster=vCenter \u7fa4\u96c6 +label.vcenter.datacenter=vCenter \u6570\u636e\u4e2d\u5fc3 +label.vcenter.datastore=vCenter \u6570\u636e\u5b58\u50a8 +label.vcenter.host=vCenter \u4e3b\u673a +label.vcenter.password=vCenter \u5bc6\u7801 +label.vcenter.username=vCenter \u7528\u6237\u540d +label.vcipaddress=vCenter IP \u5730\u5740 +label.version=\u7248\u672c +label.view.all=\u67e5\u770b\u5168\u90e8 +label.view.console=\u67e5\u770b\u63a7\u5236\u53f0 +label.viewing=\u6b63\u5728\u67e5\u770b +label.view.more=\u67e5\u770b\u66f4\u591a +label.view=\u67e5\u770b +label.virtual.appliances=\u865a\u62df\u8bbe\u5907 +label.virtual.appliance=\u865a\u62df\u8bbe\u5907 +label.virtual.machines=\u865a\u62df\u673a +label.virtual.network=\u865a\u62df\u7f51\u7edc +label.virtual.routers=\u865a\u62df\u8def\u7531\u5668 +label.virtual.router=\u865a\u62df\u8def\u7531\u5668 +label.vlan.id=VLAN ID +label.vlan.range=VLAN \u8303\u56f4 +label.vlan=VLAN +label.vm.add=\u6dfb\u52a0\u5b9e\u4f8b +label.vm.destroy=\u9500\u6bc1 +label.vm.display.name=VM \u663e\u793a\u540d\u79f0 +label.VMFS.datastore=VMFS \u6570\u636e\u5b58\u50a8 +label.vmfs=VMFS +label.vm.name=VM \u540d\u79f0 +label.vm.reboot=\u91cd\u65b0\u542f\u52a8 +label.VMs.in.tier=\u5c42\u4e2d\u7684 VM +label.vmsnapshot.current=\u5f53\u524d\u6700\u65b0 +label.vmsnapshot.memory=\u5236\u4f5c\u5185\u5b58\u5feb\u7167 +label.vmsnapshot.parentname=\u6839 +label.vmsnapshot.type=\u00e7\u00b1\u00bb\u00e5\u009e\u008b +label.vmsnapshot=\u865a\u673a\u5feb\u7167 +label.vm.start=\u542f\u52a8 +label.vm.state=VM \u72b6\u6001 +label.vm.stop=\u505c\u6b62 +label.vms=VM +label.vmware.traffic.label=VMware \u6d41\u91cf\u6807\u7b7e +label.volgroup=\u5377\u7ec4 +label.volume.limits=\u5377\u9650\u5236 +label.volume.name=\u5377\u540d\u79f0 +label.volumes=\u5377 +label.volume=\u5377 +label.vpc.id=VPC ID +label.VPC.router.details=VPC \u8def\u7531\u5668\u8be6\u7ec6\u4fe1\u606f +label.vpc=VPC +label.VPN.connection=VPN \u8fde\u63a5 +label.vpn.customer.gateway=VPN \u5ba2\u6237\u7f51\u5173 +label.VPN.customer.gateway=VPN \u5ba2\u6237\u7f51\u5173 +label.VPN.gateway=VPN \u7f51\u5173 +label.vpn=VPN +label.vsmctrlvlanid=\u63a7\u5236 VLAN ID +label.vsmpktvlanid=\u6570\u636e\u5305 VLAN ID +label.vsmstoragevlanid=\u5b58\u50a8 VLAN ID +label.vsphere.managed=\u7531 vSphere \u7ba1\u7406 +label.waiting=\u6b63\u5728\u7b49\u5f85 +label.warn=\u8b66\u544a +label.wednesday=\u661f\u671f\u4e09 +label.weekly=\u6bcf\u5468\u4e00\u6b21 +label.welcome.cloud.console=\u6b22\u8fce\u4f7f\u7528\u7ba1\u7406\u63a7\u5236\u53f0 +label.welcome=\u6b22\u8fce +label.what.is.cloudstack=\u4ec0\u4e48\u662f CloudStack&\#8482? +label.xen.traffic.label=XenServer \u6d41\u91cf\u6807\u7b7e +label.yes=\u662f +label.zone.details=\u533a\u57df\u8be6\u60c5 +label.zone.id=\u533a\u57df ID +label.zone.name=\u533a\u57df\u540d\u79f0 +label.zone.step.1.title=\u6b65\u9aa4 1\: \u9009\u62e9\u4e00\u4e2a\u7f51\u7edc +label.zone.step.2.title=\u6b65\u9aa4 2\: \u6dfb\u52a0\u4e00\u4e2a\u533a\u57df +label.zone.step.3.title=\u6b65\u9aa4 3\: \u6dfb\u52a0\u4e00\u4e2a\u63d0\u4f9b\u70b9 +label.zone.step.4.title=\u6b65\u9aa4 4\: \u6dfb\u52a0\u4e00\u4e2a IP \u8303\u56f4 +label.zones=\u533a\u57df +label.zone.type=\u533a\u57df\u7c7b\u578b +label.zone=\u533a\u57df +label.zone.wide=\u6574\u4e2a\u533a\u57df +label.zoneWizard.trafficType.guest=\u6765\u5bbe\u7f51\u7edc\: \u5ba2\u6237\u865a\u62df\u673a\u4e4b\u95f4\u7684\u7f51\u7edc\u6d41\u91cf +label.zoneWizard.trafficType.management=\u7ba1\u7406\u7f51\: CloudStack\u5185\u90e8\u8d44\u6e90\u4e4b\u95f4\u7684\u7f51\u7edc\u6d41\u91cf, \u5305\u62ec\u4e0e\u7ba1\u7406\u670d\u52a1\u5668\u4ea4\u4e92\u7684\u4efb\u4f55\u7ec4\u4ef6, \u6bd4\u5982\u4e3b\u673a\u548cCloudStack\u7cfb\u7edf\u865a\u62df\u673a +label.zoneWizard.trafficType.public=\u516c\u5171\u7f51\u7edc\: \u4e91\u73af\u5883\u4e2d\u865a\u62df\u673a\u4e0e\u56e0\u7279\u7f51\u4e4b\u95f4\u7684\u7f51\u7edc\u6d41\u91cf. +label.zoneWizard.trafficType.storage=\u5b58\u50a8\u7f51\: \u4e3b\u5b58\u50a8\u4e0e\u4e8c\u7ea7\u5b58\u50a8\u670d\u52a1\u5668\u4e4b\u95f4\u7684\u6d41\u91cf, \u6bd4\u5982\u865a\u673a\u6a21\u677f\u548c\u5feb\u7167 +managed.state=\u6258\u7ba1\u72b6\u6001 +message.acquire.new.ip=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e3a\u6b64\u7f51\u7edc\u83b7\u53d6\u4e00\u4e2a\u65b0 IP\u3002 +message.acquire.new.ip.vpc=\u8bf7\u786e\u8ba4\u4f60\u60f3\u8981\u4e3a\u6b64VPC\u83b7\u5f97\u65b0\u7684IP +message.acquire.public.ip=\u8bf7\u9009\u62e9\u4e00\u4e2a\u8981\u4ece\u4e2d\u83b7\u53d6\u65b0 IP \u7684\u533a\u57df\u3002 +message.action.cancel.maintenance.mode=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u53d6\u6d88\u6b64\u7ef4\u62a4\u3002 +message.action.cancel.maintenance=\u5df2\u6210\u529f\u53d6\u6d88\u7ef4\u62a4\u60a8\u7684\u4e3b\u673a\u3002\u6b64\u8fc7\u7a0b\u53ef\u80fd\u9700\u8981\u957f\u8fbe\u51e0\u5206\u949f\u65f6\u95f4\u3002 +message.action.change.service.warning.for.instance=\u5fc5\u987b\u5148\u7981\u7528\u60a8\u7684\u5b9e\u4f8b\uff0c\u7136\u540e\u518d\u5c1d\u8bd5\u66f4\u6539\u5176\u5f53\u524d\u7684\u670d\u52a1\u65b9\u6848\u3002 +message.action.change.service.warning.for.router=\u5fc5\u987b\u5148\u505c\u6b62\u60a8\u7684\u8def\u7531\u5668\uff0c\u7136\u540e\u518d\u5c1d\u8bd5\u66f4\u6539\u5176\u5f53\u524d\u7684\u670d\u52a1\u65b9\u6848\u3002 +message.action.delete.cluster=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u7fa4\u96c6\u3002 +message.action.delete.disk.offering=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u78c1\u76d8\u65b9\u6848\u3002 +message.action.delete.domain=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u57df\u3002 +message.action.delete.external.firewall=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u5916\u90e8\u9632\u706b\u5899\u3002\u8b66\u544a\: \u5982\u679c\u60a8\u8ba1\u5212\u91cd\u65b0\u6dfb\u52a0\u540c\u4e00\u4e2a\u5916\u90e8\u9632\u706b\u5899\uff0c\u5219\u5fc5\u987b\u5728\u8bbe\u5907\u4e0a\u91cd\u7f6e\u4f7f\u7528\u6570\u636e\u3002 +message.action.delete.external.load.balancer=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u5916\u90e8\u8d1f\u8f7d\u5e73\u8861\u5668\u3002\u8b66\u544a\: \u5982\u679c\u60a8\u8ba1\u5212\u91cd\u65b0\u6dfb\u52a0\u540c\u4e00\u4e2a\u5916\u90e8\u8d1f\u8f7d\u5e73\u8861\u5668\uff0c\u5219\u5fc5\u987b\u5728\u8bbe\u5907\u4e0a\u91cd\u7f6e\u4f7f\u7528\u6570\u636e\u3002 +message.action.delete.ingress.rule=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u5165\u53e3\u89c4\u5219\u3002 +message.action.delete.ISO.for.all.zones=\u6b64 ISO \u7531\u6240\u6709\u533a\u57df\u4f7f\u7528\u3002\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5c06\u5176\u4ece\u6240\u6709\u533a\u57df\u4e2d\u5220\u9664\u3002 +message.action.delete.ISO=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64 ISO\u3002 +message.action.delete.network=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u7f51\u7edc\u3002 +message.action.delete.nexusVswitch=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64 Nexus 1000v +message.action.delete.physical.network=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u7269\u7406\u7f51\u7edc +message.action.delete.pod=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u63d0\u4f9b\u70b9\u3002 +message.action.delete.primary.storage=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u4e3b\u5b58\u50a8\u3002 +message.action.delete.secondary.storage=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u8f85\u52a9\u5b58\u50a8\u3002 +message.action.delete.security.group=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u5b89\u5168\u7ec4\u3002 +message.action.delete.service.offering=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u670d\u52a1\u65b9\u6848\u3002 +message.action.delete.snapshot=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u5feb\u7167\u3002 +message.action.delete.system.service.offering=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u7cfb\u7edf\u670d\u52a1\u65b9\u6848\u3002 +message.action.delete.template.for.all.zones=\u6b64\u6a21\u677f\u7531\u6240\u6709\u533a\u57df\u4f7f\u7528\u3002\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5c06\u5176\u4ece\u6240\u6709\u533a\u57df\u4e2d\u5220\u9664\u3002 +message.action.delete.template=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u6a21\u677f\u3002 +message.action.delete.volume=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u5377\u3002 +message.action.delete.zone=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u533a\u57df\u3002 +message.action.destroy.instance=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u9500\u6bc1\u6b64\u5b9e\u4f8b\u3002 +message.action.destroy.systemvm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u9500\u6bc1\u6b64\u7cfb\u7edf VM\u3002 +message.action.disable.cluster=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528\u6b64\u7fa4\u96c6\u3002 +message.action.disable.nexusVswitch=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528\u6b64 Nexus 1000v +message.action.disable.physical.network=\u8bf7\u4f60\u786e\u8ba4\u662f\u662f\u5426\u9700\u8981\u7981\u7528\u8fd9\u4e2a\u7269\u7406\u7f51\u7edc\u3002 +message.action.disable.pod=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528\u6b64\u63d0\u4f9b\u70b9\u3002 +message.action.disable.static.NAT=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528\u9759\u6001 NAT\u3002 +message.action.disable.zone=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528\u6b64\u533a\u57df\u3002 +message.action.download.iso=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e0b\u8f7d\u6b64 ISO\u3002 +message.action.download.template=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e0b\u8f7d\u6b64\u6a21\u677f\u3002 +message.action.enable.cluster=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u7528\u6b64\u7fa4\u96c6\u3002 +message.action.enable.maintenance=\u5df2\u6210\u529f\u51c6\u5907\u597d\u7ef4\u62a4\u60a8\u7684\u4e3b\u673a\u3002\u6b64\u8fc7\u7a0b\u53ef\u80fd\u9700\u8981\u957f\u8fbe\u51e0\u5206\u949f\u6216\u66f4\u957f\u65f6\u95f4\uff0c\u5177\u4f53\u53d6\u51b3\u4e8e\u5f53\u524d\u6b64\u4e3b\u673a\u4e0a\u7684 VM \u6570\u91cf\u3002 +message.action.enable.nexusVswitch=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u7528\u6b64 Nexus 1000v +message.action.enable.physical.network=\u8bf7\u4f60\u786e\u8ba4\u662f\u662f\u5426\u9700\u8981\u542f\u7528\u8fd9\u4e2a\u7269\u7406\u7f51\u7edc\u3002 +message.action.enable.pod=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u7528\u6b64\u63d0\u4f9b\u70b9\u3002 +message.action.enable.zone=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u7528\u6b64\u533a\u57df\u3002 +message.action.force.reconnect=\u5df2\u6210\u529f\u5f3a\u5236\u91cd\u65b0\u8fde\u63a5\u60a8\u7684\u4e3b\u673a\u3002\u6b64\u8fc7\u7a0b\u53ef\u80fd\u9700\u8981\u957f\u8fbe\u51e0\u5206\u949f\u65f6\u95f4\u3002 +message.action.host.enable.maintenance.mode=\u542f\u7528\u7ef4\u62a4\u6a21\u5f0f\u5c06\u5bfc\u81f4\u5c06\u6b64\u4e3b\u673a\u4e0a\u6b63\u5728\u8fd0\u884c\u7684\u6240\u6709\u5b9e\u4f8b\u5b9e\u65f6\u8fc1\u79fb\u5230\u4efb\u4f55\u53ef\u7528\u7684\u4e3b\u673a\u3002 +message.action.instance.reset.password=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u66f4\u6539\u6b64\u865a\u62df\u673a\u7684 ROOT \u7528\u6237\u5bc6\u7801\u3002 +message.action.manage.cluster=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u6258\u7ba1\u6b64\u7fa4\u96c6\u3002 +message.action.primarystorage.enable.maintenance.mode=\u8b66\u544a\: \u5c06\u4e3b\u5b58\u50a8\u7f6e\u4e8e\u7ef4\u62a4\u6a21\u5f0f\u5c06\u5bfc\u81f4\u4f7f\u7528\u4e3b\u5b58\u50a8\u4e2d\u7684\u5377\u7684\u6240\u6709 VM \u505c\u6b62\u8fd0\u884c\u3002\u662f\u5426\u8981\u7ee7\u7eed? +message.action.reboot.instance=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u91cd\u65b0\u542f\u52a8\u6b64\u5b9e\u4f8b\u3002 +message.action.reboot.router=\u6b64\u865a\u62df\u8def\u7531\u5668\u63d0\u4f9b\u7684\u6240\u6709\u670d\u52a1\u90fd\u5c06\u4e2d\u65ad\u3002\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u91cd\u65b0\u542f\u52a8\u6b64\u8def\u7531\u5668\u3002 +message.action.reboot.systemvm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u91cd\u65b0\u542f\u52a8\u6b64\u7cfb\u7edf VM\u3002 +message.action.release.ip=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u91ca\u653e\u6b64 IP\u3002 +message.action.remove.host=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u4e3b\u673a\u3002 +message.action.reset.password.off=\u60a8\u7684\u5b9e\u4f8b\u5f53\u524d\u4e0d\u652f\u6301\u6b64\u529f\u80fd\u3002 +message.action.reset.password.warning=\u5fc5\u987b\u5148\u505c\u6b62\u60a8\u7684\u5b9e\u4f8b\uff0c\u7136\u540e\u518d\u5c1d\u8bd5\u66f4\u6539\u5176\u5f53\u524d\u7684\u5bc6\u7801\u3002 +message.action.restore.instance=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u8fd8\u539f\u6b64\u5b9e\u4f8b\u3002 +message.action.start.instance=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u52a8\u6b64\u5b9e\u4f8b\u3002 +message.action.start.router=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u52a8\u6b64\u8def\u7531\u5668\u3002 +message.action.start.systemvm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u52a8\u6b64\u7cfb\u7edf VM\u3002 +message.action.stop.instance=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u505c\u6b62\u6b64\u5b9e\u4f8b\u3002 +message.action.stop.router=\u6b64\u865a\u62df\u8def\u7531\u5668\u63d0\u4f9b\u7684\u6240\u6709\u670d\u52a1\u90fd\u5c06\u4e2d\u65ad\u3002\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u505c\u6b62\u6b64\u8def\u7531\u5668\u3002 +message.action.stop.systemvm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u505c\u6b62\u6b64\u7cfb\u7edf VM\u3002 +message.action.take.snapshot=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u521b\u5efa\u6b64\u5377\u7684\u5feb\u7167\u3002 +message.action.unmanage.cluster=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u53d6\u6d88\u6258\u7ba1\u6b64\u7fa4\u96c6\u3002 +message.action.vmsnapshot.delete=\u8bf7\u786e\u8ba4\u4f60\u8981\u5220\u9664\u6b64\u865a\u673a\u7684\u5feb\u7167 +message.action.vmsnapshot.revert=\u6062\u590d\u865a\u673a\u5feb\u7167 +message.activate.project=\u662f\u5426\u786e\u5b9e\u8981\u6fc0\u6d3b\u6b64\u9879\u76ee? +message.add.cluster=\u5411\u533a\u57df \u3001\u63d0\u4f9b\u70b9 \u4e2d\u6dfb\u52a0\u4e00\u4e2a\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u6258\u7ba1\u7684\u7fa4\u96c6 +message.add.cluster.zone=\u5411\u533a\u57df \u4e2d\u6dfb\u52a0\u4e00\u4e2a\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u6258\u7ba1\u7684\u7fa4\u96c6 +message.add.disk.offering=\u8bf7\u6307\u5b9a\u4ee5\u4e0b\u53c2\u6570\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7684\u78c1\u76d8\u65b9\u6848 +message.add.domain=\u8bf7\u6307\u5b9a\u8981\u5728\u6b64\u57df\u4e0b\u521b\u5efa\u7684\u5b50\u57df +message.add.firewall=\u5411\u533a\u57df\u4e2d\u6dfb\u52a0\u4e00\u4e2a\u9632\u706b\u5899 +message.add.guest.network=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u6dfb\u52a0\u4e00\u4e2a\u6765\u5bbe\u7f51\u7edc +message.add.host=\u8bf7\u6307\u5b9a\u4ee5\u4e0b\u53c2\u6570\u4ee5\u6dfb\u52a0\u4e00\u53f0\u65b0\u4e3b\u673a +message.adding.host=\u6b63\u5728\u6dfb\u52a0\u4e3b\u673a +message.adding.Netscaler.device=\u6b63\u5728\u6dfb\u52a0 Netscaler \u8bbe\u5907 +message.adding.Netscaler.provider=\u6b63\u5728\u6dfb\u52a0 Netscaler \u63d0\u4f9b\u7a0b\u5e8f +message.add.ip.range.direct.network=\u5411\u533a\u57df \u4e2d\u7684\u76f4\u63a5\u7f51\u7edc \u6dfb\u52a0\u4e00\u4e2a IP \u8303\u56f4 +message.add.ip.range.to.pod=

\u5411\u63d0\u4f9b\u70b9\u6dfb\u52a0\u4e00\u4e2a IP \u8303\u56f4\:

+message.add.ip.range=\u5411\u533a\u57df\u4e2d\u7684\u516c\u7528\u7f51\u7edc\u6dfb\u52a0\u4e00\u4e2a IP \u8303\u56f4 +message.additional.networks.desc=\u8bf7\u9009\u62e9\u865a\u62df\u673a\u8981\u8fde\u63a5\u5230\u7684\u5176\u4ed6\u7f51\u7edc\u3002 +message.add.load.balancer=\u5411\u533a\u57df\u4e2d\u6dfb\u52a0\u4e00\u4e2a\u8d1f\u8f7d\u5e73\u8861\u5668 +message.add.load.balancer.under.ip=\u5df2\u5728\u4ee5\u4e0b IP \u4e0b\u6dfb\u52a0\u8d1f\u8f7d\u5e73\u8861\u5668\u89c4\u5219\: +message.add.network=\u4e3a\u533a\u57df\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7f51\u7edc\: +message.add.new.gateway.to.vpc=\u8bf7\u6307\u5b9a\u5c06\u65b0\u7f51\u5173\u6dfb\u52a0\u5230\u6b64 VPC \u6240\u9700\u7684\u4fe1\u606f\u3002 +message.add.pod.during.zone.creation=\u6bcf\u4e2a\u533a\u57df\u4e2d\u5fc5\u987b\u5305\u542b\u4e00\u4e2a\u6216\u591a\u4e2a\u63d0\u4f9b\u70b9\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u6dfb\u52a0\u7b2c\u4e00\u4e2a\u63d0\u4f9b\u70b9\u3002\u63d0\u4f9b\u70b9\u4e2d\u5305\u542b\u4e3b\u673a\u548c\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\uff0c\u60a8\u5c06\u5728\u968f\u540e\u7684\u67d0\u4e2a\u6b65\u9aa4\u4e2d\u6dfb\u52a0\u8fd9\u4e9b\u4e3b\u673a\u548c\u670d\u52a1\u5668\u3002\u9996\u5148\uff0c\u8bf7\u4e3a CloudStack \u7684\u5185\u90e8\u7ba1\u7406\u6d41\u91cf\u914d\u7f6e\u4e00\u4e2a\u9884\u7559 IP \u5730\u5740\u8303\u56f4\u3002\u9884\u7559\u7684 IP \u8303\u56f4\u5bf9\u4e91\u4e2d\u7684\u6bcf\u4e2a\u533a\u57df\u6765\u8bf4\u5fc5\u987b\u552f\u4e00\u3002 +message.add.pod=\u4e3a\u533a\u57df \u6dfb\u52a0\u4e00\u4e2a\u65b0\u63d0\u4f9b\u70b9 +message.add.primary.storage=\u4e3a\u533a\u57df \u3001\u63d0\u4f9b\u70b9 \u6dfb\u52a0\u4e00\u4e2a\u65b0\u7684\u4e3b\u5b58\u50a8 +message.add.primary=\u8bf7\u6307\u5b9a\u4ee5\u4e0b\u53c2\u6570\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u4e3b\u5b58\u50a8 +message.add.region=\u8bf7\u6307\u5b9a\u9700\u8981\u7684\u4fe1\u606f\u4ee5\u6dfb\u52a0\u65b0\u7684\u533a\u57df +message.add.secondary.storage=\u4e3a\u533a\u57df \u6dfb\u52a0\u4e00\u4e2a\u65b0\u5b58\u50a8 +message.add.service.offering=\u8bf7\u586b\u5199\u4ee5\u4e0b\u6570\u636e\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u8ba1\u7b97\u65b9\u6848\u3002 +message.add.system.service.offering=\u8bf7\u586b\u5199\u4ee5\u4e0b\u6570\u636e\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7684\u7cfb\u7edf\u670d\u52a1\u65b9\u6848\u3002 +message.add.template=\u8bf7\u8f93\u5165\u4ee5\u4e0b\u6570\u636e\u4ee5\u521b\u5efa\u65b0\u6a21\u677f +message.add.volume=\u8bf7\u586b\u5199\u4ee5\u4e0b\u6570\u636e\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u5377\u3002 +message.add.VPN.gateway=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u6dfb\u52a0 VPN \u7f51\u5173 +message.advanced.mode.desc=\u5982\u679c\u60a8\u5e0c\u671b\u542f\u7528 VLAN \u652f\u6301\uff0c\u8bf7\u9009\u62e9\u6b64\u7f51\u7edc\u6a21\u5f0f\u3002\u6b64\u7f51\u7edc\u6a21\u5f0f\u5728\u5141\u8bb8\u7ba1\u7406\u5458\u63d0\u4f9b\u9632\u706b\u5899\u3001VPN \u6216\u8d1f\u8f7d\u5e73\u8861\u5668\u652f\u6301\u7b49\u81ea\u5b9a\u4e49\u7f51\u7edc\u65b9\u6848\u4ee5\u53ca\u542f\u7528\u76f4\u63a5\u7f51\u7edc\u8fde\u63a5\u4e0e\u865a\u62df\u7f51\u7edc\u8fde\u63a5\u7b49\u65b9\u9762\u63d0\u4f9b\u4e86\u6700\u5927\u7684\u7075\u6d3b\u6027\u3002 +message.advanced.security.group=\u5982\u679c\u8981\u4f7f\u7528\u5b89\u5168\u7ec4\u63d0\u4f9b\u6765\u5bbe VM \u9694\u79bb\uff0c\u8bf7\u9009\u62e9\u6b64\u6a21\u5f0f\u3002 +message.advanced.virtual=\u5982\u679c\u8981\u4f7f\u7528\u6574\u4e2a\u533a\u57df\u7684 VLAN \u63d0\u4f9b\u6765\u5bbe VM \u9694\u79bb\uff0c\u8bf7\u9009\u62e9\u6b64\u6a21\u5f0f\u3002 +message.after.enable.s3=\u5df2\u914d\u7f6e\u652f\u6301S3\u7684\u4e8c\u7ea7\u5b58\u50a8. \u6ce8\u610f\: \u5f53\u4f60\u79bb\u5f00\u6b64\u9875\u9762, \u4f60\u5c06\u65e0\u6cd5\u518d\u6b21\u914d\u7f6eS3. +message.after.enable.swift=\u5df2\u914d\u7f6e SWIFT\u3002\u6ce8\u610f\: \u9000\u51fa\u6b64\u9875\u9762\u540e\uff0c\u60a8\u5c06\u65e0\u6cd5\u518d\u6b21\u91cd\u65b0\u914d\u7f6e SWIFT\u3002 +message.alert.state.detected=\u68c0\u6d4b\u5230\u8b66\u62a5\u72b6\u6001 +message.allow.vpn.access=\u8bf7\u8f93\u5165\u8981\u5141\u8bb8\u8fdb\u884c VPN \u8bbf\u95ee\u7684\u7528\u6237\u7684\u7528\u6237\u540d\u548c\u5bc6\u7801\u3002 +message.apply.snapshot.policy=\u60a8\u5df2\u6210\u529f\u66f4\u65b0\u5f53\u524d\u7684\u5feb\u7167\u7b56\u7565\u3002 +message.attach.iso.confirm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5c06\u6b64 ISO \u9644\u52a0\u5230\u6b64\u865a\u62df\u5b9e\u4f8b\u3002 +message.attach.volume=\u8bf7\u586b\u5199\u4ee5\u4e0b\u6570\u636e\u4ee5\u9644\u52a0\u4e00\u4e2a\u65b0\u5377\u3002\u5982\u679c\u8981\u5c06\u78c1\u76d8\u5377\u9644\u52a0\u5230\u57fa\u4e8e Windows \u7684\u865a\u62df\u673a\uff0c\u9700\u8981\u91cd\u65b0\u542f\u52a8\u6b64\u5b9e\u4f8b\u624d\u80fd\u663e\u793a\u5df2\u8fde\u63a5\u7684\u78c1\u76d8\u3002 +message.basic.mode.desc=\u5982\u679c\u60a8*\u4e0d*\u5e0c\u671b\u542f\u7528\u4efb\u4f55 VLAN \u652f\u6301\uff0c\u8bf7\u9009\u62e9\u6b64\u7f51\u7edc\u6a21\u5f0f\u3002\u5c06\u76f4\u63a5\u4ece\u6b64\u7f51\u7edc\u4e2d\u4e3a\u5728\u6b64\u7f51\u7edc\u6a21\u5f0f\u4e0b\u521b\u5efa\u7684\u6240\u6709\u865a\u62df\u673a\u5b9e\u4f8b\u5206\u914d\u4e00\u4e2a IP\uff0c\u5e76\u4f7f\u7528\u5b89\u5168\u7ec4\u63d0\u4f9b\u5b89\u5168\u6027\u548c\u9694\u79bb\u3002 +message.change.offering.confirm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u66f4\u6539\u6b64\u865a\u62df\u5b9e\u4f8b\u7684\u670d\u52a1\u65b9\u6848\u3002 +message.change.password=\u8bf7\u66f4\u6539\u60a8\u7684\u5bc6\u7801\u3002 +message.configure.all.traffic.types=\u60a8\u6709\u591a\u4e2a\u7269\u7406\u7f51\u7edc\uff0c\u8bf7\u5355\u51fb\u201c\u7f16\u8f91\u201d\u6309\u94ae\u4e3a\u6bcf\u79cd\u6d41\u91cf\u7c7b\u578b\u914d\u7f6e\u6807\u7b7e\u3002 +message.configuring.guest.traffic=\u6b63\u5728\u914d\u7f6e\u6765\u5bbe\u6d41\u91cf +message.configuring.physical.networks=\u6b63\u5728\u914d\u7f6e\u7269\u7406\u7f51\u7edc +message.configuring.public.traffic=\u6b63\u5728\u914d\u7f6e\u516c\u5171\u6d41\u91cf +message.configuring.storage.traffic=\u6b63\u5728\u914d\u7f6e\u5b58\u50a8\u6d41\u91cf +message.confirm.action.force.reconnect=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5f3a\u5236\u91cd\u65b0\u8fde\u63a5\u6b64\u4e3b\u673a\u3002 +message.confirm.delete.F5=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664 F5 +message.confirm.delete.NetScaler=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664 NetScaler +message.confirm.delete.SRX=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664 SRX +message.confirm.destroy.router=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u9500\u6bc1\u6b64\u8def\u7531\u5668 +message.confirm.disable.provider=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528\u6b64\u63d0\u4f9b\u7a0b\u5e8f +message.confirm.enable.provider=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u7528\u6b64\u63d0\u4f9b\u7a0b\u5e8f +message.confirm.join.project=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u52a0\u5165\u6b64\u9879\u76ee\u3002 +message.confirm.remove.IP.range=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64 IP \u8303\u56f4\u3002 +message.confirm.shutdown.provider=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5173\u95ed\u6b64\u63d0\u4f9b\u7a0b\u5e8f +message.copy.iso.confirm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5c06 ISO \u590d\u5236\u5230 +message.copy.template=\u5c06\u6a21\u677f XXX \u4ece\u533a\u57df \u590d\u5236\u5230 +message.create.template=\u662f\u5426\u786e\u5b9e\u8981\u521b\u5efa\u6a21\u677f? +message.create.template.vm=\u57fa\u4e8e\u6a21\u677f \u521b\u5efa VM +message.create.template.volume=\u8bf7\u5148\u6307\u5b9a\u4ee5\u4e0b\u4fe1\u606f\uff0c\u7136\u540e\u518d\u521b\u5efa\u78c1\u76d8\u5377\u7684\u6a21\u677f\: \u3002\u521b\u5efa\u6a21\u677f\u53ef\u80fd\u9700\u8981\u51e0\u5206\u949f\u5230\u66f4\u957f\u7684\u65f6\u95f4\uff0c\u5177\u4f53\u53d6\u51b3\u4e8e\u78c1\u76d8\u5377\u7684\u5927\u5c0f\u3002 +message.creating.cluster=\u6b63\u5728\u521b\u5efa\u7fa4\u96c6 +message.creating.guest.network=\u6b63\u5728\u521b\u5efa\u6765\u5bbe\u7f51\u7edc +message.creating.physical.networks=\u6b63\u5728\u521b\u5efa\u7269\u7406\u7f51\u7edc +message.creating.pod=\u6b63\u5728\u521b\u5efa\u63d0\u4f9b\u70b9 +message.creating.primary.storage=\u6b63\u5728\u521b\u5efa\u4e3b\u5b58\u50a8 +message.creating.secondary.storage=\u6b63\u5728\u521b\u5efa\u8f85\u52a9\u5b58\u50a8 +message.creating.zone=\u6b63\u5728\u521b\u5efa\u533a\u57df +message.decline.invitation=\u662f\u5426\u786e\u5b9e\u8981\u62d2\u7edd\u6b64\u9879\u76ee\u9080\u8bf7? +message.delete.account=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u5e10\u6237\u3002 +message.delete.gateway=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u7f51\u5173 +message.delete.project=\u662f\u5426\u786e\u5b9e\u8981\u5220\u9664\u6b64\u9879\u76ee? +message.delete.user=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64\u7528\u6237\u3002 +message.delete.VPN.connection=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664 VPN \u8fde\u63a5 +message.delete.VPN.customer.gateway=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64 VPN \u5ba2\u6237\u7f51\u5173 +message.delete.VPN.gateway=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u6b64 VPN \u7f51\u5173 +message.desc.advanced.zone=\u9002\u7528\u4e8e\u66f4\u52a0\u590d\u6742\u7684\u7f51\u7edc\u62d3\u6251\u3002\u6b64\u7f51\u7edc\u6a21\u5f0f\u5728\u5b9a\u4e49\u6765\u5bbe\u7f51\u7edc\u5e76\u63d0\u4f9b\u9632\u706b\u5899\u3001VPN \u6216\u8d1f\u8f7d\u5e73\u8861\u5668\u652f\u6301\u7b49\u81ea\u5b9a\u4e49\u7f51\u7edc\u65b9\u6848\u65b9\u9762\u63d0\u4f9b\u4e86\u6700\u5927\u7684\u7075\u6d3b\u6027\u3002 +message.desc.basic.zone=\u63d0\u4f9b\u4e00\u4e2a\u7f51\u7edc\uff0c\u5c06\u76f4\u63a5\u4ece\u6b64\u7f51\u7edc\u4e2d\u4e3a\u6bcf\u4e2a VM \u5b9e\u4f8b\u5206\u914d\u4e00\u4e2a IP\u3002\u53ef\u4ee5\u901a\u8fc7\u5b89\u5168\u7ec4\u7b49\u7b2c 3 \u5c42\u65b9\u5f0f\u63d0\u4f9b\u6765\u5bbe\u9694\u79bb(IP \u5730\u5740\u6e90\u8fc7\u6ee4)\u3002 +message.desc.cluster=\u6bcf\u4e2a\u63d0\u4f9b\u70b9\u4e2d\u5fc5\u987b\u5305\u542b\u4e00\u4e2a\u6216\u591a\u4e2a\u7fa4\u96c6\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u6dfb\u52a0\u7b2c\u4e00\u4e2a\u7fa4\u96c6\u3002\u7fa4\u96c6\u63d0\u4f9b\u4e86\u4e00\u79cd\u7f16\u7ec4\u4e3b\u673a\u7684\u65b9\u6cd5\u3002\u7fa4\u96c6\u4e2d\u7684\u6240\u6709\u4e3b\u673a\u90fd\u5177\u6709\u76f8\u540c\u7684\u786c\u4ef6\uff0c\u8fd0\u884c\u76f8\u540c\u7684\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\uff0c\u4f4d\u4e8e\u76f8\u540c\u7684\u5b50\u7f51\u4e2d\uff0c\u5e76\u8bbf\u95ee\u76f8\u540c\u7684\u5171\u4eab\u5b58\u50a8\u3002\u6bcf\u4e2a\u7fa4\u96c6\u7531\u4e00\u4e2a\u6216\u591a\u4e2a\u4e3b\u673a\u4ee5\u53ca\u4e00\u4e2a\u6216\u591a\u4e2a\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\u7ec4\u6210\u3002 +message.desc.host=\u6bcf\u4e2a\u7fa4\u96c6\u4e2d\u5fc5\u987b\u81f3\u5c11\u5305\u542b\u4e00\u4e2a\u4e3b\u673a\u4ee5\u4f9b\u6765\u5bbe VM \u5728\u4e0a\u9762\u8fd0\u884c\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u6dfb\u52a0\u7b2c\u4e00\u4e2a\u4e3b\u673a\u3002\u8981\u4f7f\u4e3b\u673a\u5728 CloudStack \u4e2d\u8fd0\u884c\uff0c\u5fc5\u987b\u5728\u6b64\u4e3b\u673a\u4e0a\u5b89\u88c5\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u8f6f\u4ef6\uff0c\u4e3a\u5176\u5206\u914d\u4e00\u4e2a IP \u5730\u5740\uff0c\u5e76\u786e\u4fdd\u5c06\u5176\u8fde\u63a5\u5230 CloudStack \u7ba1\u7406\u670d\u52a1\u5668\u3002

\u8bf7\u63d0\u4f9b\u4e3b\u673a\u7684 DNS \u6216 IP \u5730\u5740\u3001\u7528\u6237\u540d(\u901a\u5e38\u4e3a root)\u548c\u5bc6\u7801\uff0c\u4ee5\u53ca\u7528\u4e8e\u5bf9\u4e3b\u673a\u8fdb\u884c\u5206\u7c7b\u7684\u4efb\u4f55\u6807\u7b7e\u3002 +message.desc.primary.storage=\u6bcf\u4e2a\u7fa4\u96c6\u4e2d\u5fc5\u987b\u5305\u542b\u4e00\u4e2a\u6216\u591a\u4e2a\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u6dfb\u52a0\u7b2c\u4e00\u4e2a\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\u3002\u4e3b\u5b58\u50a8\u4e2d\u5305\u542b\u5728\u7fa4\u96c6\u4e2d\u7684\u4e3b\u673a\u4e0a\u8fd0\u884c\u7684\u6240\u6709 VM \u7684\u78c1\u76d8\u5377\u3002\u8bf7\u4f7f\u7528\u5e95\u5c42\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u652f\u6301\u7684\u7b26\u5408\u6807\u51c6\u7684\u534f\u8bae\u3002 +message.desc.secondary.storage=\u6bcf\u4e2a\u533a\u57df\u4e2d\u5fc5\u987b\u81f3\u5c11\u5305\u542b\u4e00\u4e2a NFS \u6216\u8f85\u52a9\u5b58\u50a8\u670d\u52a1\u5668\uff0c\u73b0\u5728\u6211\u4eec\u5c06\u6dfb\u52a0\u7b2c\u4e00\u4e2a NFS \u6216\u8f85\u52a9\u5b58\u50a8\u670d\u52a1\u5668\u3002\u8f85\u52a9\u5b58\u50a8\u7528\u4e8e\u5b58\u50a8 VM \u6a21\u677f\u3001ISO \u6620\u50cf\u548c VM \u78c1\u76d8\u5377\u5feb\u7167\u3002\u6b64\u670d\u52a1\u5668\u5fc5\u987b\u5bf9\u533a\u57df\u4e2d\u7684\u6240\u6709\u670d\u52a1\u5668\u53ef\u7528\u3002

\u8bf7\u63d0\u4f9b IP \u5730\u5740\u548c\u5bfc\u51fa\u8def\u5f84\u3002 +message.desc.zone=\u533a\u57df\u662f CloudStack \u4e2d\u6700\u5927\u7684\u7ec4\u7ec7\u5355\u4f4d\uff0c\u4e00\u4e2a\u533a\u57df\u901a\u5e38\u4e0e\u4e00\u4e2a\u6570\u636e\u4e2d\u5fc3\u76f8\u5bf9\u5e94\u3002\u533a\u57df\u53ef\u63d0\u4f9b\u7269\u7406\u9694\u79bb\u548c\u5197\u4f59\u3002\u4e00\u4e2a\u533a\u57df\u7531\u4e00\u4e2a\u6216\u591a\u4e2a\u63d0\u4f9b\u70b9\u4ee5\u53ca\u7531\u533a\u57df\u4e2d\u7684\u6240\u6709\u63d0\u4f9b\u70b9\u5171\u4eab\u7684\u4e00\u4e2a\u8f85\u52a9\u5b58\u50a8\u670d\u52a1\u5668\u7ec4\u6210\uff0c\u5176\u4e2d\u6bcf\u4e2a\u63d0\u4f9b\u70b9\u4e2d\u5305\u542b\u591a\u4e2a\u4e3b\u673a\u548c\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\u3002 +message.detach.disk=\u662f\u5426\u786e\u5b9e\u8981\u53d6\u6d88\u9644\u52a0\u6b64\u78c1\u76d8? +message.detach.iso.confirm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4ece\u6b64\u865a\u62df\u673a\u4e2d\u53d6\u6d88\u9644\u52a0\u6b64 ISO\u3002 +message.disable.account=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528\u6b64\u5e10\u6237\u3002\u901a\u8fc7\u7981\u7528\u6b64\u5e10\u6237\uff0c\u6b64\u5e10\u6237\u7684\u6240\u6709\u7528\u6237\u5c06\u4e0d\u518d\u6709\u6743\u8bbf\u95ee\u5404\u81ea\u7684\u4e91\u8d44\u6e90\u3002\u6240\u6709\u6b63\u5728\u8fd0\u884c\u7684\u865a\u62df\u673a\u5c06\u7acb\u5373\u5173\u95ed\u3002 +message.disable.snapshot.policy=\u60a8\u5df2\u6210\u529f\u7981\u7528\u5f53\u524d\u7684\u5feb\u7167\u7b56\u7565\u3002 +message.disable.user=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528\u6b64\u7528\u6237\u3002 +message.disable.vpn.access=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u7981\u7528 VPN \u8bbf\u95ee\u3002 +message.disable.vpn=\u662f\u5426\u786e\u5b9e\u8981\u7981\u7528 VPN? +message.download.ISO=\u8bf7\u5355\u51fb 00000 \u4e0b\u8f7d ISO +message.download.template=\u8bf7\u5355\u51fb 00000 \u4e0b\u8f7d\u6a21\u677f +message.download.volume.confirm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e0b\u8f7d\u6b64\u5377 +message.download.volume=\u8bf7\u5355\u51fb 00000 \u4e0b\u8f7d\u5377 +message.edit.account=\u7f16\u8f91(\u201c-1\u201d\u8868\u793a\u5bf9\u8981\u521b\u5efa\u7684\u8d44\u6e90\u6570\u91cf\u6ca1\u6709\u4efb\u4f55\u9650\u5236) +message.edit.confirm=\u8bf7\u5148\u786e\u8ba4\u60a8\u6240\u505a\u7684\u66f4\u6539\uff0c\u7136\u540e\u5355\u51fb\u201c\u4fdd\u5b58\u201d\u3002 +message.edit.limits=\u8bf7\u6307\u5b9a\u5bf9\u4ee5\u4e0b\u8d44\u6e90\u7684\u9650\u5236\u3002\u201c-1\u201d\u8868\u793a\u4e0d\u9650\u5236\u8981\u521b\u5efa\u7684\u8d44\u6e90\u6570\u3002 +message.edit.traffic.type=\u8bf7\u6307\u5b9a\u60a8\u5e0c\u671b\u4e0e\u6b64\u6d41\u91cf\u7c7b\u578b\u5173\u8054\u7684\u6d41\u91cf\u6807\u7b7e\u3002 +message.enable.account=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u7528\u6b64\u5e10\u6237\u3002 +message.enabled.vpn.ip.sec=\u60a8\u7684 IPSec \u9884\u5171\u4eab\u5bc6\u94a5 +message.enabled.vpn=\u60a8\u7684 VPN \u8bbf\u95ee\u529f\u80fd\u5f53\u524d\u5df2\u542f\u7528\uff0c\u53ef\u4ee5\u901a\u8fc7 IP \u8fdb\u884c\u8bbf\u95ee +message.enable.user=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u542f\u7528\u6b64\u7528\u6237\u3002 +message.enable.vpn.access=\u5f53\u524d\u5df2\u5bf9\u6b64 IP \u5730\u5740\u7981\u7528\u4e86 VPN\u3002\u662f\u5426\u8981\u542f\u7528 VPN \u8bbf\u95ee? +message.enable.vpn=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5bf9\u6b64 IP \u5730\u5740\u542f\u7528 VPN \u8bbf\u95ee\u3002 +message.enabling.security.group.provider=\u6b63\u5728\u542f\u7528\u5b89\u5168\u7ec4\u63d0\u4f9b\u7a0b\u5e8f +message.enabling.zone=\u6b63\u5728\u542f\u7528\u533a\u57df +message.enter.token=\u8bf7\u8f93\u5165\u60a8\u5728\u9080\u8bf7\u7535\u5b50\u90ae\u4ef6\u4e2d\u6536\u5230\u7684\u4ee4\u724c\u3002 +message.generate.keys=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e3a\u6b64\u7528\u6237\u751f\u6210\u65b0\u5bc6\u94a5\u3002 +message.guest.traffic.in.advanced.zone=\u6765\u5bbe\u7f51\u7edc\u6d41\u91cf\u662f\u6307\u6700\u7ec8\u7528\u6237\u865a\u62df\u673a\u4e4b\u95f4\u7684\u901a\u4fe1\u3002\u6307\u5b9a\u4e00\u4e2a VLAN ID \u8303\u56f4\u53ef\u4f20\u9001\u6bcf\u4e2a\u7269\u7406\u7f51\u7edc\u7684\u6765\u5bbe\u6d41\u91cf\u3002 +message.guest.traffic.in.basic.zone=\u6765\u5bbe\u7f51\u7edc\u6d41\u91cf\u662f\u6307\u6700\u7ec8\u7528\u6237\u865a\u62df\u673a\u4e4b\u95f4\u7684\u901a\u4fe1\u3002\u5e94\u6307\u5b9a\u4e00\u4e2a CloudStack \u53ef\u4ee5\u5206\u914d\u7ed9\u6765\u5bbe VM \u7684 IP \u5730\u5740\u8303\u56f4\u3002\u8bf7\u786e\u4fdd\u6b64\u8303\u56f4\u4e0e\u9884\u7559\u7684\u7cfb\u7edf IP \u8303\u56f4\u4e0d\u91cd\u53e0\u3002 +message.installWizard.click.retry=\u8bf7\u5355\u51fb\u6b64\u6309\u94ae\u91cd\u65b0\u5c1d\u8bd5\u542f\u52a8\u3002 +message.installWizard.copy.whatIsACluster=\u7fa4\u96c6\u63d0\u4f9b\u4e86\u4e00\u79cd\u7f16\u7ec4\u4e3b\u673a\u7684\u65b9\u6cd5\u3002\u7fa4\u96c6\u4e2d\u7684\u6240\u6709\u4e3b\u673a\u90fd\u5177\u6709\u76f8\u540c\u7684\u786c\u4ef6\uff0c\u8fd0\u884c\u76f8\u540c\u7684\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\uff0c\u4f4d\u4e8e\u540c\u4e00\u5b50\u7f51\u4e2d\uff0c\u5e76\u8bbf\u95ee\u76f8\u540c\u7684\u5171\u4eab\u5b58\u50a8\u3002\u53ef\u4ee5\u5b9e\u65f6\u5c06\u865a\u62df\u673a\u5b9e\u4f8b(VM)\u4ece\u4e00\u53f0\u4e3b\u673a\u8fc1\u79fb\u5230\u540c\u4e00\u7fa4\u96c6\u5185\u7684\u5176\u4ed6\u4e3b\u673a\uff0c\u800c\u65e0\u9700\u4e2d\u65ad\u5411\u7528\u6237\u63d0\u4f9b\u670d\u52a1\u3002\u7fa4\u96c6\u662f CloudStack&\#8482; \u90e8\u7f72\u4e2d\u7684\u7b2c\u4e09\u5927\u7ec4\u7ec7\u5355\u4f4d\u3002\u7fa4\u96c6\u5305\u542b\u5728\u63d0\u4f9b\u70b9\u4e2d\uff0c\u63d0\u4f9b\u70b9\u5305\u542b\u5728\u533a\u57df\u4e2d\u3002

CloudStack&\#8482; \u5141\u8bb8\u4e91\u90e8\u7f72\u4e2d\u5b58\u5728\u591a\u4e2a\u7fa4\u96c6\uff0c\u4f46\u5bf9\u4e8e\u57fa\u672c\u5b89\u88c5\uff0c\u6211\u4eec\u53ea\u9700\u8981\u4e00\u4e2a\u7fa4\u96c6\u3002 +message.installWizard.copy.whatIsAHost=\u4e3b\u673a\u662f\u6307\u4e00\u53f0\u8ba1\u7b97\u673a\u3002\u4e3b\u673a\u63d0\u4f9b\u8fd0\u884c\u6765\u5bbe\u865a\u62df\u673a\u7684\u8ba1\u7b97\u8d44\u6e90\u3002\u6bcf\u53f0\u4e3b\u673a\u4e0a\u90fd\u5b89\u88c5\u6709\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u8f6f\u4ef6\uff0c\u7528\u4e8e\u7ba1\u7406\u6765\u5bbe VM (\u88f8\u673a\u4e3b\u673a\u9664\u5916\uff0c\u5c06\u5728\u201c\u9ad8\u7ea7\u5b89\u88c5\u6307\u5357\u201d\u4e2d\u8ba8\u8bba\u8fd9\u4e00\u7279\u6b8a\u6848\u4f8b)\u3002\u4f8b\u5982\uff0c\u542f\u7528\u4e86 KVM \u7684 Linux \u670d\u52a1\u5668\u3001Citrix XenServer \u670d\u52a1\u5668\u548c ESXi \u670d\u52a1\u5668\u90fd\u53ef\u7528\u4f5c\u4e3b\u673a\u3002\u5728\u57fa\u672c\u5b89\u88c5\u4e2d\uff0c\u6211\u4eec\u5c06\u4f7f\u7528\u4e00\u53f0\u8fd0\u884c XenServer \u7684\u4e3b\u673a\u3002

\u4e3b\u673a\u662f CloudStack&\#8482; \u90e8\u7f72\u4e2d\u6700\u5c0f\u7684\u7ec4\u7ec7\u5355\u4f4d\u3002\u4e3b\u673a\u5305\u542b\u5728\u7fa4\u96c6\u4e2d\uff0c\u7fa4\u96c6\u5305\u542b\u5728\u63d0\u4f9b\u70b9\u4e2d\uff0c\u63d0\u4f9b\u70b9\u5305\u542b\u5728\u533a\u57df\u4e2d\u3002 +message.installWizard.copy.whatIsAPod=\u4e00\u4e2a\u63d0\u4f9b\u70b9\u901a\u5e38\u4ee3\u8868\u4e00\u4e2a\u673a\u67b6\u3002\u540c\u4e00\u63d0\u4f9b\u70b9\u4e2d\u7684\u4e3b\u673a\u4f4d\u4e8e\u540c\u4e00\u5b50\u7f51\u4e2d\u3002

\u63d0\u4f9b\u70b9\u662f CloudStack&\#8482; \u90e8\u7f72\u4e2d\u7684\u7b2c\u4e8c\u5927\u7ec4\u7ec7\u5355\u4f4d\u3002\u63d0\u4f9b\u70b9\u5305\u542b\u5728\u533a\u57df\u4e2d\u3002\u6bcf\u4e2a\u533a\u57df\u4e2d\u53ef\u4ee5\u5305\u542b\u4e00\u4e2a\u6216\u591a\u4e2a\u63d0\u4f9b\u70b9\uff1b\u5728\u57fa\u672c\u5b89\u88c5\u4e2d\uff0c\u60a8\u7684\u533a\u57df\u4e2d\u5c06\u4ec5\u5305\u542b\u4e00\u4e2a\u63d0\u4f9b\u70b9\u3002 +message.installWizard.copy.whatIsAZone=\u533a\u57df\u662f CloudStack&\#8482; \u90e8\u7f72\u4e2d\u6700\u5927\u7684\u7ec4\u7ec7\u5355\u4f4d\u3002\u867d\u7136\u5141\u8bb8\u4e00\u4e2a\u6570\u636e\u4e2d\u5fc3\u4e2d\u5b58\u5728\u591a\u4e2a\u533a\u57df\uff0c\u4f46\u662f\u4e00\u4e2a\u533a\u57df\u901a\u5e38\u4e0e\u4e00\u4e2a\u6570\u636e\u4e2d\u5fc3\u76f8\u5bf9\u5e94\u3002\u5c06\u57fa\u7840\u67b6\u6784\u7f16\u7ec4\u5230\u533a\u57df\u4e2d\u7684\u597d\u5904\u662f\u53ef\u4ee5\u63d0\u4f9b\u7269\u7406\u9694\u79bb\u548c\u5197\u4f59\u3002\u4f8b\u5982\uff0c\u6bcf\u4e2a\u533a\u57df\u90fd\u53ef\u4ee5\u62e5\u6709\u5404\u81ea\u7684\u7535\u6e90\u4f9b\u5e94\u548c\u7f51\u7edc\u4e0a\u884c\u65b9\u6848\uff0c\u5e76\u4e14\u5404\u533a\u57df\u53ef\u4ee5\u5728\u5730\u7406\u4f4d\u7f6e\u4e0a\u76f8\u9694\u5f88\u8fdc(\u867d\u7136\u5e76\u975e\u5fc5\u987b\u76f8\u9694\u5f88\u8fdc)\u3002 +message.installWizard.copy.whatIsCloudStack=CloudStack&\#8482 \u662f\u4e00\u4e2a\u8f6f\u4ef6\u5e73\u53f0\uff0c\u53ef\u5c06\u8ba1\u7b97\u8d44\u6e90\u96c6\u4e2d\u5728\u4e00\u8d77\u4ee5\u6784\u5efa\u516c\u5171\u3001\u79c1\u6709\u548c\u6df7\u5408\u57fa\u7840\u8bbe\u65bd\u5373\u670d\u52a1(IaaS)\u4e91\u3002CloudStack&\#8482 \u8d1f\u8d23\u7ba1\u7406\u7ec4\u6210\u4e91\u57fa\u7840\u67b6\u6784\u7684\u7f51\u7edc\u3001\u5b58\u50a8\u548c\u8ba1\u7b97\u8282\u70b9\u3002\u4f7f\u7528 CloudStack&\#8482 \u53ef\u4ee5\u90e8\u7f72\u3001\u7ba1\u7406\u548c\u914d\u7f6e\u4e91\u8ba1\u7b97\u73af\u5883\u3002

CloudStack&\#8482 \u901a\u8fc7\u6269\u5c55\u5546\u7528\u786c\u4ef6\u4e0a\u8fd0\u884c\u7684\u6bcf\u4e2a\u865a\u62df\u673a\u6620\u50cf\u7684\u8303\u56f4\uff0c\u63d0\u4f9b\u4e86\u4e00\u4e2a\u5b9e\u65f6\u53ef\u7528\u7684\u4e91\u57fa\u7840\u67b6\u6784\u8f6f\u4ef6\u5806\u6808\u7528\u4e8e\u4ee5\u670d\u52a1\u65b9\u5f0f\u4ea4\u4ed8\u865a\u62df\u6570\u636e\u4e2d\u5fc3\uff0c\u5373\u4ea4\u4ed8\u6784\u5efa\u3001\u90e8\u7f72\u548c\u7ba1\u7406\u591a\u5c42\u6b21\u548c\u591a\u79df\u6237\u4e91\u5e94\u7528\u7a0b\u5e8f\u5fc5\u9700\u7684\u6240\u6709\u7ec4\u4ef6\u3002\u5f00\u6e90\u7248\u672c\u548c Premium \u7248\u672c\u90fd\u5df2\u53ef\u7528\uff0c\u4e14\u63d0\u4f9b\u7684\u529f\u80fd\u51e0\u4e4e\u5b8c\u5168\u76f8\u540c\u3002 +message.installWizard.copy.whatIsPrimaryStorage=CloudStack&\#8482; \u4e91\u57fa\u7840\u67b6\u6784\u4f7f\u7528\u4ee5\u4e0b\u4e24\u79cd\u7c7b\u578b\u7684\u5b58\u50a8\: \u4e3b\u5b58\u50a8\u548c\u8f85\u52a9\u5b58\u50a8\u3002\u8fd9\u4e24\u79cd\u7c7b\u578b\u7684\u5b58\u50a8\u53ef\u4ee5\u662f iSCSI \u6216 NFS \u670d\u52a1\u5668\uff0c\u4e5f\u53ef\u4ee5\u662f\u672c\u5730\u78c1\u76d8\u3002

\u4e3b\u5b58\u50a8\u4e0e\u7fa4\u96c6\u76f8\u5173\u8054\uff0c\u7528\u4e8e\u5b58\u50a8\u8be5\u7fa4\u96c6\u4e2d\u7684\u4e3b\u673a\u4e0a\u6b63\u5728\u8fd0\u884c\u7684\u6240\u6709 VM \u5bf9\u5e94\u7684\u6bcf\u4e2a\u6765\u5bbe VM \u7684\u78c1\u76d8\u5377\u3002\u4e3b\u5b58\u50a8\u670d\u52a1\u5668\u901a\u5e38\u4f4d\u4e8e\u9760\u8fd1\u4e3b\u673a\u7684\u4f4d\u7f6e\u3002 +message.installWizard.copy.whatIsSecondaryStorage=\u8f85\u52a9\u5b58\u50a8\u4e0e\u533a\u57df\u76f8\u5173\u8054\uff0c\u7528\u4e8e\u5b58\u50a8\u4ee5\u4e0b\u9879\u76ee\:
  • \u6a21\u677f - \u53ef\u7528\u4e8e\u542f\u52a8 VM \u5e76\u53ef\u4ee5\u5305\u542b\u5176\u4ed6\u914d\u7f6e\u4fe1\u606f(\u4f8b\u5982\uff0c\u5df2\u5b89\u88c5\u7684\u5e94\u7528\u7a0b\u5e8f)\u7684\u64cd\u4f5c\u7cfb\u7edf\u6620\u50cf
  • ISO \u6620\u50cf - \u53ef\u91cd\u65b0\u542f\u52a8\u6216\u4e0d\u53ef\u91cd\u65b0\u542f\u52a8\u7684\u64cd\u4f5c\u7cfb\u7edf\u6620\u50cf
  • \u78c1\u76d8\u5377\u5feb\u7167 - \u5df2\u4fdd\u5b58\u7684 VM \u6570\u636e\u526f\u672c\uff0c\u53ef\u7528\u4e8e\u6267\u884c\u6570\u636e\u6062\u590d\u6216\u521b\u5efa\u65b0\u6a21\u677f
+message.installWizard.now.building=\u73b0\u5728\u6b63\u5728\u6784\u5efa\u60a8\u7684\u4e91... +message.installWizard.tooltip.addCluster.name=\u7fa4\u96c6\u7684\u540d\u79f0\u3002\u6b64\u540d\u79f0\u53ef\u4ee5\u662f\u60a8\u9009\u62e9\u7684\u6587\u672c\uff0c\u4e14\u672a\u7531 CloudStack \u4f7f\u7528\u3002 +message.installWizard.tooltip.addHost.hostname=\u4e3b\u673a\u7684 DNS \u540d\u79f0\u6216 IP \u5730\u5740\u3002 +message.installWizard.tooltip.addHost.password=\u6b64\u4e3a\u4e0a\u8ff0\u7528\u6237\u7684\u5bc6\u7801(\u6765\u81ea XenServer \u5b89\u88c5)\u3002 +message.installWizard.tooltip.addHost.username=\u901a\u5e38\u4e3a root\u3002 +message.installWizard.tooltip.addPod.name=\u63d0\u4f9b\u70b9\u7684\u540d\u79f0 +message.installWizard.tooltip.addPod.reservedSystemEndIp=\u6b64\u4e3a CloudStack \u7528\u4e8e\u7ba1\u7406\u8f85\u52a9\u5b58\u50a8 VM \u548c\u63a7\u5236\u53f0\u4ee3\u7406 VM \u7684\u4e13\u7528\u7f51\u7edc\u4e2d\u7684 IP \u8303\u56f4\u3002\u8fd9\u4e9b IP \u5730\u5740\u6765\u81ea\u4e0e\u8ba1\u7b97\u670d\u52a1\u5668\u76f8\u540c\u7684\u5b50\u7f51\u3002 +message.installWizard.tooltip.addPod.reservedSystemGateway=\u8be5\u63d0\u4f9b\u70b9\u4e2d\u7684\u4e3b\u673a\u7f51\u5173\u3002 +message.installWizard.tooltip.addPod.reservedSystemNetmask=\u6765\u5bbe\u5c06\u8981\u4f7f\u7528\u7684\u5b50\u7f51\u4e0a\u6b63\u5728\u4f7f\u7528\u7684\u7f51\u7edc\u63a9\u7801\u3002 +message.installWizard.tooltip.addPod.reservedSystemStartIp=\u6b64\u4e3a CloudStack \u7528\u4e8e\u7ba1\u7406\u8f85\u52a9\u5b58\u50a8 VM \u548c\u63a7\u5236\u53f0\u4ee3\u7406 VM \u7684\u4e13\u7528\u7f51\u7edc\u4e2d\u7684 IP \u8303\u56f4\u3002\u8fd9\u4e9b IP \u5730\u5740\u6765\u81ea\u4e0e\u8ba1\u7b97\u670d\u52a1\u5668\u76f8\u540c\u7684\u5b50\u7f51\u3002 +message.installWizard.tooltip.addPrimaryStorage.name=\u5b58\u50a8\u8bbe\u5907\u7684\u540d\u79f0\u3002 +message.installWizard.tooltip.addPrimaryStorage.path=(\u9002\u7528\u4e8e NFS)\u5728 NFS \u4e2d\uff0c\u6b64\u8def\u5f84\u4e3a\u670d\u52a1\u5668\u7684\u5bfc\u51fa\u8def\u5f84\u3002\u8def\u5f84(\u9488\u5bf9 SharedMountPoint)\u3002\u5bf9\u4e8e KVM\uff0c\u6b64\u8def\u5f84\u4e3a\u88c5\u8f7d\u4e86\u8f85\u52a9\u5b58\u50a8\u7684\u6bcf\u4e2a\u4e3b\u673a\u4e0a\u7684\u8def\u5f84\u3002\u4f8b\u5982\uff0c/mnt/primary\u3002 +message.installWizard.tooltip.addPrimaryStorage.server=(\u9002\u7528\u4e8e NFS\u3001iSCSI \u6216 PreSetup)\u5b58\u50a8\u8bbe\u5907\u7684 IP \u5730\u5740\u6216 DNS \u540d\u79f0\u3002 +message.installWizard.tooltip.addSecondaryStorage.nfsServer=\u6258\u7ba1\u8f85\u52a9\u5b58\u50a8\u7684 NFS \u670d\u52a1\u5668\u7684 IP \u5730\u5740 +message.installWizard.tooltip.addSecondaryStorage.path=\u5bfc\u51fa\u8def\u5f84(\u4f4d\u4e8e\u4e0a\u8ff0\u6307\u5b9a\u670d\u52a1\u5668\u4e0a) +message.installWizard.tooltip.addZone.dns1=\u8fd9\u4e9b\u670d\u52a1\u5668\u662f\u4f9b\u6b64\u533a\u57df\u4e2d\u7684\u6765\u5bbe VM \u4f7f\u7528\u7684 DNS \u670d\u52a1\u5668\uff0c\u5c06\u901a\u8fc7\u60a8\u7a0d\u540e\u8981\u6dfb\u52a0\u7684\u516c\u7528\u7f51\u7edc\u8fdb\u884c\u8bbf\u95ee\u3002\u6b64\u533a\u57df\u7684\u516c\u7528 IP \u5730\u5740\u5fc5\u987b\u8def\u7531\u5230\u5728\u6b64\u5904\u6307\u5b9a\u7684 DNS \u670d\u52a1\u5668\u3002 +message.installWizard.tooltip.addZone.dns2=\u8fd9\u4e9b\u670d\u52a1\u5668\u662f\u4f9b\u6b64\u533a\u57df\u4e2d\u7684\u6765\u5bbe VM \u4f7f\u7528\u7684 DNS \u670d\u52a1\u5668\uff0c\u5c06\u901a\u8fc7\u60a8\u7a0d\u540e\u8981\u6dfb\u52a0\u7684\u516c\u7528\u7f51\u7edc\u8fdb\u884c\u8bbf\u95ee\u3002\u6b64\u533a\u57df\u7684\u516c\u7528 IP \u5730\u5740\u5fc5\u987b\u8def\u7531\u5230\u5728\u6b64\u5904\u6307\u5b9a\u7684 DNS \u670d\u52a1\u5668\u3002 +message.installWizard.tooltip.addZone.internaldns1=\u8fd9\u4e9b\u670d\u52a1\u5668\u662f\u4f9b\u6b64\u533a\u57df\u4e2d\u7684\u7cfb\u7edf VM \u4f7f\u7528\u7684 DNS \u670d\u52a1\u5668\uff0c\u5c06\u901a\u8fc7\u7cfb\u7edf VM \u7684\u4e13\u7528\u7f51\u7edc\u63a5\u53e3\u8fdb\u884c\u8bbf\u95ee\u3002\u60a8\u4e3a\u63d0\u4f9b\u70b9\u63d0\u4f9b\u7684\u4e13\u7528 IP \u5730\u5740\u5fc5\u987b\u8def\u7531\u5230\u5728\u6b64\u5904\u6307\u5b9a\u7684 DNS \u670d\u52a1\u5668\u3002 +message.installWizard.tooltip.addZone.internaldns2=\u8fd9\u4e9b\u670d\u52a1\u5668\u662f\u4f9b\u6b64\u533a\u57df\u4e2d\u7684\u7cfb\u7edf VM \u4f7f\u7528\u7684 DNS \u670d\u52a1\u5668\uff0c\u5c06\u901a\u8fc7\u7cfb\u7edf VM \u7684\u4e13\u7528\u7f51\u7edc\u63a5\u53e3\u8fdb\u884c\u8bbf\u95ee\u3002\u60a8\u4e3a\u63d0\u4f9b\u70b9\u63d0\u4f9b\u7684\u4e13\u7528 IP \u5730\u5740\u5fc5\u987b\u8def\u7531\u5230\u5728\u6b64\u5904\u6307\u5b9a\u7684 DNS \u670d\u52a1\u5668\u3002 +message.installWizard.tooltip.addZone.name=\u533a\u57df\u540d\u79f0 +message.installWizard.tooltip.configureGuestTraffic.description=\u60a8\u7684\u7f51\u7edc\u8bf4\u660e +message.installWizard.tooltip.configureGuestTraffic.guestEndIp=\u80fd\u591f\u5206\u914d\u7ed9\u6b64\u533a\u57df\u4e2d\u7684\u6765\u5bbe\u7684 IP \u5730\u5740\u8303\u56f4\u3002\u5982\u679c\u4f7f\u7528\u4e00\u4e2a NIC\uff0c\u8fd9\u4e9b IP \u5e94\u4f4d\u4e8e\u4e0e\u63d0\u4f9b\u70b9 CIDR \u76f8\u540c\u7684 CIDR \u4e2d\u3002 +message.installWizard.tooltip.configureGuestTraffic.guestGateway=\u6765\u5bbe\u5e94\u4f7f\u7528\u7684\u7f51\u5173 +message.installWizard.tooltip.configureGuestTraffic.guestNetmask=\u6765\u5bbe\u5e94\u4f7f\u7528\u7684\u5b50\u7f51\u4e0a\u6b63\u5728\u4f7f\u7528\u7684\u7f51\u7edc\u63a9\u7801 +message.installWizard.tooltip.configureGuestTraffic.guestStartIp=\u80fd\u591f\u5206\u914d\u7ed9\u6b64\u533a\u57df\u4e2d\u7684\u6765\u5bbe\u7684 IP \u5730\u5740\u8303\u56f4\u3002\u5982\u679c\u4f7f\u7528\u4e00\u4e2a NIC\uff0c\u8fd9\u4e9b IP \u5e94\u4f4d\u4e8e\u4e0e\u63d0\u4f9b\u70b9 CIDR \u76f8\u540c\u7684 CIDR \u4e2d\u3002 +message.installWizard.tooltip.configureGuestTraffic.name=\u60a8\u7684\u7f51\u7edc\u540d\u79f0 +message.instanceWizard.noTemplates=\u60a8\u6ca1\u6709\u4efb\u4f55\u53ef\u7528\u6a21\u677f\uff1b\u8bf7\u6dfb\u52a0\u4e00\u4e2a\u517c\u5bb9\u7684\u6a21\u677f\uff0c\u7136\u540e\u91cd\u65b0\u542f\u52a8\u5b9e\u4f8b\u5411\u5bfc\u3002 +message.ip.address.changed=\u60a8\u7684 IP \u5730\u5740\u53ef\u80fd\u5df2\u53d1\u751f\u53d8\u5316\uff1b\u662f\u5426\u8981\u5237\u65b0\u6b64\u5217\u8868? \u8bf7\u6ce8\u610f\uff0c\u5237\u65b0\u6b64\u5217\u8868\u65f6\uff0c\u201c\u8be6\u7ec6\u4fe1\u606f\u201d\u7a97\u683c\u5c06\u5173\u95ed\u3002 +message.iso.desc=\u5305\u542b\u64cd\u4f5c\u7cfb\u7edf\u7684\u6570\u636e\u6216\u53ef\u542f\u52a8\u4ecb\u8d28\u7684\u78c1\u76d8\u6620\u50cf +message.join.project=\u60a8\u73b0\u5728\u5df2\u52a0\u5165\u4e86\u4e00\u4e2a\u9879\u76ee\u3002\u8bf7\u5207\u6362\u5230\u201c\u9879\u76ee\u89c6\u56fe\u201d\u4ee5\u67e5\u770b\u9879\u76ee\u3002 +message.launch.vm.on.private.network=\u662f\u5426\u8981\u5728\u60a8\u7684\u79c1\u4eba\u4e13\u7528\u7f51\u7edc\u4e2d\u542f\u52a8\u5b9e\u4f8b? +message.launch.zone=\u533a\u57df\u5df2\u51c6\u5907\u5c31\u7eea\uff0c\u53ef\u968f\u65f6\u542f\u52a8\uff1b\u8bf7\u7ee7\u7eed\u6267\u884c\u4e0b\u4e00\u6b65\u9aa4\u3002 +message.lock.account=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u9501\u5b9a\u6b64\u5e10\u6237\u3002\u901a\u8fc7\u9501\u5b9a\u6b64\u5e10\u6237\uff0c\u6b64\u5e10\u6237\u7684\u6240\u6709\u7528\u6237\u5c06\u4e0d\u518d\u80fd\u591f\u7ba1\u7406\u5404\u81ea\u7684\u4e91\u8d44\u6e90\uff0c\u4f46\u4ecd\u7136\u53ef\u4ee5\u8bbf\u95ee\u73b0\u6709\u8d44\u6e90\u3002 +message.migrate.instance.confirm=\u8bf7\u786e\u8ba4\u8981\u5c06\u865a\u62df\u5b9e\u4f8b\u8fc1\u79fb\u5230\u7684\u4e3b\u673a\u3002 +message.migrate.instance.to.host=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5c06\u5b9e\u4f8b\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u673a\u3002 +message.migrate.instance.to.ps=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5c06\u5b9e\u4f8b\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u5b58\u50a8\u3002 +message.migrate.router.confirm=\u8bf7\u786e\u8ba4\u60a8\u8981\u5c06\u8def\u7531\u5668\u8fc1\u79fb\u5230\u7684\u4e3b\u673a\: +message.migrate.systemvm.confirm=\u8bf7\u786e\u8ba4\u60a8\u8981\u5c06\u7cfb\u7edf VM \u8fc1\u79fb\u5230\u7684\u4e3b\u673a\: +message.migrate.volume=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5c06\u5377\u8fc1\u79fb\u5230\u5176\u4ed6\u4e3b\u5b58\u50a8\u3002 +message.new.user=\u8bf7\u6307\u5b9a\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u5411\u5e10\u6237\u4e2d\u6dfb\u52a0\u4e00\u4e2a\u65b0\u7528\u6237 +message.no.network.support.configuration.not.true=\u60a8\u7684\u6240\u6709\u533a\u57df\u90fd\u672a\u542f\u7528\u5b89\u5168\u7ec4\uff0c\u56e0\u6b64\u65e0\u5176\u4ed6\u7f51\u7edc\u529f\u80fd\u3002\u8bf7\u7ee7\u7eed\u6267\u884c\u6b65\u9aa4 5\u3002 +message.no.network.support=\u60a8\u9009\u62e9\u7684\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f vSphere \u6ca1\u6709\u4efb\u4f55\u5176\u4ed6\u7f51\u7edc\u529f\u80fd\u3002\u8bf7\u7ee7\u7eed\u6267\u884c\u6b65\u9aa4 5\u3002 +message.no.projects.adminOnly=\u60a8\u6ca1\u6709\u4efb\u4f55\u9879\u76ee\u3002
\u8bf7\u8981\u6c42\u7ba1\u7406\u5458\u521b\u5efa\u4e00\u4e2a\u65b0\u9879\u76ee\u3002 +message.no.projects=\u60a8\u6ca1\u6709\u4efb\u4f55\u9879\u76ee\u3002
\u8bf7\u4ece\u201c\u9879\u76ee\u201d\u90e8\u5206\u4e2d\u521b\u5efa\u4e00\u4e2a\u65b0\u9879\u76ee\u3002 +message.number.clusters=

\u7fa4\u96c6\u6570

+message.number.hosts=

\u4e3b\u673a\u6570

+message.number.pods=

\u63d0\u4f9b\u70b9\u6570

+message.number.storage=

\u4e3b\u5b58\u50a8\u5377\u6570

+message.number.zones=

\u533a\u57df\u6570

+message.pending.projects.1=\u60a8\u6709\u5f85\u5b9a\u9879\u76ee\u9080\u8bf7\: +message.pending.projects.2=\u8981\u67e5\u770b\uff0c\u8bf7\u8f6c\u81f3\u201c\u9879\u76ee\u201d\u90e8\u5206\uff0c\u7136\u540e\u4ece\u4e0b\u62c9\u5217\u8868\u4e2d\u9009\u62e9\u201c\u9080\u8bf7\u201d\u3002 +message.please.add.at.lease.one.traffic.range=\u8bf7\u81f3\u5c11\u6dfb\u52a0\u4e00\u4e2a\u6d41\u91cf\u8303\u56f4\u3002 +message.please.proceed=\u8bf7\u7ee7\u7eed\u6267\u884c\u4e0b\u4e2a\u6b65\u9aa4\u3002 +message.please.select.a.configuration.for.your.zone=\u8bf7\u4e3a\u60a8\u7684\u533a\u57df\u9009\u62e9\u4e00\u79cd\u914d\u7f6e\u3002 +message.please.select.a.different.public.and.management.network.before.removing=\u8bf7\u5148\u9009\u62e9\u5176\u4ed6\u516c\u5171\u7ba1\u7406\u7f51\u7edc\uff0c\u7136\u540e\u518d\u5220\u9664 +message.please.select.networks=\u8bf7\u4e3a\u60a8\u7684\u865a\u62df\u673a\u9009\u62e9\u7f51\u7edc\u3002 +message.please.wait.while.zone.is.being.created=\u6b63\u5728\u521b\u5efa\u533a\u57df\uff0c\u8bf7\u7a0d\u5019\uff1b\u6b64\u64cd\u4f5c\u53ef\u80fd\u9700\u8981\u4e00\u6bb5\u65f6\u95f4\u624d\u80fd\u5b8c\u6210... +message.project.invite.sent=\u53d1\u9001\u7ed9\u7528\u6237\u7684\u9080\u8bf7\uff1b\u7528\u6237\u63a5\u53d7\u9080\u8bf7\u540e\uff0c\u5c06\u52a0\u5165\u5230\u9879\u76ee\u4e2d +message.public.traffic.in.advanced.zone=\u4e91\u4e2d\u7684 VM \u8bbf\u95ee Internet \u65f6\u5c06\u751f\u6210\u516c\u5171\u6d41\u91cf\uff0c\u4f46\u5fc5\u987b\u5206\u914d\u53ef\u516c\u5f00\u8bbf\u95ee\u7684 IP \u624d\u80fd\u5b9e\u73b0\u3002\u6700\u7ec8\u7528\u6237\u53ef\u4ee5\u4f7f\u7528 CloudStack UI \u83b7\u53d6\u8fd9\u4e9b IP\uff0c\u4ee5\u5728\u5176\u6765\u5bbe\u7f51\u7edc\u4e0e\u516c\u7528\u7f51\u7edc\u4e4b\u95f4\u6267\u884c NAT\u3002

\u8bf7\u81f3\u5c11\u4e3a Internet \u6d41\u91cf\u63d0\u4f9b\u4e00\u4e2a IP \u5730\u5740\u8303\u56f4\u3002 +message.public.traffic.in.basic.zone=\u4e91\u4e2d\u7684 VM \u8bbf\u95ee Internet \u6216\u901a\u8fc7 Internet \u5411\u5ba2\u6237\u7aef\u63d0\u4f9b\u670d\u52a1\u65f6\u5c06\u751f\u6210\u516c\u5171\u6d41\u91cf\uff0c\u4f46\u5fc5\u987b\u5206\u914d\u53ef\u516c\u5f00\u8bbf\u95ee\u7684 IP \u624d\u80fd\u5b9e\u73b0\u3002\u521b\u5efa\u5b9e\u4f8b\u65f6\uff0c\u5c06\u628a\u8fd9\u4e00\u7ec4\u516c\u7528 IP \u4e2d\u7684 IP (\u6765\u5bbe IP \u5730\u5740\u9664\u5916)\u5206\u914d\u7ed9\u6b64\u5b9e\u4f8b\u3002\u9759\u6001 1-1 NAT \u5c06\u5728\u516c\u7528 IP \u4e0e\u6765\u5bbe IP \u4e4b\u95f4\u81ea\u52a8\u8bbe\u7f6e\u3002\u6700\u7ec8\u7528\u6237\u8fd8\u53ef\u4ee5\u4f7f\u7528 CloudStack UI \u83b7\u53d6\u5176\u4ed6 IP\uff0c\u4ee5\u5728\u5176\u5b9e\u4f8b\u4e0e\u516c\u7528 IP \u4e4b\u95f4\u6267\u884c\u9759\u6001 NAT\u3002 +message.redirecting.region=\u6b63\u5728\u91cd\u5b9a\u5411\u5230\u533a\u57df... +message.remove.region=\u4f60\u786e\u5b9a\u60f3\u8981\u4ece\u7ba1\u7406\u670d\u52a1\u5668\u5220\u9664\u6b64\u533a\u57df\u5417? +message.remove.vpc=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664 VPC +message.remove.vpn.access=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u5220\u9664\u4ee5\u4e0b\u7528\u6237\u7684 VPN \u8bbf\u95ee\u3002 +message.reset.password.warning.notPasswordEnabled=\u521b\u5efa\u6b64\u5b9e\u4f8b\u7684\u6a21\u677f\u65f6\u672a\u542f\u7528\u5bc6\u7801 +message.reset.password.warning.notStopped=\u5fc5\u987b\u5148\u505c\u6b62\u60a8\u7684\u5b9e\u4f8b\uff0c\u624d\u80fd\u5c1d\u8bd5\u66f4\u6539\u5176\u5f53\u524d\u5bc6\u7801 +message.reset.VPN.connection=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u91cd\u7f6e VPN \u8fde\u63a5 +message.restart.mgmt.server=\u8bf7\u91cd\u65b0\u542f\u52a8\u7ba1\u7406\u670d\u52a1\u5668\u4ee5\u4f7f\u60a8\u7684\u65b0\u8bbe\u7f6e\u751f\u6548\u3002 +message.restart.mgmt.usage.server=\u4e3a\u4e86\u4f7f\u4f60\u7684\u65b0\u8bbe\u7f6e\u751f\u6548\uff0c\u8bf7\u91cd\u65b0\u542f\u52a8\u4f60\u7684\u7ba1\u7406\u670d\u52a1\u5668\u548c\u4f7f\u7528\u670d\u52a1\u5668\u3002 +message.restart.network=\u6b64\u7f51\u7edc\u63d0\u4f9b\u7684\u6240\u6709\u670d\u52a1\u90fd\u5c06\u4e2d\u65ad\u3002\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u91cd\u65b0\u542f\u52a8\u6b64\u7f51\u7edc\u3002 +message.restart.vpc=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u91cd\u65b0\u542f\u52a8 VPC +message.security.group.usage=(\u6309\u4f4f Ctrl \u952e\u5e76\u5355\u51fb\u9f20\u6807\u53ef\u9009\u62e9\u6240\u6709\u9002\u7528\u7684\u5b89\u5168\u7ec4) +message.select.a.zone=\u4e00\u4e2a\u533a\u57df\u901a\u5e38\u4e0e\u4e00\u4e2a\u6570\u636e\u4e2d\u5fc3\u76f8\u5bf9\u5e94\u3002\u591a\u4e2a\u533a\u57df\u53ef\u4ee5\u63d0\u4f9b\u7269\u7406\u9694\u79bb\u548c\u5197\u4f59\uff0c\u6709\u52a9\u4e8e\u4f7f\u4e91\u66f4\u52a0\u53ef\u9760\u3002 +message.select.instance=\u8bf7\u9009\u62e9\u4e00\u4e2a\u5b9e\u4f8b\u3002 +message.select.iso=\u8bf7\u4e3a\u60a8\u7684\u65b0\u865a\u62df\u5b9e\u4f8b\u9009\u62e9\u4e00\u4e2a ISO\u3002 +message.select.item=\u8bf7\u9009\u62e9\u4e00\u4e2a\u9879\u76ee\u3002 +message.select.security.groups=\u8bf7\u4e3a\u60a8\u7684\u65b0 VM \u9009\u62e9\u5b89\u5168\u7ec4 +message.select.template=\u8bf7\u4e3a\u60a8\u7684\u65b0\u865a\u62df\u5b9e\u4f8b\u9009\u62e9\u4e00\u4e2a\u6a21\u677f\u3002 +message.setup.physical.network.during.zone.creation.basic=\u6dfb\u52a0\u57fa\u7840\u533a\u57df\u65f6\uff0c\u53ef\u4ee5\u8bbe\u7f6e\u4e00\u4e2a\u7269\u7406\u7f51\u7edc\uff0c\u6b64\u7f51\u7edc\u5e94\u4e0e\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u4e2d\u7684 NIC \u76f8\u5bf9\u5e94\u3002\u6b64\u7f51\u7edc\u53ef\u4ee5\u627f\u8f7d\u591a\u79cd\u6d41\u91cf\u7c7b\u578b\u3002

\u6b64\u5916\uff0c\u8fd8\u53ef\u4ee5\u5c06\u5176\u4ed6\u6d41\u91cf\u7c7b\u578b\u62d6\u653e\u5230\u6b64\u7269\u7406\u7f51\u7edc\u3002 +message.setup.physical.network.during.zone.creation=\u6dfb\u52a0\u9ad8\u7ea7\u533a\u57df\u65f6\uff0c\u9700\u8981\u8bbe\u7f6e\u4e00\u4e2a\u6216\u591a\u4e2a\u7269\u7406\u7f51\u7edc\u3002\u6bcf\u4e2a\u7f51\u7edc\u90fd\u4e0e\u865a\u62df\u673a\u7ba1\u7406\u7a0b\u5e8f\u4e2d\u7684\u4e00\u4e2a NIC \u76f8\u5bf9\u5e94\u3002\u6bcf\u4e2a\u7269\u7406\u7f51\u7edc\u4e2d\u53ef\u4ee5\u5305\u542b\u4e00\u79cd\u6216\u591a\u79cd\u6d41\u91cf\u7c7b\u578b\uff0c\u5e76\u5bf9\u8fd9\u4e9b\u6d41\u91cf\u7c7b\u578b\u53ef\u80fd\u7684\u7ec4\u5408\u65b9\u5f0f\u8bbe\u7f6e\u4e86\u67d0\u4e9b\u9650\u5236\u3002

\u53ef\u4ee5\u5c06\u4e00\u79cd\u6216\u591a\u79cd\u6d41\u91cf\u7c7b\u578b\u62d6\u653e\u5230\u6bcf\u4e2a\u7269\u7406\u7f51\u7edc\u4e2d\u3002 +message.setup.successful=\u5df2\u6210\u529f\u8bbe\u7f6e\u4e91\! +message.snapshot.schedule=\u53ef\u4ee5\u901a\u8fc7\u4ece\u4ee5\u4e0b\u53ef\u7528\u9009\u9879\u4e2d\u8fdb\u884c\u9009\u62e9\u5e76\u5e94\u7528\u60a8\u7684\u7b56\u7565\u9996\u9009\u9879\u6765\u8bbe\u7f6e\u91cd\u73b0\u5feb\u7167\u8ba1\u5212 +message.specify.url=\u8bf7\u6307\u5b9a URL +message.step.1.continue=\u8bf7\u9009\u62e9\u4e00\u4e2a\u6a21\u677f\u6216 ISO \u4ee5\u7ee7\u7eed +message.step.1.desc=\u8bf7\u4e3a\u60a8\u7684\u65b0\u865a\u62df\u5b9e\u4f8b\u9009\u62e9\u4e00\u4e2a\u6a21\u677f\u3002\u8fd8\u53ef\u4ee5\u9009\u62e9\u4e00\u4e2a\u53ef\u5c06 ISO \u6620\u50cf\u5b89\u88c5\u5230\u5176\u4e2d\u7684\u7a7a\u6a21\u677f\u3002 +message.step.2.continue=\u8bf7\u9009\u62e9\u4e00\u79cd\u670d\u52a1\u65b9\u6848\u4ee5\u7ee7\u7eed +message.step.2.desc= +message.step.3.continue=\u8bf7\u9009\u62e9\u4e00\u79cd\u78c1\u76d8\u65b9\u6848\u4ee5\u7ee7\u7eed +message.step.3.desc= +message.step.4.continue=\u8bf7\u81f3\u5c11\u9009\u62e9\u4e00\u4e2a\u7f51\u7edc\u4ee5\u7ee7\u7eed +message.step.4.desc=\u8bf7\u9009\u62e9\u865a\u62df\u5b9e\u4f8b\u8981\u8fde\u63a5\u5230\u7684\u4e3b\u7f51\u7edc\u3002 +message.storage.traffic=CloudStack \u5185\u90e8\u8d44\u6e90(\u5305\u62ec\u4e0e\u7ba1\u7406\u670d\u52a1\u5668\u901a\u4fe1\u7684\u4efb\u4f55\u7ec4\u4ef6\uff0c\u4f8b\u5982\u4e3b\u673a\u548c CloudStack \u7cfb\u7edf VM)\u4e4b\u95f4\u7684\u6d41\u91cf\u3002\u8bf7\u5728\u6b64\u5904\u914d\u7f6e\u5b58\u50a8\u6d41\u91cf\u3002 +message.suspend.project=\u662f\u5426\u786e\u5b9e\u8981\u6682\u505c\u6b64\u9879\u76ee? +message.template.desc=\u53ef\u7528\u4e8e\u542f\u52a8 VM \u7684\u64cd\u4f5c\u7cfb\u7edf\u6620\u50cf +message.tooltip.dns.1=\u4f9b\u533a\u57df\u4e2d\u7684 VM \u4f7f\u7528\u7684 DNS \u670d\u52a1\u5668\u540d\u79f0\u3002\u533a\u57df\u7684\u516c\u7528 IP \u5730\u5740\u5fc5\u987b\u8def\u7531\u5230\u6b64\u670d\u52a1\u5668\u3002 +message.tooltip.dns.2=\u4f9b\u533a\u57df\u4e2d\u7684 VM \u4f7f\u7528\u7684\u8f85\u52a9 DNS \u670d\u52a1\u5668\u540d\u79f0\u3002\u533a\u57df\u7684\u516c\u7528 IP \u5730\u5740\u5fc5\u987b\u8def\u7531\u5230\u6b64\u670d\u52a1\u5668\u3002 +message.tooltip.internal.dns.1=\u4f9b\u533a\u57df\u4e2d\u7684 CloudStack \u5185\u90e8\u7cfb\u7edf VM \u4f7f\u7528\u7684 DNS \u670d\u52a1\u5668\u540d\u79f0\u3002\u63d0\u4f9b\u70b9\u7684\u4e13\u7528 IP \u5730\u5740\u5fc5\u987b\u8def\u7531\u5230\u6b64\u670d\u52a1\u5668\u3002 +message.tooltip.internal.dns.2=\u4f9b\u533a\u57df\u4e2d\u7684 CloudStack \u5185\u90e8\u7cfb\u7edf VM \u4f7f\u7528\u7684 DNS \u670d\u52a1\u5668\u540d\u79f0\u3002\u63d0\u4f9b\u70b9\u7684\u4e13\u7528 IP \u5730\u5740\u5fc5\u987b\u8def\u7531\u5230\u6b64\u670d\u52a1\u5668\u3002 +message.tooltip.network.domain=DNS \u540e\u7f00\uff0c\u5c06\u4e3a\u7531\u6765\u5bbe VM \u8bbf\u95ee\u7684\u7f51\u7edc\u521b\u5efa\u4e00\u4e2a\u81ea\u5b9a\u4e49\u57df\u540d\u3002 +message.tooltip.pod.name=\u6b64\u63d0\u4f9b\u70b9\u7684\u540d\u79f0\u3002 +message.tooltip.reserved.system.gateway=\u63d0\u4f9b\u70b9\u4e2d\u7684\u4e3b\u673a\u7f51\u5173\u3002 +message.tooltip.reserved.system.netmask=\u7528\u4e8e\u5b9a\u4e49\u63d0\u4f9b\u70b9\u5b50\u7f51\u7684\u7f51\u7edc\u524d\u7f00\u3002\u8bf7\u4f7f\u7528 CIDR \u7b26\u53f7\u3002 +message.tooltip.zone.name=\u533a\u57df\u540d\u79f0\u3002 +message.update.os.preference=\u8bf7\u4e3a\u6b64\u4e3b\u673a\u9009\u62e9\u4e00\u4e2a\u64cd\u4f5c\u7cfb\u7edf\u9996\u9009\u9879\u3002\u9996\u5148\u5c06\u5177\u6709\u76f8\u4f3c\u9996\u9009\u9879\u7684\u6240\u6709\u865a\u62df\u5b9e\u4f8b\u5206\u914d\u81f3\u6b64\u4e3b\u673a\uff0c\u7136\u540e\u518d\u9009\u62e9\u5176\u4ed6\u5b9e\u4f8b\u3002 +message.update.resource.count=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u66f4\u65b0\u6b64\u5e10\u6237\u7684\u8d44\u6e90\u6570\u3002 +message.update.ssl=\u8bf7\u63d0\u4ea4\u4e00\u4e2a\u65b0\u7684 X.509 \u517c\u5bb9\u7684 SSL \u8bc1\u4e66\uff0c\u4ee5\u5c06\u5176\u66f4\u65b0\u5230\u6bcf\u4e2a\u63a7\u5236\u53f0\u4ee3\u7406\u865a\u62df\u5b9e\u4f8b\: +message.validate.instance.name=\u5b9e\u4f8b\u540d\u79f0\u4e0d\u5f97\u8d85\u8fc7 63 \u4e2a\u5b57\u7b26\u3002\u4ec5\u5141\u8bb8\u4f7f\u7528 ASCII \u5b57\u6bcd a - z \u6216 A - Z\u3001\u6570\u5b57 0 - 9 \u4ee5\u53ca\u8fde\u5b57\u7b26\u3002\u5b9e\u4f8b\u540d\u79f0\u5fc5\u987b\u4ee5\u5b57\u6bcd\u5f00\u5934\u5e76\u4ee5\u5b57\u6bcd\u6216\u6570\u5b57\u7ed3\u675f\u3002 +message.virtual.network.desc=\u60a8\u7684\u5e10\u6237\u7684\u4e13\u7528\u865a\u62df\u7f51\u7edc\u3002\u5e7f\u64ad\u57df\u5305\u542b\u5728 VLAN \u4e2d\uff0c\u5e76\u4e14\u6240\u6709\u516c\u7528\u7f51\u7edc\u8bbf\u95ee\u90fd\u7531\u865a\u62df\u8def\u7531\u5668\u8def\u7531\u51fa\u53bb\u3002 +message.vm.create.template.confirm=\u521b\u5efa\u6a21\u677f\u5c06\u81ea\u52a8\u91cd\u65b0\u542f\u52a8 VM\u3002 +message.vm.review.launch=\u8bf7\u5148\u6838\u5bf9\u4ee5\u4e0b\u4fe1\u606f\uff0c\u786e\u8ba4\u60a8\u7684\u865a\u62df\u5b9e\u4f8b\u6b63\u786e\u65e0\u8bef\uff0c\u7136\u540e\u518d\u542f\u52a8\u3002 +message.volume.create.template.confirm=\u8bf7\u786e\u8ba4\u60a8\u786e\u5b9e\u8981\u4e3a\u6b64\u78c1\u76d8\u5377\u521b\u5efa\u4e00\u4e2a\u6a21\u677f\u3002\u521b\u5efa\u6a21\u677f\u53ef\u80fd\u9700\u8981\u51e0\u5206\u949f\u5230\u66f4\u957f\u7684\u65f6\u95f4\uff0c\u5177\u4f53\u53d6\u51b3\u4e8e\u5377\u7684\u5927\u5c0f\u3002 +message.you.must.have.at.least.one.physical.network=\u60a8\u5fc5\u987b\u81f3\u5c11\u62e5\u6709\u4e00\u4e2a\u7269\u7406\u7f51\u7edc +message.Zone.creation.complete=\u5df2\u5b8c\u6210\u521b\u5efa\u533a\u57df +message.zone.creation.complete.would.you.like.to.enable.this.zone=\u5df2\u5b8c\u6210\u521b\u5efa\u533a\u57df\u3002\u662f\u5426\u8981\u542f\u7528\u6b64\u533a\u57df? +message.zone.no.network.selection=\u6240\u9009\u533a\u57df\u65e0\u4efb\u4f55\u7f51\u7edc\u9009\u9879\u3002 +message.zone.step.1.desc=\u8bf7\u4e3a\u60a8\u7684\u533a\u57df\u9009\u62e9\u4e00\u79cd\u7f51\u7edc\u6a21\u5f0f\u3002 +message.zone.step.2.desc=\u8bf7\u8f93\u5165\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u533a\u57df +message.zone.step.3.desc=\u8bf7\u8f93\u5165\u4ee5\u4e0b\u4fe1\u606f\u4ee5\u6dfb\u52a0\u4e00\u4e2a\u65b0\u63d0\u4f9b\u70b9 +message.zoneWizard.enable.local.storage=\u8b66\u544a\: \u5982\u679c\u4e3a\u6b64\u533a\u57df\u542f\u7528\u4e86\u672c\u5730\u5b58\u50a8\uff0c\u5219\u5fc5\u987b\u6267\u884c\u4ee5\u4e0b\u64cd\u4f5c\uff0c\u5177\u4f53\u53d6\u51b3\u4e8e\u5e0c\u671b\u542f\u52a8\u7cfb\u7edf VM \u7684\u4f4d\u7f6e\:

1. \u5982\u679c\u8981\u5728\u4e3b\u5b58\u50a8\u4e2d\u542f\u52a8\u7cfb\u7edf VM\uff0c\u5219\u9700\u8981\u5728\u521b\u5efa\u540e\u5c06\u4e3b\u5b58\u50a8\u6dfb\u52a0\u5230\u6b64\u533a\u57df\u4e2d\u3002\u6b64\u5916\uff0c\u8fd8\u5fc5\u987b\u542f\u52a8\u5904\u4e8e\u7981\u7528\u72b6\u6001\u7684\u533a\u57df\u3002

2. \u5982\u679c\u8981\u5728\u672c\u5730\u5b58\u50a8\u4e2d\u542f\u52a8\u7cfb\u7edf VM\uff0c\u5219\u9700\u8981\u5148\u5c06 system.vm.use.local.storage \u8bbe\u7f6e\u4e3a True\uff0c\u7136\u540e\u518d\u542f\u7528\u6b64\u533a\u57df\u3002


\u662f\u5426\u8981\u7ee7\u7eed? +mode=\u6a21\u5f0f +network.rate=\u7f51\u7edc\u901f\u7387 +notification.reboot.instance=\u91cd\u65b0\u542f\u52a8\u5b9e\u4f8b +notification.start.instance=\u542f\u52a8\u5b9e\u4f8b +notification.stop.instance=\u505c\u6b62\u5b9e\u4f8b +side.by.side=\u5e76\u884c +state.Accepted=\u5df2\u63a5\u53d7 +state.Active=\u6d3b\u52a8 +state.Allocated=\u5df2\u5206\u914d +state.Allocating=\u6b63\u5728\u5206\u914d +state.BackedUp=\u5df2\u5907\u4efd +state.BackingUp=\u6b63\u5728\u5907\u4efd +state.Completed=\u5df2\u5b8c\u6210 +state.Creating=\u6b63\u5728\u521b\u5efa +state.Declined=\u5df2\u62d2\u7edd +state.Destroyed=\u5df2\u9500\u6bc1 +state.Disabled=\u5df2\u7981\u7528 +state.enabled=\u5df2\u542f\u7528 +state.Enabled=\u5df2\u542f\u7528 +state.Error=\u9519\u8bef +state.Expunging=\u6b63\u5728\u5220\u9664 +state.Migrating=\u6b63\u5728\u8fc1\u79fb +state.Pending=\u5f85\u5b9a +state.ready=\u5df2\u5c31\u7eea +state.Ready=\u5df2\u5c31\u7eea +state.Running=\u6b63\u5728\u8fd0\u884c +state.Starting=\u6b63\u5728\u542f\u52a8 +state.Stopped=\u5df2\u505c\u6b62 +state.Stopping=\u6b63\u5728\u505c\u6b62 +state.Suspended=\u5df2\u6682\u505c +ui.listView.filters.all=\u5168\u90e8 +ui.listView.filters.mine=\u672c\u7528\u6237 diff --git a/client/pom.xml b/client/pom.xml index 9323d0fb20f..743cd363005 100644 --- a/client/pom.xml +++ b/client/pom.xml @@ -234,6 +234,11 @@ cloud-plugin-snmp-alerts ${project.version} + + org.apache.cloudstack + cloud-plugin-host-anti-affinity + ${project.version} + install @@ -284,7 +289,7 @@ --> copy-systemvm - package + process-resources run @@ -450,6 +455,27 @@ file="${basedir}/target/generated-webapp/WEB-INF/web.xml" match="classpath:componentContext.xml" replace="classpath:nonossComponentContext.xml" byline="true" /> + + + + + + + + + + process-quickcloud-spring-context + process-resources + + run + + + + quickcloud + @@ -618,6 +644,11 @@ cloud-vmware-base ${project.version} + + org.apache.cloudstack + cloud-plugin-network-cisco-vnmc + ${project.version} + diff --git a/client/tomcatconf/applicationContext.xml.in b/client/tomcatconf/applicationContext.xml.in index d3699b93cfb..d2ea380ddab 100644 --- a/client/tomcatconf/applicationContext.xml.in +++ b/client/tomcatconf/applicationContext.xml.in @@ -32,6 +32,12 @@ + + + + + + @@ -386,54 +392,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -496,11 +454,11 @@ - + - + @@ -545,7 +503,7 @@ - + @@ -640,7 +598,56 @@ + --> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -700,9 +707,98 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + diff --git a/client/tomcatconf/commands.properties.in b/client/tomcatconf/commands.properties.in index 163c2cee861..b49e1fbf5ff 100644 --- a/client/tomcatconf/commands.properties.in +++ b/client/tomcatconf/commands.properties.in @@ -69,6 +69,7 @@ changeServiceForVirtualMachine=15 scaleVirtualMachine=15 assignVirtualMachine=1 migrateVirtualMachine=1 +migrateVirtualMachineWithVolume=1 recoverVirtualMachine=7 #### snapshot commands @@ -124,6 +125,8 @@ listDiskOfferings=15 createVlanIpRange=1 deleteVlanIpRange=1 listVlanIpRanges=1 +dedicatePublicIpRange=1 +releasePublicIpRange=1 #### address commands associateIpAddress=15 @@ -252,6 +255,7 @@ deleteHost=3 prepareHostForMaintenance=1 cancelHostMaintenance=1 listHosts=3 +findHostsForMigration=1 addSecondaryStorage=1 updateHostPassword=1 @@ -286,6 +290,7 @@ deleteStoragePool=1 listClusters=3 enableStorageMaintenance=1 cancelStorageMaintenance=1 +findStoragePoolsForMigration=1 #### security group commands createSecurityGroup=15 @@ -568,3 +573,21 @@ revertToSnapshot=15 #### Baremetal commands addBaremetalHost=1 + +#### Affinity group commands +createAffinityGroup=15 +deleteAffinityGroup=15 +listAffinityGroups=15 +updateVMAffinityGroup=15 +listAffinityGroupTypes=15 + +#### Cisco Vnmc commands +addCiscoVnmcResource=1 +deleteCiscoVnmcResource=1 +listCiscoVnmcResources=1 + +#### Cisco Asa1000v commands +addCiscoAsa1000vResource=1 +deleteCiscoAsa1000vResource=1 +listCiscoAsa1000vResources=1 + diff --git a/client/tomcatconf/componentContext.xml.in b/client/tomcatconf/componentContext.xml.in index 6c7c7d425a5..7a469816f82 100644 --- a/client/tomcatconf/componentContext.xml.in +++ b/client/tomcatconf/componentContext.xml.in @@ -31,170 +31,21 @@ http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/tomcatconf/db-enc.properties.in b/client/tomcatconf/db-enc.properties.in deleted file mode 100644 index a9404fa4932..00000000000 --- a/client/tomcatconf/db-enc.properties.in +++ /dev/null @@ -1,68 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -# management server clustering parameters, change cluster.node.IP to the machine IP address -# in which the management server(Tomcat) is running -cluster.node.IP=127.0.0.1 -cluster.servlet.port=9090 - -# CloudStack database settings -db.cloud.username=@DBUSER@ -db.cloud.password=@DBPW@ -db.cloud.host=@DBHOST@ -db.cloud.port=3306 -db.cloud.name=cloud - -# CloudStack database tuning parameters -db.cloud.maxActive=250 -db.cloud.maxIdle=30 -db.cloud.maxWait=10000 -db.cloud.autoReconnect=true -db.cloud.validationQuery=SELECT 1 -db.cloud.testOnBorrow=true -db.cloud.testWhileIdle=true -db.cloud.timeBetweenEvictionRunsMillis=40000 -db.cloud.minEvictableIdleTimeMillis=240000 -db.cloud.poolPreparedStatements=false -db.cloud.url.params=prepStmtCacheSize=517&cachePrepStmts=true - -# CloudStack database SSL settings -db.cloud.useSSL=false -db.cloud.keyStore= -db.cloud.keyStorePassword= -db.cloud.trustStore= -db.cloud.trustStorePassword= - -# Encryption Settings -db.cloud.encryption.type=file -db.cloud.encrypt.secret=password - -# usage database settings -db.usage.username=@DBUSER@ -db.usage.password=@DBPW@ -db.usage.host=@DBHOST@ -db.usage.port=3306 -db.usage.name=cloud_usage - -# usage database tuning parameters -db.usage.maxActive=100 -db.usage.maxIdle=30 -db.usage.maxWait=10000 -db.usage.autoReconnect=true - -# awsapi database settings -db.awsapi.name=cloudbridge diff --git a/client/tomcatconf/nonossComponentContext.xml.in b/client/tomcatconf/nonossComponentContext.xml.in index 479c03ff8b9..2359ba80699 100644 --- a/client/tomcatconf/nonossComponentContext.xml.in +++ b/client/tomcatconf/nonossComponentContext.xml.in @@ -32,11 +32,23 @@ http://www.springframework.org/schema/context/spring-context-3.0.xsd"> - + - + + + + + + @@ -124,6 +136,16 @@ + + + + + + + + @@ -132,172 +154,6 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/client/tomcatconf/server.xml.in b/client/tomcatconf/server.xml.in deleted file mode 100644 index 30e6a6cd6f9..00000000000 --- a/client/tomcatconf/server.xml.in +++ /dev/null @@ -1,231 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/client/tomcatconf/simulatorComponentContext.xml.in b/client/tomcatconf/simulatorComponentContext.xml.in index 1cb9f6f2b63..9d8c6c0ce93 100644 --- a/client/tomcatconf/simulatorComponentContext.xml.in +++ b/client/tomcatconf/simulatorComponentContext.xml.in @@ -1,22 +1,21 @@ - + ~ Licensed to the Apache Software Foundation (ASF) under one + ~ or more contributor license agreements. See the NOTICE file + ~ distributed with this work for additional information + ~ regarding copyright ownership. The ASF licenses this file + ~ to you under the Apache License, Version 2.0 (the + ~ "License"); you may not use this file except in compliance + ~ with the License. You may obtain a copy of the License at + ~ + ~ http://www.apache.org/licenses/LICENSE-2.0 + ~ + ~ Unless required by applicable law or agreed to in writing, + ~ software distributed under the License is distributed on an + ~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + ~ KIND, either express or implied. See the License for the + ~ specific language governing permissions and limitations + ~ under the License. + --> - - + + @@ -51,88 +50,54 @@ - - + + + + - + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + - - - - - + + + @@ -140,7 +105,10 @@ - + + + + @@ -149,28 +117,73 @@ - - + + + - - - - - - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -183,39 +196,10 @@ - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -230,6 +214,23 @@ - + + + + + + + + + + + + + + + diff --git a/core/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java b/core/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java index b525a2d05d5..66890668387 100644 --- a/core/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java +++ b/core/src/com/cloud/hypervisor/HypervisorCapabilitiesVO.java @@ -62,15 +62,23 @@ public class HypervisorCapabilitiesVO implements HypervisorCapabilities { @Column(name="max_hosts_per_cluster") private Integer maxHostsPerCluster; + @Column(name="vm_snapshot_enabled") + private Boolean vmSnapshotEnabled; + + @Column(name="storage_motion_supported") + private boolean storageMotionSupported; + protected HypervisorCapabilitiesVO() { this.uuid = UUID.randomUUID().toString(); } - public HypervisorCapabilitiesVO(HypervisorType hypervisorType, String hypervisorVersion, Long maxGuestsLimit, boolean securityGroupEnabled) { + public HypervisorCapabilitiesVO(HypervisorType hypervisorType, String hypervisorVersion, Long maxGuestsLimit, + boolean securityGroupEnabled, boolean storageMotionSupported) { this.hypervisorType = hypervisorType; this.hypervisorVersion = hypervisorVersion; this.maxGuestsLimit = maxGuestsLimit; this.securityGroupEnabled = securityGroupEnabled; + this.storageMotionSupported = storageMotionSupported; this.uuid = UUID.randomUUID().toString(); } @@ -132,6 +140,21 @@ public class HypervisorCapabilitiesVO implements HypervisorCapabilities { return maxGuestsLimit; } + /** + * @param storageMotionSupported + */ + public void setStorageMotionSupported(boolean storageMotionSupported) { + this.storageMotionSupported = storageMotionSupported; + } + + /** + * @return if storage motion is supported + */ + @Override + public boolean isStorageMotionSupported() { + return storageMotionSupported; + } + public long getId() { return id; @@ -169,7 +192,15 @@ public class HypervisorCapabilitiesVO implements HypervisorCapabilities { this.maxHostsPerCluster = maxHostsPerCluster; } - @Override + public Boolean getVmSnapshotEnabled() { + return vmSnapshotEnabled; + } + + public void setVmSnapshotEnabled(Boolean vmSnapshotEnabled) { + this.vmSnapshotEnabled = vmSnapshotEnabled; + } + + @Override public boolean equals(Object obj) { if (obj instanceof HypervisorCapabilitiesVO) { return ((HypervisorCapabilitiesVO)obj).getId() == this.getId(); diff --git a/core/src/com/cloud/resource/ServerResourceBase.java b/core/src/com/cloud/resource/ServerResourceBase.java index 9449b058556..e381fcbec86 100755 --- a/core/src/com/cloud/resource/ServerResourceBase.java +++ b/core/src/com/cloud/resource/ServerResourceBase.java @@ -80,7 +80,7 @@ public abstract class ServerResourceBase implements ServerResource { _storageNic2 = getNetworkInterface(storageNic2); if (_privateNic == null) { - s_logger.error("Nics are not configured!"); + s_logger.warn("Nics are not specified in properties file/db, will try to autodiscover"); Enumeration nics = null; try { diff --git a/core/src/com/cloud/user/AccountVO.java b/core/src/com/cloud/user/AccountVO.java index 5e939c52173..77110aedb95 100644 --- a/core/src/com/cloud/user/AccountVO.java +++ b/core/src/com/cloud/user/AccountVO.java @@ -65,6 +65,9 @@ public class AccountVO implements Account { @Column(name="default_zone_id") private Long defaultZoneId = null; + + @Column(name = "default") + boolean isDefault; public AccountVO() { this.uuid = UUID.randomUUID().toString(); @@ -179,4 +182,8 @@ public class AccountVO implements Account { this.uuid = uuid; } + @Override + public boolean isDefault() { + return isDefault; + } } diff --git a/core/src/com/cloud/user/UserVO.java b/core/src/com/cloud/user/UserVO.java index 8b7c4e3f1e1..2a857580506 100644 --- a/core/src/com/cloud/user/UserVO.java +++ b/core/src/com/cloud/user/UserVO.java @@ -29,10 +29,11 @@ import javax.persistence.Id; import javax.persistence.Table; import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; + import com.cloud.user.Account.State; import com.cloud.utils.db.Encrypt; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; /** * A bean representing a user @@ -92,6 +93,9 @@ public class UserVO implements User, Identity, InternalIdentity { @Column(name="uuid") private String uuid; + + @Column(name = "default") + boolean isDefault; public UserVO() { this.uuid = UUID.randomUUID().toString(); @@ -262,4 +266,9 @@ public class UserVO implements User, Identity, InternalIdentity { this.uuid = uuid; } + @Override + public boolean isDefault() { + return isDefault; + } + } diff --git a/core/src/com/cloud/vm/UserVmVO.java b/core/src/com/cloud/vm/UserVmVO.java index a16eaf9dca0..2e9bdf51b5d 100755 --- a/core/src/com/cloud/vm/UserVmVO.java +++ b/core/src/com/cloud/vm/UserVmVO.java @@ -18,9 +18,11 @@ package com.cloud.vm; import java.util.HashMap; +import javax.persistence.Basic; import javax.persistence.Column; import javax.persistence.DiscriminatorValue; import javax.persistence.Entity; +import javax.persistence.FetchType; import javax.persistence.PrimaryKeyJoinColumn; import javax.persistence.Table; @@ -36,7 +38,8 @@ public class UserVmVO extends VMInstanceVO implements UserVm { @Column(name="iso_id", nullable=true, length=17) private Long isoId = null; - @Column(name="user_data", updatable=true, nullable=true, length=2048) + @Column(name="user_data", updatable=true, nullable=true, length=32768) + @Basic(fetch = FetchType.LAZY) private String userData; @Column(name="display_name", updatable=true, nullable=true) @@ -119,6 +122,7 @@ public class UserVmVO extends VMInstanceVO implements UserVm { return details != null ? details.get(name) : null; } + @Override public void setAccountId(long accountId){ this.accountId = accountId; } diff --git a/core/src/com/cloud/vm/VmDetailConstants.java b/core/src/com/cloud/vm/VmDetailConstants.java index 90068d1b72b..5ff3ce02fe4 100644 --- a/core/src/com/cloud/vm/VmDetailConstants.java +++ b/core/src/com/cloud/vm/VmDetailConstants.java @@ -20,4 +20,5 @@ public interface VmDetailConstants { public static final String KEYBOARD = "keyboard"; public static final String NIC_ADAPTER = "nicAdapter"; public static final String ROOK_DISK_CONTROLLER = "rootDiskController"; + public static final String NESTED_VIRTUALIZATION_FLAG = "nestedVirtualizationFlag"; } diff --git a/debian/cloudstack-agent.install b/debian/cloudstack-agent.install index 02501855354..a3cc86964dd 100644 --- a/debian/cloudstack-agent.install +++ b/debian/cloudstack-agent.install @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -20,7 +20,7 @@ /etc/cloudstack/agent/log4j-cloud.xml /etc/init.d/cloudstack-agent /usr/bin/cloudstack-setup-agent -/usr/bin/cloud-ssh +/usr/bin/cloudstack-ssh /var/log/cloudstack/agent /usr/share/cloudstack-agent/lib/* /usr/share/cloudstack-agent/plugins diff --git a/debian/cloudstack-awsapi.install b/debian/cloudstack-awsapi.install index 02ba66829ef..675b84def74 100644 --- a/debian/cloudstack-awsapi.install +++ b/debian/cloudstack-awsapi.install @@ -15,4 +15,12 @@ # specific language governing permissions and limitations # under the License. -/var/log/cloudstack/awsapi \ No newline at end of file +/etc/cloudstack/management/cloud-bridge.properties +/etc/cloudstack/management/commons-logging.properties +/etc/cloudstack/management/crypto.properties +/etc/cloudstack/management/xes.keystore +/etc/cloudstack/management/ec2-service.properties +/var/log/cloudstack/awsapi +/usr/bin/cloudstack-setup-bridge +/usr/bin/cloudstack-aws-api-register +/usr/share/cloudstack-bridge \ No newline at end of file diff --git a/debian/cloudstack-common.install b/debian/cloudstack-common.install index 021474e1b65..7e01adadedf 100644 --- a/debian/cloudstack-common.install +++ b/debian/cloudstack-common.install @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,6 +27,6 @@ /usr/share/cloudstack-common/scripts/vm/hypervisor/versions.sh /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver/* /usr/share/cloudstack-common/lib/* -/usr/bin/cloud-set-guest-password -/usr/bin/cloud-set-guest-sshkey +/usr/bin/cloudstack-set-guest-password +/usr/bin/cloudstack-set-guest-sshkey /usr/lib/python2.?/*-packages/* diff --git a/debian/cloudstack-management.install b/debian/cloudstack-management.install index b42343ad5a4..5a682d45862 100644 --- a/debian/cloudstack-management.install +++ b/debian/cloudstack-management.install @@ -15,7 +15,6 @@ # specific language governing permissions and limitations # under the License. -/etc/cloudstack/server/* /etc/cloudstack/management/* /etc/init.d/cloudstack-management /etc/security/limits.d/cloudstack-limits.conf @@ -26,9 +25,10 @@ /var/log/cloudstack/management /var/lib/cloudstack/mnt /var/lib/cloudstack/management -/usr/bin/cloud-update-xenserver-licenses -/usr/bin/cloud-setup-management -/usr/bin/cloud-setup-databases -/usr/bin/cloud-migrate-databases +/usr/bin/cloudstack-update-xenserver-licenses +/usr/bin/cloudstack-setup-management +/usr/bin/cloudstack-setup-databases +/usr/bin/cloudstack-migrate-databases +/usr/bin/cloudstack-setup-encryption +/usr/bin/cloudstack-sysvmadm /usr/share/cloudstack-management/* -/usr/share/tomcat6/lib/* diff --git a/debian/cloudstack-management.postinst b/debian/cloudstack-management.postinst index 293810a97e7..a1219cc789f 100644 --- a/debian/cloudstack-management.postinst +++ b/debian/cloudstack-management.postinst @@ -6,9 +6,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -27,10 +27,7 @@ if [ "$1" = configure ]; then /var/cache/cloudstack/management/work \ /var/cache/cloudstack/management/temp \ /var/log/cloudstack/management \ - /etc/cloudstack/management/Catalina \ - /etc/cloudstack/management/Catalina/localhost \ - /var/lib/cloudstack/management \ - /etc/cloudstack/management/Catalina/localhost/client + /var/lib/cloudstack/management do chmod 0770 $i chgrp cloud $i @@ -38,7 +35,7 @@ if [ "$1" = configure ]; then OLDCONFDIR="/etc/cloud/management" NEWCONFDIR="/etc/cloudstack/management" - CONFFILES="db.properties db-enc.properties cloud.keystore key" + CONFFILES="db.properties cloud.keystore key" # Copy old configuration so the admin doesn't have to do that # Only do so when we are installing for the first time diff --git a/debian/control b/debian/control index 27a3150158e..eec9ca25c7b 100644 --- a/debian/control +++ b/debian/control @@ -15,14 +15,14 @@ Description: A common package which contains files which are shared by several C Package: cloudstack-management Architecture: all -Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, chkconfig, sudo, jsvc, python-mysqldb, python-paramiko, augeas-tools +Depends: cloudstack-common (= ${source:Version}), tomcat6, sysvinit-utils, sudo, jsvc, python-mysqldb, python-paramiko, augeas-tools Conflicts: cloud-server, cloud-client, cloud-client-ui Description: CloudStack server library The CloudStack management server Package: cloudstack-agent Architecture: all -Depends: openjdk-6-jre | openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, libjna-java, openssh-client, libvirt0, sysvinit-utils, chkconfig, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset +Depends: openjdk-6-jre | openjdk-7-jre, cloudstack-common (= ${source:Version}), lsb-base (>= 3.2), libcommons-daemon-java, libjna-java, openssh-client, libvirt0, sysvinit-utils, qemu-kvm, libvirt-bin, uuid-runtime, rsync, grep, iproute, perl-base, perl-modules, ebtables, vlan, wget, jsvc, ipset Conflicts: cloud-agent, cloud-agent-libs, cloud-agent-deps, cloud-agent-scripts Description: CloudStack agent The CloudStack agent is in charge of managing shared computing resources in diff --git a/debian/rules b/debian/rules index 2cf037645fe..c5875e75c99 100755 --- a/debian/rules +++ b/debian/rules @@ -34,8 +34,9 @@ build: build-indep build-indep: build-indep-stamp build-indep-stamp: configure - mvn package -DskipTests -Dsystemvm \ - -Dcs.replace.properties=replace.properties.tmp + mvn package -Pawsapi -DskipTests -Dsystemvm \ + -Dcs.replace.properties=replace.properties.tmp \ + ${ACS_BUILD_OPTS} touch $@ clean: @@ -69,7 +70,7 @@ install: install -D plugins/hypervisors/kvm/target/dependencies/* $(DESTDIR)/usr/share/$(PACKAGE)-agent/lib/ install -D packaging/debian/init/cloud-agent $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-agent install -D agent/bindir/cloud-setup-agent.in $(DESTDIR)/usr/bin/cloudstack-setup-agent - install -D agent/bindir/cloud-ssh.in $(DESTDIR)/usr/bin/cloud-ssh + install -D agent/bindir/cloud-ssh.in $(DESTDIR)/usr/bin/cloudstack-ssh install -D agent/target/transformed/* $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/agent # cloudstack-management @@ -98,14 +99,15 @@ install: chmod 0440 $(DESTDIR)/$(SYSCONFDIR)/sudoers.d/cloudstack ln -s tomcat6-nonssl.conf $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/tomcat6.conf - mkdir -p $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/Catalina/localhost/client - mkdir -p ${DESTDIR}/usr/share/tomcat6/lib + ln -s server-nonssl.xml $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/server.xml install -D packaging/debian/init/cloud-management $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-management - install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloud-update-xenserver-licenses + install -D client/bindir/cloud-update-xenserver-licenses.in $(DESTDIR)/usr/bin/cloudstack-update-xenserver-licenses ln -s /usr/share/tomcat6/bin $(DESTDIR)/usr/share/$(PACKAGE)-management/bin + # Remove configuration in /ur/share/cloudstack-management/webapps/client/WEB-INF + # This should all be in /etc/cloudstack/management + rm $(DESTDIR)/usr/share/$(PACKAGE)-management/webapps/client/WEB-INF/classes/*.* ln -s ../../..$(SYSCONFDIR)/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/conf ln -s ../../../usr/share/tomcat6/lib $(DESTDIR)/usr/share/$(PACKAGE)-management/lib - ln -s ../../java/$(PACKAGE)-server.jar $(DESTDIR)/usr/share/tomcat6/lib/$(PACKAGE)-server.jar ln -s ../../../var/log/$(PACKAGE)/management $(DESTDIR)/usr/share/$(PACKAGE)-management/logs ln -s ../../../var/cache/$(PACKAGE)/management/temp $(DESTDIR)/usr/share/$(PACKAGE)-management/temp ln -s ../../../var/cache/$(PACKAGE)/management/work $(DESTDIR)/usr/share/$(PACKAGE)-management/work @@ -120,11 +122,13 @@ install: cp -r scripts/storage $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts cp -r scripts/util $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts cp -r scripts/vm $(DESTDIR)/usr/share/$(PACKAGE)-common/scripts - install -D client/target/utilities/bin/cloud-migrate-databases $(DESTDIR)/usr/bin - install -D client/target/utilities/bin/cloud-set-guest-password $(DESTDIR)/usr/bin - install -D client/target/utilities/bin/cloud-set-guest-sshkey $(DESTDIR)/usr/bin - install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin - install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin + install -D client/target/utilities/bin/cloud-migrate-databases $(DESTDIR)/usr/bin/cloudstack-migrate-databases + install -D client/target/utilities/bin/cloud-set-guest-password $(DESTDIR)/usr/bin/cloudstack-set-guest-password + install -D client/target/utilities/bin/cloud-set-guest-sshkey $(DESTDIR)/usr/bin/cloudstack-set-guest-sshkey + install -D client/target/utilities/bin/cloud-setup-databases $(DESTDIR)/usr/bin/cloudstack-setup-databases + install -D client/target/utilities/bin/cloud-setup-management $(DESTDIR)/usr/bin/cloudstack-setup-management + install -D client/target/utilities/bin/cloud-setup-encryption $(DESTDIR)/usr/bin/cloudstack-setup-encryption + install -D client/target/utilities/bin/cloud-sysvmadm $(DESTDIR)/usr/bin/cloudstack-sysvmadm install -D services/console-proxy/server/dist/systemvm.iso $(DESTDIR)/usr/share/$(PACKAGE)-common/vms/systemvm.iso # We need jasypt for cloud-install-sys-tmplt, so this is a nasty hack to get it into the right place install -D agent/target/dependencies/jasypt-1.9.0.jar $(DESTDIR)/usr/share/$(PACKAGE)-common/lib @@ -144,7 +148,25 @@ install: install -D packaging/debian/init/cloud-usage $(DESTDIR)/$(SYSCONFDIR)/init.d/$(PACKAGE)-usage # cloudstack-awsapi + mkdir $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/awsapi mkdir $(DESTDIR)/var/log/$(PACKAGE)/awsapi + mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge + mkdir -p $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi + mkdir $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup + cp -r awsapi/target/cloud-awsapi-$(VERSION)-SNAPSHOT/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi + install -D awsapi-setup/setup/cloud-setup-bridge $(DESTDIR)/usr/bin/cloudstack-setup-bridge + install -D awsapi-setup/setup/cloudstack-aws-api-register $(DESTDIR)/usr/bin/cloudstack-aws-api-register + cp -r awsapi-setup/db/mysql/* $(DESTDIR)/usr/share/$(PACKAGE)-bridge/setup + for i in applicationContext.xml cloud-bridge.properties commons-logging.properties crypto.properties xes.keystore ec2-service.properties; do \ + mv $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/$$i $(DESTDIR)/$(SYSCONFDIR)/$(PACKAGE)/management/; \ + done + rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/log4j-vmops.xml + rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/log4j.properties + rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/db.properties + rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/LICENSE.txt + rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt + rm $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/services.xml + rm -rf $(DESTDIR)/usr/share/$(PACKAGE)-bridge/webapps/awsapi/WEB-INF/classes/META-INF dh_installdirs dh_install @@ -153,10 +175,7 @@ install: binary: install dh_install dh_installchangelogs - dh_installdocs LICENSE - dh_installdocs DISCLAIMER - dh_installdocs NOTICE - dh_installdocs INSTALL.md + dh_installdocs -A tools/whisker/LICENSE tools/whisker/NOTICE INSTALL.md dh_installman dh_link dh_strip diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh index 74575a8dbd1..0bf8e48d70c 100755 --- a/deps/install-non-oss.sh +++ b/deps/install-non-oss.sh @@ -17,7 +17,6 @@ # under the License. mvn install:install-file -Dfile=cloud-iControl.jar -DgroupId=com.cloud.com.f5 -DartifactId=icontrol -Dversion=1.0 -Dpackaging=jar -mvn install:install-file -Dfile=cloud-netscaler.jar -DgroupId=com.cloud.com.citrix -DartifactId=netscaler -Dversion=1.0 -Dpackaging=jar mvn install:install-file -Dfile=cloud-netscaler-sdx.jar -DgroupId=com.cloud.com.citrix -DartifactId=netscaler-sdx -Dversion=1.0 -Dpackaging=jar # From http://support.netapp.com/ (not available online, contact your support representative) @@ -25,18 +24,6 @@ mvn install:install-file -Dfile=cloud-netscaler-sdx.jar -DgroupId=com.cloud.com. if [ -e cloud-manageontap.jar ]; then mv cloud-manageontap.jar manageontap.jar; fi mvn install:install-file -Dfile=manageontap.jar -DgroupId=com.cloud.com.netapp -DartifactId=manageontap -Dversion=4.0 -Dpackaging=jar -# From https://my.vmware.com/group/vmware/get-download?downloadGroup=VSDK41 -# Version: 4.1, Release-date: 2010-07-13, Build: 257238 -if [ -e vmware-apputils.jar ]; then mv vmware-apputils.jar apputils.jar; fi -if [ -e vmware-vim.jar ]; then mv vmware-vim.jar vim.jar; fi -if [ -e vmware-vim25.jar ]; then mv vmware-vim25.jar vim25.jar; fi -mvn install:install-file -Dfile=vim25.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25 -Dversion=4.1 -Dpackaging=jar -mvn install:install-file -Dfile=apputils.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-apputils -Dversion=4.1 -Dpackaging=jar -mvn install:install-file -Dfile=vim.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim -Dversion=4.1 -Dpackaging=jar - -# # From https://my.vmware.com/group/vmware/get-download?downloadGroup=VSP510-WEBSDK-510 # Version: 5.1, Release-date: 2012-09-10, Build: 774886 mvn install:install-file -Dfile=vim25_51.jar -DgroupId=com.cloud.com.vmware -DartifactId=vmware-vim25 -Dversion=5.1 -Dpackaging=jar - - diff --git a/docs/en-US/Admin_Guide.xml b/docs/en-US/Admin_Guide.xml index 07f5e889fc8..d3b9706f84e 100644 --- a/docs/en-US/Admin_Guide.xml +++ b/docs/en-US/Admin_Guide.xml @@ -26,7 +26,7 @@ &PRODUCT; Administrator's Guide Apache CloudStack - 4.0.0-incubating + 4.2.0 1 diff --git a/docs/en-US/Book_Info.xml b/docs/en-US/Book_Info.xml index be8bcdd7544..327668dfc9d 100644 --- a/docs/en-US/Book_Info.xml +++ b/docs/en-US/Book_Info.xml @@ -22,23 +22,26 @@ specific language governing permissions and limitations under the License. --> + - &PRODUCT; Guide - Revised August 9, 2012 10:48 pm Pacific - Apache CloudStack - 4.0.0 - 1 - - - Complete technical documentation of &PRODUCT;. - - - - - - - - - - + &PRODUCT; Guide + Revised August 9, 2012 10:48 pm Pacific + Apache CloudStack + 4.2.0 + 1 + + + + Complete technical documentation of &PRODUCT;. + + + + + + + + + + + diff --git a/docs/en-US/Book_Info_Release_Notes_4-0.xml b/docs/en-US/Book_Info_Release_Notes_4-0.xml index 0d57fb6d9a8..9655986cc99 100644 --- a/docs/en-US/Book_Info_Release_Notes_4-0.xml +++ b/docs/en-US/Book_Info_Release_Notes_4-0.xml @@ -18,14 +18,13 @@ specific language governing permissions and limitations under the License. --> - - Version 4.0.0-incubating Release Notes - Revised October 17, 2012 19:49 UTC + + Version 4.1.0 Release Notes Apache CloudStack - Release notes for the Apache CloudStack 4.0.0-incubating release. + Release notes for the Apache CloudStack 4.1.0 release. diff --git a/docs/en-US/CloudStack_Nicira_NVP_Guide.xml b/docs/en-US/CloudStack_Nicira_NVP_Guide.xml index a4c367c26f7..7f156d5dc09 100644 --- a/docs/en-US/CloudStack_Nicira_NVP_Guide.xml +++ b/docs/en-US/CloudStack_Nicira_NVP_Guide.xml @@ -28,7 +28,7 @@ &PRODUCT; Plugin Guide for the Nicira NVP Plugin Apache CloudStack - 4.0.0-incubating + 4.2.0 1 diff --git a/docs/en-US/Common_Content/feedback.xml b/docs/en-US/Common_Content/feedback.xml new file mode 100644 index 00000000000..4b06c9f3898 --- /dev/null +++ b/docs/en-US/Common_Content/feedback.xml @@ -0,0 +1,24 @@ + + +%BOOK_ENTITIES; +]> + +
+ Feedback + to-do +
diff --git a/docs/en-US/Developers_Guide.xml b/docs/en-US/Developers_Guide.xml index c86208b3271..87dc8a6675a 100644 --- a/docs/en-US/Developers_Guide.xml +++ b/docs/en-US/Developers_Guide.xml @@ -26,7 +26,7 @@ &PRODUCT; Developer's Guide Apache CloudStack - 4.1.0-incubating + 4.2.0 diff --git a/docs/en-US/Installation_Guide.xml b/docs/en-US/Installation_Guide.xml index 28df071d42f..e6a80318611 100644 --- a/docs/en-US/Installation_Guide.xml +++ b/docs/en-US/Installation_Guide.xml @@ -11,7 +11,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -23,7 +25,7 @@ &PRODUCT; Installation Guide Apache CloudStack - 4.0.0 + 4.2.0 1 diff --git a/docs/en-US/Preface.xml b/docs/en-US/Preface.xml index 3f5cdc6bfcb..e046410234d 100644 --- a/docs/en-US/Preface.xml +++ b/docs/en-US/Preface.xml @@ -25,7 +25,7 @@ Preface - + diff --git a/docs/en-US/Release_Notes.xml b/docs/en-US/Release_Notes.xml index 2cedb90a763..cda8d724e9f 100644 --- a/docs/en-US/Release_Notes.xml +++ b/docs/en-US/Release_Notes.xml @@ -4,61 +4,4833 @@ %BOOK_ENTITIES; ]> - - Submitting Feedback and Getting Help - The Apache CloudStack project has mailing lists for users and developers. These are the - official channels of communication for the project and are the best way to get answers about - using and contributing to CloudStack. It's a good idea to subscribe to the cloudstack-users - mailing list if you've deployed or are deploying CloudStack into production, and even for test - deployments. - The CloudStack developer's mailing list (cloudstack-dev) is for discussions about - CloudStack development, and is the best list for discussing possible bugs in CloudStack. - Anyone contributing to CloudStack should be on this mailing list. - You can also report bugs in CloudStack using the Apache Defect Tracking - System. - To posts to the lists, you'll need to be subscribed. See the CloudStack Web site - for instructions. + + + Welcome to &PRODUCT; 4.1 + Welcome to the 4.1.0 release of &PRODUCT;, the first major release from the Apache + CloudStack project since its graduation from the Apache Incubator. + This document contains information specific to this release of &PRODUCT;, including + upgrade instructions from prior releases, new features added to &PRODUCT;, API changes, and + issues fixed in the release. For installation instructions, please see the Installation Guide. For usage and administration instructions, please see the + &PRODUCT; Administrator's Guide. Developers and users who wish to work with the API + will find instruction in the &PRODUCT; API Developer's Guide + If you find any errors or problems in this guide, please see . We hope you enjoy + working with &PRODUCT;! + + + Version 4.1.0 +
+ What’s New in 4.1 + Apache CloudStack 4.1.0 includes many new features. This section covers the most + prominent new features and changes. +
+ Localization + The 4.1.0 release adds partial User Interface (UI) support for Catalan, Chinese, + French, German, Italian, Japanese, Korean, Norwegian, Portuguese, Russian, and Spanish. + Not all languages are complete. + The 4.1.0 release also adds documentation translations for Chinese, Chinese (Taiwan), + Italian, Japanese, Korean, and Portuguese. +
+
+ Added Region Support + CLOUDSTACK-241: This feature adds a "region" construct that spans several + management servers. The objective of this feature is to add AWS EC2 like Regions + implementation into CloudStack. Regions are dispersed and located in separate geographic + areas. Availability Zones (or Zones in CloudStack) are distinct locations within a Region + that are engineered to be isolated from failures in other Zones and provide inexpensive, + low latency network connectivity to other Zones in the same Region. + Regions are expected to add the following benefits + + + Higher availability of the services: users can deploy services across AZs and even + if one of the AZ goes down the services are still available to the end-user through + VMs deployed in other zones. + + + Higher availability of the Management Server (MS): Since each MS Cluster only + manages a single Region, if that MS Cluster goes down, only that particular Region is + impacted. Admin should be able to access all the other Regions. + + + Scalability: The scalability limit of CloudStack dramatically improves, as the + scalability limit of MS Cluster is limited to a single Region. + + + Object Store: With Regions construct, CloudStack would also allow users to define + Object Store (Secondary Storage) across AZs. This helps users easily deploy VMs in + different AZs using the same template, offerings. + + + Geographical Grouping: Regions allow admins to group AZs (that have low latency + and are geographically located nearby) into a broader region construct. + + + Currently the Region feature is exposed in the API, but does not have a UI + component. +
+
+ Support for EC2 Query API + CLOUDSTACK-197: This introduces a query API for the AWS APIs that are currently + only supported by SOAP. The AWS Java SDK and AWS PHP SDK should now be supported by the + AWSAPI in CloudStack. + Supported Query APIs in 4.1.0: + + + AllocateAddress + + + AssociateAddress + + + AttachVolume + + + AuthorizeSecurityGroupIngress + + + CreateImage + + + CreateKeyPair + + + CreateSecurityGroup + + + CreateSnapshot + + + CreateTags + + + CreateVolume + + + DeleteKeyPair + + + DeleteSecurityGroup + + + DeleteSnapshot + + + DeleteTags + + + DeleteVolume + + + DeregisterImage + + + DescribeAddresses + + + DescribeAvailabilityZones + + + DescribeImageAttribute + + + DescribeImages + + + DescribeInstanceAttribute + + + DescribeInstances + + + DescribeKeyPairs + + + DescribeSecurityGroups + + + DescribeSnapshots + + + DescribeTags + + + DescribeVolumes + + + DetachVolume + + + DisassociateAddress + + + GetPasswordData + + + ImportkeyPair + + + ModifyImageAttribute + + + RebootInstances + + + RegisterImage + + + ReleaseAddress + + + ResetImageAttribute + + + RevokeSecurityGroupIngress + + + RunInstances + + + StartInstances + + + StopInstances + + + TerminateInstances + + + See the Feature Specification for more information on the Query API support. +
+
+ Auto-Completing Shell for CloudStack (CloudMonkey) + CLOUDSTACK-132: Adds a auto-completing shell and command-line tool for + &PRODUCT; written in Python, called CloudMonkey. + CloudMonkey includes the following features: + + + Usable as a command line tool and interactive shell. + + + All commands are lowercase unlike API. + + + Api Discovery using sync feature, with build time api precaching for failsafe + sync. + + + Raw api execution support. + + + Auto-completion via double tab. + + + Reverse search using Ctrl+R + + + Emacs compatible key bindings. + + + Output that's "pipeable" to other *nix programs. + + + Unix shell execution. + + + Support to handle asynchronous jobs using user defined blocking or non-blocking + way. + + + Tabular or JSON output with filtering of table columns. + + + Colored output. + + + API parameter value completion (based on predication, fuzzy results may fail + sometimes). + + + CloudMonkey has a few requirements above and beyond CloudStack, and does not need to + be run on the same machine as a management server. If you wish to run + CloudMonkey you'll need Python 2.5 or later, + readline, Pygments, and + prettytable. CloudMonkey can be installed with + pip: + $ pip install cloudmonkey + See the Developer's Guide and the CloudStack + wiki for the latest information on CloudMonkey + installation and use. +
+
+ API Discovery Service + CLOUDSTACK-926: CloudStack has more than 300 APIs and more are added in each + major release. CloudStack admins can enable or disable APIs, or add plugins which provide + more APIs. The API Discovery Service is a plugin which will help users discover the APIs + available to them on a CloudStack Management Server. + The discovery service implements a method called listApis which + will return information about APIs for a user. It currently accepts an apiName to list api + information of that particular API. The method ensures that user can only list APIs they + are entitled to. + All CloudStack APIs are implemented by annotated command class and PluggableService is + a contract implemented by all the components such as the Management Server and all the + plugins which provide an API. During load time, API discovery service asks all the + pluggable services to return list of API cmd classes from whose fields and annotations it + gathers information about each API, the information consists of name, description, + parameter name, parameter description, etc. + For more information on the implementation of the API Discovery Service for 4.1.0, see + the CloudStack + wiki. +
+
+ Events Framework + CLOUDSTACK-820: The Events Framework provides a mechanism to publish and + subscribe to events in &PRODUCT;. +
+
+ Additional VMX Settings + ### +
+
+ L3 Router Functionality in Nicira Nvp Plugin + ### +
+
+ Persistent Networks without Running VM + ### +
+
+ Add/Remove Network on VM + ### +
+
+ Resize Volumes Feature + ### +
+
+ Autoscale + ### +
+
+ API Request Throttling + CLOUDSTACK-618: Limits the number of API requests per second that can be placed + against a management server to avoid DoS attacks via API requests. + The throttling is controlled by the api.throttling.enabled, + api.throttling.interval, and api.throttling.max + configuration settings. Note that api.throttling.enabled is set to + false by default. +
+
+ S3 Backed Secondary Storage + CLOUDSTACK-509: This enhancement backs NFS secondary storage with an + S3-compatible object store. Periodically, a reaper thread synchronizes the templates, + ISOs, and snapshots stored on a NFS secondary storage mount with a configured S3 object + store. In addition to permitting the use of commodity or IaaS storage solutions for static + assets, it provides a means of automatically synchronizing template and ISO assets across + multiple zones. + See the &PRODUCT; + wiki for more information on this feature, currently the documentation is + incomplete. +
+
+ User and Domain Admin Can Create API Key and Secret + CLOUDSTACK-437: This feature adds the ability for domain admins and users to + create their own API Key and Secret. Domain admins can create keys for themselves, + subdomain admins, and for regular users, but not for other domain admins. +
+
+ Support Inline Mode for F5 and SRX + CLOUDSTACK-306: For &PRODUCT; deployments using the Juniper SRX (firewall) and + F5 Big IP (load balancer), &PRODUCT; 4.1.0 supports putting the firewall in front of the + load balancer, making the firewall device the gateway and putting the load balancer behind + the public network. +
+
+ Egress Firewall Rules for Guest Networks + CLOUDSTACK-299: This feature allows users to create egress (exit) traffic rules + from private networks to public networks (e.g. from your internal + network to the public Internet). By default all traffic is blocked from internal networks + to the public networks, this allows you to open ports as necessary. + Egress traffic rules are suppored only on virtual routers at this time, physical + devices are not supported. +
+
+ Reset SSH Key to Access VM + CLOUDSTACK-297: &PRODUCT; 4.1.0 introduces a new API + resetSSHKeyForVirtualMachine, that can allow them to set or reset the + SSH keypair assigned to a virtual machine. +
+
+
+ Issues Fixed in 4.1.0 + Apache CloudStack uses Jira to track its issues. All new features and bugs for 4.1.0 have been tracked + in Jira, and have a standard naming convention of "CLOUDSTACK-NNNN" where "NNNN" is the + issue number. + This section includes a summary of known issues against 4.0.0 that were fixed in 4.1.0. + Approximately 470 bugs were resolved or closed in the 4.1.0 cycle. + + + + + + + + Defect + + + Description + + + + + + + CLOUDSTACK-46 + + + Remnants of mycloud remain. + + + + + CLOUDSTACK-70 + + + Improve Network Restart Behaviour for Basic Zone: Restarting Network + Fail + + + + + CLOUDSTACK-94 + + + "API command, listIsos documentation clarity + + + + + CLOUDSTACK-95 + + + IP address allocation not working when a user tries to allocate IP addresses + in a Project + + + + + CLOUDSTACK-97 + + + Vmware network labels are ignored when creating a Zone using basic + networking + + + + + CLOUDSTACK-108 + + + VM should not be allowed to be deployed on two Isolated Networks of an Account + that were created from DefaultNetworkOfferingwithSourceNATService + + + + + CLOUDSTACK-118 + + + Status of host resorce stuck in "ErrorInMaintenance" + + + + + CLOUDSTACK-119 + + + Move Agent-Simulator in to the hypervisor plugin model + + + + + CLOUDSTACK-130 + + + Clarify docs on tags parameter in API reference + + + + + CLOUDSTACK-152 + + + Routes on the User VM are programmed incorrectly on a VM present on both + Isolated and Shared Guest Network + + + + + CLOUDSTACK-178 + + + Expose name parameter of VM in list Vm view. + + + + + CLOUDSTACK-198 + + + vpn:failto add VPN Users deletes all the existing Vpn user + + + + + CLOUDSTACK-222 + + + Admin UI prompts to restart Management server with cancel edit + operation + + + + + CLOUDSTACK-225 + + + API Docs: Request params repeated with different description + + + + + CLOUDSTACK-226 + + + UpdatePhysicalNetworkcommand failed due to java.sql.BatchUpdateException ; + Tried to extend the existing Guest VLAN Range of one physical network into the + Guest VLAN range of the other physical network + + + + + CLOUDSTACK-227 + + + ReconnectHostCmd: NullPointerException: Unable to get host Information for + XenServer 6.0.2 host - on intentionally changing the traffic labels on the + physical network + + + + + CLOUDSTACK-228 + + + UI provides an option to reconnect a disconnected host - ServerApiException is + thrown on an attempt + + + + + CLOUDSTACK-232 + + + Zone infrastructure chart -- disable resource total display + + + + + CLOUDSTACK-235 + + + Network rate can be set in 2 places. Clarify docs on how this works + + + + + CLOUDSTACK-249 + + + Add host id to failed VM deploy alerts + + + + + CLOUDSTACK-250 + + + Incorrect description of maintenance mode in admin guide + + + + + CLOUDSTACK-256 + + + "vpn:As an admin user, not able to delete VPN user which is present in a + regular user's network. + + + + + CLOUDSTACK-271 + + + updatePhysicalNetwork dies with an NPE when the vlan range is empty + + + + + CLOUDSTACK-274 + + + Two error codes mapped to same value in API + + + + + CLOUDSTACK-275 + + + hostid not always a UUID + + + + + CLOUDSTACK-277 + + + Message during CloudStack management server Installation: cannot access + /usr/share/cloud/bridge/lib: No such file or directory + + + + + CLOUDSTACK-279 + + + deleteProject fails when executed by the regular user (works fine for + root/domain admin) + + + + + CLOUDSTACK-284 + + + listVirtualMachines does not return deleted machines when zone is + specified + + + + + CLOUDSTACK-290 + + + 3.0.0 template also needed for 2.2.14 to 3.0.5 direct upgrade. + + + + + CLOUDSTACK-293 + + + "We do awful, hacky things in our spec file for client" + + + + + CLOUDSTACK-304 + + + Add synchronization for createSnapshot command per host basis + + + + + CLOUDSTACK-309 + + + iptables rules being deleted from wrong VM after a migration + + + + + CLOUDSTACK-318 + + + Adding XenServer Host Fails - 6.0.2 fails with 4.0.0 + + + + + CLOUDSTACK-320 + + + "sessionKey query parameter should be case-insensitive, now only sessionkey is + accepted" + + + + + CLOUDSTACK-322 + + + During upgrade displays error - a foreign key constraint fails + (`cloud/#sql-f34_6e`.. + + + + + CLOUDSTACK-332 + + + "count" property in list* API response should be equal to how many entries in + database, not how many objects in API response + + + + + CLOUDSTACK-333 + + + When Datacenter name in VCenter has spaces Primary Storage (VMFS) discovery + will fail + + + + + CLOUDSTACK-335 + + + KVM VPC load balancer not working + + + + + CLOUDSTACK-336 + + + listZones doesn't honour paging + + + + + CLOUDSTACK-343 + + + "Document what tools and packages are required to build, package and install + CloudStack 4.0 + + + + + CLOUDSTACK-346 + + + Cannot add Vmware cluster with class loader conflict exception + + + + + CLOUDSTACK-347 + + + listNetworks API: return vlan information only when the caller is ROOT + admin + + + + + CLOUDSTACK-348 + + + deleteNetwork does not clean up network resource count correctly + + + + + CLOUDSTACK-354 + + + Display of storage statistics is wrong + + + + + CLOUDSTACK-355 + + + "Fix ""count"" in a bunch of API commands + + + + + CLOUDSTACK-357 + + + "ISOs can be deleted while still attached to a running VM, and they + subsequently cannot be detached from a running VM + + + + + CLOUDSTACK-359 + + + PropagateResourceEventCommand failes in cluster configuration + + + + + CLOUDSTACK-361 + + + Wrong creation of guest networks on a KVM host in Multiple Physical Networks + with guest traffic + + + + + CLOUDSTACK-364 + + + Docs point to download.cloud.com for AWS API script + + + + + CLOUDSTACK-368 + + + OVM - cannot create guest VM + + + + + CLOUDSTACK-369 + + + ASF 4.0 - unable to support XenServer 6.1 host + + + + + CLOUDSTACK-373 + + + "static NAT and Firewall is not working on external firewall device SRX, it + needs to be implemented + + + + + CLOUDSTACK-377 + + + provide deployment config access to marvin's testcase + + + + + CLOUDSTACK-378 + + + mavenize marvin on master + + + + + CLOUDSTACK-390 + + + Install Guide: Section 4.5.7 (Prepare the System VM Template): Links go to + cloud.com + + + + + CLOUDSTACK-397 + + + Install Guide: Section 11.1 (Guest Traffic): Diagram is the wrong + diagram + + + + + CLOUDSTACK-398 + + + Install Guide: Section 11.17.3 (Using VPN with Mac OSX): Not complete + + + + + CLOUDSTACK-404 + + + Update docs on the usage of cloud-setup-database + + + + + CLOUDSTACK-412 + + + Data truncation: Out of range value for column 'ram' at row + + + + + CLOUDSTACK-415 + + + restartNetwork call causes VM to be unreachable when Nicira based SDN is + used + + + + + CLOUDSTACK-416 + + + XCP 1.6beta2 (61002c) - can't add a host + + + + + CLOUDSTACK-417 + + + Handle password server securely to run on port 8080 on VR + + + + + CLOUDSTACK-424 + + + Updated userdata not propagating to the VR + + + + + CLOUDSTACK-427 + + + Change hardcoded step number references to dynamic link + + + + + CLOUDSTACK-428 + + + Storage capacity shown in UI is incorrect + + + + + CLOUDSTACK-435 + + + Vmware network labels are ignored when creating a Zone using basic + networking + + + + + CLOUDSTACK-441 + + + Running mgmt server using jetty fails to start api server + + + + + CLOUDSTACK-446 + + + "Host going to alert state, if you are adding already added host + + + + + CLOUDSTACK-448 + + + SSVM bootstrap failure on XenServer hosts with E3 CPU + + + + + CLOUDSTACK-456 + + + License tag in SPEC isn't what RPM is expecting + + + + + CLOUDSTACK-459 + + + [Optional Public IP assignment for EIP with Basic Zone] Associate IP Checkbox + in Create Network Offering Dialog is Displayed When Elastic LB is Selected + + + + + CLOUDSTACK-462 + + + A few corrections to make to the 4.0.0 installation guide + + + + + CLOUDSTACK-464 + + + "Regression in AWSAPI docs, entire sections removed + + + + + CLOUDSTACK-465 + + + French language file quotes are dropping javascript syntax error + + + + + CLOUDSTACK-467 + + + Developer's Guide points to cloud.com for API reference + + + + + CLOUDSTACK-479 + + + UpdateVirtualMachine api fails to propagate userdata to domr + + + + + CLOUDSTACK-481 + + + Installation Guide Doc Error + + + + + CLOUDSTACK-493 + + + 2.2.x-3.0 DB upgrade support for Advance SG enabled network + + + + + CLOUDSTACK-499 + + + cloudmonkey CLI can't accept complex parameter + + + + + CLOUDSTACK-500 + + + Passwd-server iptables rules are dropped on domr on fresh start or on + reboot. + + + + + CLOUDSTACK-501 + + + Apidocs and marvin does not know how to handle Autoscaling docs. + + + + + CLOUDSTACK-504 + + + Duplicate guest password scripts in codebase. + + + + + CLOUDSTACK-507 + + + fix api docs for listSSHKeyPair + + + + + CLOUDSTACK-508 + + + CLVM copies template to primary storage unnecessarily. + + + + + CLOUDSTACK-510 + + + Add button not visible when adding public IPs to physical network. + + + + + CLOUDSTACK-514 + + + Marvin and Cloudmonkey don't work when an API target uses https or an + alternate path. + + + + + CLOUDSTACK-518 + + + API refactoring -- change @Parameter annotation and remove the @IdentityMapper + annotation. + + + + + CLOUDSTACK-520 + + + Dependency jar names mismatch with install-non-oss.sh + + + + + CLOUDSTACK-521 + + + Build will hung up when doing test for TestAgentShell + + + + + CLOUDSTACK-522 + + + Log requests in cloudmonkey's log file. + + + + + CLOUDSTACK-527 + + + List API performance optimization by using DB views and removing UUID + conversion. + + + + + CLOUDSTACK-534 + + + Failed to add host + + + + + CLOUDSTACK-536 + + + remove citrix cloudpatform from 4.0 build - CloudStack is ASF project. + + + + + CLOUDSTACK-539 + + + Cropped Text in UI under Quick View. + + + + + CLOUDSTACK-552 + + + ]Quick view details for a volume displays scroll bar in place of name of the + volume when the name of the volume has more no of characters. + + + + + CLOUDSTACK-553 + + + "SRX - When adding SRX device make "Public Network" - default to "untrusted" + and "Private Network" - default to "trusted" as un-editable fields. + + + + + CLOUDSTACK-556 + + + Erratic window behavior in Quick View tooltip. + + + + + CLOUDSTACK-559 + + + source code import problem + + + + + CLOUDSTACK-560 + + + Usage server doesn't work in 4.0.0 due to missing db changes + + + + + CLOUDSTACK-572 + + + SG Enabled Advanced Zone - Not able to deploy a VM in an account specific + shared network + + + + + CLOUDSTACK-573 + + + "NPE at + ""com.cloud.network.NetworkManagerImpl.networkOfferingIsConfiguredForExternalNetworking(NetworkManagerImpl.java:4345)"" + when create network from the network offering having NULL provider for the + service + + + + + CLOUDSTACK-578 + + + The already deleted same hostname is not deleted from /etc/hosts of + vRouter + + + + + CLOUDSTACK-584 + + + "typos in + ""Apache_CloudStack-4.0.0-incubating-CloudStack_Nicira_NVP_Guide-en-US"" + + + + + CLOUDSTACK-590 + + + Incorrect Network Gateways Assigned to System VM + + + + + CLOUDSTACK-592 + + + "API bloat, unknown apis cmd classes + + + + + CLOUDSTACK-593 + + + "2 guest network, auto create vlan error + + + + + CLOUDSTACK-596 + + + DeployVM command takes a lot of time to return job id. + + + + + CLOUDSTACK-599 + + + DhcpEntryCommand fails on Router VM on CS4.0 and vSphere5 with Advanced + Network Zone. + + + + + CLOUDSTACK-600 + + + When rebooting KVM local storage VM host, libvirt definitions deleted + + + + + CLOUDSTACK-605 + + + Host physical CPU is incorrectly calculated for Vmware host + + + + + CLOUDSTACK-606 + + + Starting VM fails with 'ConcurrentOperationException' in a clustered MS + scenario + + + + + CLOUDSTACK-614 + + + "ListTemplates API is not returning ""Enable SSH Key"" attribute for any given + template + + + + + CLOUDSTACK-617 + + + Unable to edit a Sub domain + + + + + CLOUDSTACK-639 + + + API Refactoring: Adapters for ACL + + + + + CLOUDSTACK-648 + + + The normal users could change their own login password. + + + + + CLOUDSTACK-660 + + + Network Traffic Labels are not functional in Marvin + + + + + CLOUDSTACK-683 + + + Image Is Missing in the Accessing VM Section + + + + + CLOUDSTACK-689 + + + RVR: Stop pending flag is not cleared when user start the disconnected router + from another host + + + + + CLOUDSTACK-691 + + + A warning dialog box shows after reloading the welcome page. + + + + + CLOUDSTACK-693 + + + Adding a VPC virtual router to a NiciraNVP enabled network fails. + + + + + CLOUDSTACK-694 + + + "Create a new VPC network offering with "connectivity" option needed for SDN + networking) is not allowed / VPC support for SDN networks + + + + + CLOUDSTACK-717 + + + cloudmonkey fails to parse/print response. + + + + + CLOUDSTACK-720 + + + Fail to load a png image when accessing the web console. + + + + + CLOUDSTACK-721 + + + Bytes sent/received in user statistics is empty (CloudStack 4.0) + + + + + CLOUDSTACK-725 + + + UI: Error when the Egress rules tab is selected for a network. + + + + + CLOUDSTACK-734 + + + api_refactoring: CreateAccountCmd fails to send response due to NPE in service + layer + + + + + CLOUDSTACK-735 + + + Integration smoke tests: Fix expunge vm test on api_refactoring + + + + + CLOUDSTACK-736 + + + Integration smoke tests: Fix check for vm name for the deployvm smoke + test. + + + + + CLOUDSTACK-793 + + + "Create cloudmonkey-helper, a plugin that helps autodiscover and sync api info + via an api over some endpoint + + + + + CLOUDSTACK-798 + + + Move usage related cmd classes from cloud-server to cloud-api + + + + + CLOUDSTACK-799 + + + [Load Test] Check router statistics falls behind in gathering stats by more + than 2 times the set value + + + + + CLOUDSTACK-819 + + + Create Account/User API logging password in access log + + + + + CLOUDSTACK-863 + + + Non-printable characters (ASCII control character) such as %00 or %0025 are + getting stored in raw/non encoded form in the database + + + + + CLOUDSTACK-870 + + + Client UI: Wrong character encoding for some language + + + + + CLOUDSTACK-928 + + + [Simulator] Latency for Agent Commands - change unit of wait from seconds to + milliseconds + + + + + CLOUDSTACK-938 + + + s2s VPN trouble + + + + + CLOUDSTACK-959 + + + Missing sub-sections in document section System Service Offering + + + + + CLOUDSTACK-968 + + + marvin: vlan should be an attribute of the physical_network and not the + zone + + + + + CLOUDSTACK-977 + + + Document how to use openvswitch with KVM hypervisor + + + + + CLOUDSTACK-978 + + + TypeError: instance.displayname is undefined while adding VM's to the LB + rule + + + + + CLOUDSTACK-985 + + + Different MAC address for RvR caused issue in short term network outage + + + + + CLOUDSTACK-987 + + + Sections missing in Working With Snapshots + + + + + CLOUDSTACK-993 + + + "admin"" user is not getting created when management server is started. + + + + + CLOUDSTACK-995 + + + Not able to add the KVM host + + + + + CLOUDSTACK-1002 + + + Not able to start VM + + + + + CLOUDSTACK-1006 + + + need to disable service libvirt-guests in CentOS packaging RPMs, or in + installation docs + + + + + CLOUDSTACK-1008 + + + "Egress"" tab should not be presented in the UI for Shared Networks + + + + + CLOUDSTACK-1010 + + + Host count and Secondary storage count always shows 1 in UI + + + + + CLOUDSTACK-1011 + + + KVM host getting disconnected in cluster environment + + + + + CLOUDSTACK-1013 + + + running cloudstack overwrites default public/private ssh key + + + + + CLOUDSTACK-1014 + + + Merge ManagementServer and ManagementServerEx + + + + + CLOUDSTACK-1016 + + + Not able to deploy VM + + + + + CLOUDSTACK-1021 + + + the vlan is not creat to right nic. when i creat multi guest network + + + + + CLOUDSTACK-1024 + + + Regression: Unable to add Xenserver host with latest build. + + + + + CLOUDSTACK-1027 + + + "Update SSL certificate" button should properly reflect its + functionality + + + + + CLOUDSTACK-1029 + + + Enter the token to specified project is malfunctioned + + + + + CLOUDSTACK-1037 + + + "Make cloudmonkey awesome-er: Online help docs and api discovery, better + colored output, parameter value autocompletion + + + + + CLOUDSTACK-1050 + + + No Documentation on Adding a Load Balancer Rule + + + + + CLOUDSTACK-1051 + + + API dispatcher unable to find objectVO corresponding to + DeleteTemplatecmd + + + + + CLOUDSTACK-1055 + + + "The overlay still exists when the ""Recurring Snapshots"" dialog is canceled + by pressing esc key. + + + + + CLOUDSTACK-1056 + + + S3 secondary storage fails to upload systemvm template due to KVMHA + directory + + + + + CLOUDSTACK-1057 + + + regression of changeServiceForVirtualMachine API - fails to find service + offering by serviceOfferingId parameter + + + + + CLOUDSTACK-1063 + + + "SG Enabled Advanced Zone - "Add Guest Networks" - When user tries to add a + guest Network with scope as "Account" he should NOT be presented with "Offering + for shared security group enabled" + + + + + CLOUDSTACK-1064 + + + A type error occurs when trying to add account/register template... + + + + + CLOUDSTACK-1068 + + + Names in VR list is useless + + + + + CLOUDSTACK-1070 + + + javelin: NPE on executing registerIso API + + + + + CLOUDSTACK-1071 + + + Netscaler element is not getting loaded as part of LoadBalancing Service + Providers + + + + + CLOUDSTACK-1078 + + + Not able to start System Vms on Rhel 6.3 KVM host + + + + + CLOUDSTACK-1079 + + + Deploying AWSAPI with mvn -pl :cloud-awsapi jetty:run fail + + + + + CLOUDSTACK-1082 + + + UI doesn't throw any error message when trying to delete ip range from a + network that is in use. + + + + + CLOUDSTACK-1083 + + + listUsageRecords api: removed project results in NPE + + + + + CLOUDSTACK-1087 + + + Update the Developer Guide for ASFCS 4.1 Release + + + + + CLOUDSTACK-1088 + + + EnableStaticNat error will clear the data in database + + + + + CLOUDSTACK-1094 + + + Ipv6 - hostname/hostname --fqdn does not return the name of the VM. But i am + able to reach the Vm using their names + + + + + CLOUDSTACK-1095 + + + Ipv6 - dhclient command needs to be run manually on the Vms to get the Ipv6 + address + + + + + CLOUDSTACK-1100 + + + Expunge thread is not kicked off based on global configuration if the global + setting is less than 60 seconds + + + + + CLOUDSTACK-1103 + + + "IpV6 - listNetwork() command does not retrun gateway,netmask,cidr + + + + + CLOUDSTACK-1104 + + + Ipv6 - listVlanIpRanges() returns error 530 + + + + + CLOUDSTACK-1105 + + + "IpV6 - listVirtualMachines() does not return netmask, + gateway,ipaddress. + + + + + CLOUDSTACK-1107 + + + Ipv6 - Unable to extend Ip range for a Ipv6 network using craeteVlanIpRange() + command - Error code 530 returned + + + + + CLOUDSTACK-1108 + + + Ipv6 - Not able to restart Networks + + + + + CLOUDSTACK-1109 + + + "Ipv6 - Unable to expunge User Vms that are "Destroyed". + + + + + CLOUDSTACK-1111 + + + Ipv6 - listRouters() does not return guestipaddress/ + + + + + CLOUDSTACK-1112 + + + "Errors in "Prepare the System VM Template" + + + + + CLOUDSTACK-1113 + + + "Ipv6 - Not able to deploy a new VM in this network because of "Unable to + allocate Unique Ipv6 address" + + + + + CLOUDSTACK-1114 + + + unable to execute listegressfirewallrules API due invalid value id + + + + + CLOUDSTACK-1115 + + + In multiple shared network unable to login with default nic - KVM + + + + + CLOUDSTACK-1123 + + + ListStoragePools API broken by refactor + + + + + CLOUDSTACK-1138 + + + "Providing invalid values for gateway, netmask etc in the zoneWizard blocks + the VLAN container to load, throwing an error + + + + + CLOUDSTACK-1139 + + + "After the Vm is "Expunged" we see the entry still being present in the router + in /etc/dhcphosts.txt + + + + + CLOUDSTACK-1141 + + + "Ipv6 - After network restart (and reboot router), we do not see the existing + vms dnsentries not being programmed in the router. + + + + + CLOUDSTACK-1152 + + + Missing tag in host-add.xml + + + + + CLOUDSTACK-1153 + + + "Ipv6 - Vm deployment fails with "n must be positive" error. + + + + + CLOUDSTACK-1154 + + + Account/Users related API failed due to RegionService inject exception. + + + + + CLOUDSTACK-1157 + + + No API Documentation on Listing Custom User Templates Using CS4 API + + + + + CLOUDSTACK-1160 + + + References to version=3.0.3|4|5|6 in API classes needs to be removed. + + + + + CLOUDSTACK-1161 + + + Differences between 4.1 and master in + ongoing-config-of-external-firewalls-lb.xml + + + + + CLOUDSTACK-1163 + + + Failed with NPE while creating firewall rule + + + + + CLOUDSTACK-1168 + + + Create firewall rule broke + + + + + CLOUDSTACK-1173 + + + ConsoleProxyResource instantiation exception. + + + + + CLOUDSTACK-1174 + + + Snapshots related SQL error. + + + + + CLOUDSTACK-1176 + + + Issue with snapshots(create/list) + + + + + CLOUDSTACK-1181 + + + mvn deploy db failing with NPE + + + + + CLOUDSTACK-1190 + + + Make APIChecker interface throw a single sensible exception. + + + + + CLOUDSTACK-1200 + + + "Unknown column 'vm_instance.disk_offering_id' in table vm_instance, db + exception shown in MS log + + + + + CLOUDSTACK-1201 + + + "Failed to create ssh key for user "cloud" + /var/lib/cloud/management/.ssh/id_rsa and failed to start management server + + + + + CLOUDSTACK-1202 + + + Fail to install KVM cloud-agent. + + + + + CLOUDSTACK-1203 + + + Fail to create advance zone with SG enabled when UI allows SG enabled + option. + + + + + CLOUDSTACK-1204 + + + Fail to create advance zone due to fail to add host + + + + + CLOUDSTACK-1205 + + + Ipv6 - Ubuntu 12.10 guest Vms loses default route (after it expiration time ~ + 30 mts) when ipv6.autoconfig parameters are disabled except for + net.ipv6.conf.lo.autoconf which is enabled. + + + + + CLOUDSTACK-1206 + + + Failure in Copy of System template + + + + + CLOUDSTACK-1210 + + + Make all pluggable services return list of api cmd classes + + + + + CLOUDSTACK-1216 + + + UUID is null for admin and failed to register user key with 4.0 + + + + + CLOUDSTACK-1218 + + + "IPv6: Shared Network - After network restart with clean option, router is + assigned a different address. Name resolution for the existing guest Vms in the + network fails. + + + + + CLOUDSTACK-1219 + + + Ipv6 - Provide better error messages when deploying a Vm with Ip an address + that is outside the network's ip range / if the ip address already is assigned to + another Vm + + + + + CLOUDSTACK-1220 + + + Ipv6 - Better error message when deploy Vm fails to get a free Ip + address + + + + + CLOUDSTACK-1222 + + + API rate limit configs: removed double quote in upgrade script + + + + + CLOUDSTACK-1223 + + + Exception while starting jetty server: + org.springframework.beans.factory.BeanCreationException Error creating bean with + name 'apiServer' + + + + + CLOUDSTACK-1224 + + + Volume snapshot creation failing + + + + + CLOUDSTACK-1226 + + + Error while running Cloudstack-setup-database + + + + + CLOUDSTACK-1228 + + + Unable to Create System Vm's in the VMware Hypervisor setup + + + + + CLOUDSTACK-1229 + + + Incorrect SQL syntax to insert api limit related configuration items in + upgrade path script. + + + + + CLOUDSTACK-1231 + + + cloud-install-sys-tmplt failed due to missing path + + + + + CLOUDSTACK-1232 + + + "Ipv6 - Guest Vms are not able to get Ipaddress when executing dhclient + command when using ""/96"" network. + + + + + CLOUDSTACK-1233 + + + Veewee configuration files are inappropriately identified as ASLv2 licensed + file + + + + + CLOUDSTACK-1234 + + + Unable to start KVM agent with 4.1 build. + + + + + CLOUDSTACK-1237 + + + "Register Template fails with ""Cannot find template adapter for + XenServer"" + + + + + CLOUDSTACK-1239 + + + Unable to registerISO :unhandled exception executing api command: + registerIso + + + + + CLOUDSTACK-1240 + + + Unable to registerTemplate : Cannot find template adapter for + XenServer. + + + + + CLOUDSTACK-1241 + + + Network apply rules logic is broken. + + + + + CLOUDSTACK-1242 + + + [F5-SRX-InlineMode] Failed to create LB rule with F5-SRX inlinemode + deployment + + + + + CLOUDSTACK-1243 + + + Failed to cleanup account :java.lang.NullPointerException + + + + + CLOUDSTACK-1244 + + + fail to push sysmvm.iso onto xen host + + + + + CLOUDSTACK-1246 + + + "[ ALU beta CS 4.1 build2] ""Guest network"" missing in Add Zone wizard ( step + 3, Setup Network \ Physical Network) + + + + + CLOUDSTACK-1251 + + + Baremetal zone doesn't need primary/secondary storage in UI wizard. + + + + + CLOUDSTACK-1252 + + + Failed to download default template in VMware. + + + + + CLOUDSTACK-1260 + + + Failed to register template: Unable to find template adapter + + + + + CLOUDSTACK-1261 + + + Cannot find template adapter for XenServer. + + + + + CLOUDSTACK-1262 + + + "Failed to Prepare Secondary Storage in VMware, + + + + + CLOUDSTACK-1265 + + + logrotate dnsmasq configuration is wrong + + + + + CLOUDSTACK-1267 + + + KVM's cloudstack-agent service doesn't log (log4j) + + + + + CLOUDSTACK-1269 + + + Failed to start CPVM java.lang.NullPointerException Unable to start + SSVM + + + + + CLOUDSTACK-1272 + + + Autoscale: createAutoScaleVmProfile fails due to unable to retrieve Service + Offering ip + + + + + CLOUDSTACK-1274 + + + UpdateNetworkCmd throws NP + + + + + CLOUDSTACK-1276 + + + Remove autoscanning for 4.1 + + + + + CLOUDSTACK-1277 + + + ApiResponseHelper.createUserVmResponse failed to populate password field set + from UserVm object + + + + + CLOUDSTACK-1278 + + + Improper permissions on injectkeys.sh + + + + + CLOUDSTACK-1288 + + + [F5-SRX-InlineMode] classCastException during network restart with cleanup + option true + + + + + CLOUDSTACK-1289 + + + [F5-SRX-InlineMode] Usage stats are not generated for Juniper SRX Firewall in + inlinemode + + + + + CLOUDSTACK-1290 + + + listNetoworks API takes too long to respond + + + + + CLOUDSTACK-1292 + + + "[F5-SRX-InlineMode] Update network from SRX,F5 as service provideds to VR as + service provider does not delete firewall rules from SRX + + + + + CLOUDSTACK-1295 + + + NPE in usage parsers due to missing @Component inject + + + + + CLOUDSTACK-1299 + + + Errors in 4.5.5 section of installation guide + + + + + CLOUDSTACK-1300 + + + section in wrong order in installation guide + + + + + CLOUDSTACK-1303 + + + Ipv6 - java.lang.NullPointerException when executing listnetworks() and + deployVirtualMachine() after extending the Ipv4 range of a dual stack + network + + + + + CLOUDSTACK-1307 + + + Noticed NPE when we put host in maintenance mode in clustered management + setup + + + + + CLOUDSTACK-1310 + + + ASF-build-master-nonoss-rhel63 - create advance zone FAIL - + CreatePhysicalNetworkCmd FAIL - MySQLIntegrityConstraintViolationException: + Duplicate entry '200-Public' for key 'physical_network_id' + + + + + CLOUDSTACK-1312 + + + "Fix rolling upgrades from 4.0 to 4.1 in 4.1 release, fix db schemas to be + same as 4.0 + + + + + CLOUDSTACK-1313 + + + Working with Volumes Section Is Missing + + + + + CLOUDSTACK-1315 + + + [F5-SRX-InlineMode] Network implement failed with Run time Exception during + network upgrade from VR to SRX-F5 + + + + + CLOUDSTACK-1319 + + + createCustomerVpnGateway response gives TypeError: + json.createvpncustomergatewayresponse is undefined + + + + + CLOUDSTACK-1320 + + + Routers naming convention is changed to hostname. + + + + + CLOUDSTACK-1321 + + + [Site-to-Site VPN] No events are generated in case of status change in site to + site vpn connection + + + + + CLOUDSTACK-1326 + + + KVM - Failed to start cloud agent from SSVM + + + + + CLOUDSTACK-1328 + + + console view unable to connect - CPVM SSVM guest VM + + + + + CLOUDSTACK-1329 + + + "API listRouters response returns hostname instead of Virtual Routers, UI + displays host entry for each VR + + + + + CLOUDSTACK-1330 + + + ec2-run-instances - When -n option is used to deploy multiple Vms API returns + error even though few of the Vms have been deployed successfully + + + + + CLOUDSTACK-1331 + + + Upgrade fails for a 2.2.14 Zone having multiple guest networks using + network_tags and Public Vlan + + + + + CLOUDSTACK-1332 + + + IPV6 - Router and guest Vms should be able to use an IPV6 address for external + DNS entry + + + + + CLOUDSTACK-1334 + + + vmware.root.disk.controller doesn't work + + + + + CLOUDSTACK-1337 + + + Zone to zone template/ISO copy fails and template/ISO download also + fail + + + + + CLOUDSTACK-1338 + + + Deploy VM failed using IS + + + + + CLOUDSTACK-1339 + + + ASF 4.1: Management server becomes unresponsive + + + + + CLOUDSTACK-1341 + + + URL for the KEYs file is wrong in the installation guide + + + + + CLOUDSTACK-1342 + + + Document installation and usage of cloudmonkey for 4.1 docs + + + + + CLOUDSTACK-1343 + + + Porting Baremetal related UI changes to ACS + + + + + CLOUDSTACK-1344 + + + Typo in use.external.dns setting description + + + + + CLOUDSTACK-1345 + + + BigSwitch plugin introduces 'VNS' isolation in UI without backend + implementation + + + + + CLOUDSTACK-1346 + + + "Check to see if external devices are used in the network, is hardcoded for + specific devices + + + + + CLOUDSTACK-1347 + + + "Not able to delete network. Error - "Unable to insert queue item into + database, DB is full?" + + + + + CLOUDSTACK-1348 + + + API/UI: zoneObj is undefined. + + + + + CLOUDSTACK-1349 + + + "VPC network Adding Network ACls, PF rules - Unable to insert queue item into + database, DB is full? PF rules and NW Acls in Add state in DB + + + + + CLOUDSTACK-1350 + + + Management server Stop and start causes previously downloaded ISOs and + templates to redownload & reinstall. + + + + + CLOUDSTACK-1353 + + + KVM 6.3 snapshot Scheduling snapshot failed due to + java.lang.NullPointerException + + + + + CLOUDSTACK-1357 + + + "Autoscale: Provisioned VMs from Netscaler not being added to lb vserver, + provserver fails with provserver_err_asynctaskpoll + + + + + CLOUDSTACK-1360 + + + The clusterid field of the createStoragePool API command should be documented + as required. + + + + + CLOUDSTACK-1367 + + + NPE noticed in logs while AgentMonitor is monitoring the host ping + interval + + + + + CLOUDSTACK-1368 + + + Shared network - Not able to delete network because of + java.lang.NullPointerException + + + + + CLOUDSTACK-1369 + + + "Ipv6 - In dual Stack network, guest VM does not have the Ipv6 address of the + router programmed in /etc/resolv.conf for DNS resolution. + + + + + CLOUDSTACK-1370 + + + DeployVM Fail - VPC or non-VPC network + + + + + CLOUDSTACK-1375 + + + deploydb failing with acs master + + + + + CLOUDSTACK-1376 + + + Unable to migrate VM due to internal error process exited while connecting to + monitor + + + + + CLOUDSTACK-1377 + + + HA fail - when host is shutdown, VMs and SSVMs are not failover to second host + in cluster. + + + + + CLOUDSTACK-1382 + + + vm deploy fails with Error "cannot find DeployPlannerSelector for vm" + + + + + CLOUDSTACK-1383 + + + Deploying basic zone on 4.1 fails in NPE + + + + + CLOUDSTACK-1386 + + + BASIC zone SSVM fail to start due to exception + + + + + CLOUDSTACK-1388 + + + UI - ListUsers doesnt display any User except the Default Root Admin + User + + + + + CLOUDSTACK-1391 + + + EventBus is not getting injected after javelin merge + + + + + CLOUDSTACK-1394 + + + [F5-SRX-InlineMode] Failure in static nat configuration on SRX does not result + in LB configuration error in CS during LB rule configuration + + + + + CLOUDSTACK-1397 + + + Static Nat configuration is failing with NPE + + + + + CLOUDSTACK-1399 + + + Unhandled exception executing api command: stopVirtualMachine + + + + + CLOUDSTACK-1402 + + + listRouters API response doesn't return linklocal IP and public IP + details + + + + + CLOUDSTACK-1403 + + + Storage and console-proxy related error + + + + + CLOUDSTACK-1411 + + + Issues with VMWare Hypervisor host_ids not updated when ESX(i) crashes in + instance table + + + + + CLOUDSTACK-1414 + + + Redundant router: BACKUP switch cancelled due to lock timeout after a glitch + in network. + + + + + CLOUDSTACK-1417 + + + When invalid values are passed to createNetwork(), error message does not + indicate the parameter name that has invalid values. + + + + + CLOUDSTACK-1418 + + + As regular user, we are not allowed to deploy VM on a shared network. + + + + + CLOUDSTACK-1419 + + + Apache-ify and apply trademark logos in the UI + + + + + CLOUDSTACK-1420 + + + Ensure trademarks are properly attributed in publican brand + + + + + CLOUDSTACK-1423 + + + Unable to launch UI [HTTP Status 404]. + + + + + CLOUDSTACK-1425 + + + unhandled exception executing api command: migrateVirtualMachine & + recoverVirtualMachine + + + + + CLOUDSTACK-1427 + + + Failed to delete Guestnetwork which has LB with Netscaler + + + + + CLOUDSTACK-1428 + + + [UI] Instance which are created without display name are not visible when + added to LB + + + + + CLOUDSTACK-1429 + + + single account is unable to use same vnet across multiple physical + network + + + + + CLOUDSTACK-1436 + + + 4.1 management server fails to start from RPM build artifact + + + + + CLOUDSTACK-1443 + + + As domain admin we are allowed to create shared network + + + + + CLOUDSTACK-1446 + + + [UI]VPC Router type should be of type vpc and not system + + + + + CLOUDSTACK-1447 + + + [UI]Persistent Status is not displayed for VPC Tier + + + + + CLOUDSTACK-1449 + + + listAccounts and listProjectAccounts API lists all the users not + account-specific users for each account returned + + + + + CLOUDSTACK-1451 + + + Getting EntityExistsException while creating more than one project in CS + 4.1 + + + + + CLOUDSTACK-1452 + + + Public IP's are assigned to private interface with VPC Restart [PF/LB rules + are not functional + + + + + CLOUDSTACK-1461 + + + "Ipv6 - From a Vm that that is part of 2 networks, non default network + router's details should not get programmed in the DNS entries of the guest + VM. + + + + + CLOUDSTACK-1463 + + + IPV6 - Ubuntu 12.10 - Multiple Nic - IPV6 address is assigned automatically + for 1 nic only. Need to do a manual dhclient request to get the ipv6 for other + nic. + + + + + CLOUDSTACK-1464 + + + "IPV6 - Multi nic - Ubuntu 1210 -When Vm is stopped and started/ rebooted, i + get multiple global IPV6 addresses being allocated for one of the nics. + + + + + CLOUDSTACK-1465 + + + List Zones returns null under create instance when logged is as user + + + + + CLOUDSTACK-1467 + + + Failed to create Volume for the System VMs + + + + + CLOUDSTACK-1469 + + + kvm agent: agent service fails to start up + + + + + CLOUDSTACK-1470 + + + unhandled exception executing api command: deployVirtualMachine + + + + + CLOUDSTACK-1472 + + + AssignVirtualMachine API with wrong Virtual Instance ID failed with NPE + + + + + CLOUDSTACK-1473 + + + deleteDomain is failing with NPE + + + + + CLOUDSTACK-1481 + + + "IPV6 - When Vm is part of 1 dual network and 1 ipv6 network, name resolution + using fqdn fails for the ipv6 network. + + + + + CLOUDSTACK-1482 + + + IPV6 - We are not allowed to create a shared IPV6 network with a VLAN which + already is associated with a IPV4 network + + + + + CLOUDSTACK-1484 + + + API Throttling : api.throttling.enabled, Global setting missing + + + + + CLOUDSTACK-1485 + + + Add Baremetal Provider back to 4.1 branch + + + + + CLOUDSTACK-1487 + + + cloudstack-setup-agent fails to set private.network.device on KVM host + add + + + + + CLOUDSTACK-1488 + + + "Ipv6 - When Vm is deployed as part of multiple networks, one of the IPV6 + address assigned to guest VM is lost. + + + + + CLOUDSTACK-1490 + + + 4.1 deb management fails to start due to tomcat dep problem + + + + + CLOUDSTACK-1496 + + + List API Performance: listAccounts failing with OOME for high values of + pagesize (>1000) + + + + + CLOUDSTACK-1499 + + + ListAPI Performance for few APIs not as good as it was before API + optimization + + + + + CLOUDSTACK-1503 + + + listHypervisor API not getting fired when logged in as User + + + + + CLOUDSTACK-1505 + + + Unknown column 'domain.region_id' in 'field list' + + + + + CLOUDSTACK-1509 + + + Failed to implement network elements and resources while provisioning for + persistent network(createVlanIpRange to an account + + + + + CLOUDSTACK-1511 + + + [UI] Instances NIC details does not have Network Name + + + + + CLOUDSTACK-1512 + + + [UI] Wrong message[message.configure.all.traffic.types] when trying to create + zone with mulitple physical networks without providing the traffic label + + + + + CLOUDSTACK-1515 + + + None of the cloudstack packges are marked for upgrade when tried to upgrade + from.4.0/4.0.1 to 4.1 + + + + + CLOUDSTACK-1516 + + + Create documentation in languages that have translations available + + + + + CLOUDSTACK-1517 + + + Check UI in languages available + + + + + CLOUDSTACK-1521 + + + Redundant router: Services are not stopped when switch to BACKUP state + + + + + CLOUDSTACK-1526 + + + Template registration fails in the VMware Setup + + + + + CLOUDSTACK-1531 + + + vmware create volume from snapshot will missing date + + + + + CLOUDSTACK-1537 + + + Restart network with clean up set to true causes Autoscaled LB rule to get + mangled and unusable + + + + + CLOUDSTACK-1541 + + + NPE while deleting snapshot :Unexpected exception while executing + org.apache.cloudstack.api.command.user.snapshot.DeleteSnapshotCmd + + + + + CLOUDSTACK-1542 + + + unhandled exception while creating project + + + + + CLOUDSTACK-1544 + + + The description and the response format for the deleteUser command are + incorrect + + + + + CLOUDSTACK-1550 + + + createaccountresponse returns more than the user you requested for + creation + + + + + CLOUDSTACK-1553 + + + AWS Regions-Not able to list accounts from the 2nd region after + user/account/domain details have been manually synced up from first region + + + + + CLOUDSTACK-1555 + + + "AWS Regions - userapikey and usersecretkey parameters are not returned in the + response of addRegion, updateRegion listRegion api calls.. + + + + + CLOUDSTACK-1557 + + + EC2 REST API : cloudbridge database is missing on the CloudStack + Installation + + + + + CLOUDSTACK-1562 + + + Replace the short-cut solution of supportting @DB with the formal one + + + + + CLOUDSTACK-1565 + + + "Used Master Branch System VM Template: Default Route on the System VMs + (SSVM,CPVM and VR) is missing + + + + + CLOUDSTACK-1566 + + + Baremetal API addBaremetalPxePingServer fail to add PXE PING server to + deployment causing create instance with PING style image to fail + + + + + CLOUDSTACK-1569 + + + "AWS Regions - Not able to Edit domain/account/user from a region that is not + the owner region.""The content of elements must consist of well-formed character + data or markup."" - error message presented to the user. + + + + + CLOUDSTACK-1571 + + + "AWS Regions - When deleting domain/account/user from a region that is not the + owner, the request is not being forwarded to the owner region. + + + + + CLOUDSTACK-1574 + + + updateResourceCount API is failed saying to specify valida resource type even + after parsing the valid resource type + + + + + CLOUDSTACK-1583 + + + AWS Regions - RabbitMQ Server did not recieve any event notification during + account creation + + + + + CLOUDSTACK-1587 + + + Basic zone - CPVM fail to go to running state, Exception while trying to start + secondary storage vm + + + + + CLOUDSTACK-1588 + + + AWS Regions - When registerUserKeys() is called for a user from a region that + is not the owner, it is handled by this region. + + + + + CLOUDSTACK-1600 + + + Typo in dpkg-buildpackage command + + + + + CLOUDSTACK-1604 + + + deploy VM failed when global setting "vm.allocation.algorithm" is set to + "userdispersing + + + + + CLOUDSTACK-1615 + + + "VMware Cluster discovery fails with if ESXi version is 5.0 Update 1, build + 721882 + + + + + CLOUDSTACK-1620 + + + Cannot provision CentOS 6 VMs on XenServer 6.1 + + + + + CLOUDSTACK-1621 + + + listProjectInvitations fails with NPE for valid request + + + + + CLOUDSTACK-1624 + + + API is not returning response in details:UI is also not returning any + output + + + + + CLOUDSTACK-1625 + + + NPE with updateResourceCount when && is passed thru API + + + + + CLOUDSTACK-1630 + + + 4.0.x cloud-aws-api not properly obsoleted + + + + + CLOUDSTACK-1631 + + + 4.1 RPM packaging broken + + + + + CLOUDSTACK-1636 + + + AWS Regions - Remove the concept of having an owner region for + domain/account/user objects + + + + + CLOUDSTACK-1642 + + + Add support CentOS 6.4 + + + + + CLOUDSTACK-1648 + + + Unable to add KVM host. + + + + + CLOUDSTACK-1649 + + + vmware vm os type error + + + + + CLOUDSTACK-1651 + + + agent scripts still pointing to /var/log/cloud + + + + + CLOUDSTACK-1656 + + + NicResponses in a UserVmResponse are not preserving the natural order + + + + + CLOUDSTACK-1663 + + + AWS Regions - Events - There are no events being generated when a new domain + is added/edited + + + + + CLOUDSTACK-1664 + + + Action Events are not logged due to spring change + + + + + CLOUDSTACK-1665 + + + AWS Regions - Events - There are no events being generated when a new user is + added/edited/enabled/deleted/password changes/api & secret keys are + generated + + + + + CLOUDSTACK-1666 + + + KVM VPC NetworkUsage does not work + + + + + CLOUDSTACK-1668 + + + IP conflict in VPC tier + + + + + CLOUDSTACK-1671 + + + AWS Regions - Events - Domain Delete event does not include the UUID of the + domain that was deleted + + + + + CLOUDSTACK-1674 + + + AWS Regions - Events - Account Deletion event does not include the UUID of the + account deleted + + + + + CLOUDSTACK-1681 + + + Upgrade instructions mention incorrect name and description of systemvm-vmware + template in registering template section + + + + + CLOUDSTACK-1684 + + + "api.throttling.enabled configuration setting should be set to ""false"" in + Config.java + + + + + CLOUDSTACK-1688 + + + AWS Regions - Domain admin user is not able to use getUser() command to fetch + user details + + + + + CLOUDSTACK-1690 + + + NPE from API server when starting mgmt server + + + + + CLOUDSTACK-1694 + + + Issues to start/access Management Server after upgrade from 4.0 to 4.1 + + + + + CLOUDSTACK-1697 + + + Six DB tables are not available with upgraded setup(4.0 to 4.1) when compare + to 4.1 newly installation + + + + + CLOUDSTACK-1706 + + + Failed to deploy VM with error "cannot find DeployPlannerSelector" + + + + + CLOUDSTACK-1709 + + + AWS Regions - As part of adding a new region, project related entries should + not be synced from accounts table. + + + + + CLOUDSTACK-1710 + + + AWS Regions - As part of adding a new region,default_zone_id column for the + account entries should not be synced. + + + + + CLOUDSTACK-1711 + + + AWS Regions - Include all the details of the API call made in the Events + payload when changes in Admin/Account/User objects are made. + + + + + CLOUDSTACK-1713 + + + EC2 REST API: AWS API Installation Problem + + + + + CLOUDSTACK-1714 + + + Doc section has wrong title: Setting Zone VLAN and Running VM Maximum + + + + + CLOUDSTACK-1715 + + + "Missing ""host"" config setting in docs on management server load + balancing + + + + + CLOUDSTACK-1716 + + + "AWS Regions - listRegions(),removeRegions(),updateRegions() should accept + UUID value instead of id. + + + + + CLOUDSTACK-1718 + + + AWS Regions - removeRegion() response returns updateregionresponse + + + + + CLOUDSTACK-1719 + + + EC2 REST API: AWS APIs are not getting translated on the CloudStack Management + Server + + + + + CLOUDSTACK-1720 + + + Have an upgrade path from 4.0.x to 4.1 and 4.0.x to 4.2.0 + + + + + CLOUDSTACK-1729 + + + Ensure adapter execution order in runtime + + + + + CLOUDSTACK-1733 + + + [ACS41][UI] Add guest network is missing ip range fields and missing network + offering + + + + + CLOUDSTACK-1736 + + + Ubuntu 12.04 cloud-setup-management Failed to configure CloudStack Management + Server + + + + + CLOUDSTACK-1738 + + + StatsCollector is not running + + + + + CLOUDSTACK-1740 + + + Failed to view console + + + + + CLOUDSTACK-1746 + + + Cloudstack Usage Server won't start + + + + + CLOUDSTACK-1747 + + + "mvn deploydb only creates 4.0 DB, not 4.1 + + + + + CLOUDSTACK-1750 + + + injectkeys script fails on OSX because cp does not have a -b option (backup of + destination file + + + + + CLOUDSTACK-1761 + + + Available local storage disk capacity incorrectly reported in KVM to + manager + + + + + CLOUDSTACK-1764 + + + ListTemplateCommand failed with java.lang.NumberFormatException and failed to + create default template. + + + + + CLOUDSTACK-1772 + + + the change in vnc listening port will cause live migration doesn't + work. + + + + + CLOUDSTACK-1773 + + + Disable baremetal functionality + + + + + CLOUDSTACK-1776 + + + NPE on listSecondaryStorageHostsInAllZones in Upgraded setup from 4.0 to + 4.1.0 + + + + + CLOUDSTACK-1785 + + + Redundant Router test cases failing during automation run. + + + + + CLOUDSTACK-1789 + + + Unable to download templates to Primary Storage if a host is in + maintenance. + + + + + CLOUDSTACK-1791 + + + Volumes with storage tags can't be attached. + + + + + CLOUDSTACK-1792 + + + "AWS Regions - RuntimeException while executing listAccounts(), when the + encryption keys are set to different values between regions. + + + + + CLOUDSTACK-1793 + + + L10n docs don't build in chinese, portuguese and japanese + + + + + CLOUDSTACK-1795 + + + Customize AOP to fully support legacy CloudStack @DB and @ActionEvent + semantics. + + + + + CLOUDSTACK-1796 + + + Japanese docs don't build. + + + + + CLOUDSTACK-1802 + + + Upgrade 4.0 -> 4.1 - Not able to start management server becasue of missing + /etc/cloudstack/management/tomcat6.conf file + + + + + CLOUDSTACK-1804 + + + Upgrade 4.0 -> 4.1 - DB upgrade fails + + + + + CLOUDSTACK-1805 + + + com.mysql.jdbc.exceptions.jdbc4.CommunicationsException seen after long time + of inactivity resulting in not being able to log in to the management + server + + + + + CLOUDSTACK-1810 + + + listTemplate API with templatefilter=featured|community is not returning any + lists + + + + + CLOUDSTACK-1811 + + + "Upgrade 4.0->4.1 - When upgrade scripts fail, component loading continues and + management server starts. + + + + + CLOUDSTACK-1812 + + + create physical network fails while creating basic zone + + + + + CLOUDSTACK-1825 + + + EC2 REST API: AWS APIs fail to execute due to BeanCreationException: Error + creating bean with name 'SAclDaoImpl' + + + + + CLOUDSTACK-1826 + + + "Storage migration not working, seemingly due to uuid vs id + + + + + CLOUDSTACK-1827 + + + Redundant router - When VR Master was stopped failover to VR Backup did not + occur. + + + + + CLOUDSTACK-1834 + + + "Events are not generated for registerUserKeys(), Enabling account and Editing + account. + + + + + CLOUDSTACK-1836 + + + License header failures for ja-JP .po translation file + + + + + CLOUDSTACK-1839 + + + Upgrade 4.0 -> 4.1 - Upgraded DB has lot more keys and indexes for many tables + compare to the fresh installed 4.1 DB + + + + + CLOUDSTACK-1841 + + + ASF 4.0 to 4.1 Upgrade: Missing Few Global Configuration parameters on the + Upgraded Setup. + + + + + CLOUDSTACK-1842 + + + ASF 4.0 to 4.1 Upgrade: Missing Ubuntu 12.04 Guest OS Types on the Upgraded + Setup. + + + + + CLOUDSTACK-1844 + + + Upgrade 4.0 -> 4.1 - KVM host agent.properties is not restored as part of + upgrading the binaries from 4.0 to 4.1. + + + + + CLOUDSTACK-1845 + + + KVM - storage migration often fails + + + + + CLOUDSTACK-1846 + + + "KVM - storage pools can silently fail to be unregistered, leading to failure + to register later. + + + + + CLOUDSTACK-1848 + + + Cloudstack Packages are not got updated with scenario 4.0 to 4.1 upgrade where + MS is on Ubuntu 12.04. + + + + + CLOUDSTACK-1856 + + + Upgrade 4.0 -> 4.1 - Fresh install of 4.1 has 3 parameters missing in + db.properties compared to an upgraded 4.0 setup + + + + + CLOUDSTACK-1873 + + + "Installation : JasyptPBEStringDecryptionCLI missing, failed to decrypt db + password + + + + + CLOUDSTACK-1874 + + + AWS Regions - Account table in cloud_usage DB has region_id + + + + + CLOUDSTACK-1876 + + + External Devices - network offering for external devices is not returned in + API listNetworkOfferings when creating instances. + + + + + CLOUDSTACK-1877 + + + Failed to connect to DB while starting Ubuntu management server after + upgrading the packages from 4.0 to 4.1.0 + + + + + CLOUDSTACK-1882 + + + “HTTP Status 404 。 The requested resource () is not available. + + + + + CLOUDSTACK-1890 + + + listProjects is not listing state in the response + + + + + CLOUDSTACK-1900 + + + "Upgrade 4.0 -> 4.1, We do not have a copy of db.properties that comes from a + 4.1 installation saved anywhere. + + + + + CLOUDSTACK-1929 + + + ASF 4.1 cloudstack agent fail to install in KVM host CENTOS 6.3 OS: + qemu-kvm-0.12.1.2-3.295.el6.10.x86_64 requires libusbredirparser.so.0 + + + + + CLOUDSTACK-1934 + + + NPE with listSupportedNetworkServices after upgrade from 4.0 to 4.1 (Ubuntu + MS) + + + + + CLOUDSTACK-1935 + + + Cloud utilities are not renamed to Cloudstack after upgrade from 4.0 to 4.1 + [Ubutnu MS] + + + + + CLOUDSTACK-1936 + + + On CentOS, after a upgrade from 4.0.1 to 4.1 on a cloud node (cloud-agent), + the new cloustack-agent isn't add as a service (chkconfig) + + + + + CLOUDSTACK-1951 + + + centos packaging: cloud-install-sys-tmplt can't find jasypt jar. + + + + + CLOUDSTACK-1971 + + + VM deployed to incorrect primary storage. + + + + + CLOUDSTACK-1972 + + + VM deployed to incorrect primary storage. + + + + + CLOUDSTACK-1978 + + + openvswitch - unable to start console session for SSVM CPVM user VM + + + + + CLOUDSTACK-1980 + + + "[4.1]cloudstack-setup-bridge, cloudstack-setup-encryption & + cloudstack-sysvmadm utilities are not available in Ubuntu 12.04 Management + Server. + + + + + CLOUDSTACK-1987 + + + Deleted service offerings owned by a domain show up to domain user. + + + + + CLOUDSTACK-1988 + + + AWS API using SOAP client - User Registration fails + + + + + CLOUDSTACK-1989 + + + "Query service offering by ID returns no result, but querying all returns + service offering + + + + + CLOUDSTACK-2003 + + + Deleting domain while deleted account is cleaning up leaves VMs expunging + forever due to 'Failed to update resource count + + + + + CLOUDSTACK-2007 + + + Release Notes failing to build on jenkins.cs. + + + + + +
+
+ Known Issues in 4.1.0 + + + + + + + + Issue ID + + + Description + + + + + + CLOUDSTACK-1747 + mvn deploydb only creates 4.0 DB, not 4.1 + Due to tooling changes between 4.1 and 4.2, CloudStack's database is created + using the 4.0 schema and updated to the 4.1 schema when the management server + starts for the first time. It's OK to see the same schema if the management server + has not started yet. + + + + CLOUDSTACK-1824 + Service CloudStack-Management is being displayed as cloud-management + service + Many scripts and text entries have references to cloud-management rather than + cloudstack-management due to the changeover between 4.0 and 4.1 to rename + services. This is a minor issue and should be corrected by 4.2. + + + + + CLOUDSTACK-1824 + Service CloudStack-Management is being displayed as cloud-management + service + + + + + CLOUDSTACK-1510 + + + NPE when primary storage is added with wrong path + + + + + CLOUDSTACK-1428 + + + [UI] Instance which are created without display name are not visible when + added to LB + + + + + CLOUDSTACK-1306 + + + Better Error message when trying to deploy Vm by passing static Ipv4 addresses + that are assigned to another VM/IP4 address is outside the iprange. + + + + + CLOUDSTACK-1236 + + + Warning while adding Xen 6.1 host [Unable to create local link network] + + + + + CLOUDSTACK-969 + + + api: zone response lists vlan in it as "vlan range of zone" but the + vlan belongs to physical network + + + + + CLOUDSTACK-963 + + + [cloud.utils.AnnotationHelper] class java.lang.Stringdoes not have a Table + annotation + + + + + CLOUDSTACK-458 + + + xen:snapshots:Storage gc fail to clean the failed snapshot images from + secondarystorage + + + + + CLOUDSTACK-315 + + + Infrastructure view does not show capacity values + + + + + CLOUDSTACK-300 + + + Creation of compute offering allow combination of local storage + HA + + + + + CLOUDSTACK-282 + + + Virtual Routers do not properly resolve DNS SRV Records + + + + + CLOUDSTACK-276 + + + SSVM ID is exposed in the Error Message thrown by AddTrafficType API + + + + + CLOUDSTACK-270 + + + Ui should not ask for a vlan range if the physical network isolation type is + not VLAN + + + + + CLOUDSTACK-245 + + + VPC ACLs are not stored and programmed consistently + + + + + CLOUDSTACK-231 + + + Tag creation using special charecters + + + + + CLOUDSTACK-124 + + + NetworkGarbageCollector not cleaning up networks + + + + + CLOUDSTACK-62 + + + console proxy does not support any keymaps besides us, jp + + + + + +
Upgrade Instructions -
- Upgrade from 3.0.2 to 4.0.0-incubating - Perform the following to upgrade from version 3.0.2 to version 4.0.0-incubating. Note - that some of the steps here are only required if you're using a specific hypervisor. The - steps that are hypervisor-specific are called out with a note. + This section contains upgrade instructions from prior versions of CloudStack to Apache + CloudStack 4.1.0. We include instructions on upgrading to Apache CloudStack from pre-Apache + versions of Citrix CloudStack (last version prior to Apache is 3.0.2) and from the releases + made while CloudStack was in the Apache Incubator. + If you run into any issues during upgrades, please feel free to ask questions on + users@apache.cloudstack.org or dev@apache.cloudstack.org. +
+ Upgrade from 4.0.x to 4.1.0 + This section will guide you from &PRODUCT; 4.0.x versions to &PRODUCT; 4.1.0. + Any steps that are hypervisor-specific will be called out with a note. + + Package Structure Changes + The package structure for &PRODUCT; has changed significantly since the 4.0.x + releases. If you've compiled your own packages, you'll notice that the package names and + the number of packages has changed. This is not a bug. + However, this does mean that the procedure is not as simple as an + apt-get upgrade or yum update, so please follow + this section carefully. + + We recommend reading through this section once or twice before beginning your upgrade + procedure, and working through it on a test system before working on a production + system. - Ensure that you query your IP address usage records and process them or make a - backup. During the upgrade you will lose the old IP address usage records. - Starting in 3.0.2, the usage record format for IP addresses is the same as the rest - of the usage types. Instead of a single record with the assignment and release dates, - separate records are generated per aggregation period with start and end dates. After - upgrading, any existing IP address usage records in the old format will no longer be - available. + Most users of &PRODUCT; manage the installation and upgrades of &PRODUCT; with one + of Linux's predominant package systems, RPM or APT. This guide assumes you'll be using + RPM and Yum (for Red Hat Enterprise Linux or CentOS), or APT and Debian packages (for + Ubuntu). + Create RPM or Debian packages (as appropriate) and a repository from the 4.1.0 + source, or check the Apache CloudStack downloads page at http://cloudstack.apache.org/downloads.html for package repositories supplied + by community members. You will need them for step + or step . + Instructions for creating packages from the &PRODUCT; source are in the Installation + Guide. + + + Stop your management server or servers. Run this on all management server + hosts: + # service cloud-management stop + + + If you are running a usage server or usage servers, stop those as well: + # service cloud-usage stop + + + Make a backup of your MySQL database. If you run into any issues or need to roll + back the upgrade, this will assist in debugging or restoring your existing environment. + You'll be prompted for your password. + # mysqldump -u root -p cloud > cloudstack-backup.sql + + + Whether you're upgrading a Red Hat/CentOS based system or Ubuntu based system, + you're going to need to stop the CloudStack management server before proceeding. + # service cloud-management stop + + + If you have made changes to + /etc/cloud/management/components.xml, you'll need to carry these + over manually to the new file, + /etc/cloudstack/management/componentContext.xml. This is not done + automatically. (If you're unsure, we recommend making a backup of the original + components.xml to be on the safe side. + + + If you are using Ubuntu, follow this procedure to upgrade your packages. If not, + skip to step . + + Community Packages + This section assumes you're using the community supplied packages for &PRODUCT;. + If you've created your own packages and APT repository, substitute your own URL for + the ones used in these examples. + + + + The first order of business will be to change the sources list for each system + with &PRODUCT; packages. This means all management servers, and any hosts that have + the KVM agent. (No changes should be necessary for hosts that are running VMware or + Xen.) + Start by opening /etc/apt/sources.list.d/cloudstack.list on + any systems that have &PRODUCT; packages installed. + This file should have one line, which contains: + deb http://cloudstack.apt-get.eu/ubuntu precise 4.0 + We'll change it to point to the new package repository: + deb http://cloudstack.apt-get.eu/ubuntu precise 4.1 + If you're using your own package repository, change this line to read as + appropriate for your 4.1.0 repository. + + + Now update your apt package list: + $ sudo apt-get update + + + Now that you have the repository configured, it's time to install the + cloudstack-management package. This will pull in any other + dependencies you need. + $ sudo apt-get install cloudstack-management + + + You will need to manually install the cloudstack-agent + package: + $ sudo apt-get install cloudstack-agent + During the installation of cloudstack-agent, APT will copy + your agent.properties, log4j-cloud.xml, + and environment.properties from + /etc/cloud/agent to + /etc/cloudstack/agent. + When prompted whether you wish to keep your configuration, say Yes. + + + Verify that the file + /etc/cloudstack/agent/environment.properties has a line that + reads: + paths.script=/usr/share/cloudstack-common + If not, add the line. + + + Restart the agent: + +service cloud-agent stop +killall jsvc +service cloudstack-agent start + + + + During the upgrade, log4j-cloud.xml was simply copied over, + so the logs will continue to be added to + /var/log/cloud/agent/agent.log. There's nothing + wrong with this, but if you prefer to be consistent, you can + change this by copying over the sample configuration file: + +cd /etc/cloudstack/agent +mv log4j-cloud.xml.dpkg-dist log4j-cloud.xml +service cloudstack-agent restart + + + + Once the agent is running, you can uninstall the old cloud-* packages from your + system: + sudo dpkg --purge cloud-agent + + + + + If you are using CentOS or RHEL, follow this procedure to upgrade your packages. If + not, skip to step . + + Community Packages + This section assumes you're using the community supplied packages for &PRODUCT;. + If you've created your own packages and yum repository, substitute your own URL for + the ones used in these examples. + + + + The first order of business will be to change the yum repository for each system + with &PRODUCT; packages. This means all management servers, and any hosts that have + the KVM agent. (No changes should be necessary for hosts that are running VMware or + Xen.) + Start by opening /etc/yum.repos.d/cloudstack.repo on any + systems that have &PRODUCT; packages installed. + This file should have content similar to the following: + +[apache-cloudstack] +name=Apache CloudStack +baseurl=http://cloudstack.apt-get.eu/rhel/4.0/ +enabled=1 +gpgcheck=0 + + If you are using the community provided package repository, change the baseurl + to http://cloudstack.apt-get.eu/rhel/4.1/ + If you're using your own package repository, change this line to read as + appropriate for your 4.1.0 repository. + + + Now that you have the repository configured, it's time to install the + cloudstack-management package by upgrading the older + cloud-client package. + $ sudo yum upgrade cloud-client + + + For KVM hosts, you will need to upgrade the cloud-agent + package, similarly installing the new version as + cloudstack-agent. + $ sudo yum upgrade cloud-agent + During the installation of cloudstack-agent, the RPM will + copy your agent.properties, + log4j-cloud.xml, and + environment.properties from + /etc/cloud/agent to + /etc/cloudstack/agent. + + + Verify that the file + /etc/cloudstack/agent/environment.properties has a line that + reads: + paths.script=/usr/share/cloudstack-common + If not, add the line. + + + Restart the agent: + +service cloud-agent stop +killall jsvc +service cloudstack-agent start + + + + + + Once you've upgraded the packages on your management servers, you'll need to restart + the system VMs. Make sure port 8096 is open in your local host firewall to do + this. + There is a script that will do this for you, all you need to do is run the script + and supply the IP address for your MySQL instance and your MySQL credentials: + # nohup cloudstack-sysvmadm -d IP address -u cloud -p -a > sysvm.log 2>&1 & + You can monitor the log for progress. The process of restarting the system VMs can + take an hour or more. + # tail -f sysvm.log + The output to sysvm.log will look something like this: + +Stopping and starting 1 secondary storage vm(s)... +Done stopping and starting secondary storage vm(s) +Stopping and starting 1 console proxy vm(s)... +Done stopping and starting console proxy vm(s). +Stopping and starting 4 running routing vm(s)... +Done restarting router(s). + + + + For Xen Hosts: Copy vhd-utils + This step is only for CloudStack installs that are using Xen hosts. + + Copy the file vhd-utils to + /usr/share/cloudstack-common/scripts/vm/hypervisor/xenserver. + + +
+
+ Upgrade from 3.0.2 to 4.1.0 + This section will guide you from Citrix CloudStack 3.0.2 to Apache CloudStack 4.1.0. + Sections that are hypervisor-specific will be called out with a note. + The following upgrade instructions apply only if you're using VMware hosts. If - you're not using VMware hosts, skip this step and move on to step 3: stopping all - usage servers. + you're not using VMware hosts, skip this step and move on to . In each zone that includes VMware hosts, you need to add a new system VM template. @@ -92,11 +4864,11 @@ Name - systemvm-vmware-4.0 + systemvm-vmware-4.1 Description - systemvm-vmware-4.0 + systemvm-vmware-4.1 URL @@ -144,13 +4916,13 @@ - + Stop all Usage Servers if running. Run this on all Usage Server hosts. - # service cloud-usage stop + # service cloud-usage stop Stop the Management Servers. Run this on all Management Server hosts. - # service cloud-management stop + # service cloud-management stop On the MySQL master, take a backup of the MySQL databases. We recommend performing @@ -160,35 +4932,162 @@ database, which is a CloudStack recommended best practice. Substitute your own MySQL root password. # mysqldump -u root -pmysql_password cloud > cloud-backup.dmp -# mysqldump -u root -pmysql_password cloud_usage > cloud-usage-backup.dmp + # mysqldump -u root -pmysql_password cloud_usage > cloud-usage-backup.dmp Either build RPM/DEB packages as detailed in the Installation Guide, or use one of the community provided yum/apt repositories to gain access to the &PRODUCT; binaries. - - After you have configured an appropriate yum or apt repository, you may execute the - one of the following commands as appropriate for your environment in order to upgrade - &PRODUCT;: # yum update cloud-* - # apt-get update -# apt-get upgrade cloud-* - - You will, of course, have to agree to the changes suggested by Yum or APT. + + If you are using Ubuntu, follow this procedure to upgrade your packages. If not, + skip to step . - If the upgrade output includes a message similar to the following, then some - custom content was found in your old components.xml, and you need to merge the two - files: - warning: /etc/cloud/management/components.xml created as /etc/cloud/management/components.xml.rpmnew - Instructions follow in the next step. + Community Packages + This section assumes you're using the community supplied packages for &PRODUCT;. + If you've created your own packages and APT repository, substitute your own URL for + the ones used in these examples. + + + The first order of business will be to change the sources list for each system + with &PRODUCT; packages. This means all management servers, and any hosts that have + the KVM agent. (No changes should be necessary for hosts that are running VMware or + Xen.) + Start by opening /etc/apt/sources.list.d/cloudstack.list on + any systems that have &PRODUCT; packages installed. + This file should have one line, which contains: + deb http://cloudstack.apt-get.eu/ubuntu precise 4.0 + We'll change it to point to the new package repository: + deb http://cloudstack.apt-get.eu/ubuntu precise 4.1 + If you're using your own package repository, change this line to read as + appropriate for your 4.1.0 repository. + + + Now update your apt package list: + $ sudo apt-get update + + + Now that you have the repository configured, it's time to install the + cloudstack-management package. This will pull in any other + dependencies you need. + $ sudo apt-get install cloudstack-management + + + You will need to manually install the cloudstack-agent + package: + $ sudo apt-get install cloudstack-agent + During the installation of cloudstack-agent, APT will copy + your agent.properties, log4j-cloud.xml, + and environment.properties from + /etc/cloud/agent to + /etc/cloudstack/agent. + When prompted whether you wish to keep your configuration, say Yes. + + + Verify that the file + /etc/cloudstack/agent/environment.properties has a line that + reads: + paths.script=/usr/share/cloudstack-common + If not, add the line. + + + Restart the agent: + +service cloud-agent stop +killall jsvc +service cloudstack-agent start + + + + During the upgrade, log4j-cloud.xml was simply copied over, + so the logs will continue to be added to + /var/log/cloud/agent/agent.log. There's nothing + wrong with this, but if you prefer to be consistent, you can + change this by copying over the sample configuration file: + +cd /etc/cloudstack/agent +mv log4j-cloud.xml.dpkg-dist log4j-cloud.xml +service cloudstack-agent restart + + + + Once the agent is running, you can uninstall the old cloud-* packages from your + system: + sudo dpkg --purge cloud-agent + + - + + If you are using CentOS or RHEL, follow this procedure to upgrade your packages. If + not, skip to step . + + Community Packages + This section assumes you're using the community supplied packages for &PRODUCT;. + If you've created your own packages and yum repository, substitute your own URL for + the ones used in these examples. + + + + The first order of business will be to change the yum repository for each system + with &PRODUCT; packages. This means all management servers, and any hosts that have + the KVM agent. (No changes should be necessary for hosts that are running VMware or + Xen.) + Start by opening /etc/yum.repos.d/cloudstack.repo on any + systems that have &PRODUCT; packages installed. + This file should have content similar to the following: + +[apache-cloudstack] +name=Apache CloudStack +baseurl=http://cloudstack.apt-get.eu/rhel/4.0/ +enabled=1 +gpgcheck=0 + + If you are using the community provided package repository, change the baseurl + to http://cloudstack.apt-get.eu/rhel/4.1/ + If you're using your own package repository, change this line to read as + appropriate for your 4.1.0 repository. + + + Now that you have the repository configured, it's time to install the + cloudstack-management package by upgrading the older + cloud-client package. + $ sudo yum upgrade cloud-client + + + For KVM hosts, you will need to upgrade the cloud-agent + package, similarly installing the new version as + cloudstack-agent. + $ sudo yum upgrade cloud-agent + During the installation of cloudstack-agent, the RPM will + copy your agent.properties, + log4j-cloud.xml, and + environment.properties from + /etc/cloud/agent to + /etc/cloudstack/agent. + + + Verify that the file + /etc/cloudstack/agent/environment.properties has a line that + reads: + paths.script=/usr/share/cloudstack-common + If not, add the line. + + + Restart the agent: + +service cloud-agent stop +killall jsvc +service cloudstack-agent start + + + + + If you have made changes to your copy of /etc/cloud/management/components.xml the changes will be preserved in the upgrade. However, you need to do the following steps to place these - changes in a new version of the file which is compatible with version - 4.0.0-incubating. + changes in a new version of the file which is compatible with version 4.1.0. Make a backup copy of /etc/cloud/management/components.xml. @@ -214,7 +5113,7 @@ Start the first Management Server. Do not start any other Management Server nodes yet. - # service cloud-management start + # service cloud-management start Wait until the databases are upgraded. Ensure that the database upgrade is complete. After confirmation, start the other Management Servers one at a time by running the same command on each node. @@ -315,9 +5214,9 @@ If needed, upgrade all Citrix XenServer hypervisor hosts in your cloud to a version - supported by CloudStack 4.0.0-incubating. The supported versions are XenServer 5.6 SP2 - and 6.0.2. Instructions for upgrade can be found in the CloudStack 4.0.0-incubating - Installation Guide. + supported by CloudStack 4.1.0. The supported versions are XenServer 5.6 SP2 and 6.0.2. + Instructions for upgrade can be found in the CloudStack 4.1.0 Installation Guide under + "Upgrading XenServer Versions." Now apply the XenServer hotfix XS602E003 (and any other needed hotfixes) to @@ -471,8 +5370,8 @@ issues are seen, try clearing your browser cache and reloading the UI page.
-
- Upgrade from 2.2.14 to 4.0.0-incubating +
+ Upgrade from 2.2.14 to 4.1.0 Ensure that you query your IPaddress usage records and process them; for example, @@ -480,18 +5379,20 @@ Starting in 3.0.2, the usage record format for IP addresses is the same as the rest of the usage types. Instead of a single record with the assignment and release dates, separate records are generated per aggregation period with start and end dates. After - upgrading to 4.0.0-incubating, any existing IP address usage records in the old format - will no longer be available. + upgrading to 4.1.0, any existing IP address usage records in the old format will no + longer be available. If you are using version 2.2.0 - 2.2.13, first upgrade to 2.2.14 by using the - instructions in the 2.2.14 Release Notes. + instructions in the 2.2.14 + Release Notes. KVM Hosts If KVM hypervisor is used in your cloud, be sure you completed the step to insert a valid username and password into the host_details table on each KVM node as described in the 2.2.14 Release Notes. This step is critical, as the database will be - encrypted after the upgrade to 4.0.0-incubating. + encrypted after the upgrade to 4.1.0. @@ -528,8 +5429,8 @@ XenServer - Name: systemvm-xenserver-3.0.0 - Description: systemvm-xenserver-3.0.0 + Name: systemvm-xenserver-4.1.0 + Description: systemvm-xenserver-4.1.0 URL: http://download.cloud.com/templates/acton/acton-systemvm-02062012.vhd.bz2 Zone: Choose the zone where this hypervisor is used @@ -544,8 +5445,8 @@ KVM - Name: systemvm-kvm-3.0.0 - Description: systemvm-kvm-3.0.0 + Name: systemvm-kvm-4.1.0 + Description: systemvm-kvm-4.1.0 URL: http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 Zone: Choose the zone where this hypervisor is used @@ -560,8 +5461,8 @@ VMware - Name: systemvm-vmware-3.0.0 - Description: systemvm-vmware-3.0.0 + Name: systemvm-vmware-4.1.0 + Description: systemvm-vmware-4.1.0 URL: http://download.cloud.com/templates/burbank/burbank-systemvm-08012012.ova Zone: Choose the zone where this hypervisor is used @@ -595,7 +5496,7 @@ Stop the Management Servers. Run this on all Management Server hosts. - # service cloud-management stop + # service cloud-management stop On the MySQL master, take a backup of the MySQL databases. We recommend performing @@ -605,24 +5506,159 @@ database, which is a CloudStack recommended best practice. Substitute your own MySQL root password. # mysqldump -u root -pmysql_password cloud > cloud-backup.dmp -# mysqldump -u root -pmysql_password cloud_usage > cloud-usage-backup.dmp - + # mysqldump -u root -pmysql_password cloud_usage > cloud-usage-backup.dmp + Either build RPM/DEB packages as detailed in the Installation Guide, or use one of the community provided yum/apt repositories to gain access to the &PRODUCT; binaries. - - After you have configured an appropriate yum or apt repository, you may execute the - one of the following commands as appropriate for your environment in order to upgrade - &PRODUCT;: # yum update cloud-* - # apt-get update -# apt-get upgrade cloud-* - - You will, of course, have to agree to the changes suggested by Yum or APT. + + If you are using Ubuntu, follow this procedure to upgrade your packages. If not, + skip to step . + + Community Packages + This section assumes you're using the community supplied packages for &PRODUCT;. + If you've created your own packages and APT repository, substitute your own URL for + the ones used in these examples. + + + + The first order of business will be to change the sources list for each system + with &PRODUCT; packages. This means all management servers, and any hosts that have + the KVM agent. (No changes should be necessary for hosts that are running VMware or + Xen.) + Start by opening /etc/apt/sources.list.d/cloudstack.list on + any systems that have &PRODUCT; packages installed. + This file should have one line, which contains: + deb http://cloudstack.apt-get.eu/ubuntu precise 4.0 + We'll change it to point to the new package repository: + deb http://cloudstack.apt-get.eu/ubuntu precise 4.1 + If you're using your own package repository, change this line to read as + appropriate for your 4.1.0 repository. + + + Now update your apt package list: + $ sudo apt-get update + + + Now that you have the repository configured, it's time to install the + cloudstack-management package. This will pull in any other + dependencies you need. + $ sudo apt-get install cloudstack-management + + + You will need to manually install the cloudstack-agent + package: + $ sudo apt-get install cloudstack-agent + During the installation of cloudstack-agent, APT will copy + your agent.properties, log4j-cloud.xml, + and environment.properties from + /etc/cloud/agent to + /etc/cloudstack/agent. + When prompted whether you wish to keep your configuration, say Yes. + + + Verify that the file + /etc/cloudstack/agent/environment.properties has a line that + reads: + paths.script=/usr/share/cloudstack-common + If not, add the line. + + + Restart the agent: + +service cloud-agent stop +killall jsvc +service cloudstack-agent start + + + + During the upgrade, log4j-cloud.xml was simply copied over, + so the logs will continue to be added to + /var/log/cloud/agent/agent.log. There's nothing + wrong with this, but if you prefer to be consistent, you can + change this by copying over the sample configuration file: + +cd /etc/cloudstack/agent +mv log4j-cloud.xml.dpkg-dist log4j-cloud.xml +service cloudstack-agent restart + + + + Once the agent is running, you can uninstall the old cloud-* packages from your + system: + sudo dpkg --purge cloud-agent + + - + + If you are using CentOS or RHEL, follow this procedure to upgrade your packages. If + not, skip to step . + + Community Packages + This section assumes you're using the community supplied packages for &PRODUCT;. + If you've created your own packages and yum repository, substitute your own URL for + the ones used in these examples. + + + + The first order of business will be to change the yum repository for each system + with &PRODUCT; packages. This means all management servers, and any hosts that have + the KVM agent. (No changes should be necessary for hosts that are running VMware or + Xen.) + Start by opening /etc/yum.repos.d/cloudstack.repo on any + systems that have &PRODUCT; packages installed. + This file should have content similar to the following: + +[apache-cloudstack] +name=Apache CloudStack +baseurl=http://cloudstack.apt-get.eu/rhel/4.0/ +enabled=1 +gpgcheck=0 + + If you are using the community provided package repository, change the baseurl + to http://cloudstack.apt-get.eu/rhel/4.1/ + If you're using your own package repository, change this line to read as + appropriate for your 4.1.0 repository. + + + Now that you have the repository configured, it's time to install the + cloudstack-management package by upgrading the older + cloud-client package. + $ sudo yum upgrade cloud-client + + + For KVM hosts, you will need to upgrade the cloud-agent + package, similarly installing the new version as + cloudstack-agent. + $ sudo yum upgrade cloud-agent + During the installation of cloudstack-agent, the RPM will + copy your agent.properties, + log4j-cloud.xml, and + environment.properties from + /etc/cloud/agent to + /etc/cloudstack/agent. + + + Verify that the file + /etc/cloudstack/agent/environment.properties has a line that + reads: + paths.script=/usr/share/cloudstack-common + If not, add the line. + + + Restart the agent: + +service cloud-agent stop +killall jsvc +service cloudstack-agent start + + + + + If you have made changes to your existing copy of the file components.xml in your previous-version CloudStack installation, the changes will be preserved in the upgrade. However, you need to do the following steps to place these changes in a new version of @@ -648,7 +5684,7 @@ Merge your changes from the backup file into the new components.xml file. # vi /etc/cloud/management/components.xml - + @@ -706,7 +5742,7 @@ Start the first Management Server. Do not start any other Management Server nodes yet. - # service cloud-management start + # service cloud-management start Wait until the databases are upgraded. Ensure that the database upgrade is complete. You should see a message like "Complete! Done." After confirmation, start the other Management Servers one at a time by running the same command on each node. @@ -714,7 +5750,7 @@ Start all Usage Servers (if they were running on your previous version). Perform this on each Usage Server host. - # service cloud-usage start + # service cloud-usage start (KVM only) Additional steps are required for each KVM host. These steps will not @@ -734,9 +5770,9 @@ appropriate. # yum update cloud-* - # apt-get update -# apt-get upgrade cloud-* - + # apt-get update + # apt-get upgrade cloud-* + Start the agent. @@ -773,7 +5809,7 @@ user. In addition to those parameters, provide the "-c" and "-r" arguments. For example: # nohup cloud-sysvmadm -d 192.168.1.5 -u cloud -p password -c -r > sysvm.log 2>&1 & -# tail -f sysvm.log + # tail -f sysvm.log This might take up to an hour or more to run, depending on the number of accounts in the system. @@ -782,13 +5818,13 @@ # tail -f sysvm.log The content should be like the following: -Stopping and starting 1 secondary storage vm(s)... -Done stopping and starting secondary storage vm(s) -Stopping and starting 1 console proxy vm(s)... -Done stopping and starting console proxy vm(s). -Stopping and starting 4 running routing vm(s)... -Done restarting router(s). - + Stopping and starting 1 secondary storage vm(s)... + Done stopping and starting secondary storage vm(s) + Stopping and starting 1 console proxy vm(s)... + Done stopping and starting console proxy vm(s). + Stopping and starting 4 running routing vm(s)... + Done restarting router(s). + @@ -806,7 +5842,7 @@ Done restarting router(s). Run the following commands on the XenServer or KVM host on which the system VM is present: # ssh -i private-key-path link-local-ip -p 3922 -# cat /etc/cloudstack-release + # cat /etc/cloudstack-release The output should be like the following: Cloudstack Release 4.0.0-incubating Mon Oct 9 15:10:04 PST 2012 @@ -817,8 +5853,8 @@ Done restarting router(s). Run the following commands on the Management Server: # ssh -i private-key-path private-ip -p 3922 -# cat /etc/cloudstack-release - + # cat /etc/cloudstack-release + The output should be like the following: Cloudstack Release 4.0.0-incubating Mon Oct 9 15:10:04 PST 2012 @@ -979,1954 +6015,7 @@ Done restarting router(s).
- - Version 4.0.0-incubating -
- What’s New in 4.0.0-incubating - Apache CloudStack 4.0.0-incubating includes the following new features: -
- Inter-VLAN Routing - Inter-VLAN Routing is the capability to route network traffic between VLANs. This - feature enables you to set up Virtual Private Clouds (VPC) that can hold multi-tier - applications. These tiers are deployed on different VLANs that can communicate with each - other. You can provision VLANs to the tiers your create, and VMs can be deployed on - different tiers, such as Web, Application, or Database. The VLANs are connected to a - virtual router, which facilitates communication between the VMs. In effect, you can - segment VMs by means of VLANs into different networks that can host multi-tier - applications. Such segmentation by means of VLANs logically separate application VMs for - higher security and lower broadcasts, while remaining physically connected to the same - device. - This feature is supported on XenServer and VMware hypervisors. -
-
- Site-to-Site VPN - A Site-to-Site VPN connection helps you establish a secure connection from an - enterprise datacenter to the cloud infrastructure. This allows users to access the guest - VMs by establishing a VPN connection to the virtual router of the account from a device in - the datacenter of the enterprise. Having this facility eliminates the need to establish - VPN connections to individual VMs. - The supported endpoints on the remote datacenters are: - - - Cisco ISR with IOS 12.4 or later - - - Juniper J-Series routers with JunOS 9.5 or later - - -
-
- Local Storage Support for Data Volumes - You can now create data volumes on local storage. The data volume is placed on the - same XenServer host as the VM instance that is attached to the data volume. These local - data volumes can be attached to virtual machines, detached, re-attached, and deleted just - as with the other types of data volume. In earlier releases of CloudStack, only the root - disk could be placed in local storage. - Local storage is ideal for scenarios where persistence of data volumes and HA is not - required. Some of the benefits include reduced disk I/O latency and cost reduction from - using inexpensive local disks. - In order for local volumes to be used, the feature must be enabled for the - zone. - You can create a data disk offering for local storage. When a user creates a new VM, - they can select this disk offering in order to cause the data disk volume to be placed in - local storage. - You can not migrate a VM that has a volume in local storage to a different host, nor - migrate the volume itself away to a different host. If you want to put a host into - maintenance mode, you must first stop any VMs with local data volumes on that host. - Local storage support for volumes is available for XenServer, KVM, and VMware - hypervisors. -
-
- Tags - A tag is a key-value pair that stores metadata about a resource in the cloud. Tags are - useful for categorizing resources. For example, you can tag a user VM with a value that - indicates the user's city of residence. In this case, the key would be "city" and the - value might be "Toronto" or "Tokyo." You can then request CloudStack to find all resources - that have a given tag; for example, VMs for users in a given city. - You can tag a user virtual machine, volume, snapshot, guest network, template, ISO, - firewall rule, port forwarding rule, public IP address, security group, load balancer - rule, project, VPC, network ACL, or static route. You can not tag a remote access - VPN. - You can work with tags through the UI or through the new API commands createTags, - deleteTags, and listTags. You can define multiple tags for each resource. There is no - limit on the number of tags you can define. Each tag can be up to 255 characters long. - Users can define tags on the resources they own, and administrators can define tags on any - resources in the cloud. - A new optional input parameter, "tags," has been added to many of the list* API - commands. The following example shows how to use this new parameter to find all the - volumes having tag region=canada OR tag city=Toronto: - command=listVolumes -&listAll=true -&tags[0].key=region -&tags[0].value=canada -&tags[1].key=city -&tags[1].value=Toronto - The following API commands have the new "tags" input parameter: - - - listVirtualMachines - - - listVolumes - - - listSnapshots - - - listNetworks - - - listTemplates - - - listIsos - - - listFirewallRules - - - listPortForwardingRules - - - listPublicIpAddresses - - - listSecurityGroups - - - listLoadBalancerRules - - - listProjects - - - listVPCs - - - listNetworkACLs - - - listStaticRoutes - - -
-
- AWS API Changes for Tags - Some changes have been made to the Amazon Web Services API compatibility support in - order to accommodate the new tagging feature. - New APIs: - - - - - - - - New API - - - Description - - - - - - - ec2-create-tags - - - Add tags to one or more resources. - - - - - ec2-delete-tags - - - Remove tags from one or more resources. - - - - ec2-describe-tags - - Show currently defined tags. - - - - - - Changed APIs: - - - - - - - - Changed API - - - Description - - - - - - ec2-describe-images - - Output now shows tags defined for each image. - - - - - ec2-describe-instances - - - Output now shows tags defined for each image. - The following filters can now be passed in to limit the output result set: - tag-key, tag-value and tag:key - - - - - ec2-describe-snapshots - - - Output now shows tags defined for each image. - The following filters can now be passed in to limit the output result set: - tag-key, tag-value and tag:key - - - - ec2-describe-volumes - - Output now shows tags defined for each image. - The following filters can now be passed in to limit the output result set: - tag-key, tag-value and tag:key - - - - - -
-
- Secure Console Access on XenServer - With the addition of Secure Console feature, users can now securely access the VM - consoles on the XenServer hypervisor. You can either SSH or use the View Console option in - the Management Server to securely connect to the VMs on the XenServer host. The Management - Server uses the xapi API to stream the VM consoles. However, there is no change in the way - you can access the console of a VM. This feature is supported on XenServer 5.6 and 6.0 - versions. -
-
- Stopped VM - This release supports creating VMs without starting them on the backend. You can - determine whether the VM needs to be started as part of the VM deployment. A VM can be - deployed in two ways: create and start a VM (the default method); create a VM and leave it - in the stopped state. - A new request parameter, startVM, is introduced in the deployVm API to support the - stopped VM feature. The possible values are: - - - true - The VM starts as a part of the VM deployment - - - false - The VM is left in stopped state at the end of the VM deployment - - -
-
- Uploading an Existing Volume to a Virtual Machine - Existing data can now be made accessible to a virtual machine. This is called - uploading a volume to the VM. For example, this is useful to upload data from a local file - system and attach it to a VM. Root administrators, domain administrators, and end users - can all upload existing volumes to VMs. The upload is performed by using HTTP. The - uploaded volume is placed in the zone's secondary storage. - This functionality is supported for the following hypervisors: - - - Hypervisor : Disk Image Format - - - XenServer : VHD - - - VMware : OVA - - - KVM : QCOW2 - - - -
-
- Dedicated High-Availability Hosts - One or more hosts can now be designated for use only by high-availability (HA) enabled - VMs that are restarted due to a host failure. Setting up a pool of such dedicated HA hosts - as the recovery destination for all HA-enabled VMs make it easier to determine which VMs - are restarted as part of the high-availability function. You can designate a host as a - dedicated-HA restart node only if the Dedicated HA Hosts feature is enabled by setting the - appropriate global configuration parameter. -
-
- Support for Amazon Web Services API - This release supports Amazon Web Services APIs, including Elastic Compute Cloud (EC2) - API. Fidelity with the EC2 API and the installation experience for this functionality are - both enhanced. In prior releases, users were required to install a separate component - called CloudBridge, in addition to installing the Management Server. For new installations - of CloudStack 4.0.0-incubating, this software is installed automatically along with - CloudStack and runs in a more closely integrated fashion. The feature is disabled by - default, but can be easily enabled by setting the appropriate global configuration - parameter and performing a few setup steps. -
-
- The Nicira NVP Plugin - The Nicira NVP plug-in allows CloudStack to use the Nicira solution for virtualized - network as a provider for CloudStack networks and services. In CloudStack 4.0.0-incubating - this plug-in supports the Connectivity service. This service is responsible for creating - Layer 2 networks supporting the networks created by guests. When a tenant creates a new - network, instead of a traditional VLAN, a logical network will be created by sending the - appropriate calls to the Nicira NVP Controller. The plug-in has been tested with Nicira - NVP versions 2.1.0, 2.2.0 and 2.2.1. -
-
- The BigSwitch Controller Plugin - The BigSwitch Controller plug-in adds OpenFlow based solution for network virtualization - to CloudStack. The plugin supports both BigSwitch commercial controller and the opensource - Floodlight controller. The plugin functions as a provider for CloudStack networks and Connectivity - service. This service is responsible for creating Layer 2 networks supporting the networks - created by guests. When a tenant creates a new network, a virutal network segment will be - created by sending the appropriate calls to the BigSwitch Controller. -
-
- Support for CAStor Cluster - CloudStack 4.0.0-incubating supports using a CAStor cluster as the back-end storage - system for a CloudStack S3 front-end. The CAStor back-end storage for CloudStack extends - the existing storage classes and allows the storage configuration attribute to point to a - CAStor cluster. This feature makes use of the CloudStack server's local disk to spool - files before writing them to CAStor when handling the PUT operations. However, a file must - be successfully written into the CAStor cluster prior to the return of a success code to - the S3 client to ensure that the transaction outcome is correctly reported. - The S3 multipart file upload is not supported in this release. You are prompted with - proper error message if a multipart upload is attempted. -
-
- Clustered Logical Volume Manager Support for KVM - This release adds Clustered Logical Volume Manager (CLVM) storage support for KVM - hosts. With this support, you can use CLVM as primary storage. - The CLVM support for KVM allows root and data disks (primary storage) to reside on - Linux logical volumes. The administrators are required to configure CLVM on the KVM hosts - independent of CloudStack. When the volume groups are available, an administrator can - simply add primary storage of type CLVM, providing the volume group name. Then CloudStack - creates and manages logical volumes as needed. - CLVM also supports Snapshots. CloudStack creates an LVM snapshot, copy the applicable - logical volume to the secondary storage in the qcow2 format, and then delete the LVM - snapshot. -
-
- Rados Block Device Support for KVM - You can now use Rados Block Device (RBD) to run instances on Apache CloudStack - 4.0.0-incubating. This can be done by adding a RBD pool as primary storage. Before using - RBD, ensure that Qemu is compiled with RBD enabled, and the libvirt version is at least - 0.10 with RBD enabled on the KVM host - Create a disk offering for RBD so that you can ensure that StoragePoolAllocator - chooses the RBD pool to deploy instances. -
-
-
- Issues Fixed in 4.0.0-incubating - Many bugs include a defect number that reflects the bug number that was held in the bug - tracker run by Citrix (bugs.cloudstack.org). The Apache CloudStack project now uses Jira to manage its bugs, so - some of the bugs that are referenced here may not be available to view. However, we are - still including them for completeness. - - - - - - - - Defect - - - Description - - - - - - Many - vSphere 5.0 now has GA support. Formerly only Beta support was - provided. - - - CS-16135 - Creating volumes after upgrading from snapshot taken in 2.2.14 no longer - deletes the snapshot physically from the secondary storage. - - - CS-16122 - In a site-to-site VPN setup, alerts are generated when the VPC virtual - router is rebooted with multiple vpn connections. - - - CS-16022 - If host connection fails due to a database error, host now disconnects - and the Managerment Server id is removed. - - - CS-16011 - Name of network offering is no longer truncated due to too-narrow field - width in Add Guest Network dialog box. - - - - CS-15978 - When the virtual router and its host go down, the high availability - mechanism now works for the virtual router. - - - - CS-15921 - The 2.2.x security group script now accounts for the VMs created in the - version 2.1 timeframe. - - - - CS-15919 - A level parameter is added to the listVolumes command; therefore queries - return the response more quickly. - - - CS-15904 - Upgrade from version 2.2.14 to CloudStack-3.0.5-0.2944-rhel5 works as - expected. The upgrade script, - /usr/share/cloud/setup/db/schema-2214to30-cleanup.sql, works as - expected. - - - CS-15879 - The database upgrade from version 3.0.4 to 3.0.5 works as - expected. - - - - CS-15807 - Network label for OVM now available in UI. - - - - CS-15779 - When the thumbnail is requested, the console session will not be - terminated. - - - - CS-15778 - Fetching a VM thumbnail now gets a thumbnail of appropriate visual - dimensions. - - - - CS-15734 - KVM Snapshots no longer shows incorrect disk usage. - - - CS-15733 - The domainId parameter for the listNetworks command now lists the - resources belonging to the domain specified. - - - CS-15676 - Stopping the router no longer fails with the null pointer - exception. - - - - CS-15648 - If creating a volume from a snapshot fails, the error is reported on the - UI but the volume is stuck in the creating state. - - - - CS-15646 - createFirewallRule API no longer causes null pointer - exception. - - - CS-15628 - In a KVM host, the high availability mechanism no longer takes a long - time to migrate VMs to another KVM host if there are multiple storage - pools. - - - CS-15627 - Metadata instance-id and vm-id for existing VMs stays the same after - upgrade. - - - CS-15621 - Solved difficulty with allocating disk volumes when running multiple VM - deployment in parallel. - - - CS-15603 - CloudStack now stop the VMs when destroyVM command is - called. - - - CS-15586 - Public Vlan for an account no longer fails if multiple physical networks - are present. - - - CS-15582 - The dns-name filter is now supported for ec2-describe-instances in the - Amazon Web Services API compatibility commands. The filter maps to the name of a - user VM. - - - CS-15503 - An IP address which has static NAT rules can now be released. - Subsequently, restarting this network after it was shutdown can - succeed. - - - CS-15464 - Can now delete static route whose state is set to Revoke. - - - CS-15443 - Creating a firewall rule no longer fails with an internal server - error. - - - CS-15398 - Corrected technique for programming DNS on the user VMs. - - - CS-15356 - Internal DNS 2 entry now correctly shown in UI. - - - CS-15335 - The CloudBridge S3 Engine now connects to the database by using the - deciphered password in the db.properties file. - - - CS-15318 - UI now correctly prevents the user from stopping a VM that is in the - Starting state. - - - CS-15307 - Fixed Japanese localization of instance statuses in the Instances - menu. - - - CS-15278 - The deployment planner no longer takes long time to locate a suitable - host to deploy VMs when large number of clusters are present. - - - CS-15274 - Creating a VLAN range using Zone ID without network ID now - succeeds. - - - CS-15243 - Now check to be sure source NAT and VPN have same - provider. - - - CS-15232 - Ensure that networks using external load balancer/firewall in 2.2.14 or - earlier can properly upgrade. - - - CS-15200 - No exception when trying to attach the same volume while attaching the - first volume is in progress. - - - CS-15173 - Additional cluster can no longer be added with same VSM IP address as - another cluster. - - - CS-15167 - AWS API calls now honor the admin account's ability to view or act on the - resources owned by the regular users. - - - CS-15163 - The minimum limit is not honored when there is not enough capacity to - deploy all the VMs and the ec2-run-instances command with the -n >n1 -n2> - option is used to deploy multiple VMs. - - - CS-15157 - Can now add/enable service providers for multiple physical networks - through the UI. - - - CS-15145 - AWS API call ec2-register has better error handling for negative - cases. - - - CS-15122 - Filters now supported for AWS API call - ec2-describe-availability-zones. - - - CS-15120 - Actions column in UI of Volume page now shows action - links. - - - CS-15099 - Buttons no longer overlap text on Account Deletion confirmation page in - UI. - - - CS-15095 - Ensures you can not create a VM with a CPU frequency greater than the - host CPU frequency. - - - CS-15094 - CPU cap now set properly in VMware. - - - CS-15077 - NullPointerException is no longer observed while executing the command to - list the public IP in a basic zone created with the default shared NetScaler EIP - and ELB network offering. - - - CS-15044 - UI now provides option to view the list of instances which are part of - the guest network. - - - CS-15026 - UI in Deploy VM dialog now lists only templates or ISOs depending on - which is selected in previous dialog. - - - CS-14989 - In KVM, the Create Instance wizard now shows only templates from the - current (KVM) zone. - - - CS-14986, CS-14985 - Listing filters works as expected in the ec2-describe-volumes and - ec2-describe-snapshots commands. - - - CS-14964 - Automatically starting the Console Proxy no longer fails due to its - missing volume on the primary storage - - - CS-14907 - User is now correctly prevented from trying to download an uploaded - volume which has not yet been moved to primary storage. - - - CS-14879 - When a user VM is stopped or terminated, the static NAT associated with - this VM is now disabled. This public IP address is no longer owned by this account - and can be associated to any other user VM. - - - CS-14854 - Only the admin user can change the template permission to Public, so this - option is removed from the UI for domain Admins and regular Users. - - - CS-14817 - While checking if network has any external provider, CloudStack will - consider all providers in the network. - - - CS-14796 - When deploying a VM with ec2-run-instances, userdata is now - encoded. - - - CS-14770 - The API returns the keypair information when a VM is deployed with - sshkey. This affects the API commands related to virtual machines - (deployVirtualMachine, listVirtualMachines, ... *VirtualMachine), as well as the - corresponding AWS APIs. - - - CS-14724 - UI no longer displays the dropdown list of isolation method choices if - sdn.ovs.controller is false. - - - CS-14345 - Logout API returns XML header. - - - CS-14724 - Host IPs now associated with appropriate IPs according to traffic - type. - - - CS-14253 - Can now delete and re-create port forwarding rule on same - firewall. - - - CS-14724 - UI no longer displays the dropdown list of isolation method choices if - sdn.ovs.controller is false. - - - CS-14452 - Data disk volumes are now automatically copied from one cluster to - another. - - - CS-13539 - Windows VM can get IP after reboot. - - - CS-13537 - When user tries to delete a domain that contains sub-domains, an error - message is now sent to convey the reason for the delete failure. - - - CS-13153 - System VMs support HTTP proxy. - - - CS-12642 - Added Close button to Select Project list view popup in - UI. - - - CS-12510 - Deleting and reinserting host_details no longer causes - deadlocks. - - - CS-12407 - F5 and Netscaler - when dedicated is selected, capacity field is - disabled. - - - CS-12111 - Email validation for edit user form. - - - CS-10928 - Network read/write values now always positive numbers. - - - CS-15376, CS-15373 - The AWS APIs (EC2 and S3) now listen on the 7080 port and send request to - CloudStack on the 8080 port just as any other clients of - CloudStack. - - - CS-13944 - The CloudStack 2.2.x to 3.0.x database upgrade for multiple physical - networks is now supported. - - - CS-15300 - The admin accounts of a domain now honour the limits imposed on that - domain just like the regular accounts do. A domain admin now is not allowed to - create an unlimited number of instances, volumes, snapshots, and so - on. - - - CS-15396 - The CloudStack database now contain the UUD information after the 2.2.14 - to 3.0.4 upgrade. - - - CS-15450 - Upgrade from 2.2.14 to 3.0.4 no longer fails on a VMware - host. - - - CS-15449 - Running cloudstack-aws-api-register no longer fails with the "User - registration failed with error: [Errno 113] No route to host" - error. - - - CS-15455 - The iptable rules are configured to open the awsapi port (7080) as part - of the installation. - - - CS-15429 - While creating an instance with data volume, disk offering also is - considered while checking the account limit on volume resources. - - - CS-15414 - After the 2.2.14 to 3.0.4 upgrade, the value of the global parameter - xen.guest.network.device is now decrypted before setting the traffic - label. - - - CS-15382 - During 2.2.14 to 3.0.4 upgrade, the hosts no longer go to the Alert state - if destroyed networks existed with non-existent tags prior to - upgrade. - - - CS-15323 - CloudStack supports the following Citrix XenServer hotfixes: XS602E003, - XS602E004, and XS602E005. - - - CS-15430 - Create snapshot now fails if creating a snapshot exceeds the snapshot - resource limit for a domain admin or a user account. - - - CS-14256 - Virtual Router no longer remains in starting state for subdomain or user - on a KVM 3.0.1 prerlease host on RHEL 6.2. - - - CS-7495 - Implemented a variety of Xen management host improvements. - - - CS-8105 - NFS v4 for primary storage now works as expected on KVM - hosts. - - - CS-9989 - The error messages returned during VM deployment failure will have much - more details than before. - - - CS-12584 - You can no longer add security groups not supported by the hypervisor in - use. - - - CS-12705 - When creating a Network offering by using SRX as the service provider for - SourceNAT servcies, an option is given in the CloudStack UI now to set the - source_nat type to "per Zone"/"per account". - - - CS-12782 - Assigning a VM from Basic to Advanced zone no longer ignores the network - ID. A warning message is displayed for VM movements across zones. - - - CS-12591 - Broadcast Address on the Second Public IP NIC is now - corrected. - - - CS-13272 - When a user is deleted, all the associated properties, such as IPs and - virtual routers, are now deleted. - - - CS-13377 - Creating template from a root disk of a stopped instance now provides an - option to make it a "Featured template". - - - CS-13500 - Reaching the first guest VM by using its public IP from the second guest - VM no longer fails. - - - CS-13853 - The default gateway can no longer be 0.0.0.0 in the Secondary Storage VM - (SSVM). - - - CS-13863 - The queryAsyncJobResult command in XML format now returns the correct - UUIDs. - - - CS-13867 - Corrected CSP xenserver-cloud-supp.tgz for XenServer 5.6 and - 6.0. - - - CS-13904 - Labels and values for the service offerings CPU and memory are now - consistent. - - - CS-13998 - The SSVM kernel panic issue is fixed on XenServer. - - - CS-14090 - The issue is fixed where running the VMware snapshots randomly fails with - the ArrayIndexOutOfBoundsException error. - - - CS-14021 - The java.lang.OutOfMemoryError is fixed on the Management - Server. - - - CS-14025 - The Python Eggs are provided to easily package the test client for each - branch of CloudStack. - - - CS-14068 - Resetting the VM password through the CloudStack UI no longer causes any - error. - - - CS-14156 - The pod which has the administrator's virtual router is no longer - selected while creating the virtual routers for guests. - - - CS-14182 - The users can now delete their ISOs as normal users. - - - CS-14185 - The listOSTypes API now filters out the types of operating system by - using the keywords. - - - CS-14204 - The cloud-setup-bonding.sh command no longer generates the "command not - found" error. - - - CS-14214 - The Specify VLAN option cannot be enabled now for an isolated Network - offering with SourceNAT enabled. - - - CS-14234 - Sending project invite email to an account now requires SMTP configured - in CloudStack. - - - CS-14237 - The garbage collector of the primary storage no longer fails when the - first host in the cluster is not up. - - - CS-14241 - Custom Volume Disk Offering is now matching the Global configuration - value. - - - CS-14270 - The listNetworks API no longer assumes that the broadcast type is always - VLAN. - - - CS-14319 - The internal name of the VM is no longer present in the error message - that is displayed to a domain administrator. - - - CS-14321 - The listVolumes API call now returns a valid value for the isExtractable - parameter for the ISO-derived disk and data disk volumes. - - - CS-14323 - Invalid API calls will now give valid response in json/xml - format. - - - CS-14339 - Custom Disk Size will now allow values larger than 100GB. - - - CS-14357 - The ConsoleProxyLoadReportCommand is no longer fired - continuously. - - - CS-14421 - Fixed the issue of virtual router deployments. The DHCP entries can now - be assigned to the router. - - - CS-14555 - Unzipped downloaded template MD5SUM will no longer override the zipped - template MD5SUM in the database. - - - CS-14598 - The complete screen of the running VM is now displayed in the console - proxy. - - - CS-14600 - Windows or Linux based consoles are no longer lost upon rebooting - VMs. - - - CS-14784 - Multiple subnets with the same VLAN now work as expected. - - - CS-13303, 14874, 13897, 13944, 14088, 14190 - A variety of upgrade issues have been fixed in release - 3.0.3. - - - CS-15080 - Setting a private network on a VLAN for VMWare environment is now - supported. - - - CS-15168 - The console proxy now works as expected and no exception is shown in the - log after upgrading from version 2.2.14 to 3.0.2. - - - CS-15172 - Version 3.0.2 now accepts the valid public key. - - - - -
-
- Known Issues in 4.0.0-incubating - - - - - - - - Issue ID - - - Description - - - - - - CLOUDSTACK-301 - Nexus 1000v DVS integration is not functional - This source code release includes some partial functionality to support the - Cisco Nexus 1000v Distributed Virtual Switch within a VMware hypervisor - environment. The functionality is not complete at this time. - - - - CLOUDSTACK-368 - OVM - cannot create guest VM - This source code release has regressed from the CloudStack 2.2.x code - and is unable to support Oracle VM (OVM). - - - - CLOUDSTACK-279 - Deleting a project fails when executed by the regular user. This works as - expected for root/domain admin. To workaround, perform either of the - following: - - Use the account cleanup thread which will eventually complete the project - deletion. - - - Execute the call as the root/domain admin on behalf of the regular - user. - - - - - - CS-16067 - The command=listTags&key=city command does not work as expected. The - command does not return tags for the resources of the account with the tag, city - - - - - CS-16063 - The current values of volumes and snapshots are incorrect when using KVM - as a host. To fix this, the database upgrade codes, volumes.size and - snapshots.size, should be changed to show the virtual sizes. - - - - CS-16058 - Null pointer Exception while deleting the host after moving the host to - maintenance state. - - - - CS-16045 - Only the root administrator can handle the API keys. The domain - administrators are not allowed to create, delete, or retrieve API keys for the - users in their domain. - - - - CS-16019 - CIDR list in the Add VPN Customer Gateway dialog does not prompt the user - that they can provide a comma separated CIDRs if multiple CIDRs have to be - supplied. - - - - CS-16015 - Deleting a network is not supported when its network providers are - disabled. - - - - CS-16012 - Unable to delete a zone in the UI because the necessary cleanup cannot be - completed. When the hosts are removed, the expunge process fails to delete the - volumes as no hosts are present to send the commands to. Therefore, the storage - pool removal fails, and zone can't be cleaned and deleted. - - - - CS-16011 - Name of network offering might be truncated due to too-narrow field width - in Add Guest Network dialog box. - - - - CS-15789 - Invalid global setting prevents management server to restart. For - example, if you configure the "project.invite.timeout" parameter to "300" and - attempt to restart management server, it fails without throwing a warning or - setting the value to the default. - - - - CS-15749 - Restarting VPC is resulting in intermittent connection loss to the port - forwarding and StaticNAT rules. - - - - CS-15690 - The IpAssoc command failed as a part of starting the virtual router, but - the final start result is reported as succes. - - - - CS-15672, CS-15635 - The FQDN of the VM is not configured if it is deployed as a part of - default shared network and isolated guest network - (DefaultIsolatedNetworkOfferingWithSourceNatService). - - - - CS-15634 - The FQDN of a VM that is deployed as a part of both a shared network and - default isolated guest network has the suffix of the shared network instead of the - default isolated guest network. - - - - CS-15576 - Stopping a VM on XenServer creates a backlog of API commands. For - example, the Attach volume calls become delayed while waiting for the - stopVirtualMachine command to be executed. - - - - CS-15569 - Misleading error message in the exception when creating a StaticNAT rule - fails in a VPC. - - - - CS-15566 - External device such as Netscaler is not supported in VPC. - - - CS-15557 - Intermittent traffic loss in the VPN connection if Juniper is the remote - router and the life time is 300 seconds. - - - - CS-15361 - Egress rules are not working in NetScaler loadbalancer. - - - - CS-15163 - The minimum limit is not honored when there is not enough capacity to - deploy all the VMs and the ec2-run-instances command with the -n >n1 -n2> - option is used to deploy multiple VMs. - - - CS-15105 - The cloud-sysvmadm script does not work if the integration.api.port - parameter is set to any port other than 8096. - - - CS-15092 - Connecting to the guest VMs through SSH is extremely slow, and it results - in connection timeout. - - - CS-15037 - Hairpin NAT is not supported when NetScaler is used for - EIP. - - - CS-15009 - The port_profile table will not be populated with port profile - information. In this release, CloudStack directly connects to the VSM for all the - port profile operations; therefore, no port profile information is - cached. - - - CS-14939 - Adding a VMware cluster is not supported when the Management Network is - migrated to the Distributed Virtual Switch environment. - - - CS-14780 - You are allowed to ping the elastic IP address of the VM even though no - ingress rule is set that allows the ICMP protocol. - - - CS-14756 - Installing KVM on RHEL 6.2 will result in unreliable network performance. - Workaround: blacklist vhost-net. Edit /etc/modprobe.d/blacklist-kvm.conf and - include vhost-net. - - - CS-14346 - The UpdateVirtualMachine API call does not check whether the VM is - stopped. Therefore, stop the VM manually before issuing this call. - - - CS-14303 (was 14537) - The IP addresses for a shared network are still being consumed even if no - services are defined for that network. - - - CS-14296 (was 14530) - OVM: Network traffic labels are not supported. - - - CS-14291 (was 14523) - The EIP/ELB network offering for basic zones does not support multiple - NetScalers. - - - CS-14275 (was 14506) - F5: Unable to properly remove a F5 device. - - - CS-14201 (was 14430) - VMWare: Template sizes are being reported different depending on whether - the primary storage is using ISCSI or NFS. - - - CS-13758 (was 13963) - vSphere: template download from templates created off of the root volume - does not work properly. - - - CS-13733 (was 13935) - vSphere: detaching an ISO from a restored VM instance - fails. - - - CS-13682 (was 13883) - Multiple NetScalers are not supported in Basic Networking. - - - CS-13599 (was 13359) - Programming F5/NetScaler rules can be better optimized. - - - CS-13337 (was 13518) - Security Groups are not supported in Advanced Networking - - - CS-13173 (was 13336) - vSphere: cross cluster volume migration does not work - properly. - - - CS-12714 (was 12840) - Capacity view is not available for pods or clusters. - - - CS-12624 (was 12741) - vSphere: maintenance mode will not live migrate system VM to another - host. - - - - CS-15476 - - - The 2.2.14 to 4.0.0-incubating upgrade fails if multiple untagged physical - networks exist before the upgrade. - - - - - CS-15407 - - - After the 2.2.14 to 4.0.0-incubating upgrade, VLAN allocation on multiple - physical networks does not happen as expected. - To workaround this issue, follow the instructions given below: - - - Revert to your 2.2.14 setup. - - - Stop all the VMs with the isolated virtual networks in your cloud - setup. - - - Run following query to find if any networks still have the NICs - allocated: - - - Check if any virtual guest networks have the NICs allocated: - #SELECT DISTINCT op.id from `cloud`.`op_networks` op JOIN `cloud`.`networks` n on op.id=n.id WHERE nics_count != 0 AND guest_type = 'Virtual'; - - - If this returns any network IDs, then ensure the following: - - - All the VMs are stopped. - - - No new VM is started. - - - Shutdown the Management Server. - - - - - Remove the NICs count for the virtual network IDs returned in step - (a), and set the NIC count to 0: - UPDATE `cloud`.`op_networks` SET nics_count = 0 WHERE id = enter id of virtual network - - - Restart the Management Server, and wait for all the networks to shut - down. - - Networks shutdown is determined by the network.gc.interval and - network.gc.wait parameters. - - - - - - Ensure that all the networks are shut down and all the guest VNETs are - free. - - - Run the upgrade script. - This allocates all your guest VNET ranges to the first physical - network. - - - By using the updatePhysicalNetwork API, reconfigure the VNET ranges for - each physical network as desired. - - - Start all the VMs. - - - - - - - CS-14680 - - - CloudStack and LDAP user validation cannot happen simultaneously because the - user password is hashed and stored in the database, and LDAP requires the - passwords in plain text. - To work with the LDAP user, the MD5 hash should be disabled in the login - process by commenting the following variable in sharedFunctions.js file available - at /usr/share/cloud/management/webapps/client/scripts, and restart the - cloud-management service. - var md5HashedLogin = false; - However, if md5HashedLogin is set to false, the end user can login with the - LDAP credentials but not with the CloudStack user credentials. - - - - CS-14346 - The UpdateVirtualMachine API call does not check whether the VM is - stopped. Therefore, stop the VM manually before issuing this call. - - - CS-15130 - Data disk volumes are not automatically copied from one cluster to - another. - - - CS-14780 - You are allowed to ping the elastic IP address of the VM even though no - ingress rule is set that allows the ICMP protocol. - - - CS-14939 - Adding a VMware cluster is not supported when the Management Network is - migrated to the Distributed Virtual Switch environment. - - - CS-15009 - The port_profile table will not be populated with port profile - information. In this release, CloudStack directly connects to the VSM for all the - port profile operations; therefore, no port profile information is - cached. - - - CS-15037 - Hairpin NAT is not supported when NetScaler is used for - EIP. - - - CS-15092 - Connecting to the guest VMs through SSH is extremely slow, and it results - in connection timeout. - - - CS-15105 - The cloud-sysvmadm script does not work if the integration.api.port - parameter is set to any port other than 8096. - - - CS-15163 - The minimum limit is not honored when there is not enough capacity to - deploy all the VMs and the ec2-run-instances command with the -n >n1 -n2> - option is used to deploy multiple VMs. - - - - -
- - - API Changes from 3.0.2 to 4.0.0-incubating -
- New API Commands in 4.0.0-incubating - - - createCounter (Adds metric counter) - - - deleteCounter (Deletes a counter) - - - listCounters (List the counters) - - - createCondition (Creates a condition) - - - deleteCondition (Removes a condition) - - - listConditions (List Conditions for the specific user) - - - createTags. Add tags to one or more resources. Example: - command=createTags -&resourceIds=1,10,12 -&resourceType=userVm -&tags[0].key=region -&tags[0].value=canada -&tags[1].key=city -&tags[1].value=Toronto - - - deleteTags. Remove tags from one or more resources. Example: - command=deleteTags -&resourceIds=1,12 -&resourceType=Snapshot -&tags[0].key=city - - - listTags (Show currently defined resource tags) - - - createVPC (Creates a VPC) - - - listVPCs (Lists VPCs) - - - deleteVPC (Deletes a VPC) - - - updateVPC (Updates a VPC) - - - restartVPC (Restarts a VPC) - - - createVPCOffering (Creates VPC offering) - - - updateVPCOffering (Updates VPC offering) - - - deleteVPCOffering (Deletes VPC offering) - - - listVPCOfferings (Lists VPC offerings) - - - createPrivateGateway (Creates a private gateway) - - - listPrivateGateways (List private gateways) - - - deletePrivateGateway (Deletes a Private gateway) - - - createNetworkACL (Creates a ACL rule the given network (the network has to belong to - VPC)) - - - deleteNetworkACL (Deletes a Network ACL) - - - listNetworkACLs (Lists all network ACLs) - - - createStaticRoute (Creates a static route) - - - deleteStaticRoute (Deletes a static route) - - - listStaticRoutes (Lists all static routes) - - - createVpnCustomerGateway (Creates site to site vpn customer gateway) - - - createVpnGateway (Creates site to site vpn local gateway) - - - createVpnConnection (Create site to site vpn connection) - - - deleteVpnCustomerGateway (Delete site to site vpn customer gateway) - - - deleteVpnGateway (Delete site to site vpn gateway) - - - deleteVpnConnection (Delete site to site vpn connection) - - - updateVpnCustomerGateway (Update site to site vpn customer gateway) - - - resetVpnConnection (Reset site to site vpn connection) - - - listVpnCustomerGateways (Lists site to site vpn customer gateways) - - - listVpnGateways (Lists site 2 site vpn gateways) - - - listVpnConnections (Lists site to site vpn connection gateways) - - - markDefaultZoneForAccount (Marks a default zone for the current account) - - - uploadVolume (Uploads a data disk) - - -
-
- Changed API Commands in 4.0.0-incubating - - - - - - - API Commands - Description - - - - - - copyTemplate - prepareTemplate - registerTemplate - updateTemplate - createProject - activateProject - suspendProject - updateProject - listProjectAccounts - createVolume - migrateVolume - attachVolume - detachVolume - uploadVolume - createSecurityGroup - registerIso - copyIso - updateIso - createIpForwardingRule - listIpForwardingRules - createLoadBalancerRule - updateLoadBalancerRule - createSnapshot - - - The commands in this list have a single new response parameter, and no other - changes. - New response parameter: tags(*) - - Many other commands also have the new tags(*) parameter in addition to other - changes; those commands are listed separately. - - - - - rebootVirtualMachine - attachIso - detachIso - listLoadBalancerRuleInstances - resetPasswordForVirtualMachine - changeServiceForVirtualMachine - recoverVirtualMachine - startVirtualMachine - migrateVirtualMachine - deployVirtualMachine - assignVirtualMachine - updateVirtualMachine - restoreVirtualMachine - stopVirtualMachine - destroyVirtualMachine - - - The commands in this list have two new response parameters, and no other - changes. - New response parameters: keypair, tags(*) - - - - - listSecurityGroups - listFirewallRules - listPortForwardingRules - listSnapshots - listIsos - listProjects - listTemplates - listLoadBalancerRules - - The commands in this list have the following new parameters, and no other - changes. - New request parameter: tags (optional) - New response parameter: tags(*) - - - - - listF5LoadBalancerNetworks - listNetscalerLoadBalancerNetworks - listSrxFirewallNetworks - updateNetwork - - - The commands in this list have three new response parameters, and no other - changes. - New response parameters: canusefordeploy, vpcid, tags(*) - - - - - createZone - updateZone - - The commands in this list have the following new parameters, and no other - changes. - New request parameter: localstorageenabled (optional) - New response parameter: localstorageenabled - - - - listZones - New response parameter: localstorageenabled - - - - rebootRouter - changeServiceForRouter - startRouter - destroyRouter - stopRouter - - The commands in this list have two new response parameters, and no other - changes. - New response parameters: vpcid, nic(*) - - - - updateAccount - disableAccount - listAccounts - markDefaultZoneForAccount - enableAccount - - The commands in this list have three new response parameters, and no - other changes. - New response parameters: vpcavailable, vpclimit, vpctotal - - - listRouters - - New request parameters: forvpc (optional), vpcid (optional) - New response parameters: vpcid, nic(*) - - - - listNetworkOfferings - - New request parameters: forvpc (optional) - New response parameters: forvpc - - - - listVolumes - - New request parameters: details (optional), tags (optional) - New response parameters: tags(*) - - - - addTrafficMonitor - - New request parameters: excludezones (optional), includezones - (optional) - - - - createNetwork - - New request parameters: vpcid (optional) - New response parameters: canusefordeploy, vpcid, tags(*) - - - - listPublicIpAddresses - - New request parameters: tags (optional), vpcid (optional) - New response parameters: vpcid, tags(*) - - - - listNetworks - - New request parameters: canusefordeploy (optional), forvpc (optional), tags - (optional), vpcid (optional) - New response parameters: canusefordeploy, vpcid, tags(*) - - - - restartNetwork - - New response parameters: vpcid, tags(*) - - - - enableStaticNat - - New request parameter: networkid (optional) - - - - createDiskOffering - - New request parameter: storagetype (optional) - New response parameter: storagetype - - - - listDiskOfferings - - New response parameter: storagetype - - - - updateDiskOffering - - New response parameter: storagetype - - - - createFirewallRule - - Changed request parameters: ipaddressid (old version - optional, new version - - required) - New response parameter: tags(*) - - - - listVirtualMachines - - New request parameters: isoid (optional), tags (optional), templateid - (optional) - New response parameters: keypair, tags(*) - - - - updateStorageNetworkIpRange - - New response parameters: id, endip, gateway, netmask, networkid, podid, - startip, vlan, zoneid - - - - reconnectHost - A new response parameter is added: hahost. - - - addCluster - The following request parameters are added: - - - vsmipaddress (optional) - - - vsmpassword (optional) - - - vsmusername (optional) - - - The following parameter is made mandatory: podid - - - - listVolumes - A new response parameter is added: status - - - migrateVolume - A new response parameter is added: status - - - prepareHostForMaintenance - A new response parameter is added: hahost. - - - addSecondaryStorage - A new response parameter is added: hahost. - - - enableAccount - A new response parameter is added: defaultzoneid - - - attachVolume - A new response parameter is added: status - - - cancelHostMaintenance - A new response parameter is added: hahost - - - addSwift - A new response parameter is added: hahost - - - listSwifts - A new response parameter is added: hahost - - - listExternalLoadBalancers - A new response parameter is added: hahost - - - createVolume - A new response parameter is added: status - - - listCapabilities - A new response parameter is added: - customdiskofferingmaxsize - - - disableAccount - A new response parameter is added: defaultzoneid - - - deployVirtualMachine - A new request parameter is added: startvm (optional) - - - deleteStoragePool - A new request parameter is added: forced (optional) - - - updateAccount - A new response parameter is added: defaultzoneid - - - addHost - A new response parameter is added: hahost - - - updateHost - A new response parameter is added: hahost - - - detachVolume - A new response parameter is added: status - - - listAccounts - A new response parameter is added: defaultzoneid - - - listHosts - A new response parameter is added: hahostA new request - parameter is added: hahost (optional) - - - - -
- + diff --git a/docs/en-US/about-working-with-vms.xml b/docs/en-US/about-working-with-vms.xml index 259c61bc814..90e5abf07f8 100644 --- a/docs/en-US/about-working-with-vms.xml +++ b/docs/en-US/about-working-with-vms.xml @@ -3,37 +3,62 @@ %BOOK_ENTITIES; ]> - -
- About Working with Virtual Machines - &PRODUCT; provides administrators with complete control over the lifecycle of all guest VMs executing in the cloud. &PRODUCT; provides several guest management operations for end users and administrators. VMs may be stopped, started, rebooted, and destroyed. - Guest VMs have a name and group. VM names and groups are opaque to &PRODUCT; and are available for end users to organize their VMs. Each VM can have three names for use in different contexts. Only two of these names can be controlled by the user: - - Instance name – a unique, immutable ID that is generated by &PRODUCT;, and can not be modified by the user. This name conforms to the requirements in IETF RFC 1123. - Display name – the name displayed in the &PRODUCT; web UI. Can be set by the user. Defaults to instance name. - Name – host name that the DHCP server assigns to the VM. Can be set by the user. Defaults to instance name - - Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is monitored by the system. If the system detects that the VM is down, it will attempt to restart the VM, possibly on a different host. For more information, see HA-Enabled Virtual Machines on - Each new VM is allocated one public IP address. When the VM is started, &PRODUCT; automatically creates a static NAT between this public IP address and the private IP address of the VM. - If elastic IP is in use (with the NetScaler load balancer), the IP address initially allocated to the new VM is not marked as elastic. The user must replace the automatically configured IP with a specifically acquired elastic IP, and set up the static NAT mapping between this new IP and the guest VM’s private IP. The VM’s original IP address is then released and returned to the pool of available public IPs. - &PRODUCT; cannot distinguish a guest VM that was shut down by the user (such as with the “shutdown†command in Linux) from a VM that shut down unexpectedly. If an HA-enabled VM is shut down from inside the VM, &PRODUCT; will restart it. To shut down an HA-enabled VM, you must go through the &PRODUCT; UI or API. + About Working with Virtual Machines + &PRODUCT; provides administrators with complete control over the lifecycle of all guest VMs + executing in the cloud. &PRODUCT; provides several guest management operations for end users and + administrators. VMs may be stopped, started, rebooted, and destroyed. + Guest VMs have a name and group. VM names and groups are opaque to &PRODUCT; and are + available for end users to organize their VMs. Each VM can have three names for use in different + contexts. Only two of these names can be controlled by the user: + + + Instance name – a unique, immutable ID that is generated by &PRODUCT; and can not + be modified by the user. This name conforms to the requirements in IETF RFC 1123. + + + Display name – the name displayed in the &PRODUCT; web UI. Can be set by the user. + Defaults to instance name. + + + Name – host name that the DHCP server assigns to the VM. Can be set by the user. + Defaults to instance name + + + + You can append the display name of a guest VM to its internal name. For more information, + see . + + Guest VMs can be configured to be Highly Available (HA). An HA-enabled VM is monitored by + the system. If the system detects that the VM is down, it will attempt to restart the VM, + possibly on a different host. For more information, see HA-Enabled Virtual Machines on + Each new VM is allocated one public IP address. When the VM is started, &PRODUCT; + automatically creates a static NAT between this public IP address and the private IP address of + the VM. + If elastic IP is in use (with the NetScaler load balancer), the IP address initially + allocated to the new VM is not marked as elastic. The user must replace the automatically + configured IP with a specifically acquired elastic IP, and set up the static NAT mapping between + this new IP and the guest VM’s private IP. The VM’s original IP address is then released and + returned to the pool of available public IPs. Optionally, you can also decide not to allocate a + public IP to a VM in an EIP-enabled Basic zone. For more information on Elastic IP, see . + &PRODUCT; cannot distinguish a guest VM that was shut down by the user (such as with the + “shutdown†command in Linux) from a VM that shut down unexpectedly. If an HA-enabled VM is shut + down from inside the VM, &PRODUCT; will restart it. To shut down an HA-enabled VM, you must go + through the &PRODUCT; UI or API.
- diff --git a/docs/en-US/add-clusters-vsphere.xml b/docs/en-US/add-clusters-vsphere.xml index ca36ee108c4..c3a0902be8f 100644 --- a/docs/en-US/add-clusters-vsphere.xml +++ b/docs/en-US/add-clusters-vsphere.xml @@ -71,7 +71,7 @@ In Hypervisor, choose VMware. - Provide the following information in the dialog. The fields below make reference to + Provide the following information in the dialog. The fields below make reference to the values from vCenter. @@ -81,8 +81,6 @@ addcluster.png: add a cluster - There might be a slight delay while the cluster is provisioned. It will automatically - display in the UI. Cluster Name: Enter the name of the cluster you @@ -136,7 +134,7 @@ Nexus dvSwitch Username: The username required to access the Nexus VSM - applicance. + appliance. Nexus dvSwitch Password: The password associated with the username specified @@ -151,7 +149,8 @@ Guest Traffic vSwitch Type: This option is displayed only if you enable the Override Guest Traffic option. Select a desirable - switch. If the vmware.use.dvswitch global parameter is true, the default option will be + switch. + If the vmware.use.dvswitch global parameter is true, the default option will be VMware vNetwork Distributed Virtual Switch. If you have enabled Nexus dvSwitch in the environment, the following parameters for dvSwitch configuration are displayed: @@ -161,7 +160,7 @@ Nexus dvSwitch Username: The username required to access the Nexus VSM - applicance. + appliance. Nexus dvSwitch Password: The password associated with the username specified diff --git a/docs/en-US/added-API-commands-4.2.xml b/docs/en-US/added-API-commands-4.2.xml new file mode 100644 index 00000000000..4bec148ba96 --- /dev/null +++ b/docs/en-US/added-API-commands-4.2.xml @@ -0,0 +1,43 @@ + + +%BOOK_ENTITIES; +]> + +
+ Added API Commands in 4.2 + + + addIpToNic + Adds an IP address to the NIC from the guest subnet. The request parameters are: nicid, + ipaddress. + The response parameters are: nicid, ipaddress, networkid + + + removeIpFromNic + Removes the reserved IP for the NIC. The request parameters is: id. + The response parameters are: true, false + + + listNics + Lists the NIC details of the user VM; the API response also contains the Secondary IP + addresses of the NIC. The request parameters are: nicid, virtualmachineid. + The response parameters are: id, ipaddress, secondaryips, gateway, netmask, macaddr, + broadcasturi, isolationuri, isdefault, + + +
diff --git a/docs/en-US/added-API-commands.xml b/docs/en-US/added-API-commands.xml index 208aac29dc2..99635de4697 100644 --- a/docs/en-US/added-API-commands.xml +++ b/docs/en-US/added-API-commands.xml @@ -87,7 +87,7 @@ suspendProject (Suspends a project) listProjects (Lists projects and provides detailed information for listed projects) - addAccountToProject (Adds acoount to a project) + addAccountToProject (Adds account to a project) deleteAccountFromProject (Deletes account from the project) diff --git a/docs/en-US/advanced-zone-configuration.xml b/docs/en-US/advanced-zone-configuration.xml index 03a082f21ac..43b9391516e 100644 --- a/docs/en-US/advanced-zone-configuration.xml +++ b/docs/en-US/advanced-zone-configuration.xml @@ -362,7 +362,7 @@ Secondary Storage : - NFS Server. The IP address of the server. + NFS Server. The IP address of the server or fully qualified domain name of the server. Path. The exported path from the server. diff --git a/docs/en-US/advanced-zone-network-traffic-types.xml b/docs/en-US/advanced-zone-network-traffic-types.xml index d8035929374..4d1f46592e0 100644 --- a/docs/en-US/advanced-zone-network-traffic-types.xml +++ b/docs/en-US/advanced-zone-network-traffic-types.xml @@ -28,7 +28,7 @@ Guest. When end users run VMs, they generate guest traffic. The guest VMs communicate with each other over a network that can be referred to as the guest network. This network can be isolated or shared. In an isolated guest network, the administrator needs to reserve VLAN ranges to provide isolation for each &PRODUCT; account’s network (potentially a large number of VLANs). In a shared guest network, all guest VMs share a single network. Management. When &PRODUCT;’s internal resources communicate with each other, they generate management traffic. This includes communication between hosts, system VMs (VMs used by &PRODUCT; to perform various tasks in the cloud), and any other component that communicates directly with the &PRODUCT; Management Server. You must configure the IP range for the system VMs to use. Public. 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 &PRODUCT; UI to acquire these IPs to implement NAT between their guest network and the public network, as described in “Acquiring a New IP Address†in the Administration Guide. - Storage. Traffic such as VM templates and snapshots, which is sent between the secondary storage VM and secondary storage servers. &PRODUCT; uses a separate Network Interface Controller (NIC) named storage NIC for storage network traffic. Use of a storage NIC that always operates on a high bandwidth network allows fast template and snapshot copying. You must configure the IP range to use for the storage network. + Storage. While labeled "storage" this is specifically about secondary storage, and doesn't affect traffic for primary storage. This includes traffic such as VM templates and snapshots, which is sent between the secondary storage VM and secondary storage servers. &PRODUCT; uses a separate Network Interface Controller (NIC) named storage NIC for storage network traffic. Use of a storage NIC that always operates on a high bandwidth network allows fast template and snapshot copying. You must configure the IP range to use for the storage network. These traffic types can each be on a separate physical network, or they can be combined with certain restrictions. When you use the Add Zone wizard in the UI to create a new zone, you are guided into making only valid choices.
diff --git a/docs/en-US/append-displayname-vms.xml b/docs/en-US/append-displayname-vms.xml new file mode 100644 index 00000000000..592a6e863e8 --- /dev/null +++ b/docs/en-US/append-displayname-vms.xml @@ -0,0 +1,84 @@ + + +%BOOK_ENTITIES; +]> + +
+ Appending a Display Name to the Guest VM’s Internal Name + Every guest VM has an internal name. The host uses the internal name to identify the guest + VMs. &PRODUCT; gives you an option to provide a guest VM with a display name. You can set this + display name as the internal name so that the vCenter can use it to identify the guest VM. A new + global parameter, vm.instancename.flag, has now been added to achieve this functionality. + The default format of the internal name is + i-<user_id>-<vm_id>-<instance.name>, where instance.name is a global + parameter. However, If vm.instancename.flag is set to true, and if a display name is provided + during the creation of a guest VM, the display name is appended to the internal name of the + guest VM on the host. This makes the internal name format as + i-<user_id>-<vm_id>-<displayName>. The default value of vm.instancename.flag + is set to false. This feature is intended to make the correlation between instance names and + internal names easier in large data center deployments. + The following table explains how a VM name is displayed in different scenarios. + + + + + + + + + + User-Provided Display Name + vm.instancename.flag + Hostname on the VM + Name on vCenter + Internal Name + + + + + Yes + True + Display name + i-<user_id>-<vm_id>-displayName + i-<user_id>-<vm_id>-displayName + + + No + True + UUID + i-<user_id>-<vm_id>-<instance.name> + i-<user_id>-<vm_id>-<instance.name> + + + Yes + False + Display name + i-<user_id>-<vm_id>-<instance.name> + i-<user_id>-<vm_id>-<instance.name> + + + No + False + UUID + i-<user_id>-<vm_id>-<instance.name> + i-<user_id>-<vm_id>-<instance.name> + + + + +
diff --git a/docs/en-US/aws-ec2-introduction.xml b/docs/en-US/aws-ec2-introduction.xml index 538c09d5ad1..4cf071bcbb2 100644 --- a/docs/en-US/aws-ec2-introduction.xml +++ b/docs/en-US/aws-ec2-introduction.xml @@ -45,7 +45,7 @@ Available in fresh installations of &PRODUCT;. Not available through upgrade of previous versions. - Features such as Elastic IP (EIP) and Elastic Load Balacing (ELB) are only available in an infrastructure + Features such as Elastic IP (EIP) and Elastic Load Balancing (ELB) are only available in an infrastructure with a Citrix NetScaler device. Users accessing a Zone with a NetScaler device will need to use a NetScaler-enabled network offering (DefaultSharedNetscalerEIP and ELBNetworkOffering). diff --git a/docs/en-US/basic-zone-network-traffic-types.xml b/docs/en-US/basic-zone-network-traffic-types.xml index 70789d0fa1a..850373658b4 100644 --- a/docs/en-US/basic-zone-network-traffic-types.xml +++ b/docs/en-US/basic-zone-network-traffic-types.xml @@ -26,10 +26,10 @@ When basic networking is used, there can be only one physical network in the zone. That physical network carries the following traffic types: Guest. When end users run VMs, they generate guest traffic. The guest VMs communicate with each other over a network that can be referred to as the guest network. Each pod in a basic zone is a broadcast domain, and therefore each pod has a different IP range for the guest network. The administrator must configure the IP range for each pod. - Management. When &PRODUCT;’s internal resources communicate with each other, they generate management traffic. This includes communication between hosts, system VMs (VMs used by &PRODUCT; to perform various tasks in the cloud), and any other component that communicates directly with the &PRODUCT; Management Server. You must configure the IP range for the system VMs to use. + Management. When &PRODUCT;'s internal resources communicate with each other, they generate management traffic. This includes communication between hosts, system VMs (VMs used by &PRODUCT; to perform various tasks in the cloud), and any other component that communicates directly with the &PRODUCT; Management Server. You must configure the IP range for the system VMs to use. We strongly recommend the use of separate NICs for management traffic and guest traffic. Public. 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 &PRODUCT; UI to acquire these IPs to implement NAT between their guest network and the public network, as described in Acquiring a New IP Address. - Storage. Traffic such as VM templates and snapshots, which is sent between the secondary storage VM and secondary storage servers. &PRODUCT; uses a separate Network Interface Controller (NIC) named storage NIC for storage network traffic. Use of a storage NIC that always operates on a high bandwidth network allows fast template and snapshot copying. You must configure the IP range to use for the storage network. + Storage. While labeled "storage" this is specifically about secondary storage, and doesn't affect traffic for primary storage. This includes traffic such as VM templates and snapshots, which is sent between the secondary storage VM and secondary storage servers. &PRODUCT; uses a separate Network Interface Controller (NIC) named storage NIC for storage network traffic. Use of a storage NIC that always operates on a high bandwidth network allows fast template and snapshot copying. You must configure the IP range to use for the storage network. In a basic network, configuring the physical network is fairly straightforward. In most cases, you only need to configure one guest network to carry traffic that is generated by guest VMs. If you use a NetScaler load balancer and enable its elastic IP and elastic load balancing (EIP and ELB) features, you must also configure a network to carry public traffic. &PRODUCT; takes care of presenting the necessary network configuration steps to you in the UI when you add a new zone.
diff --git a/docs/en-US/build-nonoss.xml b/docs/en-US/build-nonoss.xml new file mode 100644 index 00000000000..fceca6071c2 --- /dev/null +++ b/docs/en-US/build-nonoss.xml @@ -0,0 +1,49 @@ + + +%BOOK_ENTITIES; +]> + + + +
+ Building Non-OSS + If you need support for the VMware, NetApp, F5, NetScaler, SRX, or any other non-Open Source Software (nonoss) plugins, you'll need to download a few components on your own and follow a slightly different procedure to build from source. + Why Non-OSS? + Some of the plugins supported by &PRODUCT; cannot be distributed with &PRODUCT; for licensing reasons. In some cases, some of the required libraries/JARs are under a proprietary license. In other cases, the required libraries may be under a license that's not compatible with Apache's licensing guidelines for third-party products. + + + + To build the Non-OSS plugins, you'll need to have the requisite JARs installed under the deps directory. + Because these modules require dependencies that can't be distributed with &PRODUCT; you'll need to download them yourself. Links to the most recent dependencies are listed on the How to build on master branch page on the wiki. + + You may also need to download vhd-util, which was removed due to licensing issues. You'll copy vhd-util to the scripts/vm/hypervisor/xenserver/ directory. + + + Once you have all the dependencies copied over, you'll be able to build &PRODUCT; with the nonoss option: + + $ mvn clean + $ mvn install -Dnonoss + + + + Once you've built &PRODUCT; with the nonoss profile, you can package it using the or instructions. + + +
diff --git a/docs/en-US/building-documentation.xml b/docs/en-US/building-documentation.xml index 484826604fa..8ee63b06ec0 100644 --- a/docs/en-US/building-documentation.xml +++ b/docs/en-US/building-documentation.xml @@ -25,7 +25,7 @@
Building &PRODUCT; Documentation To build a specific guide, go to the source tree of the documentation in /docs and identify the guide you want to build. - Currenlty there are four guides plus the release notes, all defined in publican configuration files: + Currently there are four guides plus the release notes, all defined in publican configuration files: publican-adminguide.cfg publican-devguide.cfg diff --git a/docs/en-US/building-marvin.xml b/docs/en-US/building-marvin.xml index 3332b16d9b1..e33c4cb2248 100644 --- a/docs/en-US/building-marvin.xml +++ b/docs/en-US/building-marvin.xml @@ -27,7 +27,7 @@ Marvin is built with Maven and is dependent on APIdoc. To build it do the following in the root tree of &PRODUCT;: mvn -P developer -pl :cloud-apidoc mvn -P developer -pl :cloud-marvin - If successfull the build will have created the cloudstackAPI Python package under tools/marvin/marvin/cloudstackAPI as well as a gziped Marvin package under tools/marvin dist. To install the Python Marvin module do the following in tools/marvin: + If successful the build will have created the cloudstackAPI Python package under tools/marvin/marvin/cloudstackAPI as well as a gziped Marvin package under tools/marvin dist. To install the Python Marvin module do the following in tools/marvin: sudo python ./setup.py install The dependencies will be downloaded the Python module installed and you should be able to use Marvin in Python. Check that you can import the module before starting to use it. $ python diff --git a/docs/en-US/building-translation.xml b/docs/en-US/building-translation.xml index 659c55ffc5e..dd66365cd9d 100644 --- a/docs/en-US/building-translation.xml +++ b/docs/en-US/building-translation.xml @@ -52,7 +52,7 @@ how to prepare a document for translation. The basic command to execute to build the pot files for the developer guide is: publican update_pot --config=publican-devguide.cfg - This will create a pot directory with pot files in it, one for each corresponding xml files needed to build the guide. Once genereated, all pots files need to be configured for translation using transifex this is best done by using the transifex client that you can install with the following command (For RHEL and its derivatives): + This will create a pot directory with pot files in it, one for each corresponding xml files needed to build the guide. Once generated, all pots files need to be configured for translation using transifex this is best done by using the transifex client that you can install with the following command (For RHEL and its derivatives): yum install transifex-client The transifex client is also available via PyPi and you can install it like this: easy_install transifex-client diff --git a/docs/en-US/change-console-proxy-ssl-certificate-domain.xml b/docs/en-US/change-console-proxy-ssl-certificate-domain.xml index 89796a22c23..3fd05018e99 100644 --- a/docs/en-US/change-console-proxy-ssl-certificate-domain.xml +++ b/docs/en-US/change-console-proxy-ssl-certificate-domain.xml @@ -32,7 +32,7 @@ Generate a new 2048-bit private keyopenssl genrsa -des3 -out yourprivate.key 2048 Generate a new certificate CSRopenssl req -new -key yourprivate.key -out yourcertificate.csr Head to the website of your favorite trusted Certificate Authority, purchase an SSL certificate, and submit the CSR. You should receive a valid certificate in return - Convert your private key format into PKCS#8 encrypted format.openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encryped.key + Convert your private key format into PKCS#8 encrypted format.openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encrypted.key Convert your PKCS#8 encrypted private key into the PKCS#8 format that is compliant with &PRODUCT;openssl pkcs8 -in yourprivate.pkcs8.encrypted.key -out yourprivate.pkcs8.key diff --git a/docs/en-US/changed-API-commands-4.2.xml b/docs/en-US/changed-API-commands-4.2.xml new file mode 100644 index 00000000000..26f10ff6037 --- /dev/null +++ b/docs/en-US/changed-API-commands-4.2.xml @@ -0,0 +1,123 @@ + + +%BOOK_ENTITIES; +]> + +
+ Changed API Commands in 4.2 + + + + + Parameter Name + Description + + + + + updateResourceLimit + + Added the following resource types to the resourcetype + request parameter to set the limits: + + + CPU + + + RAM + + + primary storage + + + secondary storage + + + network rate + + + + + + updateResourceCount + + Added the following resource types to the resourcetype + request parameter to set the limits: + + + CPU + + + RAM + + + primary storage + + + secondary storage + + + network rate + + + + + + listResourceLimits + + Added the following resource types to the resourcetype + request parameter: + + + CPU + + + RAM + + + primary storage + + + secondary storage + + + network rate + + + + + + UpdatePhysicalNetwork + + Added the following request parameters: + + + vlan (adds a new VLAN range to the existing VLAN range) + + + removelan (removes the specified VLAN range) + + + The removevlan and vlan parameters can be used together. If the VLAN range that you are trying + to remove is in use, the operation will not succeed. + + + + + +
diff --git a/docs/en-US/citrix-xenserver-installation.xml b/docs/en-US/citrix-xenserver-installation.xml index 40538658078..2cd39a41368 100644 --- a/docs/en-US/citrix-xenserver-installation.xml +++ b/docs/en-US/citrix-xenserver-installation.xml @@ -62,7 +62,7 @@ support any system that is not up to date with patches. - All hosts within a cluster must be homogenous. The CPUs must be of the same type, + All hosts within a cluster must be homogeneous. The CPUs must be of the same type, count, and feature flags. diff --git a/docs/en-US/configure-package-repository.xml b/docs/en-US/configure-package-repository.xml index 3d102c697ad..c8ba48f2717 100644 --- a/docs/en-US/configure-package-repository.xml +++ b/docs/en-US/configure-package-repository.xml @@ -33,7 +33,7 @@ If you didn't follow the steps to build your own packages from source in the sections for or you may find pre-built - DEB and RPM packages for your convience linked from the + DEB and RPM packages for your convenience linked from the downloads page. diff --git a/docs/en-US/configure-vpn.xml b/docs/en-US/configure-vpn.xml index 87b4e65b56f..5d25620b3eb 100644 --- a/docs/en-US/configure-vpn.xml +++ b/docs/en-US/configure-vpn.xml @@ -29,7 +29,7 @@ In the left navigation, click Global Settings. Set the following global configuration parameters. - remote.access.vpn.client.ip.range – The range of IP addressess to be allocated to remote access VPN clients. The first IP in the range is used by the VPN server. + remote.access.vpn.client.ip.range – The range of IP addresses to be allocated to remote access VPN clients. The first IP in the range is used by the VPN server. remote.access.vpn.psk.length – Length of the IPSec key. remote.access.vpn.user.limit – Maximum number of VPN users per account. diff --git a/docs/en-US/console-proxy.xml b/docs/en-US/console-proxy.xml index 64183b4bfc0..5f9a82027d2 100644 --- a/docs/en-US/console-proxy.xml +++ b/docs/en-US/console-proxy.xml @@ -95,7 +95,7 @@ Convert your private key format into PKCS#8 encrypted format. - openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encryped.key + openssl pkcs8 -topk8 -in yourprivate.key -out yourprivate.pkcs8.encrypted.key Convert your PKCS#8 encrypted private key into the PKCS#8 format that is compliant diff --git a/docs/en-US/creating-network-offerings.xml b/docs/en-US/creating-network-offerings.xml index 1f79fb166ce..2b23ca89a1f 100644 --- a/docs/en-US/creating-network-offerings.xml +++ b/docs/en-US/creating-network-offerings.xml @@ -193,6 +193,51 @@ For more information, see . For more information, see the Administration Guide. + + LB Isolation: Specify what type of load balancer + isolation you want for the network: Shared or Dedicated. + Dedicated: If you select dedicated LB isolation, a + dedicated load balancer device is assigned for the network from the pool of dedicated + load balancer devices provisioned in the zone. If no sufficient dedicated load balancer + devices are available in the zone, network creation fails. Dedicated device is a good + choice for the high-traffic networks that make full use of the device's + resources. + Shared: If you select shared LB isolation, a shared + load balancer device is assigned for the network from the pool of shared load balancer + devices provisioned in the zone. While provisioning &PRODUCT; picks the shared load + balancer device that is used by the least number of accounts. Once the device reaches + its maximum capacity, the device will not be allocated to a new account. + + + Mode: You can select either Inline mode or Side by + Side mode: + Inline mode: Supported only for Juniper SRX + firewall and BigF5 load balancer devices. In inline mode, a firewall device is placed in + front of a load balancing device. The firewall acts as the gateway for all the incoming + traffic, then redirect the load balancing traffic to the load balancer behind it. The + load balancer in this case will not have the direct access to the public network. + Side by Side: In side by side mode, a firewall + device is deployed in parallel with the load balancer device. So the traffic to the load + balancer public IP is not routed through the firewall, and therefore, is exposed to the + public network. + + + Associate Public IP: Select this option if you want + to assign a public IP address to the VMs deployed in the guest network. This option is + available only if + + + Guest network is shared. + + + StaticNAT is enabled. + + + Elastic IP is enabled. + + + For information on Elastic IP, see . + Redundant router capability. Available only when Virtual Router is selected as the Source NAT provider. Select this option if you want to diff --git a/docs/en-US/delete-event-alerts.xml b/docs/en-US/delete-event-alerts.xml new file mode 100644 index 00000000000..3eebcb727a0 --- /dev/null +++ b/docs/en-US/delete-event-alerts.xml @@ -0,0 +1,47 @@ + + +%BOOK_ENTITIES; +]> + + +
+ Deleting and Archiving Events and Alerts + &PRODUCT; provides you the ability to delete or archive the existing alerts and events that + you no longer want to implement. You can regularly delete or archive any alerts or events that + you cannot, or do not want to resolve from the database. + You can delete or archive individual alerts or events either directly by using the Quickview + or by using the Details page. If you want to delete multiple alerts or events at the same time, + you can use the respective context menu. You can delete alerts or events by category for a time + period. + + Archived alerts or events cannot be viewed in the UI, or by using the API. They are + maintained in the database for auditing or compliance purposes. + + + Permissions + Consider the following: + + + + The root admin can delete or archive one or multiple alerts or events. + + + The domain admin or end user can delete or archive one or multiple events. + + +
diff --git a/docs/en-US/elastic-ip.xml b/docs/en-US/elastic-ip.xml new file mode 100644 index 00000000000..b09d37d43e1 --- /dev/null +++ b/docs/en-US/elastic-ip.xml @@ -0,0 +1,90 @@ + + +%BOOK_ENTITIES; +]> + +
+ About Elastic IP + Elastic IP (EIP) addresses are the IP addresses that are associated with an account, and act + as static IP addresses. The account owner has complete control over the Elastic IP addresses + that belong to the account. You can allocate an Elastic IP to a VM of your choice from the EIP + pool of your account. Later if required you can reassign the IP address to a different VM. This + feature is extremely helpful during VM failure. Instead of replacing the VM which is down, the + IP address can be reassigned to a new VM in your account. Elastic IP service provides Static NAT + (1:1) service in an EIP-enabled basic zone. The default network offering, + DefaultSharedNetscalerEIPandELBNetworkOffering, provides your network with EIP and ELB network + services if a NetScaler device is deployed in your zone. Similar to the public IP address, + Elastic IP addresses are also mapped to their associated private IP addresses by using Stactic + NAT. + The EIP work flow is as follows: + + + When a user VM is deployed, a public IP is automatically acquired from the pool of + public IPs configured in the zone. This IP is owned by the VM's account. + + + Each VM will have its own private IP. When the user VM starts, Static NAT is provisioned + on the NetScaler device by using the Inbound Network Address Translation (INAT) and Reverse + NAT (RNAT) rules between the public IP and the private IP. + + Inbound NAT (INAT) is a type of NAT supported by NetScaler, in which the destination + IP address is replaced in the packets from the public network, such as the Internet, with + the private IP address of a VM in the private network. Reverse NAT (RNAT) is a type of NAT + supported by NetScaler, in which the source IP address is replaced in the packets + generated by a VM in the private network with the public IP address. + + + + + This default public IP will be released in two cases: + + + When the VM is stopped. When the VM starts, it again receives a new public IP, not + necessarily the same one allocated initially, from the pool of Public IPs. + + + The user acquires a public IP (Elastic IP). This public IP is associated with the + account, but will not be mapped to any private IP. However, the user can enable Static + NAT to associate this IP to the private IP of a VM in the account. The Static NAT rule + for the public IP can be disabled at any time. When Static NAT is disabled, a new public + IP is allocated from the pool, which is not necessarily be the same one allocated + initially. + + + + + However, for the deployments where public IPs are limited resources, you have the + flexibility to choose not to allocate a public IP by default. You can use the Associate Public + IP option to turn on or off the automatic public IP assignment in the EIP-enabled Basic zones. + If you turn off the automatic public IP assignment while creating a network offering, only a + private IP is assigned to a VM when the VM is deployed with that network offering. Later, the + user can acquire an IP for the VM and enable static NAT. + For more information on the Associate Public IP option, see . + For more information on the Associate Public IP option, see the + Administration Guide. + + The Associate Public IP feature is designed only for use with user VMs. The System VMs + continue to get both public IP and private by default, irrespective of the network offering + configuration. + + + New deployments which use the default shared network offering with EIP and ELB services to + create a shared network in the Basic zone will continue allocating public IPs to each user + VM. +
diff --git a/docs/en-US/events.xml b/docs/en-US/events.xml index 49ef86e62b5..4a1445873a4 100644 --- a/docs/en-US/events.xml +++ b/docs/en-US/events.xml @@ -11,9 +11,7 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at - http://www.apache.org/licenses/LICENSE-2.0 - Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -34,4 +32,5 @@ +
diff --git a/docs/en-US/feedback.xml b/docs/en-US/feedback.xml new file mode 100644 index 00000000000..4b06c9f3898 --- /dev/null +++ b/docs/en-US/feedback.xml @@ -0,0 +1,24 @@ + + +%BOOK_ENTITIES; +]> + +
+ Feedback + to-do +
diff --git a/docs/en-US/global-config.xml b/docs/en-US/global-config.xml index 2f6ad105c0d..11952c382ac 100644 --- a/docs/en-US/global-config.xml +++ b/docs/en-US/global-config.xml @@ -19,6 +19,8 @@ under the License. --> + Global Configuration Parameters +
Setting Global Configuration Parameters &PRODUCT; provides parameters that you can set to control many aspects of the cloud. When &PRODUCT; is first installed, and periodically thereafter, you might need to modify these @@ -51,4 +53,81 @@ must click the name of the hypervisor first to display the editing screen. +
+
+ About Global Configuration Parameters + &PRODUCT; provides a variety of settings you can use to set limits, configure features, + and enable or disable features in the cloud. Once your Management Server is running, you might + need to set some of these global configuration parameters, depending on what optional features + you are setting up. + To modify global configuration parameters, use the steps in "Setting Global Configuration + Parameters." + The documentation for each &PRODUCT; feature should direct you to the names of the applicable + parameters. Many of them are discussed in the &PRODUCT; Administration Guide. The following table + shows a few of the more useful parameters. + + + + + + + Field + Value + + + + + management.network.cidr + A CIDR that describes the network that the management CIDRs reside on. This + variable must be set for deployments that use vSphere. It is recommended to be set for + other deployments as well. Example: 192.168.3.0/24. + + + xen.setup.multipath + For XenServer nodes, this is a true/false variable that instructs CloudStack to + enable iSCSI multipath on the XenServer Hosts when they are added. This defaults to false. + Set it to true if you would like CloudStack to enable multipath. + If this is true for a NFS-based deployment multipath will still be enabled on the + XenServer host. However, this does not impact NFS operation and is harmless. + + + secstorage.allowed.internal.sites + This is used to protect your internal network from rogue attempts to download + arbitrary files using the template download feature. This is a comma-separated list of CIDRs. + If a requested URL matches any of these CIDRs the Secondary Storage VM will use the private + network interface to fetch the URL. Other URLs will go through the public interface. + We suggest you set this to 1 or 2 hardened internal machines where you keep your templates. + For example, set it to 192.168.1.66/32. + + + use.local.storage + Determines whether CloudStack will use storage that is local to the Host for data + disks, templates, and snapshots. By default CloudStack will not use this storage. You should + change this to true if you want to use local storage and you understand the reliability and + feature drawbacks to choosing local storage. + + + host + This is the IP address of the Management Server. If you are using multiple + Management Servers you should enter a load balanced IP address that is reachable via + the private network. + + + default.page.size + Maximum number of items per page that can be returned by a CloudStack API command. + The limit applies at the cloud level and can vary from cloud to cloud. You can override this + with a lower value on a particular API call by using the page and pagesize API command parameters. + For more information, see the Developer's Guide. Default: 500. + + + ha.tag + The label you want to use throughout the cloud to designate certain hosts as dedicated + HA hosts. These hosts will be used only for HA-enabled VMs that are restarting due to the failure + of another host. For example, you could set this to ha_host. Specify the ha.tag value as a host tag + when you add a new host to the cloud. + + + + +
diff --git a/docs/en-US/hypervisor-host-install-firewall.xml b/docs/en-US/hypervisor-host-install-firewall.xml index ae82fc47afa..c6658731819 100644 --- a/docs/en-US/hypervisor-host-install-firewall.xml +++ b/docs/en-US/hypervisor-host-install-firewall.xml @@ -34,7 +34,7 @@ 49152 - 49216 (libvirt live migration) It depends on the firewall you are using how to open these ports. Below you'll find examples how to open these ports in RHEL/CentOS and Ubuntu. -
+
Open ports in RHEL/CentOS RHEL and CentOS use iptables for firewalling the system, you can open extra ports by executing the following iptable commands: $ iptables -I INPUT -p tcp -m tcp --dport 22 -j ACCEPT @@ -45,7 +45,7 @@ These iptable settings are not persistent accross reboots, we have to save them first. $ iptables-save > /etc/sysconfig/iptables
-
+
Open ports in Ubuntu The default firewall under Ubuntu is UFW (Uncomplicated FireWall), which is a Python wrapper around iptables. To open the required ports, execute the following commands: diff --git a/docs/en-US/hypervisor-host-install-libvirt.xml b/docs/en-US/hypervisor-host-install-libvirt.xml index d7dc47f8dbd..f3ff090463c 100644 --- a/docs/en-US/hypervisor-host-install-libvirt.xml +++ b/docs/en-US/hypervisor-host-install-libvirt.xml @@ -28,7 +28,7 @@ In order to have live migration working libvirt has to listen for unsecured TCP connections. We also need to turn off libvirts attempt to use Multicast DNS advertising. Both of these settings are in /etc/libvirt/libvirtd.conf - Set the following paramaters: + Set the following parameters: listen_tls = 0 listen_tcp = 1 tcp_port = "16509" diff --git a/docs/en-US/hypervisor-host-install-network-openvswitch.xml b/docs/en-US/hypervisor-host-install-network-openvswitch.xml index e9bf47a0d20..a16dc8e0e8d 100644 --- a/docs/en-US/hypervisor-host-install-network-openvswitch.xml +++ b/docs/en-US/hypervisor-host-install-network-openvswitch.xml @@ -69,7 +69,7 @@ we can proceed to configuring the network. First we configure eth0 vi /etc/sysconfig/network-scripts/ifcfg-eth0 - Make sure it looks similair to: + Make sure it looks similar to: In order to forward traffic to your instances you will need at least two bridges: public and private. By default these bridges are called cloudbr0 and cloudbr1, but you do have to make sure they are available on each hypervisor. The most important factor is that you keep the configuration consistent on all your hypervisors. -
+
Network example There are many ways to configure your network. In the Basic networking mode you should have two (V)LAN's, one for your private network and one for the public network. We assume that the hypervisor has one NIC (eth0) with three tagged VLAN's: @@ -41,16 +41,16 @@ On VLAN 100 we give the Hypervisor the IP-Address 192.168.42.11/24 with the gateway 192.168.42.1 The Hypervisor and Management server don't have to be in the same subnet!
-
+
Configuring the network bridges It depends on the distribution you are using how to configure these, below you'll find examples for RHEL/CentOS and Ubuntu. The goal is to have two bridges called 'cloudbr0' and 'cloudbr1' after this section. This should be used as a guideline only. The exact configuration will depend on your network layout. -
+
Configure in RHEL or CentOS The required packages were installed when libvirt was installed, we can proceed to configuring the network. First we configure eth0 vi /etc/sysconfig/network-scripts/ifcfg-eth0 - Make sure it looks similair to: + Make sure it looks similar to: Now we have the VLAN interfaces configured we can add the bridges on top of them. vi /etc/sysconfig/network-scripts/ifcfg-cloudbr0 - Now we just configure it is a plain bridge without an IP-Adress + Now we just configure it is a plain bridge without an IP-Address With this configuration you should be able to restart the network, although a reboot is recommended to see if everything works properly. Make sure you have an alternative way like IPMI or ILO to reach the machine in case you made a configuration error and the network stops functioning!
-
+
Configure in Ubuntu All the required packages were installed when you installed libvirt, so we only have to configure the network. vi /etc/network/interfaces diff --git a/docs/en-US/hypervisor-installation.xml b/docs/en-US/hypervisor-installation.xml index b0fc9f46ddb..5ee7dea696a 100644 --- a/docs/en-US/hypervisor-installation.xml +++ b/docs/en-US/hypervisor-installation.xml @@ -28,4 +28,5 @@ + diff --git a/docs/en-US/hypervisor-kvm-install-flow.xml b/docs/en-US/hypervisor-kvm-install-flow.xml index 6cc73e4fdfa..aa19e47be77 100644 --- a/docs/en-US/hypervisor-kvm-install-flow.xml +++ b/docs/en-US/hypervisor-kvm-install-flow.xml @@ -34,4 +34,5 @@ +
diff --git a/docs/en-US/hypervisor-support-for-primarystorage.xml b/docs/en-US/hypervisor-support-for-primarystorage.xml index 7c2596eac29..fdef1f2b6e0 100644 --- a/docs/en-US/hypervisor-support-for-primarystorage.xml +++ b/docs/en-US/hypervisor-support-for-primarystorage.xml @@ -22,71 +22,83 @@ under the License. -->
- Hypervisor Support for Primary Storage - The following table shows storage options and parameters for different hypervisors. - - - - - - - - - - - VMware vSphere - Citrix XenServer - KVM - - - - - Format for Disks, Templates, and - Snapshots - VMDK - VHD - QCOW2 - - - iSCSI support - VMFS - Clustered LVM - Yes, via Shared Mountpoint - - - Fiber Channel support - VMFS - Yes, via Existing SR - Yes, via Shared Mountpoint - - - NFS support - Y - Y - Y - - - - Local storage support - Y - Y - Y - - - - Storage over-provisioning - NFS and iSCSI - NFS - NFS - - - - - - XenServer uses a clustered LVM system to store VM images on iSCSI and Fiber Channel volumes and does not support over-provisioning in the hypervisor. The storage server itself, however, can support thin-provisioning. As a result the &PRODUCT; can still support storage over-provisioning by running on thin-provisioned storage volumes. - KVM supports "Shared Mountpoint" storage. A shared mountpoint is a file system path local to each server in a given cluster. The path must be the same across all Hosts in the cluster, for example /mnt/primary1. This shared mountpoint is assumed to be a clustered filesystem such as OCFS2. In this case the &PRODUCT; does not attempt to mount or unmount the storage as is done with NFS. The &PRODUCT; requires that the administrator insure that the storage is available - - With NFS storage, &PRODUCT; manages the overprovisioning. In this case the global configuration parameter storage.overprovisioning.factor controls the degree of overprovisioning. This is independent of hypervisor type. - Local storage is an option for primary storage for vSphere, XenServer, and KVM. When the local disk option is enabled, a local disk storage pool is automatically created on each host. To use local storage for the System Virtual Machines (such as the Virtual Router), set system.vm.use.local.storage to true in global configuration. - &PRODUCT; supports multiple primary storage pools in a Cluster. For example, you could provision 2 NFS servers in primary storage. Or you could provision 1 iSCSI LUN initially and then add a second iSCSI LUN when the first approaches capacity. -
+ Hypervisor Support for Primary Storage + The following table shows storage options and parameters for different hypervisors. + + + + + + + + + + + VMware vSphere + Citrix XenServer + KVM + + + + + Format for Disks, Templates, and + Snapshots + VMDK + VHD + QCOW2 + + + iSCSI support + VMFS + Clustered LVM + Yes, via Shared Mountpoint + + + Fiber Channel support + VMFS + Yes, via Existing SR + Yes, via Shared Mountpoint + + + NFS support + Y + Y + Y + + + Local storage support + Y + Y + Y + + + Storage over-provisioning + NFS and iSCSI + NFS + NFS + + + + + XenServer uses a clustered LVM system to store VM images on iSCSI and Fiber Channel volumes + and does not support over-provisioning in the hypervisor. The storage server itself, however, + can support thin-provisioning. As a result the &PRODUCT; can still support storage + over-provisioning by running on thin-provisioned storage volumes. + KVM supports "Shared Mountpoint" storage. A shared mountpoint is a file system path local to + each server in a given cluster. The path must be the same across all Hosts in the cluster, for + example /mnt/primary1. This shared mountpoint is assumed to be a clustered filesystem such as + OCFS2. In this case the &PRODUCT; does not attempt to mount or unmount the storage as is done + with NFS. The &PRODUCT; requires that the administrator insure that the storage is + available + + With NFS storage, &PRODUCT; manages the overprovisioning. In this case the global + configuration parameter storage.overprovisioning.factor controls the degree of overprovisioning. + This is independent of hypervisor type. + Local storage is an option for primary storage for vSphere, XenServer, and KVM. When the + local disk option is enabled, a local disk storage pool is automatically created on each host. + To use local storage for the System Virtual Machines (such as the Virtual Router), set + system.vm.use.local.storage to true in global configuration. + &PRODUCT; supports multiple primary storage pools in a Cluster. For example, you could + provision 2 NFS servers in primary storage. Or you could provision 1 iSCSI LUN initially and + then add a second iSCSI LUN when the first approaches capacity. +
diff --git a/docs/en-US/images/VMSnapshotButton.png b/docs/en-US/images/VMSnapshotButton.png new file mode 100644 index 00000000000..52177402198 Binary files /dev/null and b/docs/en-US/images/VMSnapshotButton.png differ diff --git a/docs/en-US/images/add-vlan-icon.png b/docs/en-US/images/add-vlan-icon.png new file mode 100644 index 00000000000..04655dc37ad Binary files /dev/null and b/docs/en-US/images/add-vlan-icon.png differ diff --git a/docs/en-US/images/revert-vm.png b/docs/en-US/images/revert-vm.png new file mode 100644 index 00000000000..04655dc37ad Binary files /dev/null and b/docs/en-US/images/revert-vm.png differ diff --git a/docs/en-US/ipv6-support.xml b/docs/en-US/ipv6-support.xml index 7367ec9ad80..c7f7744393e 100644 --- a/docs/en-US/ipv6-support.xml +++ b/docs/en-US/ipv6-support.xml @@ -75,8 +75,8 @@ Use the System VM template exclusively designed to support IPv6. Download the System - VM template from http://nfs1.lab.vmops.com/templates/routing/debian/ipv6/. + VM template from http://cloudstack.apt-get.eu/systemvm/. The concept of Default Network applies to IPv6 networks. However, unlike IPv4 diff --git a/docs/en-US/limit-accounts-domains.xml b/docs/en-US/limit-accounts-domains.xml new file mode 100644 index 00000000000..a864ee27ef3 --- /dev/null +++ b/docs/en-US/limit-accounts-domains.xml @@ -0,0 +1,371 @@ + + +%BOOK_ENTITIES; +]> + + +
+ Limiting Resource Usage + &PRODUCT; allows you to control resource usage based on the types of resources, such as CPU, + RAM, Primary storage, and Secondary storage. A new set of resource types has been added to the + existing pool of resources to support the new customization model—need-basis usage, such + as large VM or small VM. The new resource types are now broadly classified as CPU, RAM, Primary + storage, and Secondary storage. The root administrator is able to impose resource usage limit by + the following resource types for Domain, Project, and Accounts. + + + CPUs + + + Memory (RAM) + + + Primary Storage (Volumes) + + + Secondary Storage (Snapshots, Templates, ISOs) + + + To control the behaviour of this feature, the following configuration parameters have been + added: + + + + + Parameter Name + Description + + + + + max.account.cpus + Maximum number of CPU cores that can be used for an account. + Default is 40. + + + max.account.ram (MB) + Maximum RAM that can be used for an account. + Default is 40960. + + + max.account.primary.storage (GB) + Maximum primary storage space that can be used for an account. + Default is 200. + + + + max.account.secondary.storage (GB) + Maximum secondary storage space that can be used for an account. + Default is 400. + + + max.project.cpus + + Maximum number of CPU cores that can be used for an account. + Default is 40. + + + + max.project.ram (MB) + + Maximum RAM that can be used for an account. + Default is 40960. + + + + max.project.primary.storage (GB) + + Maximum primary storage space that can be used for an account. + Default is 200. + + + + max.project.secondary.storage (GB) + + Maximum secondary storage space that can be used for an account. + Default is 400. + + + + + +
+ User Permission + The root administrator, domain administrators and users are able to list resources. Ensure + that proper logs are maintained in the vmops.log and + api.log files. + + + The root admin will have the privilege to list and update resource limits. + + + The domain administrators are allowed to list and change these resource limits only + for the sub-domains and accounts under their own domain or the sub-domains. + + + The end users will the privilege to list resource limits. Use the listResourceLimits + API. + + +
+
+ Limit Usage Considerations + + + Primary or Secondary storage space refers to the stated size of the volume and not the + physical size— the actual consumed size on disk in case of thin provisioning. + + + If the admin reduces the resource limit for an account and set it to less than the + resources that are currently being consumed, the existing VMs/templates/volumes are not + destroyed. Limits are imposed only if the user under that account tries to execute a new + operation using any of these resources. For example, the existing behavior in the case of + a VM are: + + + migrateVirtualMachine: The users under that account will be able to migrate the + running VM into any other host without facing any limit issue. + + + recoverVirtualMachine: Destroyed VMs cannot be recovered. + + + + + For any resource type, if a domain has limit X, sub-domains or accounts under that + domain can have there own limits. However, the sum of resource allocated to a sub-domain + or accounts under the domain at any point of time should not exceed the value X. + For example, if a domain has the CPU limit of 40 and the sub-domain D1 and account A1 + can have limits of 30 each, but at any point of time the resource allocated to D1 and A1 + should not exceed the limit of 40. + + + If any operation needs to pass through two of more resource limit check, then the + lower of 2 limits will be enforced, For example: if an account has the VM limit of 10 and + CPU limit of 20, and a user under that account requests 5 VMs of 4 CPUs each. The user + can deploy 5 more VMs because VM limit is 10. However, the user cannot deploy any more + instances because the CPU limit has been exhausted. + + +
+
+ Per-Domain Limits + &PRODUCT; allows the configuration of limits on a domain basis. With a domain limit in + place, all users still have their account limits. They are additionally limited, as a group, + to not exceed the resource limits set on their domain. Domain limits aggregate the usage of + all accounts in the domain as well as all the accounts in all the sub-domains of that domain. + Limits set at the root domain level apply to the sum of resource usage by the accounts in all + the domains and sub-domains below that root domain. + To set a domain limit: + + + Log in to the &PRODUCT; UI. + + + In the left navigation tree, click Domains. + + + Select the domain you want to modify. The current domain limits are displayed. + A value of -1 shows that there is no limit in place. + + + Click the Edit button + + + + + editbutton.png: edits the settings. + + + + + Edit the following as per your requirement: + + + + + Parameter Name + Description + + + + + Instance Limits + The number of instances that can be used in a domain. + + + Public IP Limits + + The number of public IP addresses that can be used in a + domain. + + + Volume Limits + The number of disk volumes that can be created in a domain. + + + + Snapshot Limits + The number of snapshots that can be created in a domain. + + + Template Limits + The number of templates that can be registered in a + domain. + + + VPC limits + The number of VPCs that can be created in a domain. + + + CPU limits + + The number of CPU cores that can be used for a domain. + + + + Memory limits (MB) + + The number of RAM that can be used for a domain. + + + + Primary Storage limits (GB) + + The primary storage space that can be used for a domain. + + + + Secondary Storage limits (GB) + + The secondary storage space that can be used for a domain. + + + + + + + + Click Apply. + + +
+
+ Default Account Resource Limits + You can limit resource use by accounts. The default limits are set by using Global + configuration parameters, and they affect all accounts within a cloud. The relevant parameters + are those beginning with max.account, for example: max.account.snapshots. + To override a default limit for a particular account, set a per-account resource + limit. + + + Log in to the &PRODUCT; UI. + + + In the left navigation tree, click Accounts. + + + Select the account you want to modify. The current limits are displayed. + A value of -1 shows that there is no limit in place. + + + Click the Edit button. + + + + + editbutton.png: edits the settings + + + + + Edit the following as per your requirement: + + + + + Parameter Name + Description + + + + + Instance Limits + The number of instances that can be used in an account. + The default is 20. + + + Public IP Limits + + The number of public IP addresses that can be used in an account. + The default is 20. + + + Volume Limits + The number of disk volumes that can be created in an account. + The default is 20. + + + Snapshot Limits + The number of snapshots that can be created in an account. + The default is 20. + + + Template Limits + The number of templates that can be registered in an account. + The default is 20. + + + VPC limits + The number of VPCs that can be created in an account. + The default is 20. + + + CPU limits + + The number of CPU cores that can be used for an account. + The default is 40. + + + Memory limits (MB) + + The number of RAM that can be used for an account. + The default is 40960. + + + Primary Storage limits (GB) + + The primary storage space that can be used for an account. + The default is 200. + + + Secondary Storage limits (GB) + + The secondary storage space that can be used for an account. + The default is 400. + + + + + + + Click Apply. + + +
+
diff --git a/docs/en-US/lxc-install.xml b/docs/en-US/lxc-install.xml new file mode 100644 index 00000000000..a80c18afdd6 --- /dev/null +++ b/docs/en-US/lxc-install.xml @@ -0,0 +1,110 @@ + + + %BOOK_ENTITIES; + ]> + + + +
+ LXC Installation and Configuration +
+ System Requirements for LXC Hosts + LXC requires the Linux kernel cgroups functionality which is available starting 2.6.24. Although you are not required to run these distributions, the following are recommended: + + CentOS / RHEL: 6.3 + Ubuntu: 12.04(.1) + + The main requirement for LXC hypervisors is the libvirt and Qemu version. No matter what + Linux distribution you are using, make sure the following requirements are met: + + libvirt: 1.0.0 or higher + Qemu/KVM: 1.0 or higher + + The default bridge in &PRODUCT; is the Linux native bridge implementation (bridge module). &PRODUCT; includes an option to work with OpenVswitch, the requirements are listed below + + libvirt: 1.0.0 or higher + openvswitch: 1.7.1 or higher + + In addition, the following hardware requirements apply: + + Within a single cluster, the hosts must be of the same distribution version. + All hosts within a cluster must be homogenous. The CPUs must be of the same type, count, and feature flags. + Must support HVM (Intel-VT or AMD-V enabled) + 64-bit x86 CPU (more cores results in better performance) + 4 GB of memory + At least 1 NIC + When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running + +
+
+ LXC Installation Overview + LXC does not have any native system VMs, instead KVM will be used to run system VMs. This means that your host will need to support both LXC and KVM, thus most of the installation and configuration will be identical to the KVM installation. The material in this section doesn't duplicate KVM installation docs. It provides the &PRODUCT;-specific steps that are needed to prepare a KVM host to work with &PRODUCT;. + Before continuing, make sure that you have applied the latest updates to your host. + It is NOT recommended to run services on this host not controlled by &PRODUCT;. + The procedure for installing an LXC Host is: + + Prepare the Operating System + Install and configure libvirt + Configure Security Policies (AppArmor and SELinux) + Install and configure the Agent + +
+
+ +
+
+ Install and configure the Agent + To manage LXC instances on the host &PRODUCT; uses a Agent. This Agent communicates with the Management server and controls all the instances on the host. + First we start by installing the agent: + In RHEL or CentOS: + $ yum install cloud-agent + In Ubuntu: + $ apt-get install cloud-agent + Next step is to update the Agent configuration setttings. The settings are in /etc/cloudstack/agent/agent.properties + + + Set the Agent to run in LXC mode: + hypervisor.type=lxc + + + Optional: If you would like to use direct networking (instead of the default bridge networking), configure these lines: + libvirt.vif.driver=com.cloud.hypervisor.kvm.resource.DirectVifDriver + network.direct.source.mode=private + network.direct.device=eth0 + + + The host is now ready to be added to a cluster. This is covered in a later section, see . It is recommended that you continue to read the documentation before adding the host! +
+
+ +
+
+ +
+
+ +
+
+ +
+
+ +
+
diff --git a/docs/en-US/lxc-topology-req.xml b/docs/en-US/lxc-topology-req.xml new file mode 100644 index 00000000000..315863dd34c --- /dev/null +++ b/docs/en-US/lxc-topology-req.xml @@ -0,0 +1,24 @@ + + +%BOOK_ENTITIES; +]> + +
+ LXC Topology Requirements + The Management Servers communicate with LXC hosts on port 22 (ssh). +
diff --git a/docs/en-US/management-server-install-prepare-os.xml b/docs/en-US/management-server-install-prepare-os.xml index ef78731e81a..02453a0b207 100644 --- a/docs/en-US/management-server-install-prepare-os.xml +++ b/docs/en-US/management-server-install-prepare-os.xml @@ -30,7 +30,7 @@ Check for a fully qualified hostname. hostname --fqdn - This should return a fully qualified hostname such as "managament1.lab.example.org". If it does not, edit /etc/hosts so that it does. + This should return a fully qualified hostname such as "management1.lab.example.org". If it does not, edit /etc/hosts so that it does. Make sure that the machine can reach the Internet. diff --git a/docs/en-US/management-server-install-systemvm.xml b/docs/en-US/management-server-install-systemvm.xml index 8dc73deb992..928b95618fa 100644 --- a/docs/en-US/management-server-install-systemvm.xml +++ b/docs/en-US/management-server-install-systemvm.xml @@ -53,6 +53,10 @@ For KVM: # /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h kvm -s <optional-management-server-secret-key> -F + + For LXC: + # /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h lxc -s <optional-management-server-secret-key> -F + On Ubuntu, use the following path instead: # /usr/lib/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt diff --git a/docs/en-US/management-server-lb.xml b/docs/en-US/management-server-lb.xml index 9aee1548026..13f87560e10 100644 --- a/docs/en-US/management-server-lb.xml +++ b/docs/en-US/management-server-lb.xml @@ -58,7 +58,7 @@ - In addition to above settings, the adminstrator is responsible for setting the 'host' global + In addition to above settings, the administrator is responsible for setting the 'host' global config value from the management server IP to load balancer virtual IP address. If the 'host' value is not set to the VIP for Port 8250 and one of your management servers crashes, the UI is still available but the system VMs will not be able to contact the management server. diff --git a/docs/en-US/minimum-system-requirements.xml b/docs/en-US/minimum-system-requirements.xml index 0e497dd33f1..870ef68eae4 100644 --- a/docs/en-US/minimum-system-requirements.xml +++ b/docs/en-US/minimum-system-requirements.xml @@ -57,7 +57,7 @@ If DHCP is used for hosts, ensure that no conflict occurs between DHCP server used for these hosts and the DHCP router created by &PRODUCT;. Latest hotfixes applied to hypervisor software When you deploy &PRODUCT;, the hypervisor host must not have any VMs already running - All hosts within a cluster must be homogenous. The CPUs must be of the same type, count, and feature flags. + All hosts within a cluster must be homogeneous. The CPUs must be of the same type, count, and feature flags. Hosts have additional requirements depending on the hypervisor. See the requirements listed at the top of the Installation section for your chosen hypervisor: @@ -68,6 +68,7 @@ +
diff --git a/docs/en-US/multiple-ip-nic.xml b/docs/en-US/multiple-ip-nic.xml new file mode 100644 index 00000000000..561ba0757b5 --- /dev/null +++ b/docs/en-US/multiple-ip-nic.xml @@ -0,0 +1,91 @@ + + +%BOOK_ENTITIES; +]> + + +
+ Configuring Multiple IP Addresses on a Single NIC + &PRODUCT; now provides you the ability to associate multiple private IP addresses per guest + VM NIC. This feature is supported on all the network configurations—Basic, Advanced, and + VPC. Security Groups, Static NAT and Port forwarding services are supported on these additional + IPs. In addition to the primary IP, you can assign additional IPs to the guest VM NIC. Up to 256 + IP addresses are allowed per NIC. + As always, you can specify an IP from the guest subnet; if not specified, an IP is + automatically picked up from the guest VM subnet. You can view the IPs associated with for each + guest VM NICs on the UI. You can apply NAT on these additional guest IPs by using firewall + configuration in the &PRODUCT; UI. You must specify the NIC to which the IP should be + associated. + This feature is supported on XenServer, KVM, and VMware hypervisors. + + You need to configure the secondary IP address on the guest VM. &PRODUCT; will + not configure the acquired IP address on the VM. Ensure that you assign IPs to NIC each + time the VM reboots. + + Some of the use cases are described below: + + + Building network appliances: Network appliances, such as firewalls and load balancers, + generally work best when they have access to multiple IP addresses on the network + interface. + + + Moving private IP addresses between interfaces or instances. Applications that are bound + to specific IP addresses can be moved between instances. + + + Hosting multiple SSL Websites on a single instance. You can install multiple SSL + certificates on a single instance, each associated with a distinct IP address. + + +
+ Assigning Additional IPs to a VM + + + Log in to the &PRODUCT; UI. + + + In the left navigation bar, click Instances. + + + Click the name of the instance you want to work with. + + + In the Details tab, click NICs. + + + Click View All. + + + Click Acquire New IP, and click Yes in the confirmation dialog. + You are prompted for confirmation because, typically, IP addresses are a limited + resource. Within a few moments, the new IP address should appear with the state Allocated. + You can now use the IP address in Port Forwarding or StaticNAT rules. + + +
+
+ Port Forwarding and StaticNAT Services Changes + Because multiple IPs can be associated per NIC, you are allowed to select a desired IP for + the Port Forwarding and StaticNAT services. The default is the primary IP. To enable this + functionality, an extra optional parameter 'vmguestip' is added to the Port forwarding and + StaticNAT APIs (enableStaticNat, createIpForwardingRule) to indicate on what IP address NAT + need to be configured. If vmguestip is passed, NAT is configured on the specified private IP + of the VM. if not passed, NAT is configured on the primary IP of the VM. +
+
diff --git a/docs/en-US/network-offerings.xml b/docs/en-US/network-offerings.xml index 0a7b8e78e3b..8c685bfc903 100644 --- a/docs/en-US/network-offerings.xml +++ b/docs/en-US/network-offerings.xml @@ -22,25 +22,66 @@ under the License. -->
- Network Offerings - For the most up-to-date list of supported network services, see the &PRODUCT; UI or call listNetworkServices. - A network offering is a named set of network services, such as: - - DHCP - DNS - Source NAT - Static NAT - Port Forwarding - Load Balancing - Firewall - VPN - Optional) Name one of several available providers to use for a given service, such as Juniper for the firewall - (Optional) Network tag to specify which physical network to use - - When creating a new VM, the user chooses one of the available network offerings, and that determines which network services the VM can use. - The &PRODUCT; administrator can create any number of custom network offerings, in addition to the default network offerings provided by &PRODUCT;. By creating multiple custom network offerings, you can set up your cloud to offer different classes of service on a single multi-tenant physical network. For example, while the underlying physical wiring may be the same for two tenants, tenant A may only need simple firewall protection for their website, while tenant B may be running a web server farm and require a scalable firewall solution, load balancing solution, and alternate networks for accessing the database backend. - If you create load balancing rules while using a network service offering that includes an external load balancer device such as NetScaler, and later change the network service offering to one that uses the &PRODUCT; virtual router, you must create a firewall rule on the virtual router for each of your existing load balancing rules so that they continue to function. - When creating a new virtual network, the &PRODUCT; administrator chooses which network offering to enable for that network. Each virtual network is associated with one network offering. A virtual network can be upgraded or downgraded by changing its associated network offering. If you do this, be sure to reprogram the physical network to match. - &PRODUCT; also has internal network offerings for use by &PRODUCT; system VMs. These network offerings are not visible to users but can be modified by administrators. - + Network Offerings + + For the most up-to-date list of supported network services, see the &PRODUCT; UI or call + listNetworkServices. + + A network offering is a named set of network services, such as: + + + DHCP + + + DNS + + + Source NAT + + + Static NAT + + + Port Forwarding + + + Load Balancing + + + Firewall + + + VPN + + + (Optional) Name one of several available providers to use for a given service, such as + Juniper for the firewall + + + (Optional) Network tag to specify which physical network to use + + + When creating a new VM, the user chooses one of the available network offerings, and that + determines which network services the VM can use. + The &PRODUCT; administrator can create any number of custom network offerings, in addition + to the default network offerings provided by &PRODUCT;. By creating multiple custom network + offerings, you can set up your cloud to offer different classes of service on a single + multi-tenant physical network. For example, while the underlying physical wiring may be the same + for two tenants, tenant A may only need simple firewall protection for their website, while + tenant B may be running a web server farm and require a scalable firewall solution, load + balancing solution, and alternate networks for accessing the database backend. + + If you create load balancing rules while using a network service offering that includes an + external load balancer device such as NetScaler, and later change the network service offering + to one that uses the &PRODUCT; virtual router, you must create a firewall rule on the virtual + router for each of your existing load balancing rules so that they continue to + function. + + When creating a new virtual network, the &PRODUCT; administrator chooses which network + offering to enable for that network. Each virtual network is associated with one network + offering. A virtual network can be upgraded or downgraded by changing its associated network + offering. If you do this, be sure to reprogram the physical network to match. + &PRODUCT; also has internal network offerings for use by &PRODUCT; system VMs. These network + offerings are not visible to users but can be modified by administrators. +
diff --git a/docs/en-US/networks.xml b/docs/en-US/networks.xml index f877aa55584..c2090d2b1b4 100644 --- a/docs/en-US/networks.xml +++ b/docs/en-US/networks.xml @@ -32,6 +32,7 @@ xmlns:xi="http://www.w3.org/2001/XInclude"/> + @@ -44,6 +45,7 @@ + diff --git a/docs/en-US/non-contiguous-vlan.xml b/docs/en-US/non-contiguous-vlan.xml new file mode 100644 index 00000000000..79fac835c7e --- /dev/null +++ b/docs/en-US/non-contiguous-vlan.xml @@ -0,0 +1,68 @@ + + +%BOOK_ENTITIES; +]> + + +
+ Non Contiguous VLAN Ranges + &PRODUCT; provides you with the flexibility to add non contiguous VLAN ranges to your + network. The administrator can either update an existing VLAN range or add multiple non + contiguous VLAN ranges while creating a zone. You can also use the UpdatephysicalNetwork API to + extend the VLAN range. +
+ Adding a New VLAN Range + + Log in to the CloudPlatform UI as an administrator or end user. + + Ensure that the VLAN range does not already exist. + + + Check whether the new VLAN range overlaps with any existing ones. If overlaps, extend + the existing range. If does not overlap, add the new range. + + + In the left navigation, choose Infrastructure. On Zones, click View More, then click the zone to + which you want to work with. + + + Click Physical Network. + + + In the Guest node of the diagram, click Configure. + + + Click Add VLAN Ranges button + + + + + add-vlan-ico.png: button to add a VLAN range. + + + The Add VLAN Ranges dialog is displayed. + + + Specify the start and end of the VLAN range. + + + Click OK. + + +
+
diff --git a/docs/en-US/prepare-system-vm-template.xml b/docs/en-US/prepare-system-vm-template.xml index b53a509b4a1..35cc7e979bc 100644 --- a/docs/en-US/prepare-system-vm-template.xml +++ b/docs/en-US/prepare-system-vm-template.xml @@ -60,6 +60,10 @@ For KVM: # /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h kvm -s <optional-management-server-secret-key> -F + + For LXC: + # /usr/lib64/cloud/common/scripts/storage/secondary/cloud-install-sys-tmplt -m /mnt/secondary -u http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2 -h lxc -s <optional-management-server-secret-key> -F + diff --git a/docs/en-US/set-up-network-for-users.xml b/docs/en-US/set-up-network-for-users.xml index c91565a5456..c22babc7232 100644 --- a/docs/en-US/set-up-network-for-users.xml +++ b/docs/en-US/set-up-network-for-users.xml @@ -1,5 +1,5 @@ - %BOOK_ENTITIES; ]> @@ -21,11 +21,10 @@ specific language governing permissions and limitations under the License. --> - - Setting Up Networking for Users - - - - + Setting Up Networking for Users + + + + diff --git a/docs/en-US/source-build.xml b/docs/en-US/source-build.xml index 33218962174..8504385ee29 100644 --- a/docs/en-US/source-build.xml +++ b/docs/en-US/source-build.xml @@ -25,11 +25,11 @@
Building &PRODUCT; from Source - Prior to the 4.0.0 incubating release, Ant was used to build &PRODUCT;. Starting with 4.0.0 a migration to Maven is underway. + Prior to the 4.0.0 incubating release, Ant was used to build &PRODUCT;. A migration to Maven started in the 4.0.0 cycle, and has completed in 4.1.0. The website and the wiki contain up to date information on the build procedure at: https://cwiki.apache.org/CLOUDSTACK/building-with-maven.html - http://incubator.apache.org/cloudstack/develop/environment.html + https://cwiki.apache.org/CLOUDSTACK/setting-up-cloudstack-development-environment.html The overarching steps to build &PRODUCT; are:. diff --git a/docs/en-US/source.xml b/docs/en-US/source.xml index 5d911c23050..ea30000c6a9 100644 --- a/docs/en-US/source.xml +++ b/docs/en-US/source.xml @@ -34,4 +34,5 @@ + diff --git a/docs/en-US/topology-req.xml b/docs/en-US/topology-req.xml index 65c9c2ea5c6..75fe69b41a4 100644 --- a/docs/en-US/topology-req.xml +++ b/docs/en-US/topology-req.xml @@ -28,4 +28,5 @@ -
+ +
diff --git a/docs/en-US/translating-documentation.xml b/docs/en-US/translating-documentation.xml index afe27658f1a..4d5e3d21b43 100644 --- a/docs/en-US/translating-documentation.xml +++ b/docs/en-US/translating-documentation.xml @@ -32,7 +32,7 @@ Using the Transifex client and pushing your translated strings to the website. - Once a translation is complete, a site admin will pull the translated strings within the &PRODUCT; repository, build the documenation and publish it. + Once a translation is complete, a site admin will pull the translated strings within the &PRODUCT; repository, build the documentation and publish it. For instructions on how to use the Transifex website see http://sebgoa.blogspot.ch/2012/11/translating-apache-cloudstack-docs-with.html For instructions on how to use the Transifex client to translate from the command line see http://sebgoa.blogspot.ch/2012/12/using-transifex-client-to-translate.html
diff --git a/docs/en-US/troubleshooting-working-with-server-logs.xml b/docs/en-US/troubleshooting-working-with-server-logs.xml index 1017bf57252..fa0f78cae3d 100644 --- a/docs/en-US/troubleshooting-working-with-server-logs.xml +++ b/docs/en-US/troubleshooting-working-with-server-logs.xml @@ -24,10 +24,10 @@
Working with Server Logs - The &PRODUCT; Management Server logs all web site, middle tier, and database activities for diagnostics purposes in /var/log/cloud/management/. The &PRODUCT; logs a variety of error messages. We recommend this command to find the problematic output in the Management Server log:. + The &PRODUCT; Management Server logs all web site, middle tier, and database activities for diagnostics purposes in /var/log/cloudstack/management/. The &PRODUCT; logs a variety of error messages. We recommend this command to find the problematic output in the Management Server log:. When copying and pasting a command, be sure the command has pasted as a single line before executing. Some document viewers may introduce unwanted line breaks in copied text. - grep -i -E 'exception|unable|fail|invalid|leak|warn|error' /var/log/cloud/management/management-server.log + grep -i -E 'exception|unable|fail|invalid|leak|warn|error' /var/log/cloudstack/management/management-server.log The &PRODUCT; processes requests with a Job ID. If you find an error in the logs and you are interested in debugging the issue you can grep for this job ID in the management server log. For example, suppose that you find the following ERROR message: @@ -37,5 +37,5 @@ grep "job-1076)" management-server.log - The &PRODUCT; Agent Server logs its activities in /var/log/cloud/agent/. + The &PRODUCT; Agent Server logs its activities in /var/log/cloudstack/agent/.
diff --git a/docs/en-US/using-netscaler-load-balancers.xml b/docs/en-US/using-netscaler-load-balancers.xml index c2044de527b..7d18331f106 100644 --- a/docs/en-US/using-netscaler-load-balancers.xml +++ b/docs/en-US/using-netscaler-load-balancers.xml @@ -3,58 +3,88 @@ %BOOK_ENTITIES; ]> - -
- About Using a NetScaler Load Balancer - Citrix NetScaler is supported as an external network element for load balancing in zones that use advanced networking (also called advanced zones). Set up an external load balancer when you want to provide load balancing through means other than &PRODUCT;’s provided virtual router. - The NetScaler can be set up in direct (outside the firewall) mode. It must be added before any load balancing rules are deployed on guest VMs in the zone. - The functional behavior of the NetScaler with &PRODUCT; is the same as described in the &PRODUCT; documentation for using an F5 external load balancer. The only exception is that the F5 supports routing domains, and NetScaler does not. NetScaler can not yet be used as a firewall. - The Citrix NetScaler comes in three varieties. The following table summarizes how these variants are treated in &PRODUCT;. - - - - - NetScaler ADC Type - Description of Capabilities - &PRODUCT; Supported Features - - - - - MPX - Physical appliance. Capable of deep packet inspection. Can act as application firewall and load balancer - In advanced zones, load balancer functionality fully supported without limitation. In basic zones, static NAT, elastic IP (EIP), and elastic load balancing (ELB) are also provided - - - - VPX - Virtual appliance. Can run as VM on XenServer, ESXi, and Hyper-V hypervisors. Same functionality as MPX - Supported only on ESXi. Same functional support as for MPX. &PRODUCT; will treat VPX and MPX as the same device type - - - SDX - Physical appliance. Can create multiple fully isolated VPX instances on a single appliance to support multi-tenant usage - &PRODUCT; will dynamically provision, configure, and manage the lifecycle of VPX instances on the SDX. Provisioned instances are added into &PRODUCT; automatically – no manual configuration by the administrator is required. Once a VPX instance is added into &PRODUCT;, it is treated the same as a VPX on an ESXi host. - - - - + About Using a NetScaler Load Balancer + Citrix NetScaler is supported as an external network element for load balancing in zones + that use isolated networking in advanced zones. Set up an external load balancer when you want + to provide load balancing through means other than &PRODUCT;’s provided virtual router. + + In a Basic zone, load balancing service is supported only if Elastic IP or Elastic LB + services are enabled. + + When NetScaler load balancer is used to provide EIP or ELB services in a Basic zone, ensure + that all guest VM traffic must enter and exit through the NetScaler device. When inbound traffic + goes through the NetScaler device, traffic is routed by using the NAT protocol depending on the + EIP/ELB configured on the public IP to the private IP. The traffic that is originated from the + guest VMs usually goes through the layer 3 router. To ensure that outbound traffic goes through + NetScaler device providing EIP/ELB, layer 3 router must have a policy-based routing. A + policy-based route must be set up so that all traffic originated from the guest VM's are + directed to NetScaler device. This is required to ensure that the outbound traffic from the + guest VM's is routed to a public IP by using NAT.For more information on Elastic IP, see . + The NetScaler can be set up in direct (outside the firewall) mode. It must be added before + any load balancing rules are deployed on guest VMs in the zone. + The functional behavior of the NetScaler with &PRODUCT; is the same as described in the + &PRODUCT; documentation for using an F5 external load balancer. The only exception is that the + F5 supports routing domains, and NetScaler does not. NetScaler can not yet be used as a + firewall. + To install and enable an external load balancer for &PRODUCT; management, see . + External Guest Load Balancer Integration in the Installation + Guide. + + The Citrix NetScaler comes in three varieties. The following table summarizes how these + variants are treated in &PRODUCT;. + + + + + NetScaler ADC Type + Description of Capabilities + &PRODUCT; Supported Features + + + + + MPX + Physical appliance. Capable of deep packet inspection. Can act as application + firewall and load balancer + In advanced zones, load balancer functionality fully supported without + limitation. In basic zones, static NAT, elastic IP (EIP), and elastic load balancing + (ELB) are also provided. + + + VPX + Virtual appliance. Can run as VM on XenServer, ESXi, and Hyper-V hypervisors. + Same functionality as MPX + Supported on ESXi and XenServer. Same functional support as for MPX. + &PRODUCT; will treat VPX and MPX as the same device type. + + + SDX + Physical appliance. Can create multiple fully isolated VPX instances on a + single appliance to support multi-tenant usage + &PRODUCT; will dynamically provision, configure, and manage the life cycle of + VPX instances on the SDX. Provisioned instances are added into &PRODUCT; automatically + – no manual configuration by the administrator is required. Once a VPX instance is + added into &PRODUCT;, it is treated the same as a VPX on an ESXi host. + + + +
diff --git a/docs/en-US/using-sshkeys.xml b/docs/en-US/using-sshkeys.xml index cd10d68470a..f34dfa0c15b 100644 --- a/docs/en-US/using-sshkeys.xml +++ b/docs/en-US/using-sshkeys.xml @@ -92,7 +92,7 @@ KfEEuzcCUIxtJYTahJ1pvlFkQ8anpuxjSEDp8x/18bq3 After you save the SSH keypair file, you must create an instance by using the template that you created at . Ensure that you use the same SSH key name that you created at . You cannot create the instance by using the GUI at this time and associate the instance with the newly created SSH keypair. A sample curl command to create a new instance is: - curl --globoff http://localhost:<port numbet>/?command=deployVirtualMachine\&zoneId=1\&serviceOfferingId=18727021-7556-4110-9322-d625b52e0813\&templateId=e899c18a-ce13-4bbf-98a9-625c5026e0b5\&securitygroupids=ff03f02f-9e3b-48f8-834d-91b822da40c5\&account=admin\&domainid=1\&keypair=keypair-doc + curl --globoff http://localhost:<port number>/?command=deployVirtualMachine\&zoneId=1\&serviceOfferingId=18727021-7556-4110-9322-d625b52e0813\&templateId=e899c18a-ce13-4bbf-98a9-625c5026e0b5\&securitygroupids=ff03f02f-9e3b-48f8-834d-91b822da40c5\&account=admin\&domainid=1\&keypair=keypair-doc Substitute the template, service offering and security group IDs (if you are using the security group feature) that are in your cloud environment.
diff --git a/docs/en-US/virtual-machines.xml b/docs/en-US/virtual-machines.xml index 7c74932b649..802e8e1702f 100644 --- a/docs/en-US/virtual-machines.xml +++ b/docs/en-US/virtual-machines.xml @@ -26,7 +26,9 @@ + + diff --git a/docs/en-US/vlan-provisioning.xml b/docs/en-US/vlan-provisioning.xml index 9345647d47a..d37be16fe5e 100644 --- a/docs/en-US/vlan-provisioning.xml +++ b/docs/en-US/vlan-provisioning.xml @@ -40,4 +40,6 @@ different physical NIC and use the same set of VLANs if you run out of VLANs. Another advantage is that you can use the same set of IPs for different customers, each one with their own routers and the guest networks on different physical NICs. + +
diff --git a/docs/en-US/vm-snapshots.xml b/docs/en-US/vm-snapshots.xml new file mode 100644 index 00000000000..3e72fe40ff6 --- /dev/null +++ b/docs/en-US/vm-snapshots.xml @@ -0,0 +1,148 @@ + + +%BOOK_ENTITIES; +]> + + +
+ Virtual Machine Snapshots for VMware + (VMware hosts only) + In addition to the existing &PRODUCT; ability to snapshot individual VM volumes, + you can now take a VM snapshot to preserve all the VM's data volumes as well as (optionally) its CPU/memory state. + This is useful for quick restore of a VM. + For example, you can snapshot a VM, then make changes such as software upgrades. + If anything goes wrong, simply restore the VM to its previous state using the previously saved VM snapshot. + + The snapshot is created using the VMware native snapshot facility. The VM snapshot + includes not only the data volumes, but optionally also whether the VM is running or + turned off (CPU state) and the memory contents. The snapshot is stored in &PRODUCT;'s + primary storage. + VM snapshots can have a parent/child relationship. + Each successive snapshot of the same VM is the child of the snapshot that came before it. + Each time you take an additional snapshot of the same VM, it saves only the differences + between the current state of the VM and the state stored in the most recent previous snapshot. + The previous snapshot becomes a parent, and the new snapshot is its child. + It is possible to create a long chain of these parent/child snapshots, + which amount to a "redo" record leading from the current state of the VM back to the + original. + If you need more information about VM snapshots, check out the VMware documentation + and the VMware Knowledge Base, especially + Understanding virtual machine snapshots. +
+ Limitations on VM Snapshots + + If a VM has some stored snapshots, you can't attach new volume to the VM + or delete any existing volumes. + If you change the volumes on the VM, it would become impossible to restore the VM snapshot + which was created with the previous volume structure. + If you want to attach a volume to such a VM, first delete its snapshots. + + VM snapshots which include both data volumes and memory can't be kept if you change the VM's + service offering. Any existing VM snapshots of this type will be discarded. + + You can't make a VM snapshot at the same time as you are taking a volume + snapshot. + + + The "quiesce" option is not supported. This option is provided by the underlying + VMware snapshot facility so that you can choose whether to quiesce the file system + on a running virtual machine before taking the snapshot. In &PRODUCT;, the quiesce option is always + set to false; the file system is not quiesced before taking a snapshot of a running VM. + + + You should use only &PRODUCT; to create VM snapshots on VMware hosts managed by &PRODUCT;. + Any snapshots that you make directly on vSphere will not be tracked in &PRODUCT;. + +
+
+ Configuring VM Snapshots + The cloud administrator can use global configuration variables to control the behavior of VM snapshots. + To set these variables, go through the Global Settings area of the &PRODUCT; UI. + + + + + Configuration Setting Name + Description + + + + + vmsnapshots.max + The maximum number of VM snapshots that can be saved for any given virtual machine in the cloud. + The total possible number of VM snapshots in the cloud is (number of VMs) * vmsnapshots.max. + If the number of snapshots for any VM ever hits the maximum, the older ones are removed + by the snapshot expunge job. + + + + vmsnapshot.create.wait + Number of seconds to wait for a snapshot job to succeed before declaring failure and issuing an error. + + + + +
+
+ Using VM Snapshots + To create a VM snapshot using the &PRODUCT; UI: + + Log in to the &PRODUCT; UI as a user or administrator. + Click Instances. + Click the name of the VM you want to snapshot. + Click the Take VM Snapshot button. + + + + + + If a snapshot is already in progress, then clicking this button will have no effect. + + Provide a name and description. These will be displayed in the VM Snapshots list. + (For running VMs only) If you want to include the VM's memory in the snapshot, click the + Memory checkbox. This saves the CPU and memory state of the virtual machine. If you + don't check this box, then only the current state of the VM disk is saved. Checking + this box makes the snapshot take longer. + Click OK. + + To delete a snapshot or restore a VM to the state saved in a particular snapshot: + + Navigate to the VM as described in the earlier steps. + Click View VM Snapshots. + In the list of snapshots, click the name of the snapshot you want to work with. + Depending on what you want to do: + To delete the snapshot, click the Delete button. + + + + + + To revert to the snapshot, click the Revert button. + + + + + + + + VM snapshots are deleted automatically when a VM is destroyed. + You don't have to manually delete the snapshots in this case. +
+
diff --git a/docs/en-US/vmware-cluster-config-dvswitch.xml b/docs/en-US/vmware-cluster-config-dvswitch.xml index 3e1e37c0941..3468c1bea4e 100644 --- a/docs/en-US/vmware-cluster-config-dvswitch.xml +++ b/docs/en-US/vmware-cluster-config-dvswitch.xml @@ -47,11 +47,12 @@ VMware VDS does not support multiple VDS per traffic type. If a user has many VDS - switches, only one can be used for Guest traffic and one for Public traffic. + switches, only one can be used for Guest traffic and another one for Public + traffic. - Management and Storage network does not support VDS and use Standard Switch for these - networks. + Management and Storage network does not support VDS. Therefore, use Standard Switch + for these networks.
@@ -64,7 +65,7 @@ Additionally, &PRODUCT; uses VDS for virtual network infrastructure if the value of vmware.use.dvswitch parameter is true and the value of vmware.use.nexus.dvswitch parameter is false. - &PRODUCT; supports configuring virtual networks in a deployment with a mix of Virtual + &PRODUCT; supports orchestration of virtual networks in a deployment with a mix of Virtual Distributed Switch, Standard Virtual Switch and Nexus 1000v Virtual Switch.
@@ -100,8 +101,8 @@ vCenter Host - Enter the host name or the IP address of the vCenter host where you have - deployed the Nexus virtual switch. + Enter the name or the IP address of the vCenter host where you have deployed the VMware + VDS. vCenter User name @@ -125,13 +126,13 @@ Public Traffic vSwitch Type This option is displayed only if you enable the Override Public Traffic - option. Select VMware vNetwork Distributed Virtual Switch. If the - vmware.use.dvswitch global parameter is true, the default option will be VMware - vNetwork Distributed Virtual Switch. + option. Select VMware vNetwork Distributed Virtual Switch. + If the vmware.use.dvswitch global parameter is true, the default option will be + VMware vNetwork Distributed Virtual Switch. Public Traffic vSwitch Name - Specify a name to identify the switch. + Name of virtual switch to be used for the public traffic. Override Guest Traffic @@ -141,24 +142,24 @@ Guest Traffic vSwitch Type This option is displayed only if you enable the Override Guest Traffic - option. Select VMware vNetwork Distributed Virtual Switch. If the - vmware.use.dvswitch global parameter is true, the default option will be VMware - vNetwork Distributed Virtual Switch. + option. Select VMware vNetwork Distributed Virtual Switch. + If the vmware.use.dvswitch global parameter is true, the default option will be + VMware vNetwork Distributed Virtual Switch. Guest Traffic vSwitch Name - Specify a name to identify the switch. + Name of virtual switch to be used for guest traffic.
- Removing Nexus Virtual Switch + Removing VMware Virtual Switch - In the vCenter datacenter that is served by the VMware dvSwitch, ensure that you - delete all the hosts in the corresponding cluster. + In the vCenter datacenter that is served by the VDS, ensure that you delete all the + hosts in the corresponding cluster. Log in with Admin permissions to the &PRODUCT; administrator UI. diff --git a/docs/en-US/vmware-install.xml b/docs/en-US/vmware-install.xml index 81c9a49b038..fd88fc7c0cb 100644 --- a/docs/en-US/vmware-install.xml +++ b/docs/en-US/vmware-install.xml @@ -1,5 +1,5 @@ - %BOOK_ENTITIES; ]> @@ -11,7 +11,9 @@ to you under the Apache License, Version 2.0 (the "License"); you may not use this file except in compliance with the License. You may obtain a copy of the License at + http://www.apache.org/licenses/LICENSE-2.0 + Unless required by applicable law or agreed to in writing, software distributed under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY diff --git a/docs/en-US/vmware-requirements.xml b/docs/en-US/vmware-requirements.xml index 207a4566de8..d7a6d70e6a4 100644 --- a/docs/en-US/vmware-requirements.xml +++ b/docs/en-US/vmware-requirements.xml @@ -68,7 +68,7 @@ vCenter must be configured to use the standard port 443 so that it can communicate with the &PRODUCT; Management Server. You must re-install VMware ESXi if you are going to re-use a host from a previous install. &PRODUCT; requires VMware vSphere 4.1 or 5.0. VMware vSphere 4.0 is not supported. - All hosts must be 64-bit and must support HVM (Intel-VT or AMD-V enabled). All hosts within a cluster must be homogenous. That means the CPUs must be of the same type, count, and feature flags. + All hosts must be 64-bit and must support HVM (Intel-VT or AMD-V enabled). All hosts within a cluster must be homogeneous. That means the CPUs must be of the same type, count, and feature flags. The &PRODUCT; management network must not be configured as a separate virtual network. The &PRODUCT; management network is the same as the vCenter management network, and will inherit its configuration. See . &PRODUCT; requires ESXi. ESX is not supported. All resources used for &PRODUCT; must be used for &PRODUCT; only. &PRODUCT; cannot share instance of ESXi or storage with other management consoles. Do not share the same storage volumes that will be used by &PRODUCT; with a different set of ESXi servers that are not managed by &PRODUCT;. diff --git a/docs/en-US/whats-new.xml b/docs/en-US/whats-new.xml index 252f87d0543..295b53220e1 100644 --- a/docs/en-US/whats-new.xml +++ b/docs/en-US/whats-new.xml @@ -21,7 +21,11 @@ What's New in the API? The following describes any new major features of each &PRODUCT; version as it applies to - API usage. + API usage. +
+ What's New in the API for 4.2 + +
What's New in the API for 4.1 diff --git a/docs/en-US/work-with-usage.xml b/docs/en-US/work-with-usage.xml index 00a7fb5df81..00172934644 100644 --- a/docs/en-US/work-with-usage.xml +++ b/docs/en-US/work-with-usage.xml @@ -1,5 +1,5 @@ - %BOOK_ENTITIES; ]> @@ -21,16 +21,18 @@ specific language governing permissions and limitations under the License. --> - - Working with Usage - The Usage Server is an optional, separately-installed part of &PRODUCT; that provides aggregated usage records which you can use to create billing integration for &PRODUCT;. The Usage Server works by taking data from the events log and creating summary usage records that you can access using the listUsageRecords API call. - The usage records show the amount of resources, such as VM run time or template storage - space, consumed by guest instances. - The Usage Server runs at least once per day. It can be configured to run multiple times per day. - - - - - + Working with Usage + The Usage Server is an optional, separately-installed part of &PRODUCT; that provides + aggregated usage records which you can use to create billing integration for &PRODUCT;. The + Usage Server works by taking data from the events log and creating summary usage records that + you can access using the listUsageRecords API call. + The usage records show the amount of resources, such as VM run time or template storage + space, consumed by guest instances. + The Usage Server runs at least once per day. It can be configured to run multiple times per + day. + + + + diff --git a/docs/en-US/writing-new-documentation.xml b/docs/en-US/writing-new-documentation.xml index 340900e3c60..7557359fd09 100644 --- a/docs/en-US/writing-new-documentation.xml +++ b/docs/en-US/writing-new-documentation.xml @@ -82,7 +82,7 @@
Building &PRODUCT; Documentation To build a specific guide, go to the source tree of the documentation in /docs and identify the guide you want to build. - Currenlty there are four guides plus the release notes, all defined in publican configuration files: + Currently there are four guides plus the release notes, all defined in publican configuration files: publican-adminguide.cfg publican-devguide.cfg @@ -96,5 +96,5 @@
]]> - Happy Publicaning and DocBooking. + Happy Publicating and DocBooking.
diff --git a/docs/publican-cloudstack/defaults.cfg b/docs/publican-cloudstack/defaults.cfg index 9e27bdd309d..b288b33af47 100644 --- a/docs/publican-cloudstack/defaults.cfg +++ b/docs/publican-cloudstack/defaults.cfg @@ -16,6 +16,6 @@ # specific language governing permissions and limitations # under the License. -doc_url: "http://incubator.apache.org/cloudstack/docs" -prod_url: "http://cloudstack.org" +doc_url: "http://cloudstack.apache.org/docs" +prod_url: "http://cloudstack.apache.org" diff --git a/docs/publican-cloudstack/en-US/Feedback.xml b/docs/publican-cloudstack/en-US/Feedback.xml index fb457a9ca86..8aa5f67dc2b 100644 --- a/docs/publican-cloudstack/en-US/Feedback.xml +++ b/docs/publican-cloudstack/en-US/Feedback.xml @@ -2,33 +2,43 @@ -
- We Need Feedback! - +
+ Submitting Feedback and Getting Help + feedback1 - contact information for this brand + contact information for this brand - If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a bug: https://issues.apache.org/jira/browse/CLOUDSTACK against the component Doc. + If you find a typographical error in this manual, or if you have thought of a way to make this manual better, we would love to hear from you! Please submit a bug: https://issues.apache.org/jira/browse/CLOUDSTACK against the component Doc. If you have a suggestion for improving the documentation, try to be as specific as possible when describing it. If you have found an error, please include the section number and some of the surrounding text so we can find it easily. - Better yet, feel free to submit a patch if you would like to enhance the documentation. Our documentation is, along with the rest of the CloudStack source code, kept in the project's git repository. + Better yet, feel free to submit a patch if you would like to enhance the documentation. Our documentation is, along with the rest of the &PRODUCT; source code, kept in the project's git repository. + The most efficient way to get help with &PRODUCT; is to ask on the mailing lists. + The Apache CloudStack project has mailing lists for users and developers. These are the + official channels of communication for the project and are the best way to get answers about + using and contributing to CloudStack. It's a good idea to subscribe to the + users@cloudstack.apache.org mailing list if you've deployed or are deploying + CloudStack into production, and even for test deployments. + The CloudStack developer's mailing list (dev@cloudstack.apache.org) is for discussions + about CloudStack development, and is the best list for discussing possible bugs in CloudStack. + Anyone contributing to CloudStack should be on this mailing list. + To posts to the lists, you'll need to be subscribed. See the + CloudStack Web site + for instructions.
- - diff --git a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java index 99f3120f93a..68a2ed2807b 100644 --- a/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java +++ b/engine/api/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntity.java @@ -14,48 +14,47 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.datacenter.entity.api; - -import com.cloud.hypervisor.Hypervisor.HypervisorType; - -public interface HostEntity extends DataCenterResourceEntity { - - /** - * @return total amount of memory. - */ - Long getTotalMemory(); - - /** - * @return # of cores in a machine. Note two cpus with two cores each returns 4. - */ - Integer getCpus(); - - /** - * @return speed of each cpu in mhz. - */ - Long getSpeed(); - - /** - * @return the pod. - */ - Long getPodId(); - - /** - * @return availability zone. - */ - long getDataCenterId(); - - /** - * @return type of hypervisor - */ - HypervisorType getHypervisorType(); - - /** - * @return the mac address of the host. - */ - String getGuid(); - - Long getClusterId(); - -} - +package org.apache.cloudstack.engine.datacenter.entity.api; + +import com.cloud.hypervisor.Hypervisor.HypervisorType; + +public interface HostEntity extends DataCenterResourceEntity { + + /** + * @return total amount of memory. + */ + Long getTotalMemory(); + + /** + * @return # of cores in a machine. Note two cpus with two cores each returns 4. + */ + Integer getCpus(); + + /** + * @return speed of each cpu in mhz. + */ + Long getSpeed(); + + /** + * @return the pod. + */ + Long getPodId(); + + /** + * @return availability zone. + */ + long getDataCenterId(); + + /** + * @return type of hypervisor + */ + HypervisorType getHypervisorType(); + + /** + * @return the mac address of the host. + */ + String getGuid(); + + Long getClusterId(); + +} diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java index 216cfa81d0e..2718e2fdbc8 100755 --- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java +++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ClusterRestService.java @@ -1,86 +1,86 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.engine.rest.service.api; - -import java.util.List; - -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; - -import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity; -import org.apache.cloudstack.engine.service.api.ProvisioningService; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -@Component -@Service("ClusterRestService") -@Produces("application/json") -public class ClusterRestService { -// @Inject - ProvisioningService _provisioningService; - - @GET @Path("/clusters") - public List listAll() { - return null; - } - - - @GET @Path("/cluster/{clusterid}") - public ClusterEntity get(@PathParam("clusterid") String clusterId) { - return null; - } - - @POST @Path("/cluster/{clusterid}/enable") - public String enable(@PathParam("clusterid") String clusterId) { - return null; - } - - @POST @Path("/cluster/{clusterid}/disable") - public String disable(@PathParam("clusterid") String clusterId) { - return null; - } - - @POST @Path("/cluster/{clusterid}/deactivate") - public String deactivate(@PathParam("clusterid") String clusterId) { - return null; - } - - @POST @Path("/cluster/{clusterid}/reactivate") - public String reactivate(@PathParam("clusterid") String clusterId) { - return null; - } - - @PUT @Path("/cluster/create") - public ClusterEntity create( - @QueryParam("xid") String xid, - @QueryParam("display-name") String displayName) { - return null; - } - - @PUT @Path("/cluster/{clusterid}/update") - public ClusterEntity update( - @QueryParam("display-name") String displayName) { - return null; - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.engine.rest.service.api; + +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; + +import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity; +import org.apache.cloudstack.engine.service.api.ProvisioningService; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +@Component +@Service("ClusterRestService") +@Produces("application/json") +public class ClusterRestService { +// @Inject + ProvisioningService _provisioningService; + + @GET @Path("/clusters") + public List listAll() { + return null; + } + + + @GET @Path("/cluster/{clusterid}") + public ClusterEntity get(@PathParam("clusterid") String clusterId) { + return null; + } + + @POST @Path("/cluster/{clusterid}/enable") + public String enable(@PathParam("clusterid") String clusterId) { + return null; + } + + @POST @Path("/cluster/{clusterid}/disable") + public String disable(@PathParam("clusterid") String clusterId) { + return null; + } + + @POST @Path("/cluster/{clusterid}/deactivate") + public String deactivate(@PathParam("clusterid") String clusterId) { + return null; + } + + @POST @Path("/cluster/{clusterid}/reactivate") + public String reactivate(@PathParam("clusterid") String clusterId) { + return null; + } + + @PUT @Path("/cluster/create") + public ClusterEntity create( + @QueryParam("xid") String xid, + @QueryParam("display-name") String displayName) { + return null; + } + + @PUT @Path("/cluster/{clusterid}/update") + public ClusterEntity update( + @QueryParam("display-name") String displayName) { + return null; + } +} diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java index 3e81a443115..b75600e08fe 100755 --- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java +++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/NetworkRestService.java @@ -1,62 +1,62 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.engine.rest.service.api; - -import java.util.List; - -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; - -import org.apache.cloudstack.engine.cloud.entity.api.NetworkEntity; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -@Service("NetworkRestService") -@Component -@Produces("application/json") -public class NetworkRestService { - @PUT @Path("/network/create") - public NetworkEntity create( - @QueryParam("xid") String xid, - @QueryParam("display-name") String displayName) { - return null; - } - - @GET @Path("/network/{network-id}") - public NetworkEntity get(@PathParam("network-id") String networkId) { - return null; - } - - @GET @Path("/networks") - public List listAll() { - return null; - } - - @POST @Path("/network/{network-id}/") - public String deploy(@PathParam("network-id") String networkId) { - return null; - } - - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.engine.rest.service.api; + +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; + +import org.apache.cloudstack.engine.cloud.entity.api.NetworkEntity; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +@Service("NetworkRestService") +@Component +@Produces("application/json") +public class NetworkRestService { + @PUT @Path("/network/create") + public NetworkEntity create( + @QueryParam("xid") String xid, + @QueryParam("display-name") String displayName) { + return null; + } + + @GET @Path("/network/{network-id}") + public NetworkEntity get(@PathParam("network-id") String networkId) { + return null; + } + + @GET @Path("/networks") + public List listAll() { + return null; + } + + @POST @Path("/network/{network-id}/") + public String deploy(@PathParam("network-id") String networkId) { + return null; + } + + +} diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java index 0811f0b9cf9..9c009b9aea2 100755 --- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java +++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/PodRestService.java @@ -1,79 +1,79 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.engine.rest.service.api; - -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; - -import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity; -import org.apache.cloudstack.engine.service.api.ProvisioningService; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -@Component -@Service("PodService") -@Produces({"application/json"}) -public class PodRestService { -// @Inject - ProvisioningService _provisioningService; - - @GET @Path("/pod/{pod-id}") - public PodEntity getPod(@PathParam("pod-id") String podId) { - return null; - } - - @POST @Path("/pod/{pod-id}/enable") - public String enable(@PathParam("pod-id") String podId) { - return null; - } - - @POST @Path("/pod/{pod-id}/disable") - public String disable(@PathParam("pod-id") String podId) { - return null; - } - - @POST @Path("/pod/{pod-id}/deactivate") - public String deactivate(@PathParam("pod-id") String podId) { - return null; - } - - @POST @Path("/pod/{pod-id}/reactivate") - public String reactivate(@PathParam("pod-id") String podId) { - return null; - } - - @PUT @Path("/pod/create") - public PodEntity create( - @QueryParam("xid") String xid, - @QueryParam("display-name") String displayName) { - return null; - } - - @PUT @Path("/pod/{pod-id}") - public PodEntity update( - @PathParam("pod-id") String podId, - @QueryParam("display-name") String displayName) { - return null; - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.engine.rest.service.api; + +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; + +import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity; +import org.apache.cloudstack.engine.service.api.ProvisioningService; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +@Component +@Service("PodService") +@Produces({"application/json"}) +public class PodRestService { +// @Inject + ProvisioningService _provisioningService; + + @GET @Path("/pod/{pod-id}") + public PodEntity getPod(@PathParam("pod-id") String podId) { + return null; + } + + @POST @Path("/pod/{pod-id}/enable") + public String enable(@PathParam("pod-id") String podId) { + return null; + } + + @POST @Path("/pod/{pod-id}/disable") + public String disable(@PathParam("pod-id") String podId) { + return null; + } + + @POST @Path("/pod/{pod-id}/deactivate") + public String deactivate(@PathParam("pod-id") String podId) { + return null; + } + + @POST @Path("/pod/{pod-id}/reactivate") + public String reactivate(@PathParam("pod-id") String podId) { + return null; + } + + @PUT @Path("/pod/create") + public PodEntity create( + @QueryParam("xid") String xid, + @QueryParam("display-name") String displayName) { + return null; + } + + @PUT @Path("/pod/{pod-id}") + public PodEntity update( + @PathParam("pod-id") String podId, + @QueryParam("display-name") String displayName) { + return null; + } +} diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java index 2124a81261f..f3f7bad1936 100755 --- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java +++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VirtualMachineRestService.java @@ -1,56 +1,56 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.engine.rest.service.api; - -import java.util.List; - -import javax.ws.rs.GET; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; - -import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -@Component -@Service("VirtualMachineRestService") -@Produces("application/xml") -public class VirtualMachineRestService { - - @GET @Path("/vm/{vmid}") - public VirtualMachineEntity get(@PathParam("vmid") String vmId) { - return null; - } - - @PUT @Path("/vm/create") - public VirtualMachineEntity create( - @QueryParam("xid") String xid, - @QueryParam("hostname") String hostname, - @QueryParam("display-name") String displayName) { - return null; - } - - @GET @Path("/vms") - public List listAll() { - return null; - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.engine.rest.service.api; + +import java.util.List; + +import javax.ws.rs.GET; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; + +import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +@Component +@Service("VirtualMachineRestService") +@Produces("application/xml") +public class VirtualMachineRestService { + + @GET @Path("/vm/{vmid}") + public VirtualMachineEntity get(@PathParam("vmid") String vmId) { + return null; + } + + @PUT @Path("/vm/create") + public VirtualMachineEntity create( + @QueryParam("xid") String xid, + @QueryParam("hostname") String hostname, + @QueryParam("display-name") String displayName) { + return null; + } + + @GET @Path("/vms") + public List listAll() { + return null; + } +} diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java index 3e5174b9d90..cb1a0d3dc47 100755 --- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java +++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/VolumeRestService.java @@ -1,76 +1,76 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.engine.rest.service.api; - -import java.util.List; - -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; - -import org.apache.cloudstack.engine.cloud.entity.api.VolumeEntity; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -@Component -@Service("VolumeRestService") -@Produces("application/json") -public class VolumeRestService { - - @PUT @Path("/vol/create") - public VolumeEntity create( - @QueryParam("xid") String xid, - @QueryParam("display-name") String displayName) { - return null; - } - - @POST @Path("/vol/{volid}/deploy") - public String deploy(@PathParam("volid") String volumeId) { - return null; - } - - @GET @Path("/vols") - public List listAll() { - return null; - } - - @POST @Path("/vol/{volid}/attach-to") - public String attachTo( - @PathParam("volid") String volumeId, - @QueryParam("vmid") String vmId, - @QueryParam("device-order") short device) { - return null; - } - - @DELETE @Path("/vol/{volid}") - public String delete(@PathParam("volid") String volumeId) { - return null; - } - - @POST @Path("/vol/{volid}/detach") - public String detach(@QueryParam("volid") String volumeId) { - return null; - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.engine.rest.service.api; + +import java.util.List; + +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; + +import org.apache.cloudstack.engine.cloud.entity.api.VolumeEntity; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +@Component +@Service("VolumeRestService") +@Produces("application/json") +public class VolumeRestService { + + @PUT @Path("/vol/create") + public VolumeEntity create( + @QueryParam("xid") String xid, + @QueryParam("display-name") String displayName) { + return null; + } + + @POST @Path("/vol/{volid}/deploy") + public String deploy(@PathParam("volid") String volumeId) { + return null; + } + + @GET @Path("/vols") + public List listAll() { + return null; + } + + @POST @Path("/vol/{volid}/attach-to") + public String attachTo( + @PathParam("volid") String volumeId, + @QueryParam("vmid") String vmId, + @QueryParam("device-order") short device) { + return null; + } + + @DELETE @Path("/vol/{volid}") + public String delete(@PathParam("volid") String volumeId) { + return null; + } + + @POST @Path("/vol/{volid}/detach") + public String detach(@QueryParam("volid") String volumeId) { + return null; + } + +} diff --git a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java index 7170f00747d..bd6980e064a 100755 --- a/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java +++ b/engine/api/src/org/apache/cloudstack/engine/rest/service/api/ZoneRestService.java @@ -1,87 +1,87 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.engine.rest.service.api; - -import java.util.List; - -import javax.ws.rs.DELETE; -import javax.ws.rs.GET; -import javax.ws.rs.POST; -import javax.ws.rs.PUT; -import javax.ws.rs.Path; -import javax.ws.rs.PathParam; -import javax.ws.rs.Produces; -import javax.ws.rs.QueryParam; - -import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; -import org.apache.cloudstack.engine.service.api.ProvisioningService; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -@Component -@Service("zoneService") -@Produces({"application/json"}) -public class ZoneRestService { -// @Inject - ProvisioningService _provisioningService; - - @GET @Path("/zones") - public List listAll() { - return _provisioningService.listZones(); - } - - @GET @Path("/zone/{zone-id}") - public ZoneEntity get(@PathParam("zone-id") String zoneId) { - return _provisioningService.getZone(zoneId); - } - - @POST @Path("/zone/{zone-id}/enable") - public String enable(String zoneId) { - return null; - } - - @POST @Path("/zone/{zone-id}/disable") - public String disable(@PathParam("zone-id") String zoneId) { - ZoneEntity zoneEntity = _provisioningService.getZone(zoneId); - zoneEntity.disable(); - return null; - } - - @POST @Path("/zone/{zone-id}/deactivate") - public String deactivate(@PathParam("zone-id") String zoneId) { - return null; - } - - @POST @Path("/zone/{zone-id}/activate") - public String reactivate(@PathParam("zone-id") String zoneId) { - return null; - } - - - @PUT @Path("/zone/create") - public ZoneEntity createZone(@QueryParam("xid") String xid, - @QueryParam("display-name") String displayName) { - return null; - } - - @DELETE @Path("/zone/{zone-id}") - public String deleteZone(@QueryParam("zone-id") String xid) { - return null; - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.engine.rest.service.api; + +import java.util.List; + +import javax.ws.rs.DELETE; +import javax.ws.rs.GET; +import javax.ws.rs.POST; +import javax.ws.rs.PUT; +import javax.ws.rs.Path; +import javax.ws.rs.PathParam; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; + +import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; +import org.apache.cloudstack.engine.service.api.ProvisioningService; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +@Component +@Service("zoneService") +@Produces({"application/json"}) +public class ZoneRestService { +// @Inject + ProvisioningService _provisioningService; + + @GET @Path("/zones") + public List listAll() { + return _provisioningService.listZones(); + } + + @GET @Path("/zone/{zone-id}") + public ZoneEntity get(@PathParam("zone-id") String zoneId) { + return _provisioningService.getZone(zoneId); + } + + @POST @Path("/zone/{zone-id}/enable") + public String enable(String zoneId) { + return null; + } + + @POST @Path("/zone/{zone-id}/disable") + public String disable(@PathParam("zone-id") String zoneId) { + ZoneEntity zoneEntity = _provisioningService.getZone(zoneId); + zoneEntity.disable(); + return null; + } + + @POST @Path("/zone/{zone-id}/deactivate") + public String deactivate(@PathParam("zone-id") String zoneId) { + return null; + } + + @POST @Path("/zone/{zone-id}/activate") + public String reactivate(@PathParam("zone-id") String zoneId) { + return null; + } + + + @PUT @Path("/zone/create") + public ZoneEntity createZone(@QueryParam("xid") String xid, + @QueryParam("display-name") String displayName) { + return null; + } + + @DELETE @Path("/zone/{zone-id}") + public String deleteZone(@QueryParam("zone-id") String xid) { + return null; + } +} diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/CommandResult.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/CommandResult.java index 6b6139b937d..cc45914dc41 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/CommandResult.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/CommandResult.java @@ -34,7 +34,7 @@ public class CommandResult { return !this.success; } - public void setSucess(boolean success) { + public void setSuccess(boolean success) { this.success = success; } diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreStatus.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreStatus.java deleted file mode 100644 index 2388795410c..00000000000 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/DataStoreStatus.java +++ /dev/null @@ -1,23 +0,0 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.engine.subsystem.api.storage; - -public enum DataStoreStatus { - Initial, Initialized, Creating, Attaching, Up, PrepareForMaintenance, ErrorInMaintenance, CancelMaintenance, Maintenance, Removed; -} diff --git a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java index 726ce0821c5..94ae800ab8e 100644 --- a/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java +++ b/engine/api/src/org/apache/cloudstack/engine/subsystem/api/storage/ObjectInDataStoreStateMachine.java @@ -26,8 +26,9 @@ public interface ObjectInDataStoreStateMachine extends StateObject createVolumeFromTemplateAsync(VolumeInfo volume, long dataStoreId, TemplateInfo template); AsyncCallFuture copyVolume(VolumeInfo srcVolume, DataStore destStore); + AsyncCallFuture migrateVolume(VolumeInfo srcVolume, DataStore destStore); + AsyncCallFuture migrateVolumes(Map volumeMap, VirtualMachineTO vmTo, Host srcHost, Host destHost); boolean destroyVolume(long volumeId) throws ConcurrentOperationException; diff --git a/engine/api/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailsDao.java b/engine/api/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailsDao.java index be71670e992..237f235704d 100644 --- a/engine/api/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailsDao.java +++ b/engine/api/src/org/apache/cloudstack/storage/datastore/db/StoragePoolDetailsDao.java @@ -25,4 +25,5 @@ public interface StoragePoolDetailsDao extends GenericDao details); Map getDetails(long poolId); + StoragePoolDetailVO findDetail(long poolId, String name); } diff --git a/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java b/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java index 5dbe0c6f931..73aa84c6152 100644 --- a/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java +++ b/engine/components-api/src/org/apache/cloudstack/compute/ComputeGuru.java @@ -1,34 +1,34 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.compute; - -import com.cloud.vm.VirtualMachineProfile; - -/** - * ComputeGuru understands everything about the hypervisor. - * - */ -public interface ComputeGuru { - String getVersion(); - String getHypervisor(); - void start(VirtualMachineProfile vm); - void stop(VirtualMachineProfile vm); - - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.compute; + +import com.cloud.vm.VirtualMachineProfile; + +/** + * ComputeGuru understands everything about the hypervisor. + * + */ +public interface ComputeGuru { + String getVersion(); + String getHypervisor(); + void start(VirtualMachineProfile vm); + void stop(VirtualMachineProfile vm); + + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java index a36ca3a3aba..ca0a77742a9 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManager.java @@ -14,32 +14,32 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api; - -import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO; - -import com.cloud.deploy.DeploymentPlan; -import com.cloud.deploy.DeploymentPlanner.ExcludeList; -import com.cloud.exception.AgentUnavailableException; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.OperationTimedoutException; -import com.cloud.exception.ResourceUnavailableException; +package org.apache.cloudstack.engine.cloud.entity.api; + +import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO; + +import com.cloud.deploy.DeploymentPlan; +import com.cloud.deploy.DeploymentPlanner.ExcludeList; +import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.OperationTimedoutException; +import com.cloud.exception.ResourceUnavailableException; import com.cloud.vm.VirtualMachineProfile; import java.util.Map; - -public interface VMEntityManager { - - VMEntityVO loadVirtualMachine(String vmId); - - void saveVirtualMachine(VMEntityVO vmInstanceVO); - - String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan plan, ExcludeList exclude) throws InsufficientCapacityException, ResourceUnavailableException; - - void deployVirtualMachine(String reservationId, String caller, Map params) throws InsufficientCapacityException, ResourceUnavailableException; - - boolean stopvirtualmachine(VMEntityVO vmEntityVO, String caller) throws ResourceUnavailableException; - - boolean destroyVirtualMachine(VMEntityVO vmEntityVO, String caller) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException; -} + +public interface VMEntityManager { + + VMEntityVO loadVirtualMachine(String vmId); + + void saveVirtualMachine(VMEntityVO vmInstanceVO); + + String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan plan, ExcludeList exclude) throws InsufficientCapacityException, ResourceUnavailableException; + + void deployVirtualMachine(String reservationId, VMEntityVO vmEntityVO, String caller, Map params) throws InsufficientCapacityException, ResourceUnavailableException; + + boolean stopvirtualmachine(VMEntityVO vmEntityVO, String caller) throws ResourceUnavailableException; + + boolean destroyVirtualMachine(VMEntityVO vmEntityVO, String caller) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException; +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java index 8b9b100c243..25e742301cf 100755 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VMEntityManagerImpl.java @@ -20,6 +20,7 @@ import java.util.ArrayList; import java.util.HashMap; import java.util.List; import java.util.Map; +import java.util.UUID; import javax.inject.Inject; @@ -36,7 +37,9 @@ import com.cloud.deploy.DataCenterDeployment; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner; +import com.cloud.deploy.DeploymentPlanningManager; import com.cloud.deploy.DeploymentPlanner.ExcludeList; +import com.cloud.exception.AffinityConflictException; import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; @@ -55,7 +58,7 @@ import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserDao; -import com.cloud.utils.component.ComponentContext; +import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.VirtualMachineProfile; @@ -69,42 +72,45 @@ public class VMEntityManagerImpl implements VMEntityManager { protected VMInstanceDao _vmDao; @Inject protected VMTemplateDao _templateDao = null; - + @Inject protected ServiceOfferingDao _serviceOfferingDao; - + @Inject protected DiskOfferingDao _diskOfferingDao = null; - + @Inject protected NetworkDao _networkDao; - + @Inject protected AccountDao _accountDao = null; @Inject protected UserDao _userDao = null; - @Inject + @Inject protected VMEntityDao _vmEntityDao; - - @Inject + + @Inject protected VMReservationDao _reservationDao; - + @Inject protected VirtualMachineManager _itMgr; - + @Inject protected List _planners; - + @Inject protected VolumeDao _volsDao; - + @Inject protected PrimaryDataStoreDao _storagePoolDao; @Inject DataStoreManager dataStoreMgr; - + + @Inject + DeploymentPlanningManager _dpMgr; + @Override public VMEntityVO loadVirtualMachine(String vmId) { // TODO Auto-generated method stub @@ -114,11 +120,11 @@ public class VMEntityManagerImpl implements VMEntityManager { @Override public void saveVirtualMachine(VMEntityVO entity) { _vmEntityDao.persist(entity); - + } @Override - public String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan planToDeploy, ExcludeList exclude) + public String reserveVirtualMachine(VMEntityVO vmEntityVO, String plannerToUse, DeploymentPlan planToDeploy, ExcludeList exclude) throws InsufficientCapacityException, ResourceUnavailableException { //call planner and get the deployDestination. @@ -130,12 +136,13 @@ public class VMEntityManagerImpl implements VMEntityManager { if(planToDeploy != null && planToDeploy.getDataCenterId() != 0){ plan = new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(), planToDeploy.getPoolId(), planToDeploy.getPhysicalNetworkId()); } - + + boolean planChangedByReadyVolume = false; List vols = _volsDao.findReadyRootVolumesByInstance(vm.getId()); if(!vols.isEmpty()){ VolumeVO vol = vols.get(0); StoragePool pool = (StoragePool)this.dataStoreMgr.getPrimaryDataStore(vol.getPoolId()); - + if (!pool.isInMaintenance()) { long rootVolDcId = pool.getDataCenterId(); Long rootVolPodId = pool.getPodId(); @@ -153,24 +160,24 @@ public class VMEntityManagerImpl implements VMEntityManager { plan = new DataCenterDeployment(planToDeploy.getDataCenterId(), planToDeploy.getPodId(), planToDeploy.getClusterId(), planToDeploy.getHostId(), vol.getPoolId(), null, null); }else{ plan = new DataCenterDeployment(rootVolDcId, rootVolPodId, rootVolClusterId, null, vol.getPoolId(), null, null); - + planChangedByReadyVolume = true; } } - + + } + + DeployDestination dest; + try { + dest = _dpMgr.planDeployment(vmProfile, plan, exclude); + } catch (AffinityConflictException e) { + throw new CloudRuntimeException("Unable to create deployment, affinity rules associted to the VM conflict"); } - - DeploymentPlanner planner = ComponentContext.getComponent(plannerToUse); - DeployDestination dest = null; - - if (planner.canHandle(vmProfile, plan, exclude)) { - dest = planner.plan(vmProfile, plan, exclude); - } if (dest != null) { //save destination with VMEntityVO VMReservationVO vmReservation = new VMReservationVO(vm.getId(), dest.getDataCenter().getId(), dest.getPod().getId(), dest.getCluster().getId(), dest.getHost().getId()); Map volumeReservationMap = new HashMap(); - + if (vm.getHypervisorType() != HypervisorType.BareMetal) { for(Volume vo : dest.getStorageForDisks().keySet()){ volumeReservationMap.put(vo.getId(), dest.getStorageForDisks().get(vo).getId()); @@ -180,37 +187,51 @@ public class VMEntityManagerImpl implements VMEntityManager { vmEntityVO.setVmReservation(vmReservation); _vmEntityDao.persist(vmEntityVO); - + return vmReservation.getUuid(); + } else if (planChangedByReadyVolume) { + // we could not reserve in the Volume's cluster - let the deploy + // call retry it. + return UUID.randomUUID().toString(); }else{ throw new InsufficientServerCapacityException("Unable to create a deployment for " + vmProfile, DataCenter.class, plan.getDataCenterId()); } - + } @Override - public void deployVirtualMachine(String reservationId, String caller, Map params) throws InsufficientCapacityException, ResourceUnavailableException{ + public void deployVirtualMachine(String reservationId, VMEntityVO vmEntityVO, String caller, Map params) throws InsufficientCapacityException, ResourceUnavailableException{ //grab the VM Id and destination using the reservationId. - + + VMInstanceVO vm = _vmDao.findByUuid(vmEntityVO.getUuid()); + VMReservationVO vmReservation = _reservationDao.findByReservationId(reservationId); - long vmId = vmReservation.getVmId(); - - VMInstanceVO vm = _vmDao.findById(vmId); - //Pass it down - Long poolId = null; - Map storage = vmReservation.getVolumeReservation(); - if(storage != null){ - List volIdList = new ArrayList(storage.keySet()); - if(volIdList !=null && !volIdList.isEmpty()){ - poolId = storage.get(volIdList.get(0)); + if(vmReservation != null){ + // Pass it down + Long poolId = null; + Map storage = vmReservation.getVolumeReservation(); + if (storage != null) { + List volIdList = new ArrayList(storage.keySet()); + if (volIdList != null && !volIdList.isEmpty()) { + poolId = storage.get(volIdList.get(0)); + } } + + DataCenterDeployment reservedPlan = new DataCenterDeployment(vm.getDataCenterId(), + vmReservation.getPodId(), vmReservation.getClusterId(), vmReservation.getHostId(), null, null); + try { + VMInstanceVO vmDeployed = _itMgr.start(vm, params, _userDao.findById(new Long(caller)), + _accountDao.findById(vm.getAccountId()), reservedPlan); + } catch (Exception ex) { + // Retry the deployment without using the reservation plan + _itMgr.start(vm, params, _userDao.findById(new Long(caller)), _accountDao.findById(vm.getAccountId()), + null); + } + } else { + // no reservation found. Let VirtualMachineManager retry + _itMgr.start(vm, params, _userDao.findById(new Long(caller)), _accountDao.findById(vm.getAccountId()), null); } - - DataCenterDeployment plan = new DataCenterDeployment(vm.getDataCenterId(), vmReservation.getPodId(), vmReservation.getClusterId(), - vmReservation.getHostId(), poolId , null); - - VMInstanceVO vmDeployed = _itMgr.start(vm, params, _userDao.findById(new Long(caller)), _accountDao.findById(vm.getAccountId()), plan); - + } @Override @@ -227,7 +248,7 @@ public class VMEntityManagerImpl implements VMEntityManager { VMInstanceVO vm = _vmDao.findByUuid(vmEntityVO.getUuid()); return _itMgr.destroy(vm, _userDao.findById(new Long(caller)), _accountDao.findById(vm.getAccountId())); - + } } diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java index 508b0b9a746..dd57f9a03f4 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/VirtualMachineEntityImpl.java @@ -14,33 +14,33 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api; - -import java.lang.reflect.Method; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import javax.inject.Inject; - -import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO; +package org.apache.cloudstack.engine.cloud.entity.api; + +import java.lang.reflect.Method; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import javax.inject.Inject; + +import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO; import org.springframework.stereotype.Component; - -import com.cloud.deploy.DeploymentPlan; -import com.cloud.deploy.DeploymentPlanner.ExcludeList; -import com.cloud.exception.AgentUnavailableException; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.OperationTimedoutException; -import com.cloud.exception.ResourceUnavailableException; + +import com.cloud.deploy.DeploymentPlan; +import com.cloud.deploy.DeploymentPlanner.ExcludeList; +import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.OperationTimedoutException; +import com.cloud.exception.ResourceUnavailableException; import com.cloud.vm.VirtualMachineProfile; @Component -public class VirtualMachineEntityImpl implements VirtualMachineEntity { - - @Inject private VMEntityManager manager; - - private VMEntityVO vmEntityVO; +public class VirtualMachineEntityImpl implements VirtualMachineEntity { + + @Inject private VMEntityManager manager; + + private VMEntityVO vmEntityVO; public VirtualMachineEntityImpl() { } @@ -61,204 +61,204 @@ public class VirtualMachineEntityImpl implements VirtualMachineEntity { manager.saveVirtualMachine(vmEntityVO); } - - public VirtualMachineEntityImpl(String vmId, VMEntityManager manager) { - this.manager = manager; - this.vmEntityVO = this.manager.loadVirtualMachine(vmId); - } - - public VirtualMachineEntityImpl(String vmId, String owner, String hostName, String displayName, int cpu, int speed, long memory, List computeTags, List rootDiskTags, List networks, VMEntityManager manager) { - this(vmId, manager); - this.vmEntityVO.setOwner(owner); - this.vmEntityVO.setHostname(hostName); - this.vmEntityVO.setDisplayname(displayName); - this.vmEntityVO.setSpeed(speed); - this.vmEntityVO.setComputeTags(computeTags); - this.vmEntityVO.setRootDiskTags(rootDiskTags); - this.vmEntityVO.setNetworkIds(networks); - - manager.saveVirtualMachine(vmEntityVO); - } - - @Override - public String getUuid() { - return vmEntityVO.getUuid(); - } - - @Override - public long getId() { - return vmEntityVO.getId(); - } - - @Override - public String getCurrentState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getDesiredState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Date getCreatedTime() { - return vmEntityVO.getCreated(); - } - - @Override - public Date getLastUpdatedTime() { - return vmEntityVO.getUpdateTime(); - } - - @Override - public String getOwner() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Map getDetails() { - return vmEntityVO.getDetails(); - } - - @Override - public void addDetail(String name, String value) { - vmEntityVO.setDetail(name, value); - } - - @Override - public void delDetail(String name, String value) { - // TODO Auto-generated method stub - } - - @Override - public void updateDetail(String name, String value) { - // TODO Auto-generated method stub - } - - @Override - public List getApplicableActions() { - // TODO Auto-generated method stub - return null; - } - - @Override - public List listVolumeIds() { - // TODO Auto-generated method stub - return null; - } - - @Override - public List listVolumes() { - // TODO Auto-generated method stub - return null; - } - - @Override - public List listNicUuids() { - // TODO Auto-generated method stub - return null; - } - - @Override - public List listNics() { - // TODO Auto-generated method stub - return null; - } - - @Override - public TemplateEntity getTemplate() { - // TODO Auto-generated method stub - return null; - } - - @Override - public List listTags() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void addTag() { - // TODO Auto-generated method stub - - } - - @Override - public void delTag() { - // TODO Auto-generated method stub - - } - - @Override - public String reserve(String plannerToUse, DeploymentPlan plan, - ExcludeList exclude, String caller) throws InsufficientCapacityException, ResourceUnavailableException { - return manager.reserveVirtualMachine(this.vmEntityVO, plannerToUse, plan, exclude); - } - - @Override - public void migrateTo(String reservationId, String caller) { - // TODO Auto-generated method stub - - } - - @Override + + public VirtualMachineEntityImpl(String vmId, VMEntityManager manager) { + this.manager = manager; + this.vmEntityVO = this.manager.loadVirtualMachine(vmId); + } + + public VirtualMachineEntityImpl(String vmId, String owner, String hostName, String displayName, int cpu, int speed, long memory, List computeTags, List rootDiskTags, List networks, VMEntityManager manager) { + this(vmId, manager); + this.vmEntityVO.setOwner(owner); + this.vmEntityVO.setHostname(hostName); + this.vmEntityVO.setDisplayname(displayName); + this.vmEntityVO.setSpeed(speed); + this.vmEntityVO.setComputeTags(computeTags); + this.vmEntityVO.setRootDiskTags(rootDiskTags); + this.vmEntityVO.setNetworkIds(networks); + + manager.saveVirtualMachine(vmEntityVO); + } + + @Override + public String getUuid() { + return vmEntityVO.getUuid(); + } + + @Override + public long getId() { + return vmEntityVO.getId(); + } + + @Override + public String getCurrentState() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getDesiredState() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Date getCreatedTime() { + return vmEntityVO.getCreated(); + } + + @Override + public Date getLastUpdatedTime() { + return vmEntityVO.getUpdateTime(); + } + + @Override + public String getOwner() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Map getDetails() { + return vmEntityVO.getDetails(); + } + + @Override + public void addDetail(String name, String value) { + vmEntityVO.setDetail(name, value); + } + + @Override + public void delDetail(String name, String value) { + // TODO Auto-generated method stub + } + + @Override + public void updateDetail(String name, String value) { + // TODO Auto-generated method stub + } + + @Override + public List getApplicableActions() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List listVolumeIds() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List listVolumes() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List listNicUuids() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List listNics() { + // TODO Auto-generated method stub + return null; + } + + @Override + public TemplateEntity getTemplate() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List listTags() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void addTag() { + // TODO Auto-generated method stub + + } + + @Override + public void delTag() { + // TODO Auto-generated method stub + + } + + @Override + public String reserve(String plannerToUse, DeploymentPlan plan, + ExcludeList exclude, String caller) throws InsufficientCapacityException, ResourceUnavailableException { + return manager.reserveVirtualMachine(this.vmEntityVO, plannerToUse, plan, exclude); + } + + @Override + public void migrateTo(String reservationId, String caller) { + // TODO Auto-generated method stub + + } + + @Override public void deploy(String reservationId, String caller, Map params) throws InsufficientCapacityException, ResourceUnavailableException{ - manager.deployVirtualMachine(reservationId, caller, params); - } - - @Override - public boolean stop(String caller) throws ResourceUnavailableException{ - return manager.stopvirtualmachine(this.vmEntityVO, caller); - } - - @Override - public void cleanup() { - // TODO Auto-generated method stub - - } - - @Override - public boolean destroy(String caller) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException { - return manager.destroyVirtualMachine(this.vmEntityVO, caller); - } - - @Override - public VirtualMachineEntity duplicate(String externalId) { - // TODO Auto-generated method stub - return null; - } - - @Override - public SnapshotEntity takeSnapshotOf() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void attach(VolumeEntity volume, short deviceId) { - // TODO Auto-generated method stub - - } - - @Override - public void detach(VolumeEntity volume) { - // TODO Auto-generated method stub - - } - - @Override - public void connectTo(NetworkEntity network, short nicId) { - // TODO Auto-generated method stub - - } - - @Override - public void disconnectFrom(NetworkEntity netowrk, short nicId) { - // TODO Auto-generated method stub - - } - -} + manager.deployVirtualMachine(reservationId, this.vmEntityVO, caller, params); + } + + @Override + public boolean stop(String caller) throws ResourceUnavailableException{ + return manager.stopvirtualmachine(this.vmEntityVO, caller); + } + + @Override + public void cleanup() { + // TODO Auto-generated method stub + + } + + @Override + public boolean destroy(String caller) throws AgentUnavailableException, OperationTimedoutException, ConcurrentOperationException { + return manager.destroyVirtualMachine(this.vmEntityVO, caller); + } + + @Override + public VirtualMachineEntity duplicate(String externalId) { + // TODO Auto-generated method stub + return null; + } + + @Override + public SnapshotEntity takeSnapshotOf() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void attach(VolumeEntity volume, short deviceId) { + // TODO Auto-generated method stub + + } + + @Override + public void detach(VolumeEntity volume) { + // TODO Auto-generated method stub + + } + + @Override + public void connectTo(NetworkEntity network, short nicId) { + // TODO Auto-generated method stub + + } + + @Override + public void disconnectFrom(NetworkEntity netowrk, short nicId) { + // TODO Auto-generated method stub + + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java index c367ee95483..e4fc2283349 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMComputeTagVO.java @@ -14,54 +14,54 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - -import org.apache.cloudstack.api.InternalIdentity; - -@Entity -@Table(name = "vm_compute_tags") -public class VMComputeTagVO implements InternalIdentity{ - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private long id; - - @Column(name = "vm_id") - private long vmId; - - @Column(name = "compute_tag") - private String computeTag; - - /** - * There should never be a public constructor for this class. Since it's - * only here to define the table for the DAO class. - */ - protected VMComputeTagVO() { - } - - public VMComputeTagVO(long vmId, String tag) { - this.vmId = vmId; - this.computeTag = tag; - } - - public long getId() { - return id; - } - - public long getVmId() { - return vmId; - } - - public String getComputeTag() { - return computeTag; - } - -} +package org.apache.cloudstack.engine.cloud.entity.api.db; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.apache.cloudstack.api.InternalIdentity; + +@Entity +@Table(name = "vm_compute_tags") +public class VMComputeTagVO implements InternalIdentity{ + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private long id; + + @Column(name = "vm_id") + private long vmId; + + @Column(name = "compute_tag") + private String computeTag; + + /** + * There should never be a public constructor for this class. Since it's + * only here to define the table for the DAO class. + */ + protected VMComputeTagVO() { + } + + public VMComputeTagVO(long vmId, String tag) { + this.vmId = vmId; + this.computeTag = tag; + } + + public long getId() { + return id; + } + + public long getVmId() { + return vmId; + } + + public String getComputeTag() { + return computeTag; + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java index 4fe6718e33a..4748215e3c6 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMEntityVO.java @@ -574,4 +574,4 @@ public class VMEntityVO implements VirtualMachine, FiniteStateObject poolId - @Transient - Map volumeReservationMap; - - /** - * There should never be a public constructor for this class. Since it's - * only here to define the table for the DAO class. - */ - protected VMReservationVO() { - } - - public VMReservationVO(long vmId, long dataCenterId, long podId, long clusterId, long hostId) { - this.vmId = vmId; - this.dataCenterId = dataCenterId; - this.podId = podId; - this.clusterId = clusterId; - this.hostId = hostId; - this.uuid = UUID.randomUUID().toString(); - } - - - public long getId() { - return id; - } - - public long getVmId() { - return vmId; - } - - @Override - public String getUuid() { - return uuid; - } - - public long getDataCenterId() { - return dataCenterId; - } - - public Long getPodId() { - return podId; - } - - public Long getClusterId() { - return clusterId; - } - - public Long getHostId() { - return hostId; - } - - public Map getVolumeReservation(){ - return volumeReservationMap; - } - - public void setVolumeReservation(Map volumeReservationMap){ - this.volumeReservationMap = volumeReservationMap; - } - -} +package org.apache.cloudstack.engine.cloud.entity.api.db; + +import java.util.Date; +import java.util.Map; +import java.util.UUID; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; + +import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; + +import com.cloud.utils.db.GenericDao; + +@Entity +@Table(name = "vm_reservation") +public class VMReservationVO implements Identity, InternalIdentity{ + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private long id; + + @Column(name = "vm_id") + private long vmId; + + @Column(name="uuid") + private String uuid; + + @Column(name="data_center_id") + private long dataCenterId; + + @Column(name="pod_id") + private long podId; + + @Column(name="cluster_id") + private long clusterId; + + @Column(name="host_id") + private long hostId; + + @Column(name=GenericDao.CREATED_COLUMN) + private Date created; + + @Column(name=GenericDao.REMOVED_COLUMN) + private Date removed; + + // VolumeId -> poolId + @Transient + Map volumeReservationMap; + + /** + * There should never be a public constructor for this class. Since it's + * only here to define the table for the DAO class. + */ + protected VMReservationVO() { + } + + public VMReservationVO(long vmId, long dataCenterId, long podId, long clusterId, long hostId) { + this.vmId = vmId; + this.dataCenterId = dataCenterId; + this.podId = podId; + this.clusterId = clusterId; + this.hostId = hostId; + this.uuid = UUID.randomUUID().toString(); + } + + + public long getId() { + return id; + } + + public long getVmId() { + return vmId; + } + + @Override + public String getUuid() { + return uuid; + } + + public long getDataCenterId() { + return dataCenterId; + } + + public Long getPodId() { + return podId; + } + + public Long getClusterId() { + return clusterId; + } + + public Long getHostId() { + return hostId; + } + + public Map getVolumeReservation(){ + return volumeReservationMap; + } + + public void setVolumeReservation(Map volumeReservationMap){ + this.volumeReservationMap = volumeReservationMap; + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java index a1cca3f9040..3c09e930693 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VMRootDiskTagVO.java @@ -14,54 +14,54 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; - -import org.apache.cloudstack.api.InternalIdentity; - -@Entity -@Table(name = "vm_root_disk_tags") -public class VMRootDiskTagVO implements InternalIdentity { - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private long id; - - @Column(name = "vm_id") - private long vmId; - - @Column(name = "root_disk_tag") - private String rootDiskTag; - - /** - * There should never be a public constructor for this class. Since it's - * only here to define the table for the DAO class. - */ - protected VMRootDiskTagVO() { - } - - public VMRootDiskTagVO(long vmId, String rootDiskTag) { - this.vmId = vmId; - this.rootDiskTag = rootDiskTag; - } - - public long getId() { - return id; - } - - public long getVmId() { - return vmId; - } - - public String getRootDiskTag() { - return rootDiskTag; - } - -} +package org.apache.cloudstack.engine.cloud.entity.api.db; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +import org.apache.cloudstack.api.InternalIdentity; + +@Entity +@Table(name = "vm_root_disk_tags") +public class VMRootDiskTagVO implements InternalIdentity { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private long id; + + @Column(name = "vm_id") + private long vmId; + + @Column(name = "root_disk_tag") + private String rootDiskTag; + + /** + * There should never be a public constructor for this class. Since it's + * only here to define the table for the DAO class. + */ + protected VMRootDiskTagVO() { + } + + public VMRootDiskTagVO(long vmId, String rootDiskTag) { + this.vmId = vmId; + this.rootDiskTag = rootDiskTag; + } + + public long getId() { + return id; + } + + public long getVmId() { + return vmId; + } + + public String getRootDiskTag() { + return rootDiskTag; + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java index cbad9aba568..f064623f887 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/VolumeReservationVO.java @@ -14,87 +14,87 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db; - -import java.util.Date; -import java.util.Map; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.Transient; - -import org.apache.cloudstack.api.Identity; -import org.apache.cloudstack.api.InternalIdentity; - -import com.cloud.utils.db.GenericDao; - -@Entity -@Table(name = "volume_reservation") -public class VolumeReservationVO implements InternalIdentity{ - - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - @Column(name = "id") - private long id; - - @Column(name = "vm_reservation_id") - private Long vmReservationId; - - @Column(name = "vm_id") - private long vmId; - - @Column(name="volume_id") - private long volumeId; - - @Column(name="pool_id") - private long poolId; - - // VolumeId -> poolId - @Transient - Map volumeReservationMap; - - /** - * There should never be a public constructor for this class. Since it's - * only here to define the table for the DAO class. - */ - protected VolumeReservationVO() { - } - - public VolumeReservationVO(long vmId, long volumeId, long poolId, Long vmReservationId) { - this.vmId = vmId; - this.volumeId = volumeId; - this.poolId = poolId; - this.vmReservationId = vmReservationId; - } - - - public long getId() { - return id; - } - - public long getVmId() { - return vmId; - } - - public Long geVmReservationId() { - return vmReservationId; - } - - public long getVolumeId() { - return volumeId; - } - - public Long getPoolId() { - return poolId; - } - - - public Map getVolumeReservation(){ - return volumeReservationMap; - } - -} +package org.apache.cloudstack.engine.cloud.entity.api.db; + +import java.util.Date; +import java.util.Map; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; +import javax.persistence.Transient; + +import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; + +import com.cloud.utils.db.GenericDao; + +@Entity +@Table(name = "volume_reservation") +public class VolumeReservationVO implements InternalIdentity{ + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private long id; + + @Column(name = "vm_reservation_id") + private Long vmReservationId; + + @Column(name = "vm_id") + private long vmId; + + @Column(name="volume_id") + private long volumeId; + + @Column(name="pool_id") + private long poolId; + + // VolumeId -> poolId + @Transient + Map volumeReservationMap; + + /** + * There should never be a public constructor for this class. Since it's + * only here to define the table for the DAO class. + */ + protected VolumeReservationVO() { + } + + public VolumeReservationVO(long vmId, long volumeId, long poolId, Long vmReservationId) { + this.vmId = vmId; + this.volumeId = volumeId; + this.poolId = poolId; + this.vmReservationId = vmReservationId; + } + + + public long getId() { + return id; + } + + public long getVmId() { + return vmId; + } + + public Long geVmReservationId() { + return vmReservationId; + } + + public long getVolumeId() { + return volumeId; + } + + public Long getPoolId() { + return poolId; + } + + + public Map getVolumeReservation(){ + return volumeReservationMap; + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java index d01bf2f12d3..d8178d4a8f4 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDao.java @@ -14,18 +14,18 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db.dao; - -import java.util.List; - -import org.apache.cloudstack.engine.cloud.entity.api.db.VMComputeTagVO; - -import com.cloud.utils.db.GenericDao; - -public interface VMComputeTagDao extends GenericDao{ - - void persist(long vmId, List computeTags); - - List getComputeTags(long vmId); - -} +package org.apache.cloudstack.engine.cloud.entity.api.db.dao; + +import java.util.List; + +import org.apache.cloudstack.engine.cloud.entity.api.db.VMComputeTagVO; + +import com.cloud.utils.db.GenericDao; + +public interface VMComputeTagDao extends GenericDao{ + + void persist(long vmId, List computeTags); + + List getComputeTags(long vmId); + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java index 6037ad4ec26..6f70b353176 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMComputeTagDaoImpl.java @@ -14,76 +14,76 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db.dao; - - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.PostConstruct; -import javax.ejb.Local; - - -import org.apache.cloudstack.engine.cloud.entity.api.db.VMComputeTagVO; - -import org.springframework.stereotype.Component; - -import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; - -@Component -@Local(value = { VMComputeTagDao.class }) -public class VMComputeTagDaoImpl extends GenericDaoBase implements VMComputeTagDao { - - protected SearchBuilder VmIdSearch; - - public VMComputeTagDaoImpl() { - } - - @PostConstruct - public void init() { - VmIdSearch = createSearchBuilder(); - VmIdSearch.and("vmId", VmIdSearch.entity().getVmId(), SearchCriteria.Op.EQ); - VmIdSearch.done(); - - } - - @Override - public void persist(long vmId, List computeTags) { - Transaction txn = Transaction.currentTxn(); - - txn.start(); - SearchCriteria sc = VmIdSearch.create(); - sc.setParameters("vmId", vmId); - expunge(sc); - - for (String tag : computeTags) { - if(tag != null){ - tag = tag.trim(); - if(tag.length() > 0) { - VMComputeTagVO vo = new VMComputeTagVO(vmId, tag); - persist(vo); - } - } - } - txn.commit(); - } - - @Override - public List getComputeTags(long vmId) { - - SearchCriteria sc = VmIdSearch.create(); - sc.setParameters("vmId", vmId); - - List results = search(sc, null); - List computeTags = new ArrayList(results.size()); - for (VMComputeTagVO result : results) { - computeTags.add(result.getComputeTag()); - } - - return computeTags; - } - -} +package org.apache.cloudstack.engine.cloud.entity.api.db.dao; + + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.ejb.Local; + + +import org.apache.cloudstack.engine.cloud.entity.api.db.VMComputeTagVO; + +import org.springframework.stereotype.Component; + +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.Transaction; + +@Component +@Local(value = { VMComputeTagDao.class }) +public class VMComputeTagDaoImpl extends GenericDaoBase implements VMComputeTagDao { + + protected SearchBuilder VmIdSearch; + + public VMComputeTagDaoImpl() { + } + + @PostConstruct + public void init() { + VmIdSearch = createSearchBuilder(); + VmIdSearch.and("vmId", VmIdSearch.entity().getVmId(), SearchCriteria.Op.EQ); + VmIdSearch.done(); + + } + + @Override + public void persist(long vmId, List computeTags) { + Transaction txn = Transaction.currentTxn(); + + txn.start(); + SearchCriteria sc = VmIdSearch.create(); + sc.setParameters("vmId", vmId); + expunge(sc); + + for (String tag : computeTags) { + if(tag != null){ + tag = tag.trim(); + if(tag.length() > 0) { + VMComputeTagVO vo = new VMComputeTagVO(vmId, tag); + persist(vo); + } + } + } + txn.commit(); + } + + @Override + public List getComputeTags(long vmId) { + + SearchCriteria sc = VmIdSearch.create(); + sc.setParameters("vmId", vmId); + + List results = search(sc, null); + List computeTags = new ArrayList(results.size()); + for (VMComputeTagVO result : results) { + computeTags.add(result.getComputeTag()); + } + + return computeTags; + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java index baa0920162b..59c41c298ac 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDao.java @@ -14,18 +14,18 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db.dao; - -import java.util.List; - -import org.apache.cloudstack.engine.cloud.entity.api.db.VMNetworkMapVO; - -import com.cloud.utils.db.GenericDao; - -public interface VMNetworkMapDao extends GenericDao{ - - void persist(long vmId, List networks); - - List getNetworks(long vmId); - -} +package org.apache.cloudstack.engine.cloud.entity.api.db.dao; + +import java.util.List; + +import org.apache.cloudstack.engine.cloud.entity.api.db.VMNetworkMapVO; + +import com.cloud.utils.db.GenericDao; + +public interface VMNetworkMapDao extends GenericDao{ + + void persist(long vmId, List networks); + + List getNetworks(long vmId); + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java index 378f16d519f..0f2c4ccb77e 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMNetworkMapDaoImpl.java @@ -14,72 +14,72 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db.dao; - - -import java.util.ArrayList; -import java.util.List; -import javax.annotation.PostConstruct; -import javax.ejb.Local; -import javax.inject.Inject; -import org.apache.cloudstack.engine.cloud.entity.api.db.VMNetworkMapVO; -import org.springframework.stereotype.Component; -import com.cloud.network.dao.NetworkDao; -import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; - -@Component -@Local(value = { VMNetworkMapDao.class }) -public class VMNetworkMapDaoImpl extends GenericDaoBase implements VMNetworkMapDao { - - protected SearchBuilder VmIdSearch; - - @Inject - protected NetworkDao _networkDao; - - public VMNetworkMapDaoImpl() { - } - - @PostConstruct - public void init() { - VmIdSearch = createSearchBuilder(); - VmIdSearch.and("vmId", VmIdSearch.entity().getVmId(), SearchCriteria.Op.EQ); - VmIdSearch.done(); - - } - - @Override - public void persist(long vmId, List networks) { - Transaction txn = Transaction.currentTxn(); - - txn.start(); - SearchCriteria sc = VmIdSearch.create(); - sc.setParameters("vmId", vmId); - expunge(sc); - - for (Long networkId : networks) { - VMNetworkMapVO vo = new VMNetworkMapVO(vmId, networkId); - persist(vo); - } - - txn.commit(); - } - - @Override - public List getNetworks(long vmId) { - - SearchCriteria sc = VmIdSearch.create(); - sc.setParameters("vmId", vmId); - - List results = search(sc, null); - List networks = new ArrayList(results.size()); - for (VMNetworkMapVO result : results) { - networks.add(result.getNetworkId()); - } - - return networks; - } - -} +package org.apache.cloudstack.engine.cloud.entity.api.db.dao; + + +import java.util.ArrayList; +import java.util.List; +import javax.annotation.PostConstruct; +import javax.ejb.Local; +import javax.inject.Inject; +import org.apache.cloudstack.engine.cloud.entity.api.db.VMNetworkMapVO; +import org.springframework.stereotype.Component; +import com.cloud.network.dao.NetworkDao; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.Transaction; + +@Component +@Local(value = { VMNetworkMapDao.class }) +public class VMNetworkMapDaoImpl extends GenericDaoBase implements VMNetworkMapDao { + + protected SearchBuilder VmIdSearch; + + @Inject + protected NetworkDao _networkDao; + + public VMNetworkMapDaoImpl() { + } + + @PostConstruct + public void init() { + VmIdSearch = createSearchBuilder(); + VmIdSearch.and("vmId", VmIdSearch.entity().getVmId(), SearchCriteria.Op.EQ); + VmIdSearch.done(); + + } + + @Override + public void persist(long vmId, List networks) { + Transaction txn = Transaction.currentTxn(); + + txn.start(); + SearchCriteria sc = VmIdSearch.create(); + sc.setParameters("vmId", vmId); + expunge(sc); + + for (Long networkId : networks) { + VMNetworkMapVO vo = new VMNetworkMapVO(vmId, networkId); + persist(vo); + } + + txn.commit(); + } + + @Override + public List getNetworks(long vmId) { + + SearchCriteria sc = VmIdSearch.create(); + sc.setParameters("vmId", vmId); + + List results = search(sc, null); + List networks = new ArrayList(results.size()); + for (VMNetworkMapVO result : results) { + networks.add(result.getNetworkId()); + } + + return networks; + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java index a312578a4ed..721a8c48326 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDao.java @@ -14,21 +14,21 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db.dao; - - -import java.util.Map; - -import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO; - -import com.cloud.utils.db.GenericDao; - -public interface VMReservationDao extends GenericDao{ - - VMReservationVO findByVmId(long vmId); - - void loadVolumeReservation(VMReservationVO reservation); - - VMReservationVO findByReservationId(String reservationId); - -} +package org.apache.cloudstack.engine.cloud.entity.api.db.dao; + + +import java.util.Map; + +import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO; + +import com.cloud.utils.db.GenericDao; + +public interface VMReservationDao extends GenericDao{ + + VMReservationVO findByVmId(long vmId); + + void loadVolumeReservation(VMReservationVO reservation); + + VMReservationVO findByReservationId(String reservationId); + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java index dc346cc2423..73b4dd2194c 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMReservationDaoImpl.java @@ -14,98 +14,98 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db.dao; - - -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.annotation.PostConstruct; -import javax.ejb.Local; -import javax.inject.Inject; - -import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO; -import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO; -import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO; -import org.springframework.stereotype.Component; - -import com.cloud.host.dao.HostTagsDaoImpl; -import com.cloud.utils.db.DB; -import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; - -@Component -@Local(value = { VMReservationDao.class }) -public class VMReservationDaoImpl extends GenericDaoBase implements VMReservationDao { - - protected SearchBuilder VmIdSearch; - - @Inject protected VolumeReservationDao _volumeReservationDao; - - public VMReservationDaoImpl() { - } - - @PostConstruct - public void init() { - VmIdSearch = createSearchBuilder(); - VmIdSearch.and("vmId", VmIdSearch.entity().getVmId(), SearchCriteria.Op.EQ); - VmIdSearch.done(); - } - - @Override - public VMReservationVO findByVmId(long vmId) { - SearchCriteria sc = VmIdSearch.create("vmId", vmId); - VMReservationVO vmRes = findOneBy(sc); - loadVolumeReservation(vmRes); - return vmRes; - } - - - @Override - public void loadVolumeReservation(VMReservationVO reservation){ - if(reservation != null){ - List volumeResList = _volumeReservationDao.listVolumeReservation(reservation.getId()); - Map volumeReservationMap = new HashMap(); - - for(VolumeReservationVO res : volumeResList){ - volumeReservationMap.put(res.getVolumeId(), res.getPoolId()); - } - reservation.setVolumeReservation(volumeReservationMap); - } - } - - @Override - @DB - public VMReservationVO persist(VMReservationVO reservation) { - Transaction txn = Transaction.currentTxn(); - txn.start(); - - VMReservationVO dbVO = super.persist(reservation); - - saveVolumeReservation(reservation); - loadVolumeReservation(dbVO); - - txn.commit(); - - return dbVO; - } - - private void saveVolumeReservation(VMReservationVO reservation) { - if(reservation.getVolumeReservation() != null){ - for(Long volumeId : reservation.getVolumeReservation().keySet()){ - VolumeReservationVO volumeReservation = new VolumeReservationVO(reservation.getVmId(), volumeId, reservation.getVolumeReservation().get(volumeId), reservation.getId()); - _volumeReservationDao.persist(volumeReservation); - } - } - } - - @Override - public VMReservationVO findByReservationId(String reservationId) { - VMReservationVO vmRes = super.findByUuid(reservationId); - loadVolumeReservation(vmRes); - return vmRes; - } -} +package org.apache.cloudstack.engine.cloud.entity.api.db.dao; + + +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.annotation.PostConstruct; +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.cloudstack.engine.cloud.entity.api.db.VMEntityVO; +import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO; +import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO; +import org.springframework.stereotype.Component; + +import com.cloud.host.dao.HostTagsDaoImpl; +import com.cloud.utils.db.DB; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.Transaction; + +@Component +@Local(value = { VMReservationDao.class }) +public class VMReservationDaoImpl extends GenericDaoBase implements VMReservationDao { + + protected SearchBuilder VmIdSearch; + + @Inject protected VolumeReservationDao _volumeReservationDao; + + public VMReservationDaoImpl() { + } + + @PostConstruct + public void init() { + VmIdSearch = createSearchBuilder(); + VmIdSearch.and("vmId", VmIdSearch.entity().getVmId(), SearchCriteria.Op.EQ); + VmIdSearch.done(); + } + + @Override + public VMReservationVO findByVmId(long vmId) { + SearchCriteria sc = VmIdSearch.create("vmId", vmId); + VMReservationVO vmRes = findOneBy(sc); + loadVolumeReservation(vmRes); + return vmRes; + } + + + @Override + public void loadVolumeReservation(VMReservationVO reservation){ + if(reservation != null){ + List volumeResList = _volumeReservationDao.listVolumeReservation(reservation.getId()); + Map volumeReservationMap = new HashMap(); + + for(VolumeReservationVO res : volumeResList){ + volumeReservationMap.put(res.getVolumeId(), res.getPoolId()); + } + reservation.setVolumeReservation(volumeReservationMap); + } + } + + @Override + @DB + public VMReservationVO persist(VMReservationVO reservation) { + Transaction txn = Transaction.currentTxn(); + txn.start(); + + VMReservationVO dbVO = super.persist(reservation); + + saveVolumeReservation(reservation); + loadVolumeReservation(dbVO); + + txn.commit(); + + return dbVO; + } + + private void saveVolumeReservation(VMReservationVO reservation) { + if(reservation.getVolumeReservation() != null){ + for(Long volumeId : reservation.getVolumeReservation().keySet()){ + VolumeReservationVO volumeReservation = new VolumeReservationVO(reservation.getVmId(), volumeId, reservation.getVolumeReservation().get(volumeId), reservation.getId()); + _volumeReservationDao.persist(volumeReservation); + } + } + } + + @Override + public VMReservationVO findByReservationId(String reservationId) { + VMReservationVO vmRes = super.findByUuid(reservationId); + loadVolumeReservation(vmRes); + return vmRes; + } +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java index 5a4c2be07d4..dc00880d79d 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDao.java @@ -14,18 +14,18 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db.dao; - -import java.util.List; - -import org.apache.cloudstack.engine.cloud.entity.api.db.VMRootDiskTagVO; - -import com.cloud.utils.db.GenericDao; - -public interface VMRootDiskTagDao extends GenericDao{ - - void persist(long vmId, List diskTags); - - List getRootDiskTags(long vmId); - -} +package org.apache.cloudstack.engine.cloud.entity.api.db.dao; + +import java.util.List; + +import org.apache.cloudstack.engine.cloud.entity.api.db.VMRootDiskTagVO; + +import com.cloud.utils.db.GenericDao; + +public interface VMRootDiskTagDao extends GenericDao{ + + void persist(long vmId, List diskTags); + + List getRootDiskTags(long vmId); + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java index 60ea5479398..be194bbfcaa 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VMRootDiskTagDaoImpl.java @@ -14,75 +14,75 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db.dao; - - -import java.util.ArrayList; -import java.util.List; - -import javax.annotation.PostConstruct; -import javax.ejb.Local; - - -import org.apache.cloudstack.engine.cloud.entity.api.db.VMRootDiskTagVO; - -import org.springframework.stereotype.Component; - -import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; - -@Component -@Local(value = { VMRootDiskTagDao.class }) -public class VMRootDiskTagDaoImpl extends GenericDaoBase implements VMRootDiskTagDao { - - protected SearchBuilder VmIdSearch; - - public VMRootDiskTagDaoImpl() { - } - - @PostConstruct - public void init() { - VmIdSearch = createSearchBuilder(); - VmIdSearch.and("vmId", VmIdSearch.entity().getVmId(), SearchCriteria.Op.EQ); - VmIdSearch.done(); - - } - - @Override - public void persist(long vmId, List rootDiskTags) { - Transaction txn = Transaction.currentTxn(); - - txn.start(); - SearchCriteria sc = VmIdSearch.create(); - sc.setParameters("vmId", vmId); - expunge(sc); - - for (String tag : rootDiskTags) { - if(tag != null){ - tag = tag.trim(); - if(tag.length() > 0) { - VMRootDiskTagVO vo = new VMRootDiskTagVO(vmId, tag); - persist(vo); - } - } - } - txn.commit(); - } - - - @Override - public List getRootDiskTags(long vmId) { - SearchCriteria sc = VmIdSearch.create(); - sc.setParameters("vmId", vmId); - - List results = search(sc, null); - List computeTags = new ArrayList(results.size()); - for (VMRootDiskTagVO result : results) { - computeTags.add(result.getRootDiskTag()); - } - return computeTags; - } - -} +package org.apache.cloudstack.engine.cloud.entity.api.db.dao; + + +import java.util.ArrayList; +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.ejb.Local; + + +import org.apache.cloudstack.engine.cloud.entity.api.db.VMRootDiskTagVO; + +import org.springframework.stereotype.Component; + +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.Transaction; + +@Component +@Local(value = { VMRootDiskTagDao.class }) +public class VMRootDiskTagDaoImpl extends GenericDaoBase implements VMRootDiskTagDao { + + protected SearchBuilder VmIdSearch; + + public VMRootDiskTagDaoImpl() { + } + + @PostConstruct + public void init() { + VmIdSearch = createSearchBuilder(); + VmIdSearch.and("vmId", VmIdSearch.entity().getVmId(), SearchCriteria.Op.EQ); + VmIdSearch.done(); + + } + + @Override + public void persist(long vmId, List rootDiskTags) { + Transaction txn = Transaction.currentTxn(); + + txn.start(); + SearchCriteria sc = VmIdSearch.create(); + sc.setParameters("vmId", vmId); + expunge(sc); + + for (String tag : rootDiskTags) { + if(tag != null){ + tag = tag.trim(); + if(tag.length() > 0) { + VMRootDiskTagVO vo = new VMRootDiskTagVO(vmId, tag); + persist(vo); + } + } + } + txn.commit(); + } + + + @Override + public List getRootDiskTags(long vmId) { + SearchCriteria sc = VmIdSearch.create(); + sc.setParameters("vmId", vmId); + + List results = search(sc, null); + List computeTags = new ArrayList(results.size()); + for (VMRootDiskTagVO result : results) { + computeTags.add(result.getRootDiskTag()); + } + return computeTags; + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java index d6a9fe28146..fd709b0db0a 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDao.java @@ -14,18 +14,18 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db.dao; - -import java.util.List; - -import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO; - -import com.cloud.utils.db.GenericDao; - -public interface VolumeReservationDao extends GenericDao{ - - VolumeReservationVO findByVmId(long vmId); - - List listVolumeReservation(long vmReservationId); - -} +package org.apache.cloudstack.engine.cloud.entity.api.db.dao; + +import java.util.List; + +import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO; + +import com.cloud.utils.db.GenericDao; + +public interface VolumeReservationDao extends GenericDao{ + + VolumeReservationVO findByVmId(long vmId); + + List listVolumeReservation(long vmReservationId); + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java index 4b1b1e667d6..26bc65f35c1 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/cloud/entity/api/db/dao/VolumeReservationDaoImpl.java @@ -14,55 +14,55 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.cloud.entity.api.db.dao; - - -import java.util.List; - -import javax.annotation.PostConstruct; -import javax.ejb.Local; -import javax.inject.Inject; - -import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO; -import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO; -import org.springframework.stereotype.Component; - -import com.cloud.host.dao.HostTagsDaoImpl; -import com.cloud.utils.db.GenericDaoBase; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; - -@Component -@Local(value = { VolumeReservationDao.class }) -public class VolumeReservationDaoImpl extends GenericDaoBase implements VolumeReservationDao { - - protected SearchBuilder VmIdSearch; - protected SearchBuilder VmReservationIdSearch; - - public VolumeReservationDaoImpl() { - } - - @PostConstruct - public void init() { - VmIdSearch = createSearchBuilder(); - VmIdSearch.and("vmId", VmIdSearch.entity().getVmId(), SearchCriteria.Op.EQ); - VmIdSearch.done(); - - VmReservationIdSearch = createSearchBuilder(); - VmReservationIdSearch.and("vmReservationId", VmReservationIdSearch.entity().geVmReservationId(), SearchCriteria.Op.EQ); - VmReservationIdSearch.done(); - } - - @Override - public VolumeReservationVO findByVmId(long vmId) { - SearchCriteria sc = VmIdSearch.create("vmId", vmId); - return findOneBy(sc); - } - - @Override - public List listVolumeReservation(long vmReservationId) { - SearchCriteria sc = VmReservationIdSearch.create("vmReservationId", vmReservationId); - return listBy(sc); - } - -} +package org.apache.cloudstack.engine.cloud.entity.api.db.dao; + + +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.cloudstack.engine.cloud.entity.api.db.VMReservationVO; +import org.apache.cloudstack.engine.cloud.entity.api.db.VolumeReservationVO; +import org.springframework.stereotype.Component; + +import com.cloud.host.dao.HostTagsDaoImpl; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; + +@Component +@Local(value = { VolumeReservationDao.class }) +public class VolumeReservationDaoImpl extends GenericDaoBase implements VolumeReservationDao { + + protected SearchBuilder VmIdSearch; + protected SearchBuilder VmReservationIdSearch; + + public VolumeReservationDaoImpl() { + } + + @PostConstruct + public void init() { + VmIdSearch = createSearchBuilder(); + VmIdSearch.and("vmId", VmIdSearch.entity().getVmId(), SearchCriteria.Op.EQ); + VmIdSearch.done(); + + VmReservationIdSearch = createSearchBuilder(); + VmReservationIdSearch.and("vmReservationId", VmReservationIdSearch.entity().geVmReservationId(), SearchCriteria.Op.EQ); + VmReservationIdSearch.done(); + } + + @Override + public VolumeReservationVO findByVmId(long vmId) { + SearchCriteria sc = VmIdSearch.create("vmId", vmId); + return findOneBy(sc); + } + + @Override + public List listVolumeReservation(long vmReservationId) { + SearchCriteria sc = VmReservationIdSearch.create("vmReservationId", vmReservationId); + return listBy(sc); + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java index 3471b7ae376..46dd21d28eb 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ClusterEntityImpl.java @@ -14,196 +14,196 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. - -package org.apache.cloudstack.engine.datacenter.entity.api; - -import java.lang.reflect.Method; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.org.Cluster.ClusterType; -import com.cloud.org.Grouping.AllocationState; -import com.cloud.org.Managed.ManagedState; -import com.cloud.utils.fsm.NoTransitionException; - - -public class ClusterEntityImpl implements ClusterEntity { - - - private DataCenterResourceManager manager; - - private EngineClusterVO clusterVO; - - - public ClusterEntityImpl(String clusterId, DataCenterResourceManager manager) { - this.manager = manager; - this.clusterVO = this.manager.loadCluster(clusterId); - } - - @Override - public boolean enable() { - try { - manager.changeState(this, Event.EnableRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean disable() { - try { - manager.changeState(this, Event.DisableRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean deactivate() { - try { - manager.changeState(this, Event.DeactivateRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - - @Override - public boolean reactivate() { - try { - manager.changeState(this, Event.ActivatedRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - - @Override - public State getState() { - return clusterVO.getState(); - } - - @Override - public void persist() { - manager.saveCluster(clusterVO); - } - - @Override - public String getUuid() { - return clusterVO.getUuid(); - } - - @Override - public long getId() { - return clusterVO.getId(); - } - - @Override - public String getCurrentState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getDesiredState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Date getCreatedTime() { - return clusterVO.getCreated(); - } - - @Override - public Date getLastUpdatedTime() { - return clusterVO.getLastUpdated(); - } - - @Override - public String getOwner() { - return clusterVO.getOwner(); - } - - @Override - public Map getDetails() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void addDetail(String name, String value) { - // TODO Auto-generated method stub - - } - - @Override - public void delDetail(String name, String value) { - // TODO Auto-generated method stub - - } - - @Override - public void updateDetail(String name, String value) { - // TODO Auto-generated method stub - - } - - @Override - public List getApplicableActions() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getName() { - return clusterVO.getName(); - } - - @Override - public long getDataCenterId() { - return clusterVO.getDataCenterId(); - } - - @Override - public long getPodId() { - return clusterVO.getPodId(); - } - - @Override - public HypervisorType getHypervisorType() { - return clusterVO.getHypervisorType(); - } - - @Override - public ClusterType getClusterType() { - return clusterVO.getClusterType(); - } - - @Override - public AllocationState getAllocationState() { - return clusterVO.getAllocationState(); - } - - @Override - public ManagedState getManagedState() { - return clusterVO.getManagedState(); - } - - public void setOwner(String owner) { - clusterVO.setOwner(owner); - } - - public void setName(String name) { - clusterVO.setName(name); - } - -} + +package org.apache.cloudstack.engine.datacenter.entity.api; + +import java.lang.reflect.Method; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.org.Cluster.ClusterType; +import com.cloud.org.Grouping.AllocationState; +import com.cloud.org.Managed.ManagedState; +import com.cloud.utils.fsm.NoTransitionException; + + +public class ClusterEntityImpl implements ClusterEntity { + + + private DataCenterResourceManager manager; + + private EngineClusterVO clusterVO; + + + public ClusterEntityImpl(String clusterId, DataCenterResourceManager manager) { + this.manager = manager; + this.clusterVO = this.manager.loadCluster(clusterId); + } + + @Override + public boolean enable() { + try { + manager.changeState(this, Event.EnableRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean disable() { + try { + manager.changeState(this, Event.DisableRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean deactivate() { + try { + manager.changeState(this, Event.DeactivateRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + + @Override + public boolean reactivate() { + try { + manager.changeState(this, Event.ActivatedRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + + @Override + public State getState() { + return clusterVO.getState(); + } + + @Override + public void persist() { + manager.saveCluster(clusterVO); + } + + @Override + public String getUuid() { + return clusterVO.getUuid(); + } + + @Override + public long getId() { + return clusterVO.getId(); + } + + @Override + public String getCurrentState() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getDesiredState() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Date getCreatedTime() { + return clusterVO.getCreated(); + } + + @Override + public Date getLastUpdatedTime() { + return clusterVO.getLastUpdated(); + } + + @Override + public String getOwner() { + return clusterVO.getOwner(); + } + + @Override + public Map getDetails() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void addDetail(String name, String value) { + // TODO Auto-generated method stub + + } + + @Override + public void delDetail(String name, String value) { + // TODO Auto-generated method stub + + } + + @Override + public void updateDetail(String name, String value) { + // TODO Auto-generated method stub + + } + + @Override + public List getApplicableActions() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getName() { + return clusterVO.getName(); + } + + @Override + public long getDataCenterId() { + return clusterVO.getDataCenterId(); + } + + @Override + public long getPodId() { + return clusterVO.getPodId(); + } + + @Override + public HypervisorType getHypervisorType() { + return clusterVO.getHypervisorType(); + } + + @Override + public ClusterType getClusterType() { + return clusterVO.getClusterType(); + } + + @Override + public AllocationState getAllocationState() { + return clusterVO.getAllocationState(); + } + + @Override + public ManagedState getManagedState() { + return clusterVO.getManagedState(); + } + + public void setOwner(String owner) { + clusterVO.setOwner(owner); + } + + public void setName(String name) { + clusterVO.setName(name); + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java index ab1cbe6b0b1..a5f6d5e8108 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManager.java @@ -14,37 +14,37 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.datacenter.entity.api; - - -import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; - -import com.cloud.utils.fsm.NoTransitionException; - - - -public interface DataCenterResourceManager { - - EngineDataCenterVO loadDataCenter(String dataCenterId); - - void saveDataCenter(EngineDataCenterVO dc); - - void savePod(EngineHostPodVO dc); - - void saveCluster(EngineClusterVO cluster); - - boolean changeState(DataCenterResourceEntity entity, Event event) throws NoTransitionException; - - EngineHostPodVO loadPod(String uuid); - - EngineClusterVO loadCluster(String uuid); - - EngineHostVO loadHost(String uuid); - - void saveHost(EngineHostVO hostVO); - -} +package org.apache.cloudstack.engine.datacenter.entity.api; + + +import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; + +import com.cloud.utils.fsm.NoTransitionException; + + + +public interface DataCenterResourceManager { + + EngineDataCenterVO loadDataCenter(String dataCenterId); + + void saveDataCenter(EngineDataCenterVO dc); + + void savePod(EngineHostPodVO dc); + + void saveCluster(EngineClusterVO cluster); + + boolean changeState(DataCenterResourceEntity entity, Event event) throws NoTransitionException; + + EngineHostPodVO loadPod(String uuid); + + EngineClusterVO loadCluster(String uuid); + + EngineHostVO loadHost(String uuid); + + void saveHost(EngineHostVO hostVO); + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java index 3cfca3b9369..c267e5515f1 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/DataCenterResourceManagerImpl.java @@ -14,116 +14,116 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.datacenter.entity.api; - -import javax.inject.Inject; - -import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; -import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao; -import org.springframework.stereotype.Component; - - -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.utils.fsm.NoTransitionException; -import com.cloud.utils.fsm.StateMachine2; - -@Component -public class DataCenterResourceManagerImpl implements DataCenterResourceManager { - - @Inject - EngineDataCenterDao _dataCenterDao; - - @Inject - EngineHostPodDao _podDao; - - @Inject - EngineClusterDao _clusterDao; - - @Inject - EngineHostDao _hostDao; - - - protected StateMachine2 _stateMachine = DataCenterResourceEntity.State.s_fsm; - - @Override - public EngineDataCenterVO loadDataCenter(String dataCenterId) { - EngineDataCenterVO dataCenterVO = _dataCenterDao.findByUuid(dataCenterId); - if(dataCenterVO == null){ - throw new InvalidParameterValueException("Zone does not exist"); - } - return dataCenterVO; - } - - @Override - public void saveDataCenter(EngineDataCenterVO dc) { - _dataCenterDao.persist(dc); - - } - - @Override - public boolean changeState(DataCenterResourceEntity entity, Event event) throws NoTransitionException { - - if(entity instanceof ZoneEntity){ - return _stateMachine.transitTo(entity, event, null, _dataCenterDao); - }else if(entity instanceof PodEntity){ - return _stateMachine.transitTo(entity, event, null, _podDao); - }else if(entity instanceof ClusterEntity){ - return _stateMachine.transitTo(entity, event, null, _clusterDao); - }else if(entity instanceof HostEntity){ - return _stateMachine.transitTo(entity, event, null, _hostDao); - } - - return false; - } - - @Override - public EngineHostPodVO loadPod(String uuid) { - EngineHostPodVO pod = _podDao.findByUuid(uuid); - if(pod == null){ - throw new InvalidParameterValueException("Pod does not exist"); - } - return pod; - } - - @Override - public EngineClusterVO loadCluster(String uuid) { - EngineClusterVO cluster = _clusterDao.findByUuid(uuid); - if(cluster == null){ - throw new InvalidParameterValueException("Pod does not exist"); - } - return cluster; - } - - @Override - public void savePod(EngineHostPodVO pod) { - _podDao.persist(pod); - } - - @Override - public void saveCluster(EngineClusterVO cluster) { - _clusterDao.persist(cluster); - } - - @Override - public EngineHostVO loadHost(String uuid) { - EngineHostVO host = _hostDao.findByUuid(uuid); - if(host == null){ - throw new InvalidParameterValueException("Host does not exist"); - } - return host; - } - - @Override - public void saveHost(EngineHostVO hostVO) { - _hostDao.persist(hostVO); - } - -} +package org.apache.cloudstack.engine.datacenter.entity.api; + +import javax.inject.Inject; + +import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; +import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao; +import org.springframework.stereotype.Component; + + +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.utils.fsm.NoTransitionException; +import com.cloud.utils.fsm.StateMachine2; + +@Component +public class DataCenterResourceManagerImpl implements DataCenterResourceManager { + + @Inject + EngineDataCenterDao _dataCenterDao; + + @Inject + EngineHostPodDao _podDao; + + @Inject + EngineClusterDao _clusterDao; + + @Inject + EngineHostDao _hostDao; + + + protected StateMachine2 _stateMachine = DataCenterResourceEntity.State.s_fsm; + + @Override + public EngineDataCenterVO loadDataCenter(String dataCenterId) { + EngineDataCenterVO dataCenterVO = _dataCenterDao.findByUuid(dataCenterId); + if(dataCenterVO == null){ + throw new InvalidParameterValueException("Zone does not exist"); + } + return dataCenterVO; + } + + @Override + public void saveDataCenter(EngineDataCenterVO dc) { + _dataCenterDao.persist(dc); + + } + + @Override + public boolean changeState(DataCenterResourceEntity entity, Event event) throws NoTransitionException { + + if(entity instanceof ZoneEntity){ + return _stateMachine.transitTo(entity, event, null, _dataCenterDao); + }else if(entity instanceof PodEntity){ + return _stateMachine.transitTo(entity, event, null, _podDao); + }else if(entity instanceof ClusterEntity){ + return _stateMachine.transitTo(entity, event, null, _clusterDao); + }else if(entity instanceof HostEntity){ + return _stateMachine.transitTo(entity, event, null, _hostDao); + } + + return false; + } + + @Override + public EngineHostPodVO loadPod(String uuid) { + EngineHostPodVO pod = _podDao.findByUuid(uuid); + if(pod == null){ + throw new InvalidParameterValueException("Pod does not exist"); + } + return pod; + } + + @Override + public EngineClusterVO loadCluster(String uuid) { + EngineClusterVO cluster = _clusterDao.findByUuid(uuid); + if(cluster == null){ + throw new InvalidParameterValueException("Pod does not exist"); + } + return cluster; + } + + @Override + public void savePod(EngineHostPodVO pod) { + _podDao.persist(pod); + } + + @Override + public void saveCluster(EngineClusterVO cluster) { + _clusterDao.persist(cluster); + } + + @Override + public EngineHostVO loadHost(String uuid) { + EngineHostVO host = _hostDao.findByUuid(uuid); + if(host == null){ + throw new InvalidParameterValueException("Host does not exist"); + } + return host; + } + + @Override + public void saveHost(EngineHostVO hostVO) { + _hostDao.persist(hostVO); + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java index b4a20801a79..17114e7ce07 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/HostEntityImpl.java @@ -14,202 +14,202 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.engine.datacenter.entity.api; - -import java.lang.reflect.Method; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; - -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.utils.fsm.NoTransitionException; - -public class HostEntityImpl implements HostEntity { - - private DataCenterResourceManager manager; - - private EngineHostVO hostVO; - - public HostEntityImpl(String uuid, DataCenterResourceManager manager) { - this.manager = manager; - hostVO = manager.loadHost(uuid); - } - - @Override - public boolean enable() { - try { - manager.changeState(this, Event.EnableRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean disable() { - try { - manager.changeState(this, Event.DisableRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean deactivate() { - try { - manager.changeState(this, Event.DeactivateRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean reactivate() { - try { - manager.changeState(this, Event.ActivatedRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public State getState() { - return hostVO.getOrchestrationState(); - } - - @Override - public void persist() { - manager.saveHost(hostVO); - } - - @Override - public String getName() { - return hostVO.getName(); - } - - @Override - public String getUuid() { - return hostVO.getUuid(); - } - - @Override - public long getId() { - return hostVO.getId(); - } - - @Override - public String getCurrentState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getDesiredState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Date getCreatedTime() { - return hostVO.getCreated(); - } - - @Override - public Date getLastUpdatedTime() { - return hostVO.getLastUpdated(); - } - - @Override - public String getOwner() { - // TODO Auto-generated method stub - return hostVO.getOwner(); - } - - - public void setDetails(Map details) { - hostVO.setDetails(details); - } - - @Override - public Map getDetails() { - return hostVO.getDetails(); - } - - @Override - public void addDetail(String name, String value) { - hostVO.setDetail(name, value); - } - - @Override - public void delDetail(String name, String value) { - // TODO Auto-generated method stub - } - - @Override - public void updateDetail(String name, String value) { - // TODO Auto-generated method stub - - } - - @Override - public List getApplicableActions() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Long getTotalMemory() { - return hostVO.getTotalMemory(); - } - - @Override - public Integer getCpus() { - return hostVO.getCpus(); - } - - @Override - public Long getSpeed() { - return hostVO.getSpeed(); - } - - @Override - public Long getPodId() { - return hostVO.getPodId(); - } - - @Override - public long getDataCenterId() { - return hostVO.getDataCenterId(); - } - - @Override - public HypervisorType getHypervisorType() { - return hostVO.getHypervisorType(); - } - - @Override - public String getGuid() { - return hostVO.getGuid(); - } - - @Override - public Long getClusterId() { - return hostVO.getClusterId(); - } - - public void setOwner(String owner) { - hostVO.setOwner(owner); - } - - public void setName(String name) { - hostVO.setName(name); - } - - -} +package org.apache.cloudstack.engine.datacenter.entity.api; + +import java.lang.reflect.Method; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; + +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.utils.fsm.NoTransitionException; + +public class HostEntityImpl implements HostEntity { + + private DataCenterResourceManager manager; + + private EngineHostVO hostVO; + + public HostEntityImpl(String uuid, DataCenterResourceManager manager) { + this.manager = manager; + hostVO = manager.loadHost(uuid); + } + + @Override + public boolean enable() { + try { + manager.changeState(this, Event.EnableRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean disable() { + try { + manager.changeState(this, Event.DisableRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean deactivate() { + try { + manager.changeState(this, Event.DeactivateRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean reactivate() { + try { + manager.changeState(this, Event.ActivatedRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public State getState() { + return hostVO.getOrchestrationState(); + } + + @Override + public void persist() { + manager.saveHost(hostVO); + } + + @Override + public String getName() { + return hostVO.getName(); + } + + @Override + public String getUuid() { + return hostVO.getUuid(); + } + + @Override + public long getId() { + return hostVO.getId(); + } + + @Override + public String getCurrentState() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getDesiredState() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Date getCreatedTime() { + return hostVO.getCreated(); + } + + @Override + public Date getLastUpdatedTime() { + return hostVO.getLastUpdated(); + } + + @Override + public String getOwner() { + // TODO Auto-generated method stub + return hostVO.getOwner(); + } + + + public void setDetails(Map details) { + hostVO.setDetails(details); + } + + @Override + public Map getDetails() { + return hostVO.getDetails(); + } + + @Override + public void addDetail(String name, String value) { + hostVO.setDetail(name, value); + } + + @Override + public void delDetail(String name, String value) { + // TODO Auto-generated method stub + } + + @Override + public void updateDetail(String name, String value) { + // TODO Auto-generated method stub + + } + + @Override + public List getApplicableActions() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Long getTotalMemory() { + return hostVO.getTotalMemory(); + } + + @Override + public Integer getCpus() { + return hostVO.getCpus(); + } + + @Override + public Long getSpeed() { + return hostVO.getSpeed(); + } + + @Override + public Long getPodId() { + return hostVO.getPodId(); + } + + @Override + public long getDataCenterId() { + return hostVO.getDataCenterId(); + } + + @Override + public HypervisorType getHypervisorType() { + return hostVO.getHypervisorType(); + } + + @Override + public String getGuid() { + return hostVO.getGuid(); + } + + @Override + public Long getClusterId() { + return hostVO.getClusterId(); + } + + public void setOwner(String owner) { + hostVO.setOwner(owner); + } + + public void setName(String name) { + hostVO.setName(name); + } + + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java index 5c66a21a73e..758a99751ad 100755 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/PodEntityImpl.java @@ -1,211 +1,211 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.engine.datacenter.entity.api; - -import java.lang.reflect.Method; -import java.util.Date; -import java.util.List; -import java.util.Map; - -import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; - -import com.cloud.org.Cluster; -import com.cloud.org.Grouping.AllocationState; -import com.cloud.utils.fsm.NoTransitionException; - -public class PodEntityImpl implements PodEntity { - - - private DataCenterResourceManager manager; - - private EngineHostPodVO podVO; - - public PodEntityImpl(String uuid, DataCenterResourceManager manager) { - this.manager = manager; - podVO = manager.loadPod(uuid); - } - - @Override - public boolean enable() { - try { - manager.changeState(this, Event.EnableRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean disable() { - try { - manager.changeState(this, Event.DisableRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean deactivate() { - try { - manager.changeState(this, Event.DeactivateRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean reactivate() { - try { - manager.changeState(this, Event.ActivatedRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public State getState() { - return podVO.getState(); - } - - @Override - public String getUuid() { - return podVO.getUuid(); - } - - @Override - public long getId() { - return podVO.getId(); - } - - @Override - public String getCurrentState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getDesiredState() { - // TODO Auto-generated method stub - return null; - } - - @Override - public Date getCreatedTime() { - return podVO.getCreated(); - } - - @Override - public Date getLastUpdatedTime() { - return podVO.getLastUpdated(); - } - - @Override - public String getOwner() { - return podVO.getOwner(); - } - - - @Override - public List getApplicableActions() { - // TODO Auto-generated method stub - return null; - } - - @Override - public String getCidrAddress() { - return podVO.getCidrAddress(); - } - - @Override - public int getCidrSize() { - return podVO.getCidrSize(); - } - - @Override - public String getGateway() { - return podVO.getGateway(); - } - - @Override - public long getDataCenterId() { - return podVO.getDataCenterId(); - } - - @Override - public String getName() { - return podVO.getName(); - } - - @Override - public AllocationState getAllocationState() { - return podVO.getAllocationState(); - } - - @Override - public boolean getExternalDhcp() { - return podVO.getExternalDhcp(); - } - - @Override - public List listClusters() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void persist() { - manager.savePod(podVO); - - } - - @Override - public Map getDetails() { - return null; - } - - @Override - public void addDetail(String name, String value) { - // TODO Auto-generated method stub - - } - - @Override - public void delDetail(String name, String value) { - // TODO Auto-generated method stub - - } - - @Override - public void updateDetail(String name, String value) { - - } - - public void setOwner(String owner) { - podVO.setOwner(owner); - } - - public void setName(String name) { - podVO.setName(name); - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.engine.datacenter.entity.api; + +import java.lang.reflect.Method; +import java.util.Date; +import java.util.List; +import java.util.Map; + +import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; + +import com.cloud.org.Cluster; +import com.cloud.org.Grouping.AllocationState; +import com.cloud.utils.fsm.NoTransitionException; + +public class PodEntityImpl implements PodEntity { + + + private DataCenterResourceManager manager; + + private EngineHostPodVO podVO; + + public PodEntityImpl(String uuid, DataCenterResourceManager manager) { + this.manager = manager; + podVO = manager.loadPod(uuid); + } + + @Override + public boolean enable() { + try { + manager.changeState(this, Event.EnableRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean disable() { + try { + manager.changeState(this, Event.DisableRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean deactivate() { + try { + manager.changeState(this, Event.DeactivateRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean reactivate() { + try { + manager.changeState(this, Event.ActivatedRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public State getState() { + return podVO.getState(); + } + + @Override + public String getUuid() { + return podVO.getUuid(); + } + + @Override + public long getId() { + return podVO.getId(); + } + + @Override + public String getCurrentState() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getDesiredState() { + // TODO Auto-generated method stub + return null; + } + + @Override + public Date getCreatedTime() { + return podVO.getCreated(); + } + + @Override + public Date getLastUpdatedTime() { + return podVO.getLastUpdated(); + } + + @Override + public String getOwner() { + return podVO.getOwner(); + } + + + @Override + public List getApplicableActions() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getCidrAddress() { + return podVO.getCidrAddress(); + } + + @Override + public int getCidrSize() { + return podVO.getCidrSize(); + } + + @Override + public String getGateway() { + return podVO.getGateway(); + } + + @Override + public long getDataCenterId() { + return podVO.getDataCenterId(); + } + + @Override + public String getName() { + return podVO.getName(); + } + + @Override + public AllocationState getAllocationState() { + return podVO.getAllocationState(); + } + + @Override + public boolean getExternalDhcp() { + return podVO.getExternalDhcp(); + } + + @Override + public List listClusters() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void persist() { + manager.savePod(podVO); + + } + + @Override + public Map getDetails() { + return null; + } + + @Override + public void addDetail(String name, String value) { + // TODO Auto-generated method stub + + } + + @Override + public void delDetail(String name, String value) { + // TODO Auto-generated method stub + + } + + @Override + public void updateDetail(String name, String value) { + + } + + public void setOwner(String owner) { + podVO.setOwner(owner); + } + + public void setName(String name) { + podVO.setName(name); + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java index 333a2207d66..e2548803d61 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/ZoneEntityImpl.java @@ -1,201 +1,201 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.engine.datacenter.entity.api; - -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.Date; -import java.util.List; -import java.util.Map; -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; -import com.cloud.utils.fsm.FiniteStateObject; -import com.cloud.utils.fsm.NoTransitionException; - - -@Path("/zone/{id}") -public class ZoneEntityImpl implements ZoneEntity, FiniteStateObject { - - - private DataCenterResourceManager manager; - - private EngineDataCenterVO dataCenterVO; - - - public ZoneEntityImpl(String dataCenterId, DataCenterResourceManager manager) { - this.manager = manager; - this.dataCenterVO = this.manager.loadDataCenter(dataCenterId); - } - - @Override - @GET - public String getUuid() { - return dataCenterVO.getUuid(); - } - - @Override - public long getId() { - return dataCenterVO.getId(); - } - - @Override - public boolean enable() { - try { - manager.changeState(this, Event.EnableRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean disable() { - try { - manager.changeState(this, Event.DisableRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean deactivate() { - try { - manager.changeState(this, Event.DeactivateRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public boolean reactivate() { - try { - manager.changeState(this, Event.ActivatedRequest); - } catch (NoTransitionException e) { - return false; - } - return true; - } - - @Override - public String getCurrentState() { - // TODO Auto-generated method stub - return "state"; - } - - @Override - public String getDesiredState() { - // TODO Auto-generated method stub - return "desired_state"; - } - - @Override - public Date getCreatedTime() { - return dataCenterVO.getCreated(); - } - - @Override - public Date getLastUpdatedTime() { - return dataCenterVO.getLastUpdated(); - } - - @Override - public String getOwner() { - return dataCenterVO.getOwner(); - } - - - public void setOwner(String owner) { - dataCenterVO.setOwner(owner); - } - - @Override - public Map getDetails() { - return dataCenterVO.getDetails(); - } - - public void setDetails(Map details) { - dataCenterVO.setDetails(details); - } - - - @Override - public void addDetail(String name, String value) { - dataCenterVO.setDetail(name, value); - } - - @Override - public void delDetail(String name, String value) { - // TODO Auto-generated method stub - } - - @Override - public void updateDetail(String name, String value) { - // TODO Auto-generated method stub - - } - - @Override - public List getApplicableActions() { - // TODO Auto-generated method stub - return null; - } - - @Override - public State getState() { - return dataCenterVO.getState(); - } - - - @Override - public List listPods() { - // TODO Auto-generated method stub - return null; - } - - @Override - public void setState(State state) { - //use FSM to set state. - } - - @Override - public void persist() { - manager.saveDataCenter(dataCenterVO); - } - - @Override - public String getName() { - return dataCenterVO.getName(); - } - - @Override - public List listPodIds() { - List podIds = new ArrayList(); - podIds.add("pod-uuid-1"); - podIds.add("pod-uuid-2"); - return podIds; - } - - public void setName(String name) { - dataCenterVO.setName(name); - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.engine.datacenter.entity.api; + +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.Date; +import java.util.List; +import java.util.Map; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State.Event; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; +import com.cloud.utils.fsm.FiniteStateObject; +import com.cloud.utils.fsm.NoTransitionException; + + +@Path("/zone/{id}") +public class ZoneEntityImpl implements ZoneEntity, FiniteStateObject { + + + private DataCenterResourceManager manager; + + private EngineDataCenterVO dataCenterVO; + + + public ZoneEntityImpl(String dataCenterId, DataCenterResourceManager manager) { + this.manager = manager; + this.dataCenterVO = this.manager.loadDataCenter(dataCenterId); + } + + @Override + @GET + public String getUuid() { + return dataCenterVO.getUuid(); + } + + @Override + public long getId() { + return dataCenterVO.getId(); + } + + @Override + public boolean enable() { + try { + manager.changeState(this, Event.EnableRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean disable() { + try { + manager.changeState(this, Event.DisableRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean deactivate() { + try { + manager.changeState(this, Event.DeactivateRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public boolean reactivate() { + try { + manager.changeState(this, Event.ActivatedRequest); + } catch (NoTransitionException e) { + return false; + } + return true; + } + + @Override + public String getCurrentState() { + // TODO Auto-generated method stub + return "state"; + } + + @Override + public String getDesiredState() { + // TODO Auto-generated method stub + return "desired_state"; + } + + @Override + public Date getCreatedTime() { + return dataCenterVO.getCreated(); + } + + @Override + public Date getLastUpdatedTime() { + return dataCenterVO.getLastUpdated(); + } + + @Override + public String getOwner() { + return dataCenterVO.getOwner(); + } + + + public void setOwner(String owner) { + dataCenterVO.setOwner(owner); + } + + @Override + public Map getDetails() { + return dataCenterVO.getDetails(); + } + + public void setDetails(Map details) { + dataCenterVO.setDetails(details); + } + + + @Override + public void addDetail(String name, String value) { + dataCenterVO.setDetail(name, value); + } + + @Override + public void delDetail(String name, String value) { + // TODO Auto-generated method stub + } + + @Override + public void updateDetail(String name, String value) { + // TODO Auto-generated method stub + + } + + @Override + public List getApplicableActions() { + // TODO Auto-generated method stub + return null; + } + + @Override + public State getState() { + return dataCenterVO.getState(); + } + + + @Override + public List listPods() { + // TODO Auto-generated method stub + return null; + } + + @Override + public void setState(State state) { + //use FSM to set state. + } + + @Override + public void persist() { + manager.saveDataCenter(dataCenterVO); + } + + @Override + public String getName() { + return dataCenterVO.getName(); + } + + @Override + public List listPodIds() { + List podIds = new ArrayList(); + podIds.add("pod-uuid-1"); + podIds.add("pod-uuid-2"); + return podIds; + } + + public void setName(String name) { + dataCenterVO.setName(name); + } +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java index c4f1940c119..98b7a991a3f 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineCluster.java @@ -1,23 +1,23 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package org.apache.cloudstack.engine.datacenter.entity.api.db; - -import com.cloud.org.Cluster; - -public interface EngineCluster extends Cluster { - -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.engine.datacenter.entity.api.db; + +import com.cloud.org.Cluster; + +public interface EngineCluster extends Cluster { + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java index 24e01a0b0af..240dddf1529 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenter.java @@ -1,23 +1,23 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package org.apache.cloudstack.engine.datacenter.entity.api.db; - -import com.cloud.dc.DataCenter; - -public interface EngineDataCenter extends DataCenter { - -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.engine.datacenter.entity.api.db; + +import com.cloud.dc.DataCenter; + +public interface EngineDataCenter extends DataCenter { + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java index 15bed6f8c1d..cdf08cc5b9c 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineDataCenterVO.java @@ -8,10 +8,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// // Automatically generated by addcopyright.py at 04/03/2012 -package org.apache.cloudstack.engine.datacenter.entity.api.db; - +package org.apache.cloudstack.engine.datacenter.entity.api.db; + import java.util.Date; import java.util.Map; import java.util.UUID; @@ -39,43 +39,43 @@ import com.cloud.org.Grouping; import com.cloud.utils.NumbersUtil; import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.StateMachine; - -@Entity -@Table(name="data_center") -public class EngineDataCenterVO implements EngineDataCenter, Identity { - - @Id - @GeneratedValue(strategy=GenerationType.IDENTITY) - @Column(name="id") - private long id; - - @Column(name="name") - private String name = null; - - @Column(name="description") - private String description = null; - - @Column(name="dns1") - private String dns1 = null; - - @Column(name="dns2") - private String dns2 = null; - - @Column(name="ip6Dns1") - private String ip6Dns1 = null; - - @Column(name="ip6Dns2") - private String ip6Dns2 = null; - - @Column(name="internal_dns1") - private String internalDns1 = null; - - @Column(name="internal_dns2") - private String internalDns2 = null; - - @Column(name="router_mac_address", updatable = false, nullable=false) - private String routerMacAddress = "02:00:00:00:00:01"; - + +@Entity +@Table(name="data_center") +public class EngineDataCenterVO implements EngineDataCenter, Identity { + + @Id + @GeneratedValue(strategy=GenerationType.IDENTITY) + @Column(name="id") + private long id; + + @Column(name="name") + private String name = null; + + @Column(name="description") + private String description = null; + + @Column(name="dns1") + private String dns1 = null; + + @Column(name="dns2") + private String dns2 = null; + + @Column(name="ip6Dns1") + private String ip6Dns1 = null; + + @Column(name="ip6Dns2") + private String ip6Dns2 = null; + + @Column(name="internal_dns1") + private String internalDns1 = null; + + @Column(name="internal_dns2") + private String internalDns2 = null; + + @Column(name="router_mac_address", updatable = false, nullable=false) + private String routerMacAddress = "02:00:00:00:00:01"; + @Column(name="guest_network_cidr") private String guestNetworkCidr = null; @@ -207,13 +207,13 @@ public class EngineDataCenterVO implements EngineDataCenter, Identity { } public EngineDataCenterVO(long id, String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix) { - this(name, description, dns1, dns2, dns3, dns4, guestCidr, domain, domainId, zoneType, zoneToken, domainSuffix, false, false, null, null); + this(name, description, dns1, dns2, dns3, dns4, guestCidr, domain, domainId, zoneType, zoneToken, domainSuffix, false, false, null, null); this.id = id; this.allocationState = Grouping.AllocationState.Enabled; - this.uuid = UUID.randomUUID().toString(); - } - - public EngineDataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix, boolean securityGroupEnabled, boolean localStorageEnabled, String ip6Dns1, String ip6Dns2) { + this.uuid = UUID.randomUUID().toString(); + } + + public EngineDataCenterVO(String name, String description, String dns1, String dns2, String dns3, String dns4, String guestCidr, String domain, Long domainId, NetworkType zoneType, String zoneToken, String domainSuffix, boolean securityGroupEnabled, boolean localStorageEnabled, String ip6Dns1, String ip6Dns2) { this.name = name; this.description = description; this.dns1 = dns1; @@ -285,72 +285,72 @@ public class EngineDataCenterVO implements EngineDataCenter, Identity { public void setDomainId(Long domainId) { this.domainId = domainId; - } - + } + @Override - public String getDescription() { - return description; - } - - public String getRouterMacAddress() { - return routerMacAddress; - } - + public String getDescription() { + return description; + } + + public String getRouterMacAddress() { + return routerMacAddress; + } + @Override - public String getDns1() { - return dns1; - } - + public String getDns1() { + return dns1; + } + @Override - public String getDns2() { - return dns2; - } - + public String getDns2() { + return dns2; + } + @Override - public String getInternalDns1() { - return internalDns1; - } - + public String getInternalDns1() { + return internalDns1; + } + @Override - public String getInternalDns2() { - return internalDns2; - } - - protected EngineDataCenterVO() { - } - + public String getInternalDns2() { + return internalDns2; + } + + protected EngineDataCenterVO() { + } + @Override - public long getId() { - return id; - } - + public long getId() { + return id; + } + @Override - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public void setDns1(String dns1) { - this.dns1 = dns1; - } - - public void setDns2(String dns2) { - this.dns2 = dns2; - } - - public void setInternalDns1(String dns3) { - this.internalDns1 = dns3; - } - - public void setInternalDns2(String dns4) { - this.internalDns2 = dns4; - } - - public void setRouterMacAddress(String routerMacAddress) { - this.routerMacAddress = routerMacAddress; + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public void setDns1(String dns1) { + this.dns1 = dns1; + } + + public void setDns2(String dns2) { + this.dns2 = dns2; + } + + public void setInternalDns1(String dns3) { + this.internalDns1 = dns3; + } + + public void setInternalDns2(String dns4) { + this.internalDns2 = dns4; + } + + public void setRouterMacAddress(String routerMacAddress) { + this.routerMacAddress = routerMacAddress; } @Override @@ -501,4 +501,4 @@ public class EngineDataCenterVO implements EngineDataCenter, Identity { public void setIp6Dns2(String ip6Dns2) { this.ip6Dns2 = ip6Dns2; } -} +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java index fe1b832633e..127c4457071 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHost.java @@ -1,24 +1,24 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package org.apache.cloudstack.engine.datacenter.entity.api.db; - -import com.cloud.host.Host; - -public interface EngineHost extends Host { - -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.engine.datacenter.entity.api.db; + +import com.cloud.host.Host; + +public interface EngineHost extends Host { + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java index 99c95406f9e..65b9db53e93 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EngineHostPodVO.java @@ -8,10 +8,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// // Automatically generated by addcopyright.py at 04/03/2012 -package org.apache.cloudstack.engine.datacenter.entity.api.db; - +package org.apache.cloudstack.engine.datacenter.entity.api.db; + import java.util.Date; import java.util.UUID; @@ -34,42 +34,42 @@ import com.cloud.org.Grouping; import com.cloud.utils.NumbersUtil; import com.cloud.utils.db.GenericDao; import com.cloud.utils.db.StateMachine; - -@Entity -@Table(name = "host_pod_ref") -public class EngineHostPodVO implements EnginePod, Identity { - @Id - @GeneratedValue(strategy = GenerationType.IDENTITY) - long id; - - @Column(name = "name") - private String name = null; - - @Column(name = "data_center_id") + +@Entity +@Table(name = "host_pod_ref") +public class EngineHostPodVO implements EnginePod, Identity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + long id; + + @Column(name = "name") + private String name = null; + + @Column(name = "data_center_id") private long dataCenterId; @Column(name = "gateway") - private String gateway; - - @Column(name = "cidr_address") - private String cidrAddress; - - @Column(name = "cidr_size") - private int cidrSize; - - @Column(name = "description") + private String gateway; + + @Column(name = "cidr_address") + private String cidrAddress; + + @Column(name = "cidr_size") + private int cidrSize; + + @Column(name = "description") private String description; @Column(name="allocation_state") @Enumerated(value=EnumType.STRING) - AllocationState allocationState; + AllocationState allocationState; @Column(name = "external_dhcp") private Boolean externalDhcp; @Column(name=GenericDao.REMOVED_COLUMN) private Date removed; - + @Column(name = "uuid") private String uuid; @@ -93,66 +93,66 @@ public class EngineHostPodVO implements EnginePod, Identity { @StateMachine(state=State.class, event=Event.class) @Column(name="engine_state", updatable=true, nullable=false, length=32) protected State engineState = null; - - public EngineHostPodVO(String name, long dcId, String gateway, String cidrAddress, int cidrSize, String description) { - this.name = name; + + public EngineHostPodVO(String name, long dcId, String gateway, String cidrAddress, int cidrSize, String description) { + this.name = name; this.dataCenterId = dcId; - this.gateway = gateway; - this.cidrAddress = cidrAddress; - this.cidrSize = cidrSize; + this.gateway = gateway; + this.cidrAddress = cidrAddress; + this.cidrSize = cidrSize; this.description = description; this.allocationState = Grouping.AllocationState.Enabled; this.externalDhcp = false; this.uuid = UUID.randomUUID().toString(); - this.engineState = State.Disabled; - } - - /* - * public HostPodVO(String name, long dcId) { this(null, name, dcId); } - */ - protected EngineHostPodVO() { + this.engineState = State.Disabled; + } + + /* + * public HostPodVO(String name, long dcId) { this(null, name, dcId); } + */ + protected EngineHostPodVO() { this.uuid = UUID.randomUUID().toString(); - } - + } + @Override - public long getId() { - return id; - } - + public long getId() { + return id; + } + @Override - public long getDataCenterId() { - return dataCenterId; - } - - public void setDataCenterId(long dataCenterId) { - this.dataCenterId = dataCenterId; - } - + public long getDataCenterId() { + return dataCenterId; + } + + public void setDataCenterId(long dataCenterId) { + this.dataCenterId = dataCenterId; + } + @Override - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + @Override - public String getCidrAddress() { - return cidrAddress; - } - - public void setCidrAddress(String cidrAddress) { - this.cidrAddress = cidrAddress; - } - + public String getCidrAddress() { + return cidrAddress; + } + + public void setCidrAddress(String cidrAddress) { + this.cidrAddress = cidrAddress; + } + @Override - public int getCidrSize() { - return cidrSize; - } - - public void setCidrSize(int cidrSize) { - this.cidrSize = cidrSize; + public int getCidrSize() { + return cidrSize; + } + + public void setCidrSize(int cidrSize) { + this.cidrSize = cidrSize; } @Override @@ -162,15 +162,15 @@ public class EngineHostPodVO implements EnginePod, Identity { public void setGateway(String gateway) { this.gateway = gateway; - } - + } + @Override - public String getDescription() { - return description; - } - - public void setDescription(String description) { - this.description = description; + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; } @Override @@ -241,5 +241,5 @@ public class EngineHostPodVO implements EnginePod, Identity { public State getState() { return engineState; - } -} + } +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java index 3983dd90420..2adbca36af5 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/EnginePod.java @@ -1,23 +1,23 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package org.apache.cloudstack.engine.datacenter.entity.api.db; - -import com.cloud.dc.Pod; - -public interface EnginePod extends Pod { - -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.engine.datacenter.entity.api.db; + +import com.cloud.dc.Pod; + +public interface EnginePod extends Pod { + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java index a27ed505289..3a71fe2cf9f 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostDao.java @@ -82,4 +82,4 @@ public interface EngineHostDao extends GenericDao, StateDao< * @return */ List listAllUpAndEnabledNonHAHosts(Type type, Long clusterId, Long podId, long dcId, String haTag); -} +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java index 48e77739085..451723e5370 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDao.java @@ -8,10 +8,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// // Automatically generated by addcopyright.py at 04/03/2012 -package org.apache.cloudstack.engine.datacenter.entity.api.db.dao; - +package org.apache.cloudstack.engine.datacenter.entity.api.db.dao; + import java.util.HashMap; import java.util.List; @@ -21,13 +21,13 @@ import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; import com.cloud.utils.db.GenericDao; import com.cloud.utils.fsm.StateDao; - -public interface EngineHostPodDao extends GenericDao, StateDao { - public List listByDataCenterId(long id); - - public EngineHostPodVO findByName(String name, long dcId); - + +public interface EngineHostPodDao extends GenericDao, StateDao { + public List listByDataCenterId(long id); + + public EngineHostPodVO findByName(String name, long dcId); + public HashMap> getCurrentPodCidrSubnets(long zoneId, long podIdToSkip); public List listDisabledPods(long zoneId); -} +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java index c5b4bd28de4..fee083a39a0 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/datacenter/entity/api/db/dao/EngineHostPodDaoImpl.java @@ -8,10 +8,10 @@ // WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. // See the License for the specific language governing permissions and // limitations under the License. -// +// // Automatically generated by addcopyright.py at 04/03/2012 -package org.apache.cloudstack.engine.datacenter.entity.api.db.dao; - +package org.apache.cloudstack.engine.datacenter.entity.api.db.dao; + import java.sql.PreparedStatement; import java.sql.ResultSet; import java.sql.SQLException; @@ -39,27 +39,27 @@ import com.cloud.utils.db.UpdateBuilder; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; -@Component(value="EngineHostPodDao") -@Local(value={EngineHostPodDao.class}) -public class EngineHostPodDaoImpl extends GenericDaoBase implements EngineHostPodDao { - private static final Logger s_logger = Logger.getLogger(EngineHostPodDaoImpl.class); - - protected SearchBuilder DataCenterAndNameSearch; +@Component(value="EngineHostPodDao") +@Local(value={EngineHostPodDao.class}) +public class EngineHostPodDaoImpl extends GenericDaoBase implements EngineHostPodDao { + private static final Logger s_logger = Logger.getLogger(EngineHostPodDaoImpl.class); + + protected SearchBuilder DataCenterAndNameSearch; protected SearchBuilder DataCenterIdSearch; protected SearchBuilder UUIDSearch; - protected SearchBuilder StateChangeSearch; - - protected EngineHostPodDaoImpl() { - DataCenterAndNameSearch = createSearchBuilder(); - DataCenterAndNameSearch.and("dc", DataCenterAndNameSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); - DataCenterAndNameSearch.and("name", DataCenterAndNameSearch.entity().getName(), SearchCriteria.Op.EQ); - DataCenterAndNameSearch.done(); - - DataCenterIdSearch = createSearchBuilder(); - DataCenterIdSearch.and("dcId", DataCenterIdSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); + protected SearchBuilder StateChangeSearch; + + protected EngineHostPodDaoImpl() { + DataCenterAndNameSearch = createSearchBuilder(); + DataCenterAndNameSearch.and("dc", DataCenterAndNameSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); + DataCenterAndNameSearch.and("name", DataCenterAndNameSearch.entity().getName(), SearchCriteria.Op.EQ); + DataCenterAndNameSearch.done(); + + DataCenterIdSearch = createSearchBuilder(); + DataCenterIdSearch.and("dcId", DataCenterIdSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); DataCenterIdSearch.done(); - - + + UUIDSearch = createSearchBuilder(); UUIDSearch.and("uuid", UUIDSearch.entity().getUuid(), SearchCriteria.Op.EQ); UUIDSearch.done(); @@ -67,56 +67,56 @@ public class EngineHostPodDaoImpl extends GenericDaoBase StateChangeSearch = createSearchBuilder(); StateChangeSearch.and("id", StateChangeSearch.entity().getId(), SearchCriteria.Op.EQ); StateChangeSearch.and("state", StateChangeSearch.entity().getState(), SearchCriteria.Op.EQ); - StateChangeSearch.done(); - - } - + StateChangeSearch.done(); + + } + @Override - public List listByDataCenterId(long id) { - SearchCriteria sc = DataCenterIdSearch.create(); - sc.setParameters("dcId", id); - - return listBy(sc); - } - + public List listByDataCenterId(long id) { + SearchCriteria sc = DataCenterIdSearch.create(); + sc.setParameters("dcId", id); + + return listBy(sc); + } + @Override - public EngineHostPodVO findByName(String name, long dcId) { - SearchCriteria sc = DataCenterAndNameSearch.create(); - sc.setParameters("dc", dcId); - sc.setParameters("name", name); - - return findOneBy(sc); - } - - @Override - public HashMap> getCurrentPodCidrSubnets(long zoneId, long podIdToSkip) { - HashMap> currentPodCidrSubnets = new HashMap>(); - - String selectSql = "SELECT id, cidr_address, cidr_size FROM host_pod_ref WHERE data_center_id=" + zoneId +" and removed IS NULL"; - Transaction txn = Transaction.currentTxn(); - try { - PreparedStatement stmt = txn.prepareAutoCloseStatement(selectSql); - ResultSet rs = stmt.executeQuery(); - while (rs.next()) { - Long podId = rs.getLong("id"); - if (podId.longValue() == podIdToSkip) { + public EngineHostPodVO findByName(String name, long dcId) { + SearchCriteria sc = DataCenterAndNameSearch.create(); + sc.setParameters("dc", dcId); + sc.setParameters("name", name); + + return findOneBy(sc); + } + + @Override + public HashMap> getCurrentPodCidrSubnets(long zoneId, long podIdToSkip) { + HashMap> currentPodCidrSubnets = new HashMap>(); + + String selectSql = "SELECT id, cidr_address, cidr_size FROM host_pod_ref WHERE data_center_id=" + zoneId +" and removed IS NULL"; + Transaction txn = Transaction.currentTxn(); + try { + PreparedStatement stmt = txn.prepareAutoCloseStatement(selectSql); + ResultSet rs = stmt.executeQuery(); + while (rs.next()) { + Long podId = rs.getLong("id"); + if (podId.longValue() == podIdToSkip) { continue; - } - String cidrAddress = rs.getString("cidr_address"); - long cidrSize = rs.getLong("cidr_size"); - List cidrPair = new ArrayList(); - cidrPair.add(0, cidrAddress); - cidrPair.add(1, new Long(cidrSize)); - currentPodCidrSubnets.put(podId, cidrPair); - } - } catch (SQLException ex) { - s_logger.warn("DB exception " + ex.getMessage(), ex); - return null; - } - - return currentPodCidrSubnets; - } - + } + String cidrAddress = rs.getString("cidr_address"); + long cidrSize = rs.getLong("cidr_size"); + List cidrPair = new ArrayList(); + cidrPair.add(0, cidrAddress); + cidrPair.add(1, new Long(cidrSize)); + currentPodCidrSubnets.put(podId, cidrPair); + } + } catch (SQLException ex) { + s_logger.warn("DB exception " + ex.getMessage(), ex); + return null; + } + + return currentPodCidrSubnets; + } + @Override public boolean remove(Long id) { Transaction txn = Transaction.currentTxn(); @@ -179,6 +179,6 @@ public class EngineHostPodDaoImpl extends GenericDaoBase return rows > 0; } - - -} + + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java index 83e78b45fd0..863c181a9a7 100644 --- a/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java +++ b/engine/orchestration/src/org/apache/cloudstack/engine/service/api/ProvisioningServiceImpl.java @@ -1,170 +1,170 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.engine.service.api; - -import java.util.ArrayList; -import java.util.List; -import java.util.Map; - -import javax.inject.Inject; -import javax.ws.rs.Path; - -import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntityImpl; -import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceManager; -import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.HostEntityImpl; -import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.PodEntityImpl; -import org.apache.cloudstack.engine.datacenter.entity.api.StorageEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntityImpl; -import org.springframework.stereotype.Component; -import org.springframework.stereotype.Service; - -import com.cloud.host.Host; -import com.cloud.host.Status; -import com.cloud.storage.StoragePool; - - -@Component -@Service("provisioningService") -@Path("/provisioning") -public class ProvisioningServiceImpl implements ProvisioningService { - - @Inject - DataCenterResourceManager manager; - - @Override - public StorageEntity registerStorage(String name, List tags, Map details) { - // TODO Auto-generated method stub - return null; - } - - @Override - public ZoneEntity registerZone(String zoneUuid, String name, String owner, List tags, Map details) { - ZoneEntityImpl zoneEntity = new ZoneEntityImpl(zoneUuid, manager); - zoneEntity.setName(name); - zoneEntity.setOwner(owner); - zoneEntity.setDetails(details); - zoneEntity.persist(); - return zoneEntity; - } - - @Override - public PodEntity registerPod(String podUuid, String name, String owner, String zoneUuid, List tags, Map details) { - PodEntityImpl podEntity = new PodEntityImpl(podUuid, manager); - podEntity.setOwner(owner); - podEntity.setName(name); - podEntity.persist(); - return podEntity; - } - - @Override - public ClusterEntity registerCluster(String clusterUuid, String name, String owner, List tags, Map details) { - ClusterEntityImpl clusterEntity = new ClusterEntityImpl(clusterUuid, manager); - clusterEntity.setOwner(owner); - clusterEntity.setName(name); - clusterEntity.persist(); - return clusterEntity; - } - - @Override - public HostEntity registerHost(String hostUuid, String name, String owner, List tags, Map details) { - HostEntityImpl hostEntity = new HostEntityImpl(hostUuid, manager); - hostEntity.setOwner(owner); - hostEntity.setName(name); - hostEntity.setDetails(details); - - hostEntity.persist(); - return hostEntity; - } - - @Override - public void deregisterStorage(String uuid) { - // TODO Auto-generated method stub - - } - - @Override - public void deregisterZone(String uuid) { - ZoneEntityImpl zoneEntity = new ZoneEntityImpl(uuid, manager); - zoneEntity.disable(); - } - - @Override - public void deregisterPod(String uuid) { - PodEntityImpl podEntity = new PodEntityImpl(uuid, manager); - podEntity.disable(); - } - - @Override - public void deregisterCluster(String uuid) { - ClusterEntityImpl clusterEntity = new ClusterEntityImpl(uuid, manager); - clusterEntity.disable(); - - } - - @Override - public void deregisterHost(String uuid) { - HostEntityImpl hostEntity = new HostEntityImpl(uuid, manager); - hostEntity.disable(); - } - - @Override - public void changeState(String type, String entity, Status state) { - // TODO Auto-generated method stub - - } - - @Override - public List listHosts() { - // TODO Auto-generated method stub - return null; - } - - @Override - public List listPods() { - List pods = new ArrayList(); - //pods.add(new PodEntityImpl("pod-uuid-1", "pod1")); - //pods.add(new PodEntityImpl("pod-uuid-2", "pod2")); - return null; - } - - @Override - public List listZones() { - List zones = new ArrayList(); - //zones.add(new ZoneEntityImpl("zone-uuid-1")); - //zones.add(new ZoneEntityImpl("zone-uuid-2")); - return zones; - } - - @Override - public List listStorage() { - // TODO Auto-generated method stub - return null; - } - - @Override - public ZoneEntity getZone(String uuid) { - ZoneEntityImpl impl = new ZoneEntityImpl(uuid, manager); - return impl; - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.engine.service.api; + +import java.util.ArrayList; +import java.util.List; +import java.util.Map; + +import javax.inject.Inject; +import javax.ws.rs.Path; + +import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity; +import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntityImpl; +import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceManager; +import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity; +import org.apache.cloudstack.engine.datacenter.entity.api.HostEntityImpl; +import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity; +import org.apache.cloudstack.engine.datacenter.entity.api.PodEntityImpl; +import org.apache.cloudstack.engine.datacenter.entity.api.StorageEntity; +import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; +import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntityImpl; +import org.springframework.stereotype.Component; +import org.springframework.stereotype.Service; + +import com.cloud.host.Host; +import com.cloud.host.Status; +import com.cloud.storage.StoragePool; + + +@Component +@Service("provisioningService") +@Path("/provisioning") +public class ProvisioningServiceImpl implements ProvisioningService { + + @Inject + DataCenterResourceManager manager; + + @Override + public StorageEntity registerStorage(String name, List tags, Map details) { + // TODO Auto-generated method stub + return null; + } + + @Override + public ZoneEntity registerZone(String zoneUuid, String name, String owner, List tags, Map details) { + ZoneEntityImpl zoneEntity = new ZoneEntityImpl(zoneUuid, manager); + zoneEntity.setName(name); + zoneEntity.setOwner(owner); + zoneEntity.setDetails(details); + zoneEntity.persist(); + return zoneEntity; + } + + @Override + public PodEntity registerPod(String podUuid, String name, String owner, String zoneUuid, List tags, Map details) { + PodEntityImpl podEntity = new PodEntityImpl(podUuid, manager); + podEntity.setOwner(owner); + podEntity.setName(name); + podEntity.persist(); + return podEntity; + } + + @Override + public ClusterEntity registerCluster(String clusterUuid, String name, String owner, List tags, Map details) { + ClusterEntityImpl clusterEntity = new ClusterEntityImpl(clusterUuid, manager); + clusterEntity.setOwner(owner); + clusterEntity.setName(name); + clusterEntity.persist(); + return clusterEntity; + } + + @Override + public HostEntity registerHost(String hostUuid, String name, String owner, List tags, Map details) { + HostEntityImpl hostEntity = new HostEntityImpl(hostUuid, manager); + hostEntity.setOwner(owner); + hostEntity.setName(name); + hostEntity.setDetails(details); + + hostEntity.persist(); + return hostEntity; + } + + @Override + public void deregisterStorage(String uuid) { + // TODO Auto-generated method stub + + } + + @Override + public void deregisterZone(String uuid) { + ZoneEntityImpl zoneEntity = new ZoneEntityImpl(uuid, manager); + zoneEntity.disable(); + } + + @Override + public void deregisterPod(String uuid) { + PodEntityImpl podEntity = new PodEntityImpl(uuid, manager); + podEntity.disable(); + } + + @Override + public void deregisterCluster(String uuid) { + ClusterEntityImpl clusterEntity = new ClusterEntityImpl(uuid, manager); + clusterEntity.disable(); + + } + + @Override + public void deregisterHost(String uuid) { + HostEntityImpl hostEntity = new HostEntityImpl(uuid, manager); + hostEntity.disable(); + } + + @Override + public void changeState(String type, String entity, Status state) { + // TODO Auto-generated method stub + + } + + @Override + public List listHosts() { + // TODO Auto-generated method stub + return null; + } + + @Override + public List listPods() { + List pods = new ArrayList(); + //pods.add(new PodEntityImpl("pod-uuid-1", "pod1")); + //pods.add(new PodEntityImpl("pod-uuid-2", "pod2")); + return null; + } + + @Override + public List listZones() { + List zones = new ArrayList(); + //zones.add(new ZoneEntityImpl("zone-uuid-1")); + //zones.add(new ZoneEntityImpl("zone-uuid-2")); + return zones; + } + + @Override + public List listStorage() { + // TODO Auto-generated method stub + return null; + } + + @Override + public ZoneEntity getZone(String uuid) { + ZoneEntityImpl impl = new ZoneEntityImpl(uuid, manager); + return impl; + } + +} diff --git a/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java b/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java index c07931befc8..963e4d7d967 100755 --- a/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java +++ b/engine/orchestration/src/org/apache/cloudstack/platform/orchestration/CloudOrchestrator.java @@ -51,7 +51,6 @@ import com.cloud.user.dao.AccountDao; import com.cloud.utils.Pair; import com.cloud.utils.component.ComponentContext; import com.cloud.vm.NicProfile; -import com.cloud.vm.UserVmVO; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachineManager; import com.cloud.vm.dao.UserVmDao; @@ -66,25 +65,25 @@ public class CloudOrchestrator implements OrchestrationService { @Inject private VirtualMachineManager _itMgr; - + @Inject protected VMTemplateDao _templateDao = null; - + @Inject protected VMInstanceDao _vmDao; - + @Inject protected UserVmDao _userVmDao = null; - + @Inject protected ServiceOfferingDao _serviceOfferingDao; - + @Inject protected DiskOfferingDao _diskOfferingDao = null; - + @Inject protected NetworkDao _networkDao; - + @Inject protected AccountDao _accountDao = null; @@ -147,17 +146,17 @@ public class CloudOrchestrator implements OrchestrationService { @Override public VirtualMachineEntity createVirtualMachine( - String id, - String owner, - String templateId, - String hostName, + String id, + String owner, + String templateId, + String hostName, String displayName, String hypervisor, - int cpu, - int speed, + int cpu, + int speed, long memory, Long diskSize, - List computeTags, + List computeTags, List rootDiskTags, Map networkNicMap, DeploymentPlan plan) throws InsufficientCapacityException { @@ -173,22 +172,22 @@ public class CloudOrchestrator implements OrchestrationService { VirtualMachineEntityImpl vmEntity = ComponentContext.inject(VirtualMachineEntityImpl.class); vmEntity.init(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, new ArrayList(networkNicMap.keySet())); - - + + HypervisorType hypervisorType = HypervisorType.valueOf(hypervisor); //load vm instance and offerings and call virtualMachineManagerImpl VMInstanceVO vm = _vmDao.findByUuid(id); - + // If the template represents an ISO, a disk offering must be passed in, and will be used to create the root disk // Else, a disk offering is optional, and if present will be used to create the data disk Pair rootDiskOffering = new Pair(null, null); List> dataDiskOfferings = new ArrayList>(); - + ServiceOfferingVO offering = _serviceOfferingDao.findById(vm.getServiceOfferingId()); rootDiskOffering.first(offering); - + if(vm.getDiskOfferingId() != null){ DiskOfferingVO diskOffering = _diskOfferingDao.findById(vm.getDiskOfferingId()); if (diskOffering == null) { @@ -205,32 +204,32 @@ public class CloudOrchestrator implements OrchestrationService { } dataDiskOfferings.add(new Pair(diskOffering, size)); } - - - + + + if (_itMgr.allocate(_userVmDao.findById(vm.getId(), true), _templateDao.findById(new Long(templateId)), offering, rootDiskOffering, dataDiskOfferings, networkIpMap, null, plan, hypervisorType, _accountDao.findById(new Long(owner))) == null) { return null; } - + return vmEntity; } @Override public VirtualMachineEntity createVirtualMachineFromScratch(String id, String owner, String isoId, String hostName, String displayName, String hypervisor, String os, int cpu, int speed, long memory,Long diskSize, List computeTags, List rootDiskTags, Map networkNicMap, DeploymentPlan plan) throws InsufficientCapacityException { - + // VirtualMachineEntityImpl vmEntity = new VirtualMachineEntityImpl(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, networks, vmEntityManager); VirtualMachineEntityImpl vmEntity = ComponentContext.inject(VirtualMachineEntityImpl.class); vmEntity.init(id, owner, hostName, displayName, cpu, speed, memory, computeTags, rootDiskTags, new ArrayList(networkNicMap.keySet())); //load vm instance and offerings and call virtualMachineManagerImpl VMInstanceVO vm = _vmDao.findByUuid(id); - - + + Pair rootDiskOffering = new Pair(null, null); ServiceOfferingVO offering = _serviceOfferingDao.findById(vm.getServiceOfferingId()); rootDiskOffering.first(offering); - + List> dataDiskOfferings = new ArrayList>(); Long diskOfferingId = vm.getDiskOfferingId(); if (diskOfferingId == null) { @@ -251,7 +250,7 @@ public class CloudOrchestrator implements OrchestrationService { } rootDiskOffering.first(diskOffering); rootDiskOffering.second(size); - + List> networkIpMap = new ArrayList>(); for (String uuid : networkNicMap.keySet()) { NetworkVO network = _networkDao.findByUuid(uuid); @@ -259,13 +258,13 @@ public class CloudOrchestrator implements OrchestrationService { networkIpMap.add(new Pair(network, networkNicMap.get(uuid))); } } - + HypervisorType hypervisorType = HypervisorType.valueOf(hypervisor); - + if (_itMgr.allocate(_userVmDao.findById(vm.getId(), true), _templateDao.findById(new Long(isoId)), offering, rootDiskOffering, dataDiskOfferings, networkIpMap, null, plan, hypervisorType, _accountDao.findById(new Long(owner))) == null) { return null; } - + return vmEntity; } diff --git a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java index a3ef2768287..0976f838b3b 100644 --- a/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java +++ b/engine/orchestration/test/org/apache/cloudstack/engine/provisioning/test/ProvisioningTest.java @@ -14,124 +14,124 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -/** - * - */ -package org.apache.cloudstack.engine.provisioning.test; - -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; - -import javax.inject.Inject; - -import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; -import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao; -import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao; -import org.apache.cloudstack.engine.service.api.ProvisioningService; -import org.junit.Before; -import org.junit.Test; -import org.junit.runner.RunWith; -import org.mockito.Mockito; -import org.springframework.test.context.ContextConfiguration; -import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; - -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; -import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; - -import com.cloud.dc.DataCenter.NetworkType; - -import junit.framework.TestCase; - -@RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations="classpath:/resource/provisioningContext.xml") -public class ProvisioningTest extends TestCase { - - @Inject - ProvisioningService service; - - @Inject - EngineDataCenterDao dcDao; - - @Inject - EngineHostPodDao _podDao; - - @Inject - EngineClusterDao _clusterDao; - - @Inject - EngineHostDao _hostDao; - - @Before - public void setUp() { - EngineDataCenterVO dc = new EngineDataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", - null, null, NetworkType.Basic, null, null, true, true, null, null); - Mockito.when(dcDao.findByUuid(Mockito.anyString())).thenReturn(dc); - Mockito.when(dcDao.persist((EngineDataCenterVO) Mockito.anyObject())).thenReturn(dc); - - EngineHostPodVO pod = new EngineHostPodVO("lab", 123, "10.0.0.1", "10.0.0.1", 24, "test"); - Mockito.when(_podDao.findByUuid(Mockito.anyString())).thenReturn(pod); - Mockito.when(_podDao.persist((EngineHostPodVO) Mockito.anyObject())).thenReturn(pod); - - EngineClusterVO cluster = new EngineClusterVO(); - Mockito.when(_clusterDao.findByUuid(Mockito.anyString())).thenReturn(cluster); - Mockito.when(_clusterDao.persist((EngineClusterVO) Mockito.anyObject())).thenReturn(cluster); - - EngineHostVO host = new EngineHostVO("68765876598"); - Mockito.when(_hostDao.findByUuid(Mockito.anyString())).thenReturn(host); - Mockito.when(_hostDao.persist((EngineHostVO) Mockito.anyObject())).thenReturn(host); - - } - - private void registerAndEnableZone() { - ZoneEntity zone = service.registerZone("47547648", "lab","owner", null, new HashMap()); - State state = zone.getState(); - System.out.println("state:"+state); - boolean result = zone.enable(); - System.out.println("result:"+result); - - } - - private void registerAndEnablePod() { - PodEntity pod = service.registerPod("47547648", "lab","owner", "8709874074", null, new HashMap()); - State state = pod.getState(); - System.out.println("state:"+state); - boolean result = pod.enable(); - System.out.println("result:"+result); - } - - private void registerAndEnableCluster() { - ClusterEntity cluster = service.registerCluster("1265476542", "lab","owner", null, new HashMap()); - State state = cluster.getState(); - System.out.println("state:"+state); - boolean result = cluster.enable(); - System.out.println("result:"+result); - } - - private void registerAndEnableHost() { - HostEntity host = service.registerHost("1265476542", "lab","owner", null, new HashMap()); - State state = host.getState(); - System.out.println("state:"+state); - boolean result = host.enable(); - System.out.println("result:"+result); - } - - @Test - public void testProvisioning() { - registerAndEnableZone(); - registerAndEnablePod(); - registerAndEnableCluster(); - registerAndEnableHost(); - } - - -} +/** + * + */ +package org.apache.cloudstack.engine.provisioning.test; + +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; + +import javax.inject.Inject; + +import org.apache.cloudstack.engine.datacenter.entity.api.ClusterEntity; +import org.apache.cloudstack.engine.datacenter.entity.api.DataCenterResourceEntity.State; +import org.apache.cloudstack.engine.datacenter.entity.api.HostEntity; +import org.apache.cloudstack.engine.datacenter.entity.api.PodEntity; +import org.apache.cloudstack.engine.datacenter.entity.api.ZoneEntity; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineClusterDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineDataCenterDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostDao; +import org.apache.cloudstack.engine.datacenter.entity.api.db.dao.EngineHostPodDao; +import org.apache.cloudstack.engine.service.api.ProvisioningService; +import org.junit.Before; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineClusterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineDataCenterVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostPodVO; +import org.apache.cloudstack.engine.datacenter.entity.api.db.EngineHostVO; + +import com.cloud.dc.DataCenter.NetworkType; + +import junit.framework.TestCase; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations="classpath:/resource/provisioningContext.xml") +public class ProvisioningTest extends TestCase { + + @Inject + ProvisioningService service; + + @Inject + EngineDataCenterDao dcDao; + + @Inject + EngineHostPodDao _podDao; + + @Inject + EngineClusterDao _clusterDao; + + @Inject + EngineHostDao _hostDao; + + @Before + public void setUp() { + EngineDataCenterVO dc = new EngineDataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", + null, null, NetworkType.Basic, null, null, true, true, null, null); + Mockito.when(dcDao.findByUuid(Mockito.anyString())).thenReturn(dc); + Mockito.when(dcDao.persist((EngineDataCenterVO) Mockito.anyObject())).thenReturn(dc); + + EngineHostPodVO pod = new EngineHostPodVO("lab", 123, "10.0.0.1", "10.0.0.1", 24, "test"); + Mockito.when(_podDao.findByUuid(Mockito.anyString())).thenReturn(pod); + Mockito.when(_podDao.persist((EngineHostPodVO) Mockito.anyObject())).thenReturn(pod); + + EngineClusterVO cluster = new EngineClusterVO(); + Mockito.when(_clusterDao.findByUuid(Mockito.anyString())).thenReturn(cluster); + Mockito.when(_clusterDao.persist((EngineClusterVO) Mockito.anyObject())).thenReturn(cluster); + + EngineHostVO host = new EngineHostVO("68765876598"); + Mockito.when(_hostDao.findByUuid(Mockito.anyString())).thenReturn(host); + Mockito.when(_hostDao.persist((EngineHostVO) Mockito.anyObject())).thenReturn(host); + + } + + private void registerAndEnableZone() { + ZoneEntity zone = service.registerZone("47547648", "lab","owner", null, new HashMap()); + State state = zone.getState(); + System.out.println("state:"+state); + boolean result = zone.enable(); + System.out.println("result:"+result); + + } + + private void registerAndEnablePod() { + PodEntity pod = service.registerPod("47547648", "lab","owner", "8709874074", null, new HashMap()); + State state = pod.getState(); + System.out.println("state:"+state); + boolean result = pod.enable(); + System.out.println("result:"+result); + } + + private void registerAndEnableCluster() { + ClusterEntity cluster = service.registerCluster("1265476542", "lab","owner", null, new HashMap()); + State state = cluster.getState(); + System.out.println("state:"+state); + boolean result = cluster.enable(); + System.out.println("result:"+result); + } + + private void registerAndEnableHost() { + HostEntity host = service.registerHost("1265476542", "lab","owner", null, new HashMap()); + State state = host.getState(); + System.out.println("state:"+state); + boolean result = host.enable(); + System.out.println("result:"+result); + } + + @Test + public void testProvisioning() { + registerAndEnableZone(); + registerAndEnablePod(); + registerAndEnableCluster(); + registerAndEnableHost(); + } + + +} diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/ImageServiceImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/ImageServiceImpl.java index 5898b1b0794..99b1013f964 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/ImageServiceImpl.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/ImageServiceImpl.java @@ -21,11 +21,13 @@ package org.apache.cloudstack.storage.image; import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.CommandResult; +import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.ImageService; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; +import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateEvent; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; @@ -37,6 +39,7 @@ import org.apache.cloudstack.framework.async.AsyncRpcConext; import org.apache.cloudstack.storage.datastore.DataObjectManager; import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager; import org.apache.cloudstack.storage.image.store.TemplateObject; +import org.apache.cloudstack.storage.motion.DataMotionService; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -49,6 +52,8 @@ public class ImageServiceImpl implements ImageService { ObjectInDataStoreManager objectInDataStoreMgr; @Inject DataObjectManager dataObjectMgr; + @Inject + DataMotionService motionSrv; class CreateTemplateContext extends AsyncRpcConext { final TemplateInfo srcTemplate; @@ -140,17 +145,91 @@ public class ImageServiceImpl implements ImageService { return null; } + private class CopyTemplateContext extends AsyncRpcConext { + final AsyncCallFuture future; + final DataObject object; + /** + * @param callback + */ + public CopyTemplateContext(AsyncCompletionCallback callback, AsyncCallFuture future, DataObject object) { + super(callback); + this.future = future; + this.object = object; + } + + } @Override public AsyncCallFuture createTemplateFromSnapshotAsync( SnapshotInfo snapshot, TemplateInfo template, DataStore store) { - // TODO Auto-generated method stub + AsyncCallFuture future = new AsyncCallFuture(); + DataObject templateOnStore = null; + try { + templateOnStore = store.create(template); + templateOnStore.processEvent(Event.CreateOnlyRequested); + + CopyTemplateContext context = new CopyTemplateContext(null, future, templateOnStore); + AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); + caller.setCallback(caller.getTarget().copyTemplateAsyncCallback(null, null)) + .setContext(context); + this.motionSrv.copyAsync(snapshot, templateOnStore, caller); + } catch (Exception e) { + s_logger.debug("Failed to create template: " + template.getId() + "from snapshot: " + snapshot.getId() + ", due to " + e.toString()); + if (templateOnStore != null) { + try { + templateOnStore.processEvent(Event.OperationFailed); + } catch (Exception e1) { + + } + } + CommandResult result = new CommandResult(); + result.setResult(e.toString()); + future.complete(result); + } + return future; + } + + protected Void copyTemplateAsyncCallback(AsyncCallbackDispatcher callback, CopyTemplateContext context) { + CopyCommandResult result = callback.getResult(); + AsyncCallFuture future = context.future; + DataObject object = context.object; + CommandResult res = new CommandResult(); + if (result.isFailed()) { + res.setResult(result.getResult()); + object.processEvent(Event.OperationFailed); + } else { + object.processEvent(Event.OperationSuccessed); + } + future.complete(res); return null; } @Override public AsyncCallFuture createTemplateFromVolumeAsync( VolumeInfo volume, TemplateInfo template, DataStore store) { - // TODO Auto-generated method stub - return null; + AsyncCallFuture future = new AsyncCallFuture(); + DataObject templateOnStore = null; + try { + templateOnStore = store.create(template); + templateOnStore.processEvent(Event.CreateOnlyRequested); + + CopyTemplateContext context = new CopyTemplateContext(null, future, templateOnStore); + AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); + caller.setCallback(caller.getTarget().copyTemplateAsyncCallback(null, null)) + .setContext(context); + this.motionSrv.copyAsync(volume, templateOnStore, caller); + } catch (Exception e) { + s_logger.debug("Failed to create template: " + template.getId() + "from volume: " + volume.getId() + ", due to " + e.toString()); + if (templateOnStore != null) { + try { + templateOnStore.processEvent(Event.OperationFailed); + } catch (Exception e1) { + + } + } + CommandResult result = new CommandResult(); + result.setResult(e.toString()); + future.complete(result); + } + return future; } } diff --git a/engine/storage/image/src/org/apache/cloudstack/storage/image/driver/AncientImageDataStoreDriverImpl.java b/engine/storage/image/src/org/apache/cloudstack/storage/image/driver/AncientImageDataStoreDriverImpl.java index 97ea6c48c79..4c16f2fe4b1 100644 --- a/engine/storage/image/src/org/apache/cloudstack/storage/image/driver/AncientImageDataStoreDriverImpl.java +++ b/engine/storage/image/src/org/apache/cloudstack/storage/image/driver/AncientImageDataStoreDriverImpl.java @@ -33,6 +33,8 @@ import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.framework.async.AsyncRpcConext; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.image.ImageDataStoreDriver; import org.apache.log4j.Logger; @@ -45,8 +47,8 @@ import com.cloud.agent.api.to.SwiftTO; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.storage.RegisterVolumePayload; -import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.SnapshotVO; +import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.VMTemplateStorageResourceAssoc; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VMTemplateZoneVO; @@ -80,6 +82,7 @@ public class AncientImageDataStoreDriverImpl implements ImageDataStoreDriver { @Inject SnapshotDao snapshotDao; @Inject AgentManager agentMgr; @Inject SnapshotManager snapshotMgr; + @Inject PrimaryDataStoreDao primaryDataStoreDao; @Inject private SwiftManager _swiftMgr; @Inject @@ -196,9 +199,10 @@ public class AncientImageDataStoreDriverImpl implements ImageDataStoreDriver { } SwiftTO swift = _swiftMgr.getSwiftTO(snapshot.getSwiftId()); S3TO s3 = _s3Mgr.getS3TO(); - + VolumeVO volume = volumeDao.findById(volumeId); + StoragePoolVO pool = primaryDataStoreDao.findById(volume.getPoolId()); DeleteSnapshotBackupCommand cmd = new DeleteSnapshotBackupCommand( - swift, s3, secondaryStoragePoolUrl, dcId, accountId, volumeId, + pool, swift, s3, secondaryStoragePoolUrl, dcId, accountId, volumeId, backupOfSnapshot, false); Answer answer = agentMgr.sendToSSVM(dcId, cmd); diff --git a/engine/storage/imagemotion/src/org/apache/cloudstack/storage/image/motion/DefaultImageMotionStrategy.java b/engine/storage/imagemotion/src/org/apache/cloudstack/storage/image/motion/DefaultImageMotionStrategy.java index c49a521a3ca..1c21496871f 100644 --- a/engine/storage/imagemotion/src/org/apache/cloudstack/storage/image/motion/DefaultImageMotionStrategy.java +++ b/engine/storage/imagemotion/src/org/apache/cloudstack/storage/image/motion/DefaultImageMotionStrategy.java @@ -18,12 +18,15 @@ */ package org.apache.cloudstack.storage.image.motion; +import java.util.Map; + import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.EndPoint; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCallbackDispatcher; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.framework.async.AsyncRpcConext; @@ -33,6 +36,8 @@ import org.apache.cloudstack.storage.endpoint.EndPointSelector; import org.apache.cloudstack.storage.volume.TemplateOnPrimaryDataStoreInfo; import com.cloud.agent.api.Answer; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.host.Host; //At least one of datastore is coming from image store or image cache store @@ -70,12 +75,12 @@ public class DefaultImageMotionStrategy implements ImageMotionStrategy { CommandResult result = new CommandResult(); if (!answer.getResult()) { - result.setSucess(answer.getResult()); + result.setSuccess(answer.getResult()); result.setResult(answer.getDetails()); } else { TemplateOnPrimaryDataStoreInfo templateStore = context.getTemplate(); templateStore.setPath(answer.getPath()); - result.setSucess(true); + result.setSuccess(true); } parentCall.complete(result); @@ -95,6 +100,11 @@ public class DefaultImageMotionStrategy implements ImageMotionStrategy { return false; } + @Override + public boolean canHandle(Map volumeMap, Host srcHost, Host destHost) { + return false; + } + @Override public Void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback callback) { @@ -137,4 +147,12 @@ public class DefaultImageMotionStrategy implements ImageMotionStrategy { } + @Override + public Void copyAsync(Map volumeMap, VirtualMachineTO vmTo, Host srcHost, Host destHost, + AsyncCompletionCallback callback) { + CopyCommandResult result = new CopyCommandResult("", null); + result.setResult("not implemented"); + callback.complete(result); + return null; + } } diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java index 2d6b94fdfaf..fc4aea85822 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/DirectAgentTest.java @@ -23,7 +23,7 @@ import java.util.UUID; import javax.inject.Inject; import org.apache.cloudstack.storage.to.ImageDataStoreTO; -import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO; +import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO; import org.apache.cloudstack.storage.to.PrimaryDataStoreTO; import org.apache.cloudstack.storage.to.TemplateTO; import org.mockito.Mockito; @@ -126,7 +126,7 @@ public class DirectAgentTest extends CloudStackTestNGBase { @Test public void testDownloadTemplate() { - ImageOnPrimayDataStoreTO image = Mockito.mock(ImageOnPrimayDataStoreTO.class); + ImageOnPrimaryDataStoreTO image = Mockito.mock(ImageOnPrimaryDataStoreTO.class); PrimaryDataStoreTO primaryStore = Mockito.mock(PrimaryDataStoreTO.class); Mockito.when(primaryStore.getUuid()).thenReturn(this.getLocalStorageUuid()); Mockito.when(image.getPrimaryDataStore()).thenReturn(primaryStore); diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHypervsiorHostEndPointRpcServer.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHypervisorHostEndPointRpcServer.java similarity index 95% rename from engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHypervsiorHostEndPointRpcServer.java rename to engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHypervisorHostEndPointRpcServer.java index d6985768d91..8fc161bae1e 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHypervsiorHostEndPointRpcServer.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockHypervisorHostEndPointRpcServer.java @@ -29,9 +29,9 @@ import org.apache.cloudstack.storage.HypervisorHostEndPoint; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; -public class MockHypervsiorHostEndPointRpcServer implements HostEndpointRpcServer { +public class MockHypervisorHostEndPointRpcServer implements HostEndpointRpcServer { private ScheduledExecutorService executor; - public MockHypervsiorHostEndPointRpcServer() { + public MockHypervisorHostEndPointRpcServer() { executor = Executors.newScheduledThreadPool(10); } diff --git a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java index b619ee9240f..a84f3087d59 100644 --- a/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java +++ b/engine/storage/integration-test/test/org/apache/cloudstack/storage/test/MockStorageMotionStrategy.java @@ -18,11 +18,18 @@ */ package org.apache.cloudstack.storage.test; +import java.util.Map; + import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.apache.cloudstack.storage.motion.DataMotionStrategy; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.host.Host; + public class MockStorageMotionStrategy implements DataMotionStrategy { @Override @@ -31,6 +38,11 @@ public class MockStorageMotionStrategy implements DataMotionStrategy { return true; } + @Override + public boolean canHandle(Map volumeMap, Host srcHost, Host destHost) { + return true; + } + @Override public Void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback callback) { @@ -39,4 +51,11 @@ public class MockStorageMotionStrategy implements DataMotionStrategy { return null; } + @Override + public Void copyAsync(Map volumeMap, VirtualMachineTO vmTo, Host srcHost, Host destHost, + AsyncCompletionCallback callback) { + CopyCommandResult result = new CopyCommandResult("something", null); + callback.complete(result); + return null; + } } diff --git a/engine/storage/integration-test/test/resource/component.xml b/engine/storage/integration-test/test/resource/component.xml index 0368ad41425..5ba87e8ebe9 100644 --- a/engine/storage/integration-test/test/resource/component.xml +++ b/engine/storage/integration-test/test/resource/component.xml @@ -75,7 +75,7 @@ - + diff --git a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java index d10dc778092..37238b72121 100644 --- a/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java +++ b/engine/storage/snapshot/src/org/apache/cloudstack/storage/snapshot/SnapshotObject.java @@ -106,7 +106,7 @@ public class SnapshotObject implements SnapshotInfo { @Override public Long getSize() { - return this.getSize(); + return this.snapshot.getSize(); } @Override diff --git a/engine/storage/src/org/apache/cloudstack/storage/HypervsiorHostEndPointRpcServer.java b/engine/storage/src/org/apache/cloudstack/storage/HypervisorHostEndPointRpcServer.java similarity index 92% rename from engine/storage/src/org/apache/cloudstack/storage/HypervsiorHostEndPointRpcServer.java rename to engine/storage/src/org/apache/cloudstack/storage/HypervisorHostEndPointRpcServer.java index f441f39ddfa..bc217769d91 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/HypervsiorHostEndPointRpcServer.java +++ b/engine/storage/src/org/apache/cloudstack/storage/HypervisorHostEndPointRpcServer.java @@ -36,16 +36,16 @@ import com.cloud.agent.api.Command; import com.cloud.utils.exception.CloudRuntimeException; @Component -public class HypervsiorHostEndPointRpcServer implements HostEndpointRpcServer { - private static final Logger s_logger = Logger.getLogger(HypervsiorHostEndPointRpcServer.class); +public class HypervisorHostEndPointRpcServer implements HostEndpointRpcServer { + private static final Logger s_logger = Logger.getLogger(HypervisorHostEndPointRpcServer.class); @Inject private RpcProvider rpcProvider; - public HypervsiorHostEndPointRpcServer() { + public HypervisorHostEndPointRpcServer() { } - public HypervsiorHostEndPointRpcServer(RpcProvider rpcProvider) { + public HypervisorHostEndPointRpcServer(RpcProvider rpcProvider) { rpcProvider = rpcProvider; rpcProvider.registerRpcServiceEndpoint(RpcServiceDispatcher.getDispatcher(this)); } @@ -91,7 +91,7 @@ public class HypervsiorHostEndPointRpcServer implements HostEndpointRpcServer { @Override public Answer sendCommand(HypervisorHostEndPoint host, Command command) { SendCommandContext context = new SendCommandContext(null); - AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); + AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); caller.setCallback(caller.getTarget().sendCommandCallback(null, null)) .setContext(context); @@ -109,7 +109,7 @@ public class HypervsiorHostEndPointRpcServer implements HostEndpointRpcServer { return context.getAnswer(); } - protected Object sendCommandCallback(AsyncCallbackDispatcher callback, SendCommandContext context) { + protected Object sendCommandCallback(AsyncCallbackDispatcher callback, SendCommandContext context) { context.setAnswer((Answer)callback.getResult()); synchronized(context) { context.notify(); diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java index 6334ca7f2dc..3a66b859b39 100755 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/AbstractStoragePoolAllocator.java @@ -176,7 +176,7 @@ public abstract class AbstractStoragePoolAllocator extends AdapterBase implement Long clusterId = pool.getClusterId(); ClusterVO cluster = _clusterDao.findById(clusterId); - if (!(cluster.getHypervisorType() == dskCh.getHypersorType())) { + if (!(cluster.getHypervisorType() == dskCh.getHypervisorType())) { if (s_logger.isDebugEnabled()) { s_logger.debug("StoragePool's Cluster does not have required hypervisorType, skipping this pool"); } diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java index 747e2586fed..0dd55d1d325 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ClusterScopeStoragePoolAllocator.java @@ -51,6 +51,7 @@ public class ClusterScopeStoragePoolAllocator extends AbstractStoragePoolAllocat @Override protected List select(DiskProfile dskCh, VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, int returnUpTo) { + s_logger.debug("ClusterScopeStoragePoolAllocator looking for storage pool"); List suitablePools = new ArrayList(); long dcId = plan.getDataCenterId(); diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java index 91bc25c715d..02032ee4fbd 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/GarbageCollectingStoragePoolAllocator.java @@ -48,7 +48,7 @@ public class GarbageCollectingStoragePoolAllocator extends AbstractStoragePoolAl @Override public List select(DiskProfile dskCh, VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, int returnUpTo) { - + s_logger.debug("GarbageCollectingStoragePoolAllocator looking for storage pool"); if (!_storagePoolCleanupEnabled) { s_logger.debug("Storage pool cleanup is not enabled, so GarbageCollectingStoragePoolAllocator is being skipped."); return null; diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java index a8d5173cebe..7447d988a58 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/LocalStoragePoolAllocator.java @@ -69,11 +69,12 @@ public class LocalStoragePoolAllocator extends AbstractStoragePoolAllocator { List suitablePools = new ArrayList(); - - if (s_logger.isDebugEnabled()) { - s_logger.debug("LocalStoragePoolAllocator trying to find storage pool to fit the vm"); - } + s_logger.debug("LocalStoragePoolAllocator trying to find storage pool to fit the vm"); + if (!dskCh.useLocalStorage()) { + return suitablePools; + } + // data disk and host identified from deploying vm (attach volume case) if (dskCh.getType() == Volume.Type.DATADISK && plan.getHostId() != null) { List hostPools = _poolHostDao.listByHostId(plan.getHostId()); diff --git a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java index a4aa3d5cf84..1d3cd819d70 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java +++ b/engine/storage/src/org/apache/cloudstack/storage/allocator/ZoneWideStoragePoolAllocator.java @@ -55,8 +55,9 @@ public class ZoneWideStoragePoolAllocator extends AbstractStoragePoolAllocator { protected List select(DiskProfile dskCh, VirtualMachineProfile vmProfile, DeploymentPlan plan, ExcludeList avoid, int returnUpTo) { + s_logger.debug("ZoneWideStoragePoolAllocator to find storage pool"); List suitablePools = new ArrayList(); - HypervisorType hypervisor = dskCh.getHypersorType(); + HypervisorType hypervisor = dskCh.getHypervisorType(); if (hypervisor != null) { if (hypervisor != HypervisorType.KVM) { s_logger.debug("Only kvm supports zone wide storage"); diff --git a/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java b/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java index f4be0676b9b..1734bc409cc 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java +++ b/engine/storage/src/org/apache/cloudstack/storage/command/CreateVolumeFromBaseImageCommand.java @@ -18,14 +18,14 @@ */ package org.apache.cloudstack.storage.command; -import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO; +import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO; import org.apache.cloudstack.storage.to.VolumeTO; import com.cloud.agent.api.Command; public class CreateVolumeFromBaseImageCommand extends Command implements StorageSubSystemCommand { private final VolumeTO volume; - private final ImageOnPrimayDataStoreTO image; + private final ImageOnPrimaryDataStoreTO image; public CreateVolumeFromBaseImageCommand(VolumeTO volume, String image) { this.volume = volume; @@ -36,7 +36,7 @@ public class CreateVolumeFromBaseImageCommand extends Command implements Storage return this.volume; } - public ImageOnPrimayDataStoreTO getImage() { + public ImageOnPrimaryDataStoreTO getImage() { return this.image; } diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java index 218f9013a17..9d1afbeacad 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/DataObjectManagerImpl.java @@ -109,7 +109,7 @@ public class DataObjectManagerImpl implements DataObjectManager { if (obj == null) { CreateCmdResult result = new CreateCmdResult( null, null); - result.setSucess(false); + result.setSuccess(false); result.setResult(e.toString()); callback.complete(result); return; @@ -124,7 +124,7 @@ public class DataObjectManagerImpl implements DataObjectManager { data, store); } catch (Exception e) { CreateCmdResult result = new CreateCmdResult(null, null); - result.setSucess(false); + result.setSuccess(false); result.setResult(e.toString()); callback.complete(result); return; @@ -153,7 +153,7 @@ public class DataObjectManagerImpl implements DataObjectManager { s_logger.debug("state transation failed", e1); } CreateCmdResult result = new CreateCmdResult(null, null); - result.setSucess(false); + result.setSuccess(false); result.setResult(e.toString()); callback.complete(result); return; diff --git a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java index 91b6c6329bb..40a65dcf07f 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/datastore/provider/DataStoreProviderManagerImpl.java @@ -64,7 +64,7 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements DataSto return null; } - public List getPrimayrDataStoreProviders() { + public List getPrimaryDataStoreProviders() { List providers = new ArrayList(); for (DataStoreProvider provider : providerMap.values()) { if (provider instanceof PrimaryDataStoreProvider) { @@ -138,7 +138,7 @@ public class DataStoreProviderManagerImpl extends ManagerBase implements DataSto throw new InvalidParameterValueException("Invalid parameter, need to specify type: either primary or image"); } if (type.equalsIgnoreCase(DataStoreProvider.DataStoreProviderType.PRIMARY.toString())) { - return this.getPrimayrDataStoreProviders(); + return this.getPrimaryDataStoreProviders(); } else if (type.equalsIgnoreCase(DataStoreProvider.DataStoreProviderType.IMAGE.toString())) { return this.getImageDataStoreProviders(); } else { diff --git a/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java b/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java index 3602bb16baf..a6880c3f548 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java +++ b/engine/storage/src/org/apache/cloudstack/storage/motion/AncientDataMotionStrategy.java @@ -20,12 +20,14 @@ package org.apache.cloudstack.storage.motion; import java.util.Date; import java.util.List; +import java.util.Map; import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataObjectType; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreRole; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; @@ -36,6 +38,7 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.BackupSnapshotAnswer; import com.cloud.agent.api.BackupSnapshotCommand; @@ -47,15 +50,21 @@ import com.cloud.agent.api.CreateVolumeFromSnapshotCommand; import com.cloud.agent.api.UpgradeSnapshotCommand; import com.cloud.agent.api.storage.CopyVolumeAnswer; import com.cloud.agent.api.storage.CopyVolumeCommand; +import com.cloud.agent.api.storage.MigrateVolumeAnswer; +import com.cloud.agent.api.storage.MigrateVolumeCommand; import com.cloud.agent.api.storage.CreateAnswer; import com.cloud.agent.api.storage.CreateCommand; import com.cloud.agent.api.storage.CreatePrivateTemplateAnswer; import com.cloud.agent.api.to.S3TO; import com.cloud.agent.api.to.StorageFilerTO; import com.cloud.agent.api.to.SwiftTO; +import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.configuration.Config; import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.OperationTimedoutException; import com.cloud.exception.StorageUnavailableException; +import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.storage.DiskOfferingVO; @@ -86,6 +95,8 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.DiskProfile; +import com.cloud.vm.VMInstanceVO; +import com.cloud.vm.dao.VMInstanceDao; @Component public class AncientDataMotionStrategy implements DataMotionStrategy { @@ -102,8 +113,12 @@ public class AncientDataMotionStrategy implements DataMotionStrategy { @Inject StorageManager storageMgr; @Inject + AgentManager agentMgr; + @Inject VolumeDao volDao; @Inject + VMInstanceDao instanceDao; + @Inject VMTemplateDao templateDao; @Inject SnapshotManager snapshotMgr; @@ -130,6 +145,11 @@ public class AncientDataMotionStrategy implements DataMotionStrategy { return true; } + @Override + public boolean canHandle(Map volumeMap, Host srcHost, Host destHost) { + return false; + } + @DB protected Answer copyVolumeFromImage(DataObject srcData, DataObject destData) { String value = configDao.getValue(Config.RecreateSystemVmEnabled.key()); @@ -393,6 +413,53 @@ public class AncientDataMotionStrategy implements DataMotionStrategy { return cvAnswer; } + protected Answer migrateVolumeToPool(DataObject srcData, DataStore destStore) { + VolumeInfo volume = (VolumeInfo)srcData; + Long instanceId = volume.getInstanceId(); + StoragePool destPool = (StoragePool)this.dataStoreMgr.getDataStore(destStore.getId(), DataStoreRole.Primary); + MigrateVolumeAnswer answer = null; + VMInstanceVO vmInstance = null; + if (instanceId != null) { + vmInstance = instanceDao.findById(instanceId); + } + + Long hostId = null; + if (vmInstance != null) { + hostId = vmInstance.getHostId(); + } + + try { + if (hostId != null) { + MigrateVolumeCommand command = new MigrateVolumeCommand(volume.getId(), volume.getPath(), destPool); + answer = (MigrateVolumeAnswer) this.agentMgr.send(hostId, command); + } + } catch (OperationTimedoutException e) { + s_logger.error("Operation timed out on storage motion for volume " + volume, e); + throw new CloudRuntimeException("Failed to live migrate volume " + volume + " to storage pool " + + destPool, e); + } catch (AgentUnavailableException e) { + s_logger.error("Agent unavailable exception while doing storage motion for volume " + volume, e); + throw new CloudRuntimeException("Failed to live migrate volume " + volume + " to storage pool " + + destPool, e); + } + + if (answer == null || !answer.getResult()) { + throw new CloudRuntimeException("Failed to migrate volume " + volume + " to storage pool " + destPool); + } else { + // Update the volume details after migration. + VolumeVO volumeVo = this.volDao.findById(volume.getId()); + Long oldPoolId = volume.getPoolId(); + volumeVo.setPath(answer.getVolumePath()); + volumeVo.setFolder(destPool.getPath()); + volumeVo.setPodId(destPool.getPodId()); + volumeVo.setPoolId(destPool.getId()); + volumeVo.setLastPoolId(oldPoolId); + this.volDao.update(volume.getId(), volumeVo); + } + + return answer; + } + @Override public Void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback callback) { @@ -419,7 +486,12 @@ public class AncientDataMotionStrategy implements DataMotionStrategy { answer = cloneVolume(srcData, destData); } else if (destData.getType() == DataObjectType.VOLUME && srcData.getType() == DataObjectType.VOLUME && srcData.getDataStore().getRole() == DataStoreRole.Primary) { - answer = copyVolumeBetweenPools(srcData, destData); + if (srcData.getId() == destData.getId()) { + // The volume has to be migrated across storage pools. + answer = migrateVolumeToPool(srcData, destData.getDataStore()); + } else { + answer = copyVolumeBetweenPools(srcData, destData); + } } else if (srcData.getType() == DataObjectType.SNAPSHOT && destData.getType() == DataObjectType.SNAPSHOT) { answer = copySnapshot(srcData, destData); @@ -435,6 +507,16 @@ public class AncientDataMotionStrategy implements DataMotionStrategy { return null; } + @Override + public Void copyAsync(Map volumeMap, VirtualMachineTO vmTo, Host srcHost, Host destHost, + AsyncCompletionCallback callback) { + CopyCommandResult result = new CopyCommandResult(null, null); + result.setResult("Unsupported operation requested for copying data."); + callback.complete(result); + + return null; + } + @DB protected Answer createTemplateFromSnashot(DataObject srcData, DataObject destData) { @@ -586,9 +668,7 @@ public class AncientDataMotionStrategy implements DataMotionStrategy { String checkSum = this.templateMgr .getChecksum(hostId, answer.getPath()); - Transaction txn = Transaction.currentTxn(); - txn.start(); privateTemplate.setChecksum(checkSum); templateDao.update(privateTemplate.getId(), privateTemplate); @@ -603,8 +683,9 @@ public class AncientDataMotionStrategy implements DataMotionStrategy { templateHostVO.setLastUpdated(new Date()); templateHostVO.setSize(answer.getVirtualSize()); templateHostVO.setPhysicalSize(answer.getphysicalSize()); + templateHostDao.persist(templateHostVO); - txn.close(); + return answer; } diff --git a/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionService.java b/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionService.java index db36f6492e8..5ecbcb37afb 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionService.java +++ b/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionService.java @@ -18,11 +18,20 @@ */ package org.apache.cloudstack.storage.motion; +import java.util.Map; + import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.host.Host; + public interface DataMotionService { public void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback callback); + public void copyAsync(Map volumeMap, VirtualMachineTO vmTo, + Host srcHost, Host destHost, AsyncCompletionCallback callback); } diff --git a/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java b/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java index 343140fb98e..b74e10c460f 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java +++ b/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionServiceImpl.java @@ -19,14 +19,19 @@ package org.apache.cloudstack.storage.motion; import java.util.List; +import java.util.Map; import javax.inject.Inject; import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; import org.springframework.stereotype.Component; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.host.Host; import com.cloud.utils.exception.CloudRuntimeException; @Component @@ -58,4 +63,15 @@ public class DataMotionServiceImpl implements DataMotionService { throw new CloudRuntimeException("can't find strategy to move data"); } + @Override + public void copyAsync(Map volumeMap, VirtualMachineTO vmTo, + Host srcHost, Host destHost, AsyncCompletionCallback callback) { + for (DataMotionStrategy strategy : strategies) { + if (strategy.canHandle(volumeMap, srcHost, destHost)) { + strategy.copyAsync(volumeMap, vmTo, srcHost, destHost, callback); + return; + } + } + throw new CloudRuntimeException("can't find strategy to move data"); + } } diff --git a/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionStrategy.java b/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionStrategy.java index ba40c6dcbce..e3859b4e131 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionStrategy.java +++ b/engine/storage/src/org/apache/cloudstack/storage/motion/DataMotionStrategy.java @@ -18,13 +18,23 @@ */ package org.apache.cloudstack.storage.motion; +import java.util.Map; + import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.framework.async.AsyncCompletionCallback; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.host.Host; + public interface DataMotionStrategy { public boolean canHandle(DataObject srcData, DataObject destData); + public boolean canHandle(Map volumeMap, Host srcHost, Host destHost); public Void copyAsync(DataObject srcData, DataObject destData, AsyncCompletionCallback callback); + public Void copyAsync(Map volumeMap, VirtualMachineTO vmTo, Host srcHost, Host destHost, + AsyncCompletionCallback callback); } diff --git a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimaryDataStoreTO.java similarity index 92% rename from engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java rename to engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimaryDataStoreTO.java index 18743d70bf2..a9a3cc43c0e 100644 --- a/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimayDataStoreTO.java +++ b/engine/storage/src/org/apache/cloudstack/storage/to/ImageOnPrimaryDataStoreTO.java @@ -20,11 +20,11 @@ package org.apache.cloudstack.storage.to; import org.apache.cloudstack.storage.volume.TemplateOnPrimaryDataStoreInfo; -public class ImageOnPrimayDataStoreTO { +public class ImageOnPrimaryDataStoreTO { private final String pathOnPrimaryDataStore; private PrimaryDataStoreTO dataStore; private final TemplateTO template; - public ImageOnPrimayDataStoreTO(TemplateOnPrimaryDataStoreInfo template) { + public ImageOnPrimaryDataStoreTO(TemplateOnPrimaryDataStoreInfo template) { this.pathOnPrimaryDataStore = template.getPath(); //this.dataStore = template.getPrimaryDataStore().getDataStoreTO(); this.template = new TemplateTO(template.getTemplate()); diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/driver/DefaultPrimaryDataStoreDriverImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/driver/DefaultPrimaryDataStoreDriverImpl.java index 6d0c2c6862b..e5ee742f5ba 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/driver/DefaultPrimaryDataStoreDriverImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/driver/DefaultPrimaryDataStoreDriverImpl.java @@ -144,12 +144,12 @@ public class DefaultPrimaryDataStoreDriverImpl implements PrimaryDataStoreDriver CreateVolumeAnswer answer = (CreateVolumeAnswer)callback.getResult(); CommandResult result = new CommandResult(); if (answer == null || answer.getDetails() != null) { - result.setSucess(false); + result.setSuccess(false); if (answer != null) { result.setResult(answer.getDetails()); } } else { - result.setSucess(true); + result.setSuccess(true); VolumeObject volume = context.getVolume(); volume.setPath(answer.getVolumeUuid()); } diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultPrimaryDatastoreProviderImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultPrimaryDatastoreProviderImpl.java index 46fa738e294..8c674dc0444 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultPrimaryDatastoreProviderImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/datastore/provider/DefaultPrimaryDatastoreProviderImpl.java @@ -42,7 +42,7 @@ public class DefaultPrimaryDatastoreProviderImpl implements PrimaryDataStoreProv @Inject PrimaryDataStoreProviderManager storeMgr; - protected DataStoreLifeCycle lifecyle; + protected DataStoreLifeCycle lifecycle; protected String uuid; protected long id; @Override @@ -52,12 +52,12 @@ public class DefaultPrimaryDatastoreProviderImpl implements PrimaryDataStoreProv @Override public DataStoreLifeCycle getDataStoreLifeCycle() { - return this.lifecyle; + return this.lifecycle; } @Override public boolean configure(Map params) { - lifecyle = ComponentContext.inject(DefaultPrimaryDataStoreLifeCycleImpl.class); + lifecycle = ComponentContext.inject(DefaultPrimaryDataStoreLifeCycleImpl.class); driver = ComponentContext.inject(DefaultPrimaryDataStoreDriverImpl.class); listener = ComponentContext.inject(DefaultHostListener.class); return true; diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/TemplateInstallStrategyImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/TemplateInstallStrategyImpl.java index 5f1735c180a..e09961913de 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/TemplateInstallStrategyImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/TemplateInstallStrategyImpl.java @@ -107,7 +107,7 @@ public class TemplateInstallStrategyImpl implements TemplateInstallStrategy { if (obj == null) { CreateBaseImageResult result = new CreateBaseImageResult( null); - result.setSucess(false); + result.setSuccess(false); result.setResult(e.toString()); callback.complete(result); return null; @@ -122,7 +122,7 @@ public class TemplateInstallStrategyImpl implements TemplateInstallStrategy { template, store); } catch (Exception e) { CreateBaseImageResult result = new CreateBaseImageResult(null); - result.setSucess(false); + result.setSuccess(false); result.setResult(e.toString()); callback.complete(result); return null; @@ -145,7 +145,7 @@ public class TemplateInstallStrategyImpl implements TemplateInstallStrategy { s_logger.debug("state transation failed", e1); } CreateBaseImageResult result = new CreateBaseImageResult(null); - result.setSucess(false); + result.setSuccess(false); result.setResult(e.toString()); callback.complete(result); return null; diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java index ceadb253976..ea31be3d6a0 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeObject.java @@ -176,6 +176,8 @@ public class VolumeObject implements VolumeInfo { volEvent = Volume.Event.CreateRequested; } else if (event == ObjectInDataStoreStateMachine.Event.CopyingRequested) { volEvent = Volume.Event.CopyRequested; + } else if (event == ObjectInDataStoreStateMachine.Event.MigrationRequested) { + volEvent = Volume.Event.MigrationRequested; } } diff --git a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java index 32e7d274f01..b39502b1924 100644 --- a/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java +++ b/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java @@ -18,6 +18,10 @@ */ package org.apache.cloudstack.storage.volume; +import java.util.Map; +import java.util.List; +import java.util.ArrayList; + import javax.inject.Inject; import org.apache.cloudstack.engine.cloud.entity.api.VolumeEntity; @@ -27,6 +31,7 @@ import org.apache.cloudstack.engine.subsystem.api.storage.CreateCmdResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine.Event; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeService.VolumeApiResult; import org.apache.cloudstack.engine.subsystem.api.storage.SnapshotInfo; import org.apache.cloudstack.engine.subsystem.api.storage.TemplateInfo; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; @@ -40,11 +45,14 @@ import org.apache.cloudstack.storage.datastore.DataObjectManager; import org.apache.cloudstack.storage.datastore.ObjectInDataStoreManager; import org.apache.cloudstack.storage.datastore.PrimaryDataStore; import org.apache.cloudstack.storage.datastore.PrimaryDataStoreProviderManager; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.cloudstack.storage.motion.DataMotionService; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; +import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.exception.ConcurrentOperationException; +import com.cloud.host.Host; import com.cloud.storage.StoragePool; import com.cloud.storage.Volume; import com.cloud.storage.Volume.Type; @@ -513,8 +521,8 @@ public class VolumeServiceImpl implements VolumeService { VolumeVO destVol = duplicateVolumeOnAnotherStorage(srcVolume, (StoragePool)destStore); VolumeInfo destVolume = this.volFactory.getVolume(destVol.getId(), destStore); - destVolume.processEvent(Event.CreateOnlyRequested); - srcVolume.processEvent(Event.CopyingRequested); + destVolume.processEvent(Event.MigrationRequested); + srcVolume.processEvent(Event.MigrationRequested); CopyVolumeContext context = new CopyVolumeContext(null, future, srcVolume, destVolume, @@ -542,6 +550,8 @@ public class VolumeServiceImpl implements VolumeService { res.setResult(result.getResult()); destVolume.processEvent(Event.OperationFailed); srcVolume.processEvent(Event.OperationFailed); + destroyVolume(destVolume.getId()); + destVolume = this.volFactory.getVolume(destVolume.getId()); AsyncCallFuture destroyFuture = this.expungeVolumeAsync(destVolume); destroyFuture.get(); future.complete(res); @@ -549,6 +559,8 @@ public class VolumeServiceImpl implements VolumeService { } srcVolume.processEvent(Event.OperationSuccessed); destVolume.processEvent(Event.OperationSuccessed); + destroyVolume(srcVolume.getId()); + srcVolume = this.volFactory.getVolume(srcVolume.getId()); AsyncCallFuture destroyFuture = this.expungeVolumeAsync(srcVolume); destroyFuture.get(); future.complete(res); @@ -561,7 +573,163 @@ public class VolumeServiceImpl implements VolumeService { return null; } - + + private class MigrateVolumeContext extends AsyncRpcConext { + final VolumeInfo srcVolume; + final VolumeInfo destVolume; + final DataStore destStore; + final AsyncCallFuture future; + /** + * @param callback + */ + public MigrateVolumeContext(AsyncCompletionCallback callback, AsyncCallFuture future, + VolumeInfo srcVolume, VolumeInfo destVolume, DataStore destStore) { + super(callback); + this.srcVolume = srcVolume; + this.destVolume = destVolume; + this.destStore = destStore; + this.future = future; + } + } + + @Override + public AsyncCallFuture migrateVolume(VolumeInfo srcVolume, DataStore destStore) { + AsyncCallFuture future = new AsyncCallFuture(); + VolumeApiResult res = new VolumeApiResult(srcVolume); + try { + if (!this.snapshotMgr.canOperateOnVolume(srcVolume)) { + s_logger.debug("Snapshots are being created on this volume. This volume cannot be migrated now."); + res.setResult("Snapshots are being created on this volume. This volume cannot be migrated now."); + future.complete(res); + return future; + } + + VolumeInfo destVolume = this.volFactory.getVolume(srcVolume.getId(), destStore); + srcVolume.processEvent(Event.MigrationRequested); + MigrateVolumeContext context = new MigrateVolumeContext(null, future, + srcVolume, destVolume, destStore); + AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); + caller.setCallback(caller.getTarget().migrateVolumeCallBack(null, null)).setContext(context); + this.motionSrv.copyAsync(srcVolume, destVolume, caller); + } catch (Exception e) { + s_logger.debug("Failed to copy volume", e); + res.setResult(e.toString()); + future.complete(res); + } + return future; + } + + protected Void migrateVolumeCallBack(AsyncCallbackDispatcher callback, + MigrateVolumeContext context) { + VolumeInfo srcVolume = context.srcVolume; + VolumeInfo destVolume = context.destVolume; + CopyCommandResult result = callback.getResult(); + AsyncCallFuture future = context.future; + VolumeApiResult res = new VolumeApiResult(srcVolume); + try { + if (result.isFailed()) { + res.setResult(result.getResult()); + srcVolume.processEvent(Event.OperationFailed); + future.complete(res); + } else { + srcVolume.processEvent(Event.OperationSuccessed); + future.complete(res); + } + } catch (Exception e) { + s_logger.error("Failed to process copy volume callback", e); + res.setResult(e.toString()); + future.complete(res); + } + + return null; + } + + private class MigrateVmWithVolumesContext extends AsyncRpcConext { + final Map volumeToPool; + final AsyncCallFuture future; + /** + * @param callback + */ + public MigrateVmWithVolumesContext(AsyncCompletionCallback callback, AsyncCallFuture future, + Map volumeToPool) { + super(callback); + this.volumeToPool = volumeToPool; + this.future = future; + } + } + + @Override + public AsyncCallFuture migrateVolumes(Map volumeMap, VirtualMachineTO vmTo, + Host srcHost, Host destHost) { + AsyncCallFuture future = new AsyncCallFuture(); + CommandResult res = new CommandResult(); + try { + // Check to make sure there are no snapshot operations on a volume and + // put it in the migrating state. + List volumesMigrating = new ArrayList(); + for (Map.Entry entry : volumeMap.entrySet()) { + VolumeInfo volume = entry.getKey(); + if (!this.snapshotMgr.canOperateOnVolume(volume)) { + s_logger.debug("Snapshots are being created on a volume. Volumes cannot be migrated now."); + res.setResult("Snapshots are being created on a volume. Volumes cannot be migrated now."); + future.complete(res); + + // All the volumes that are already in migrating state need to be put back in ready state. + for (VolumeInfo volumeMigrating : volumesMigrating) { + volumeMigrating.processEvent(Event.OperationFailed); + } + return future; + } else { + volume.processEvent(Event.MigrationRequested); + volumesMigrating.add(volume); + } + } + + MigrateVmWithVolumesContext context = new MigrateVmWithVolumesContext(null, + future, volumeMap); + AsyncCallbackDispatcher caller = AsyncCallbackDispatcher.create(this); + caller.setCallback(caller.getTarget().migrateVmWithVolumesCallBack(null, null)).setContext(context); + this.motionSrv.copyAsync(volumeMap, vmTo, srcHost, destHost, caller); + + } catch (Exception e) { + s_logger.debug("Failed to copy volume", e); + res.setResult(e.toString()); + future.complete(res); + } + + return future; + } + + protected Void migrateVmWithVolumesCallBack(AsyncCallbackDispatcher callback, + MigrateVmWithVolumesContext context) { + Map volumeToPool = context.volumeToPool; + CopyCommandResult result = callback.getResult(); + AsyncCallFuture future = context.future; + CommandResult res = new CommandResult(); + try { + if (result.isFailed()) { + res.setResult(result.getResult()); + for (Map.Entry entry : volumeToPool.entrySet()) { + VolumeInfo volume = entry.getKey(); + volume.processEvent(Event.OperationFailed); + } + future.complete(res); + } else { + for (Map.Entry entry : volumeToPool.entrySet()) { + VolumeInfo volume = entry.getKey(); + volume.processEvent(Event.OperationSuccessed); + } + future.complete(res); + } + } catch (Exception e) { + s_logger.error("Failed to process copy volume callback", e); + res.setResult(e.toString()); + future.complete(res); + } + + return null; + } + @Override public AsyncCallFuture registerVolume(VolumeInfo volume, DataStore store) { diff --git a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationIntrospector.java b/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationIntrospector.java index 998bfa084b3..6a26a6c5947 100644 --- a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationIntrospector.java +++ b/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationIntrospector.java @@ -1,60 +1,60 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.framework.ws.jackson; - -import java.lang.reflect.AnnotatedElement; -import java.util.List; - -import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.introspect.Annotated; -import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector; - - -/** - * Adds introspectors for the annotations added specifically for CloudStack - * Web Services. - * - */ -public class CSJacksonAnnotationIntrospector extends NopAnnotationIntrospector { - - private static final long serialVersionUID = 5532727887216652602L; - - @Override - public Version version() { - return new Version(1, 7, 0, "abc", "org.apache.cloudstack", "cloudstack-framework-rest"); - } - - @Override - public Object findSerializer(Annotated a) { - AnnotatedElement ae = a.getAnnotated(); - Url an = ae.getAnnotation(Url.class); - if (an == null) { - return null; - } - - if (an.type() == String.class) { - return new UriSerializer(an); - } else if (an.type() == List.class){ - return new UrisSerializer(an); - } - - throw new UnsupportedOperationException("Unsupported type " + an.type()); - - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.framework.ws.jackson; + +import java.lang.reflect.AnnotatedElement; +import java.util.List; + +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.introspect.Annotated; +import com.fasterxml.jackson.databind.introspect.NopAnnotationIntrospector; + + +/** + * Adds introspectors for the annotations added specifically for CloudStack + * Web Services. + * + */ +public class CSJacksonAnnotationIntrospector extends NopAnnotationIntrospector { + + private static final long serialVersionUID = 5532727887216652602L; + + @Override + public Version version() { + return new Version(1, 7, 0, "abc", "org.apache.cloudstack", "cloudstack-framework-rest"); + } + + @Override + public Object findSerializer(Annotated a) { + AnnotatedElement ae = a.getAnnotated(); + Url an = ae.getAnnotation(Url.class); + if (an == null) { + return null; + } + + if (an.type() == String.class) { + return new UriSerializer(an); + } else if (an.type() == List.class){ + return new UrisSerializer(an); + } + + throw new UnsupportedOperationException("Unsupported type " + an.type()); + + } +} diff --git a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationModule.java b/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationModule.java index 55debd9b7b2..d274b858c5f 100644 --- a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationModule.java +++ b/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationModule.java @@ -1,47 +1,47 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.framework.ws.jackson; - - -import com.fasterxml.jackson.core.Version; -import com.fasterxml.jackson.databind.Module; - - -/** - * This module extends SimpleModle so that our annotations can be processed. - * - */ -public class CSJacksonAnnotationModule extends Module { - - @Override - public String getModuleName() { - return "CloudStackSupplementalModule"; - } - - @Override - public void setupModule(SetupContext ctx) { - ctx.appendAnnotationIntrospector(new CSJacksonAnnotationIntrospector()); - } - - @Override - public Version version() { - return new Version(1, 0, 0, "", "org.apache.cloudstack", "cloudstack-framework-rest"); - } - -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.framework.ws.jackson; + + +import com.fasterxml.jackson.core.Version; +import com.fasterxml.jackson.databind.Module; + + +/** + * This module extends SimpleModle so that our annotations can be processed. + * + */ +public class CSJacksonAnnotationModule extends Module { + + @Override + public String getModuleName() { + return "CloudStackSupplementalModule"; + } + + @Override + public void setupModule(SetupContext ctx) { + ctx.appendAnnotationIntrospector(new CSJacksonAnnotationIntrospector()); + } + + @Override + public Version version() { + return new Version(1, 0, 0, "", "org.apache.cloudstack", "cloudstack-framework-rest"); + } + +} diff --git a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UriSerializer.java b/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UriSerializer.java index 074d60f8a98..07951496419 100644 --- a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UriSerializer.java +++ b/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UriSerializer.java @@ -1,58 +1,58 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.framework.ws.jackson; - -import java.io.IOException; - -import javax.ws.rs.core.UriBuilder; - -import org.apache.cxf.jaxrs.impl.tl.ThreadLocalUriInfo; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; - -public class UriSerializer extends JsonSerializer { - - Url _annotation; - - public UriSerializer(Url annotation) { - _annotation = annotation; - } - - protected UriSerializer() { - } - - @Override - public void serialize(String id, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException { - jgen.writeStartObject(); - jgen.writeStringField("id", id); - jgen.writeFieldName("uri"); - jgen.writeString(buildUri(_annotation.clazz(), _annotation.method(), id)); - jgen.writeEndObject(); - } - - protected String buildUri(Class clazz, String method, String id) { - ThreadLocalUriInfo uriInfo = new ThreadLocalUriInfo(); - UriBuilder ub = uriInfo.getAbsolutePathBuilder().path(clazz, method); - ub.build(id); - return ub.toString(); - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.framework.ws.jackson; + +import java.io.IOException; + +import javax.ws.rs.core.UriBuilder; + +import org.apache.cxf.jaxrs.impl.tl.ThreadLocalUriInfo; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + +public class UriSerializer extends JsonSerializer { + + Url _annotation; + + public UriSerializer(Url annotation) { + _annotation = annotation; + } + + protected UriSerializer() { + } + + @Override + public void serialize(String id, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException { + jgen.writeStartObject(); + jgen.writeStringField("id", id); + jgen.writeFieldName("uri"); + jgen.writeString(buildUri(_annotation.clazz(), _annotation.method(), id)); + jgen.writeEndObject(); + } + + protected String buildUri(Class clazz, String method, String id) { + ThreadLocalUriInfo uriInfo = new ThreadLocalUriInfo(); + UriBuilder ub = uriInfo.getAbsolutePathBuilder().path(clazz, method); + ub.build(id); + return ub.toString(); + } +} diff --git a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UrisSerializer.java b/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UrisSerializer.java index 8b622123e3f..6ab3ced3cd4 100644 --- a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UrisSerializer.java +++ b/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/UrisSerializer.java @@ -1,71 +1,71 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.framework.ws.jackson; - -import java.io.IOException; -import java.util.Iterator; -import java.util.List; - -import javax.ws.rs.core.UriBuilder; - -import org.apache.cxf.jaxrs.impl.tl.ThreadLocalUriInfo; - -import com.fasterxml.jackson.core.JsonGenerator; -import com.fasterxml.jackson.core.JsonProcessingException; -import com.fasterxml.jackson.databind.JsonSerializer; -import com.fasterxml.jackson.databind.SerializerProvider; - - -/** - * Serializer for a list of ids. - * - */ -public class UrisSerializer extends JsonSerializer> { - Url _annotation; - - public UrisSerializer(Url annotation) { - _annotation = annotation; - } - - protected UrisSerializer() { - } - - @Override - public void serialize(List lst, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException { - Iterator it = lst.iterator(); - jgen.writeStartObject(); - while (it.hasNext()) { - Object id = it.next(); - jgen.writeStartObject(); - jgen.writeFieldName("id"); - jgen.writeObject(id); - jgen.writeFieldName("uri"); - jgen.writeString(buildUri(_annotation.clazz(), _annotation.method(), id)); - jgen.writeEndObject(); - } - jgen.writeEndObject(); - } - - protected String buildUri(Class clazz, String method, Object id) { - ThreadLocalUriInfo uriInfo = new ThreadLocalUriInfo(); - UriBuilder ub = uriInfo.getAbsolutePathBuilder().path(clazz, method); - ub.build(id); - return ub.toString(); - } -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.framework.ws.jackson; + +import java.io.IOException; +import java.util.Iterator; +import java.util.List; + +import javax.ws.rs.core.UriBuilder; + +import org.apache.cxf.jaxrs.impl.tl.ThreadLocalUriInfo; + +import com.fasterxml.jackson.core.JsonGenerator; +import com.fasterxml.jackson.core.JsonProcessingException; +import com.fasterxml.jackson.databind.JsonSerializer; +import com.fasterxml.jackson.databind.SerializerProvider; + + +/** + * Serializer for a list of ids. + * + */ +public class UrisSerializer extends JsonSerializer> { + Url _annotation; + + public UrisSerializer(Url annotation) { + _annotation = annotation; + } + + protected UrisSerializer() { + } + + @Override + public void serialize(List lst, JsonGenerator jgen, SerializerProvider provider) throws IOException, JsonProcessingException { + Iterator it = lst.iterator(); + jgen.writeStartObject(); + while (it.hasNext()) { + Object id = it.next(); + jgen.writeStartObject(); + jgen.writeFieldName("id"); + jgen.writeObject(id); + jgen.writeFieldName("uri"); + jgen.writeString(buildUri(_annotation.clazz(), _annotation.method(), id)); + jgen.writeEndObject(); + } + jgen.writeEndObject(); + } + + protected String buildUri(Class clazz, String method, Object id) { + ThreadLocalUriInfo uriInfo = new ThreadLocalUriInfo(); + UriBuilder ub = uriInfo.getAbsolutePathBuilder().path(clazz, method); + ub.build(id); + return ub.toString(); + } +} diff --git a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/Url.java b/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/Url.java index 7094fb07f84..9f9537c1cf3 100644 --- a/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/Url.java +++ b/framework/rest/src/org/apache/cloudstack/framework/ws/jackson/Url.java @@ -1,53 +1,53 @@ -/* - * Licensed to the Apache Software Foundation (ASF) under one - * or more contributor license agreements. See the NOTICE file - * distributed with this work for additional information - * regarding copyright ownership. The ASF licenses this file - * to you under the Apache License, Version 2.0 (the - * "License"); you may not use this file except in compliance - * with the License. You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, - * software distributed under the License is distributed on an - * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY - * KIND, either express or implied. See the License for the - * specific language governing permissions and limitations - * under the License. - */ -package org.apache.cloudstack.framework.ws.jackson; - -import static java.lang.annotation.ElementType.FIELD; -import static java.lang.annotation.ElementType.METHOD; -import static java.lang.annotation.RetentionPolicy.RUNTIME; - -import java.lang.annotation.Retention; -import java.lang.annotation.Target; - -/** - * Url can be placed onto a method to construct an URL from the returned - * results. - * - * This annotation is supplemental to JAX-RS 2.0's annotations. JAX-RS 2.0 - * annotations do not include a way to construct an URL. Of - * course, this only works with how CloudStack works. - * - */ -@Target({FIELD, METHOD}) -@Retention(RUNTIME) -public @interface Url { - /** - * @return the class that the path should belong to. - */ - Class clazz() default Object.class; - - /** - * @return the name of the method that the path should call back to. - */ - String method(); - - String name() default ""; - - Class type() default String.class; -} +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.framework.ws.jackson; + +import static java.lang.annotation.ElementType.FIELD; +import static java.lang.annotation.ElementType.METHOD; +import static java.lang.annotation.RetentionPolicy.RUNTIME; + +import java.lang.annotation.Retention; +import java.lang.annotation.Target; + +/** + * Url can be placed onto a method to construct an URL from the returned + * results. + * + * This annotation is supplemental to JAX-RS 2.0's annotations. JAX-RS 2.0 + * annotations do not include a way to construct an URL. Of + * course, this only works with how CloudStack works. + * + */ +@Target({FIELD, METHOD}) +@Retention(RUNTIME) +public @interface Url { + /** + * @return the class that the path should belong to. + */ + Class clazz() default Object.class; + + /** + * @return the name of the method that the path should call back to. + */ + String method(); + + String name() default ""; + + Class type() default String.class; +} diff --git a/framework/rest/test/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java b/framework/rest/test/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java index 8869b218402..75e39046420 100644 --- a/framework/rest/test/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java +++ b/framework/rest/test/org/apache/cloudstack/framework/ws/jackson/CSJacksonAnnotationTest.java @@ -14,8 +14,8 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package org.apache.cloudstack.framework.ws.jackson; - +package org.apache.cloudstack.framework.ws.jackson; + import java.io.IOException; import java.io.StringWriter; import java.util.ArrayList; @@ -35,84 +35,84 @@ import com.fasterxml.jackson.databind.JsonMappingException; import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule; import com.fasterxml.jackson.module.jaxb.JaxbAnnotationModule.Priority; - -public class CSJacksonAnnotationTest { - - @Before - public void setUp() throws Exception { - } - - @Test @Ignore - public void test() { - ObjectMapper mapper = new ObjectMapper(); - JaxbAnnotationModule jaxbModule = new JaxbAnnotationModule(); - jaxbModule.setPriority(Priority.SECONDARY); - mapper.registerModule(jaxbModule); - mapper.registerModule(new CSJacksonAnnotationModule()); - - StringWriter writer = new StringWriter(); - - TestVO vo = new TestVO(1000, "name"); - vo.names = new ArrayList(); - vo.names.add("name1"); - vo.names.add("name2"); - vo.values = new HashMap(); - vo.values.put("key1", 1000l); - vo.values.put("key2", 2000l); - vo.vo2.name = "testvoname2"; - vo.pods="abcde"; - - try { - mapper.writeValue(writer, vo); - } catch (JsonGenerationException e) { - e.printStackTrace(); - } catch (JsonMappingException e) { - e.printStackTrace(); - } catch (IOException e) { - e.printStackTrace(); - } - - System.out.print(writer.getBuffer().toString()); - - } - - @XmlRootElement(name="xml-test2") - public class Test2VO { - public String name; - } - - @XmlRootElement(name="abc") - public class TestVO { - public int id; - - public Map values; - - public String name; - - - public List names; - - public String pods; - - - @XmlElement(name="test2") - public Test2VO vo2 = new Test2VO(); - - public TestVO(int id, String name) { - this.id = id; - this.name = name; - } - - @Url(clazz=TestVO.class, method="getName") - public String getName() { - return name; - } - - @Url(clazz=TestVO.class, method="getNames", type=List.class) - public List getNames() { - return names; - } - - } - -} + +public class CSJacksonAnnotationTest { + + @Before + public void setUp() throws Exception { + } + + @Test @Ignore + public void test() { + ObjectMapper mapper = new ObjectMapper(); + JaxbAnnotationModule jaxbModule = new JaxbAnnotationModule(); + jaxbModule.setPriority(Priority.SECONDARY); + mapper.registerModule(jaxbModule); + mapper.registerModule(new CSJacksonAnnotationModule()); + + StringWriter writer = new StringWriter(); + + TestVO vo = new TestVO(1000, "name"); + vo.names = new ArrayList(); + vo.names.add("name1"); + vo.names.add("name2"); + vo.values = new HashMap(); + vo.values.put("key1", 1000l); + vo.values.put("key2", 2000l); + vo.vo2.name = "testvoname2"; + vo.pods="abcde"; + + try { + mapper.writeValue(writer, vo); + } catch (JsonGenerationException e) { + e.printStackTrace(); + } catch (JsonMappingException e) { + e.printStackTrace(); + } catch (IOException e) { + e.printStackTrace(); + } + + System.out.print(writer.getBuffer().toString()); + + } + + @XmlRootElement(name="xml-test2") + public class Test2VO { + public String name; + } + + @XmlRootElement(name="abc") + public class TestVO { + public int id; + + public Map values; + + public String name; + + + public List names; + + public String pods; + + + @XmlElement(name="test2") + public Test2VO vo2 = new Test2VO(); + + public TestVO(int id, String name) { + this.id = id; + this.name = name; + } + + @Url(clazz=TestVO.class, method="getName") + public String getName() { + return name; + } + + @Url(clazz=TestVO.class, method="getNames", type=List.class) + public List getNames() { + return names; + } + + } + +} diff --git a/packaging/centos63/cloud-agent.rc b/packaging/centos63/cloud-agent.rc index 6d534732528..b3784882975 100755 --- a/packaging/centos63/cloud-agent.rc +++ b/packaging/centos63/cloud-agent.rc @@ -67,7 +67,8 @@ export CLASSPATH="/usr/share/java/commons-daemon.jar:/usr/share/java/jna.jar:$AC start() { echo -n $"Starting $PROGNAME: " if hostname --fqdn >/dev/null 2>&1 ; then - $JSVC -cp "$CLASSPATH" -pidfile "$PIDFILE" -errfile SYSLOG $CLASS + $JSVC -cp "$CLASSPATH" -pidfile "$PIDFILE" \ + -errfile $LOGDIR/cloudstack-agent.err -outfile $LOGDIR/cloudstack-agent.out $CLASS RETVAL=$? echo else diff --git a/packaging/centos63/cloud-usage.rc b/packaging/centos63/cloud-usage.rc index 76f0e06fdfe..a9b60478875 100755 --- a/packaging/centos63/cloud-usage.rc +++ b/packaging/centos63/cloud-usage.rc @@ -58,7 +58,7 @@ export JAVA_HOME SCP="" DCP="" -UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar`":"`ls /usr/share/cloudstack-usage/lib/* | tr '\n' ':'` +UCP=`ls /usr/share/cloudstack-usage/cloud-usage-*.jar`":"`ls /usr/share/cloudstack-usage/lib/*.jar | tr '\n' ':'` JCP="/usr/share/java/commons-daemon.jar" # We need to append the JSVC daemon JAR to the classpath diff --git a/packaging/centos63/cloud.spec b/packaging/centos63/cloud.spec index 5baf58f9fb5..a7cc20e8ab8 100644 --- a/packaging/centos63/cloud.spec +++ b/packaging/centos63/cloud.spec @@ -153,13 +153,9 @@ Provides: cloud-aws-api %description awsapi Apache Cloudstack AWS API compatibility wrapper -#%package docs -#Summary: Apache CloudStack documentation -#%description docs -#Apache CloudStack documentations - %prep echo Doing CloudStack build + %setup -q -n %{name}-%{_maventag} %build @@ -169,10 +165,10 @@ echo VERSION=%{_maventag} >> build/replace.properties echo PACKAGE=%{name} >> build/replace.properties if [ "%{_ossnoss}" == "NONOSS" -o "%{_ossnoss}" == "nonoss" ] ; then - echo "Packaging nonoss components" + echo "Executing mvn packaging for NONOSS ..." mvn -Pawsapi,systemvm -Dnonoss package else - echo "Packaging oss components" + echo "Executing mvn packaging for OSS ..." mvn -Pawsapi package -Dsystemvm fi @@ -236,7 +232,7 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/cl rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/vms for name in db.properties log4j-cloud.xml tomcat6-nonssl.conf tomcat6-ssl.conf server-ssl.xml server-nonssl.xml \ - catalina.policy catalina.properties db-enc.properties classpath.conf tomcat-users.xml web.xml environment.properties ; do + catalina.policy catalina.properties classpath.conf tomcat-users.xml web.xml environment.properties ; do mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classes/$name \ ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/$name done @@ -248,8 +244,7 @@ mv ${RPM_BUILD_ROOT}%{_datadir}/%{name}-management/webapps/client/WEB-INF/classe ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/management/Catalina/localhost/client install python/bindir/cloud-external-ipallocator.py ${RPM_BUILD_ROOT}%{_bindir}/%{name}-external-ipallocator.py -install -D client/target/pythonlibs/jasypt-1.9.0.jar ${RPM_BUILD_ROOT}%{_javadir}/jasypt-1.9.0.jar -install -D client/target/pythonlibs/jasypt-1.8.jar ${RPM_BUILD_ROOT}%{_javadir}/jasypt-1.8.jar +install -D client/target/pythonlibs/jasypt-1.9.0.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-common/lib/jasypt-1.9.0.jar install -D packaging/centos63/cloud-ipallocator.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-ipallocator install -D packaging/centos63/cloud-management.rc ${RPM_BUILD_ROOT}%{_initrddir}/%{name}-management @@ -283,6 +278,8 @@ cp plugins/hypervisors/kvm/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/% mkdir -p ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage mkdir -p ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib install -D usage/target/cloud-usage-%{_maventag}.jar ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/cloud-usage-%{_maventag}.jar +install -D usage/target/transformed/db.properties ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage/db.properties +install -D usage/target/transformed/log4j-cloud_usage.xml ${RPM_BUILD_ROOT}%{_sysconfdir}/%{name}/usage/log4j-cloud.xml cp usage/target/dependencies/* ${RPM_BUILD_ROOT}%{_datadir}/%{name}-usage/lib/ install -D packaging/centos63/cloud-usage.rc ${RPM_BUILD_ROOT}/%{_sysconfdir}/init.d/%{name}-usage mkdir -p ${RPM_BUILD_ROOT}%{_localstatedir}/log/%{name}/usage/ @@ -313,9 +310,27 @@ rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classe rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/NOTICE.txt rm -rf ${RPM_BUILD_ROOT}%{_datadir}/%{name}-bridge/webapps/awsapi/WEB-INF/classes/services.xml +#License files from whisker +install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/NOTICE +install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-management-%{version}/LICENSE +install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-common-%{version}/NOTICE +install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-common-%{version}/LICENSE +install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/NOTICE +install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE +install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE +install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE +install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE +install -D tools/whisker/NOTICE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE +install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE +install -D tools/whisker/LICENSE ${RPM_BUILD_ROOT}%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE + %clean [ ${RPM_BUILD_ROOT} != "/" ] && rm -rf ${RPM_BUILD_ROOT} +%pre awsapi +id cloud > /dev/null 2>&1 || /usr/sbin/useradd -M -c "CloudStack unprivileged user" \ + -r -s /bin/sh -d %{_localstatedir}/cloudstack/management cloud|| true + %preun management /sbin/service cloudstack-management stop || true if [ "$1" == "0" ] ; then @@ -396,6 +411,13 @@ if [ -L $oldtomcatconf ] ; then fi fi +%preun agent +/sbin/service cloudstack-agent stop || true +if [ "$1" == "0" ] ; then + /sbin/chkconfig --del cloudstack-agent > /dev/null 2>&1 || true + /sbin/service cloudstack-agent stop > /dev/null 2>&1 || true +fi + %pre agent # save old configs if they exist (for upgrade). Otherwise we may lose them @@ -405,6 +427,10 @@ if [ -d "%{_sysconfdir}/cloud" ] ; then fi %post agent +if [ "$1" == "1" ] ; then + /sbin/chkconfig --add cloudstack-agent > /dev/null 2>&1 || true + /sbin/chkconfig --level 345 cloudstack-agent on > /dev/null 2>&1 || true +fi # if saved configs from upgrade exist, copy them over if [ -f "%{_sysconfdir}/cloud.rpmsave/agent/agent.properties" ]; then @@ -414,6 +440,13 @@ if [ -f "%{_sysconfdir}/cloud.rpmsave/agent/agent.properties" ]; then mv %{_sysconfdir}/cloud.rpmsave/agent/agent.properties %{_sysconfdir}/cloud.rpmsave/agent/agent.properties.rpmsave fi +%post usage +if [ -f "%{_sysconfdir}/%{name}/management/db.properties" ]; then + echo Replacing db.properties with management server db.properties + rm -f %{_sysconfdir}/%{name}/usage/db.properties + ln -s %{_sysconfdir}/%{name}/management/db.properties %{_sysconfdir}/%{name}/usage/db.properties +fi + #%post awsapi #if [ -d "%{_datadir}/%{name}-management" ] ; then # ln -s %{_datadir}/%{name}-bridge/webapps %{_datadir}/%{name}-management/webapps7080 @@ -443,7 +476,6 @@ fi %config(noreplace) %{_sysconfdir}/%{name}/management/catalina.policy %config(noreplace) %{_sysconfdir}/%{name}/management/catalina.properties %config(noreplace) %{_sysconfdir}/%{name}/management/classpath.conf -%config(noreplace) %{_sysconfdir}/%{name}/management/db-enc.properties %config(noreplace) %{_sysconfdir}/%{name}/management/server-nonssl.xml %config(noreplace) %{_sysconfdir}/%{name}/management/server-ssl.xml %config(noreplace) %{_sysconfdir}/%{name}/management/tomcat-users.xml @@ -475,13 +507,11 @@ fi %{_datadir}/%{name}-management/setup/db/*.sql %{_datadir}/%{name}-management/setup/*.sh %{_datadir}/%{name}-management/setup/server-setup.xml -%{_javadir}/jasypt-1.9.0.jar -%{_javadir}/jasypt-1.8.jar %attr(0755,root,root) %{_bindir}/%{name}-external-ipallocator.py %attr(0755,root,root) %{_initrddir}/%{name}-ipallocator %dir %attr(0770,root,root) %{_localstatedir}/log/%{name}/ipallocator -%doc LICENSE -%doc NOTICE +%{_defaultdocdir}/%{name}-management-%{version}/LICENSE +%{_defaultdocdir}/%{name}-management-%{version}/NOTICE %files agent %attr(0755,root,root) %{_bindir}/%{name}-setup-agent @@ -491,8 +521,8 @@ fi %dir %{_localstatedir}/log/%{name}/agent %attr(0644,root,root) %{_datadir}/%{name}-agent/lib/*.jar %dir %{_datadir}/%{name}-agent/plugins -%doc LICENSE -%doc NOTICE +%{_defaultdocdir}/%{name}-agent-%{version}/LICENSE +%{_defaultdocdir}/%{name}-agent-%{version}/NOTICE %files common %dir %attr(0755,root,root) %{_libdir}/python2.6/site-packages/cloudutils @@ -503,28 +533,26 @@ fi %attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloud_utils.py %attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloud_utils.pyc %attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudutils/* -%doc LICENSE -%doc NOTICE +%attr(0644, root, root) %{_datadir}/%{name}-common/lib/jasypt-1.9.0.jar +%{_defaultdocdir}/%{name}-common-%{version}/LICENSE +%{_defaultdocdir}/%{name}-common-%{version}/NOTICE %files usage %attr(0755,root,root) %{_sysconfdir}/init.d/%{name}-usage %attr(0644,root,root) %{_datadir}/%{name}-usage/*.jar %attr(0644,root,root) %{_datadir}/%{name}-usage/lib/*.jar -%dir /var/log/%{name}/usage -%dir %{_sysconfdir}/%{name}/usage -%doc LICENSE -%doc NOTICE +%dir %attr(0770,root,cloud) %{_localstatedir}/log/%{name}/usage +%attr(0644,root,root) %{_sysconfdir}/%{name}/usage/db.properties +%attr(0644,root,root) %{_sysconfdir}/%{name}/usage/log4j-cloud.xml +%{_defaultdocdir}/%{name}-usage-%{version}/LICENSE +%{_defaultdocdir}/%{name}-usage-%{version}/NOTICE %files cli %attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudapis.py %attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudtool/__init__.py %attr(0644,root,root) %{_libdir}/python2.6/site-packages/cloudtool/utils.py -%doc LICENSE -%doc NOTICE - -#%files docs -#%doc LICENSE -#%doc NOTICE +%{_defaultdocdir}/%{name}-cli-%{version}/LICENSE +%{_defaultdocdir}/%{name}-cli-%{version}/NOTICE %files awsapi %defattr(0644,cloud,cloud,0755) @@ -532,8 +560,8 @@ fi %attr(0644,root,root) %{_datadir}/%{name}-bridge/setup/* %attr(0755,root,root) %{_bindir}/cloudstack-aws-api-register %attr(0755,root,root) %{_bindir}/cloudstack-setup-bridge -%doc LICENSE -%doc NOTICE +%{_defaultdocdir}/%{name}-awsapi-%{version}/LICENSE +%{_defaultdocdir}/%{name}-awsapi-%{version}/NOTICE %changelog diff --git a/packaging/centos63/package.sh b/packaging/centos63/package.sh index 802cf7e5e0b..faa089b73fa 100755 --- a/packaging/centos63/package.sh +++ b/packaging/centos63/package.sh @@ -20,126 +20,135 @@ function usage() { echo "" echo "usage: ./package.sh [-p|--pack] [-h|--help] [ARGS]" echo "" - echo "oss|OSS To package oss components only" - echo "nonoss|NONOSS To package non-oss and oss components" + echo "The commonly used Arguments are:" + echo "oss|OSS To package OSS specific" + echo "nonoss|NONOSS To package NONOSS specific" echo "" echo "Examples: ./package.sh -p|--pack oss|OSS" echo " ./package.sh -p|--pack nonoss|NONOSS" echo " ./package.sh (Default OSS)" - echo "" exit 1 } function defaultPackaging() { - CWD=`pwd` - RPMDIR=$CWD/../../dist/rpmbuild - PACK_PROJECT=cloudstack - VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep '^[0-9]\.'` +CWD=`pwd` +RPMDIR=$CWD/../../dist/rpmbuild +PACK_PROJECT=cloudstack - if echo $VERSION | grep SNAPSHOT ; then - REALVER=`echo $VERSION | cut -d '-' -f 1` - DEFVER="-D_ver $REALVER" - DEFPRE="-D_prerelease 1" - DEFREL="-D_rel SNAPSHOT" - else - DEFVER="-D_ver $REALVER" - DEFPRE= - DEFREL= - fi - mkdir -p $RPMDIR/SPECS - mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION +VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep '^[0-9]\.'` +if echo $VERSION | grep SNAPSHOT ; then + REALVER=`echo $VERSION | cut -d '-' -f 1` + DEFVER="-D_ver $REALVER" + DEFPRE="-D_prerelease 1" + DEFREL="-D_rel SNAPSHOT" +else + DEFVER="-D_ver $REALVER" + DEFPRE= + DEFREL= +fi - (cd ../../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x) - (cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION) +mkdir -p $RPMDIR/SPECS +mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION - cp cloud.spec $RPMDIR/SPECS +(cd ../../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x ) +(cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION) - (cd $RPMDIR; rpmbuild -ba SPECS/cloud.spec "-D_topdir $RPMDIR" "$DEFVER" "$DEFREL" "$DEFPRE") +cp cloud.spec $RPMDIR/SPECS - exit +(cd $RPMDIR; rpmbuild -ba SPECS/cloud.spec "-D_topdir $RPMDIR" "$DEFVER" "$DEFREL" "$DEFPRE") + +exit } function packaging() { - CWD=`pwd` - RPMDIR=$CWD/../../dist/rpmbuild - PACK_PROJECT=cloudstack - DEFOSSNOSS="-D_ossnoss $packageval" - VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep '^[0-9]\.'` + +CWD=`pwd` +RPMDIR=$CWD/../../dist/rpmbuild +PACK_PROJECT=cloudstack +DEFOSSNOSS="-D_ossnoss $packageval" - if echo $VERSION | grep SNAPSHOT ; then - REALVER=`echo $VERSION | cut -d '-' -f 1` - DEFVER="-D_ver $REALVER" - DEFPRE="-D_prerelease 1" - DEFREL="-D_rel SNAPSHOT" - else - DEFVER="-D_ver $REALVER" - DEFPRE= - DEFREL= - fi - mkdir -p $RPMDIR/SPECS - mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION +VERSION=`(cd ../../; mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version) | grep '^[0-9]\.'` +if echo $VERSION | grep SNAPSHOT ; then + REALVER=`echo $VERSION | cut -d '-' -f 1` + DEFVER="-D_ver $REALVER" + DEFPRE="-D_prerelease 1" + DEFREL="-D_rel SNAPSHOT" +else + REALVER=`echo $VERSION` + DEFVER="-D_ver $REALVER" + DEFPRE= + DEFREL= +fi - (cd ../../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x ) - (cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION) +mkdir -p $RPMDIR/SPECS +mkdir -p $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION - cp cloud.spec $RPMDIR/SPECS - (cd $RPMDIR; rpmbuild -ba SPECS/cloud.spec "-D_topdir $RPMDIR" "$DEFVER" "$DEFREL" "$DEFPRE" "$DEFOSSNOSS") +(cd ../../; tar -c --exclude .git --exclude dist . | tar -C $RPMDIR/SOURCES/$PACK_PROJECT-$VERSION -x ) +(cd $RPMDIR/SOURCES/; tar -czf $PACK_PROJECT-$VERSION.tgz $PACK_PROJECT-$VERSION) - exit +cp cloud.spec $RPMDIR/SPECS + +(cd $RPMDIR; rpmbuild -ba SPECS/cloud.spec "-D_topdir $RPMDIR" "$DEFVER" "$DEFREL" "$DEFPRE" "$DEFOSSNOSS") + +exit } if [ $# -lt 1 ] ; then - defaultPackaging + + defaultPackaging + elif [ $# -gt 0 ] ; then - SHORTOPTS="hp:" - LONGOPTS="help,pack:" - ARGS=$(getopt -s bash -u -a --options $SHORTOPTS --longoptions $LONGOPTS --name $0 -- "$@" ) - eval set -- "$ARGS" + SHORTOPTS="hp:" + LONGOPTS="help,pack:" + + ARGS=$(getopt -s bash -u -a --options $SHORTOPTS --longoptions $LONGOPTS --name $0 -- "$@" ) + eval set -- "$ARGS" + + while [ $# -gt 0 ] ; do + case "$1" in + -h | --help) + usage + exit 0 + ;; + -p | --pack) + echo "Doing CloudStack Packaging ....." + packageval=$2 + if [ "$packageval" == "oss" -o "$packageval" == "OSS" ] ; then + defaultPackaging + elif [ "$packageval" == "nonoss" -o "$packageval" == "NONOSS" ] ; then + packaging + else + echo "Error: Incorrect value provided in package.sh script, Please see help ./package.sh --help|-h for more details." + exit 1 + fi + ;; + -) + echo "Unrecognized option..." + usage + exit 1 + ;; + --) + echo "Unrecognized option..." + usage + exit 1 + ;; + -*) + echo "Unrecognized option..." + usage + exit 1 + ;; + *) + shift + break + ;; + esac + done - while [ $# -gt 0 ] ; do - case "$1" in - -h | --help) - usage - exit 0 - ;; - -p | --pack) - echo "Packaging Apache CloudStack" - packageval=$2 - if [ "$packageval" == "oss" -o "$packageval" == "OSS" ] ; then - defaultPackaging - elif [ "$packageval" == "nonoss" -o "$packageval" == "NONOSS" ] ; then - packaging - else - echo "Error: Incorrect usage. See help ./package.sh --help|-h." - exit 1 - fi - ;; - -) - echo "Unrecognized option." - usage - exit 1 - ;; - --) - echo "Unrecognized option." - usage - exit 1 - ;; - -*) - echo "Unrecognized option." - usage - exit 1 - ;; - *) - shift - break - ;; - esac - done else - echo "Incorrect choice. Nothing to do." >&2 - echo "./package.sh --help for details" + echo "Incorrect choice. Nothing to do." >&2 + echo "Please, execute ./package.sh --help for more help" fi diff --git a/packaging/centos63/replace.properties b/packaging/centos63/replace.properties index 211cc95449f..83458549570 100644 --- a/packaging/centos63/replace.properties +++ b/packaging/centos63/replace.properties @@ -56,5 +56,5 @@ SYSCONFDIR=/etc/sysconfig SYSTEMCLASSPATH= SYSTEMJARS= USAGECLASSPATH= -USAGELOG=/var/log/cloudstack/usage +USAGELOG=/var/log/cloudstack/usage/usage.log USAGESYSCONFDIR=/etc/sysconfig diff --git a/packaging/debian/init/cloud-management b/packaging/debian/init/cloud-management index 1e008312e09..8431eec8811 100755 --- a/packaging/debian/init/cloud-management +++ b/packaging/debian/init/cloud-management @@ -125,7 +125,7 @@ fi # Define other required variables CATALINA_PID="/var/run/$NAME.pid" BOOTSTRAP_CLASS=org.apache.catalina.startup.Bootstrap -JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar:/etc/cloudstack/management" +JSVC_CLASSPATH="/usr/share/java/commons-daemon.jar:$CATALINA_HOME/bin/bootstrap.jar:/etc/cloudstack/management:/usr/share/cloudstack-management/setup" # Look for Java Secure Sockets Extension (JSSE) JARs if [ -z "${JSSE_HOME}" -a -r "${JAVA_HOME}/jre/lib/jsse.jar" ]; then diff --git a/packaging/debian/replace.properties b/packaging/debian/replace.properties index 8c852060c02..5a0bd58ab67 100644 --- a/packaging/debian/replace.properties +++ b/packaging/debian/replace.properties @@ -57,6 +57,6 @@ SYSCONFDIR=/etc SYSTEMCLASSPATH= SYSTEMJARS= USAGECLASSPATH= -USAGELOG=/var/log/cloudstack/usage +USAGELOG=/var/log/cloudstack/usage/usage.log USAGESYSCONFDIR=/etc/cloudstack/usage PACKAGE=cloudstack diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config index 2b99c5b6cf3..187ae25c40c 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -27,6 +27,8 @@ # under the License. PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" +#set -x +#exec 3>&0 4>&1 > /var/log/test.log 2>&1 # Fix haproxy directory issue mkdir -p /var/lib/haproxy @@ -227,7 +229,29 @@ setup_interface() { ifdown $intf if [ "$RROUTER" != "1" -o "$1" != "2" ] then - ifup $intf + ifup $intf + timer=0 + log_it "checking that $intf has IP " + while true + do + ip=$(ifconfig $intf | grep "inet addr:" | awk '{print $2}' | awk -F: '{print $2}') + if [ -z $ip ] + then + sleep 1; + #waiting for the interface to setup with ip + log_it "waiting for $intf interface setup with ip timer=$timer" + else + break + fi + + if [ $timer -gt 15 ] + then + log_it "interface $intf is not set up with ip... exiting"; + break + fi + + timer=`expr $timer + 1` + done fi fi } @@ -386,33 +410,14 @@ setup_common() { ip route delete default if [ "$RROUTER" != "1" ] then - if [ -z "$3" ] - then - ip route add default via $GW dev eth0 - else - timer=0 - #default route add fails if we run before interface configured with ip - while true - do - ip=$(ifconfig $3 | grep "inet addr:" | awk '{print $2}' | awk -F: '{print $2}') - if [ -z $ip ] - then - sleep 1; - #waiting for the interface to setup with ip - echo "waiting for $3 interface setup with ip" - else - ip route add default via $GW dev $3 - break - fi - - if [ $timer -gt 5 ] - then - echo "interface $3 is not set up with ip... configuring default route failed" - break - fi - timer=`expr $timer + 1` - done - fi + gwdev=$3 + if [ -z "$gwdev" ] + then + gwdev="eth0" + fi + + ip route add default via $GW dev $gwdev + fi # a hacking way to activate vSwitch under VMware @@ -514,7 +519,7 @@ setup_sshd(){ local ip=$1 local eth=$2 [ -f /etc/ssh/sshd_config ] && sed -i -e "s/^[#]*ListenAddress.*$/ListenAddress $ip/" /etc/ssh/sshd_config - sed -i "/3922/s/eth./$eth/" /etc/iptables/rules + sed -i "/3922/s/eth./$eth/" /etc/iptables/rules.v4 } @@ -686,7 +691,7 @@ setup_router() { disable_rpfilter_domR enable_fwding 1 chkconfig nfs-common off - cp /etc/iptables/iptables-router /etc/iptables/rules + cp /etc/iptables/iptables-router /etc/iptables/rules.v4 setup_sshd $ETH1_IP "eth1" } @@ -704,7 +709,7 @@ setup_vpcrouter() { fi cat > /etc/network/interfaces << EOF -auto lo $1 +auto lo eth0 iface lo inet loopback EOF setup_interface "0" $ETH0_IP $ETH0_MASK $GW @@ -758,7 +763,7 @@ EOF enable_svc cloud 0 disable_rpfilter enable_fwding 1 - cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules + cp /etc/iptables/iptables-vpcrouter /etc/iptables/rules.v4 setup_sshd $ETH0_IP "eth0" cp /etc/vpcdnsmasq.conf /etc/dnsmasq.conf cp /etc/cloud-nic.rules /etc/udev/rules.d/cloud-nic.rules @@ -784,7 +789,7 @@ setup_dhcpsrvr() { enable_svc cloud 0 enable_fwding 0 chkconfig nfs-common off - cp /etc/iptables/iptables-router /etc/iptables/rules + cp /etc/iptables/iptables-router /etc/iptables/rules.v4 if [ "$SSHONGUEST" == "true" ] then setup_sshd $ETH0_IP "eth0" @@ -819,7 +824,7 @@ setup_secstorage() { [ "$ETH2_IP" == "0.0.0.0" ] && public_ip=$ETH1_IP echo "$public_ip $NAME" >> /etc/hosts - cp /etc/iptables/iptables-secstorage /etc/iptables/rules + cp /etc/iptables/iptables-secstorage /etc/iptables/rules.v4 if [ "$hyp" == "vmware" ]; then setup_sshd $ETH1_IP "eth1" else @@ -843,7 +848,7 @@ setup_console_proxy() { [ "$ETH2_IP" == "0.0.0.0" ] && public_ip=$ETH1_IP sed -i /gateway/d /etc/hosts echo "$public_ip $NAME" >> /etc/hosts - cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules + cp /etc/iptables/iptables-consoleproxy /etc/iptables/rules.v4 if [ "$hyp" == "vmware" ]; then setup_sshd $ETH1_IP "eth1" else @@ -868,7 +873,7 @@ setup_elbvm() { [ "$ETH2_IP" == "0.0.0.0" ] || [ "$ETH2_IP" == "" ] && public_ip=$ETH0_IP echo "$public_ip $NAME" >> /etc/hosts - cp /etc/iptables/iptables-elbvm /etc/iptables/rules + cp /etc/iptables/iptables-elbvm /etc/iptables/rules.v4 if [ "$SSHONGUEST" == "true" ] then setup_sshd $ETH0_IP "eth0" diff --git a/patches/systemvm/debian/config/root/edithosts.sh b/patches/systemvm/debian/config/root/edithosts.sh index 9f21f206172..1f98fbf96ae 100755 --- a/patches/systemvm/debian/config/root/edithosts.sh +++ b/patches/systemvm/debian/config/root/edithosts.sh @@ -200,7 +200,8 @@ fi pid=$(pidof dnsmasq) if [ "$pid" != "" ] then - service dnsmasq restart + #service dnsmasq restart + kill -HUP $pid else if [ $no_redundant -eq 1 ] then diff --git a/plugins/affinity-group-processors/host-anti-affinity/pom.xml b/plugins/affinity-group-processors/host-anti-affinity/pom.xml new file mode 100644 index 00000000000..669febd7db8 --- /dev/null +++ b/plugins/affinity-group-processors/host-anti-affinity/pom.xml @@ -0,0 +1,33 @@ + + + 4.0.0 + cloud-plugin-host-anti-affinity + Apache CloudStack Plugin - Host Anti-Affinity Processor + + org.apache.cloudstack + cloudstack-plugins + 4.2.0-SNAPSHOT + ../../pom.xml + + + install + src + + diff --git a/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java b/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java new file mode 100644 index 00000000000..4c2c7f1c131 --- /dev/null +++ b/plugins/affinity-group-processors/host-anti-affinity/src/org/apache/cloudstack/affinity/HostAntiAffinityProcessor.java @@ -0,0 +1,93 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import java.util.List; + +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.cloudstack.affinity.dao.AffinityGroupDao; +import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; +import org.apache.log4j.Logger; + +import com.cloud.deploy.DeploymentPlan; +import com.cloud.deploy.DeploymentPlanner.ExcludeList; +import com.cloud.exception.AffinityConflictException; +import com.cloud.vm.VMInstanceVO; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachineProfile; +import com.cloud.vm.dao.UserVmDao; +import com.cloud.vm.dao.VMInstanceDao; + +@Local(value = AffinityGroupProcessor.class) +public class HostAntiAffinityProcessor extends AffinityProcessorBase implements AffinityGroupProcessor { + + private static final Logger s_logger = Logger.getLogger(HostAntiAffinityProcessor.class); + @Inject + protected UserVmDao _vmDao; + @Inject + protected VMInstanceDao _vmInstanceDao; + @Inject + protected AffinityGroupDao _affinityGroupDao; + @Inject + protected AffinityGroupVMMapDao _affinityGroupVMMapDao; + + @Override + public void process(VirtualMachineProfile vmProfile, DeploymentPlan plan, + ExcludeList avoid) + throws AffinityConflictException { + VirtualMachine vm = vmProfile.getVirtualMachine(); + List vmGroupMappings = _affinityGroupVMMapDao.findByVmIdType(vm.getId(), getType()); + + for (AffinityGroupVMMapVO vmGroupMapping : vmGroupMappings) { + if (vmGroupMapping != null) { + AffinityGroupVO group = _affinityGroupDao.findById(vmGroupMapping.getAffinityGroupId()); + + if (s_logger.isDebugEnabled()) { + s_logger.debug("Processing affinity group " + group.getName() + " for VM Id: " + vm.getId()); + } + + List groupVMIds = _affinityGroupVMMapDao.listVmIdsByAffinityGroup(group.getId()); + groupVMIds.remove(vm.getId()); + + for (Long groupVMId : groupVMIds) { + VMInstanceVO groupVM = _vmInstanceDao.findById(groupVMId); + if (groupVM != null && !groupVM.isRemoved()) { + if (groupVM.getHostId() != null) { + avoid.addHost(groupVM.getHostId()); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Added host " + groupVM.getHostId() + " to avoid set, since VM " + + groupVM.getId() + " is present on the host"); + } + } else if (VirtualMachine.State.Stopped.equals(groupVM.getState()) + && groupVM.getLastHostId() != null) { + avoid.addHost(groupVM.getLastHostId()); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Added host " + groupVM.getLastHostId() + " to avoid set, since VM " + + groupVM.getId() + " is present on the host, in Stopped state"); + } + + } + } + } + } + } + + } + +} diff --git a/plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java b/plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java index d2f25654c7a..09563da2264 100644 --- a/plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java +++ b/plugins/alert-handlers/syslog-alerts/src/org/apache/cloudstack/syslog/AlertsSyslogAppender.java @@ -217,7 +217,7 @@ public class AlertsSyslogAppender extends AppenderSkeleton { message.append("unknown" + MESSAGE_DELIMITER_STRING); } - if (alertType > 0) { + if (alertType >= 0) { message.append("alertType").append(_keyValueDelimiter).append(" ").append(alertsMap.get(alertType)) .append(MESSAGE_DELIMITER_STRING); if (dataCenterId != 0) { @@ -333,4 +333,4 @@ public class AlertsSyslogAppender extends AppenderSkeleton { public void setKeyValueDelimiter(String keyValueDelimiter) { this._keyValueDelimiter = keyValueDelimiter; } -} \ No newline at end of file +} diff --git a/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java b/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java index a672efdc77e..8243f3a46ad 100755 --- a/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java +++ b/plugins/host-allocators/random/src/com/cloud/agent/manager/allocator/impl/RandomAllocator.java @@ -53,6 +53,62 @@ public class RandomAllocator extends AdapterBase implements HostAllocator { return allocateTo(vmProfile, plan, type, avoid, returnUpTo, true); } + @Override + public List allocateTo(VirtualMachineProfile vmProfile, DeploymentPlan plan, Type type, + ExcludeList avoid, List hosts, int returnUpTo, boolean considerReservedCapacity) { + long dcId = plan.getDataCenterId(); + Long podId = plan.getPodId(); + Long clusterId = plan.getClusterId(); + ServiceOffering offering = vmProfile.getServiceOffering(); + List suitableHosts = new ArrayList(); + + if (type == Host.Type.Storage) { + return suitableHosts; + } + + String hostTag = offering.getHostTag(); + if(hostTag != null){ + s_logger.debug("Looking for hosts in dc: " + dcId + " pod:" + podId + " cluster:" + clusterId + + " having host tag:" + hostTag); + }else{ + s_logger.debug("Looking for hosts in dc: " + dcId + " pod:" + podId + " cluster:" + clusterId); + } + + // list all computing hosts, regardless of whether they support routing...it's random after all + if(hostTag != null){ + hosts.retainAll(_hostDao.listByHostTag(type, clusterId, podId, dcId, hostTag)); + }else{ + hosts.retainAll(_resourceMgr.listAllUpAndEnabledHosts(type, clusterId, podId, dcId)); + } + + s_logger.debug("Random Allocator found " + hosts.size() + " hosts"); + if (hosts.size() == 0) { + return suitableHosts; + } + + Collections.shuffle(hosts); + for (Host host : hosts) { + if(suitableHosts.size() == returnUpTo){ + break; + } + + if (!avoid.shouldAvoid(host)) { + suitableHosts.add(host); + } else { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Host name: " + host.getName() + ", hostId: "+ host.getId() +" is in avoid set, " + + "skipping this and trying other available hosts"); + } + } + } + + if (s_logger.isDebugEnabled()) { + s_logger.debug("Random Host Allocator returning "+suitableHosts.size() +" suitable hosts"); + } + + return suitableHosts; + } + @Override public List allocateTo(VirtualMachineProfile vmProfile, DeploymentPlan plan, Type type, ExcludeList avoid, int returnUpTo, boolean considerReservedCapacity) { diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/AddBaremetalHostCmd.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/AddBaremetalHostCmd.java index f07b212173f..8d459028a17 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/AddBaremetalHostCmd.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/AddBaremetalHostCmd.java @@ -14,35 +14,35 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// +// // Automatically generated by addcopyright.py at 01/29/2013 -package com.cloud.baremetal.manager; - +package com.cloud.baremetal.manager; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.Parameter; import org.apache.cloudstack.api.command.admin.host.AddHostCmd; import org.apache.cloudstack.api.response.HostResponse; -@APICommand(name="addBaremetalHost", description="add a baremetal host", responseObject = HostResponse.class) +@APICommand(name="addBaremetalHost", description="add a baremetal host", responseObject = HostResponse.class) public class AddBaremetalHostCmd extends AddHostCmd { - - @Parameter(name=ApiConstants.IP_ADDRESS, type=CommandType.STRING, description="ip address intentionally allocated to this host after provisioning") - private String vmIpAddress; - - public AddBaremetalHostCmd() { - } - + + @Parameter(name=ApiConstants.IP_ADDRESS, type=CommandType.STRING, description="ip address intentionally allocated to this host after provisioning") + private String vmIpAddress; + + public AddBaremetalHostCmd() { + } + @Override - public void execute(){ - this.getFullUrlParams().put(ApiConstants.BAREMETAL_DISCOVER_NAME, BareMetalDiscoverer.class.getName()); - super.execute(); - } - - public String getVmIpAddress() { - return vmIpAddress; - } - - public void setVmIpAddress(String vmIpAddress) { - this.vmIpAddress = vmIpAddress; - } -} + public void execute(){ + this.getFullUrlParams().put(ApiConstants.BAREMETAL_DISCOVER_NAME, BareMetalDiscoverer.class.getName()); + super.execute(); + } + + public String getVmIpAddress() { + return vmIpAddress; + } + + public void setVmIpAddress(String vmIpAddress) { + this.vmIpAddress = vmIpAddress; + } +} diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java index 28c83753c09..edb5dea8ca5 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BareMetalDiscoverer.java @@ -202,7 +202,7 @@ public class BareMetalDiscoverer extends DiscovererBase implements Discoverer, R if (vmIp != null) { details.put(ApiConstants.IP_ADDRESS, vmIp); } - String isEchoScAgent = _configDao.getValue(Config.EnableBaremetalSecurityGroupAgentEcho.key()); + String isEchoScAgent = _configDao.getValue(Config.EnableBaremetalSecurityGroupAgentEcho.key()); details.put(BaremetalManager.EchoSecurityGroupAgent, isEchoScAgent); resources.put(resource, details); diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java index 6467c945795..60edde3c70d 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalManager.java @@ -22,7 +22,7 @@ import com.cloud.network.Network.Provider; import com.cloud.utils.component.Manager; import com.cloud.utils.component.PluggableService; -public interface BaremetalManager extends Manager, PluggableService { +public interface BaremetalManager extends Manager, PluggableService { public static final String EchoSecurityGroupAgent = "EchoSecurityGroupAgent"; public static final String ExternalBaremetalSystemUrl = "ExternalBaremetalSystemUrl"; public static final String DO_PXE = "doPxe"; diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalPlannerSelector.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalPlannerSelector.java index 9daee3f3fe7..45fbeb782ab 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalPlannerSelector.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/manager/BaremetalPlannerSelector.java @@ -1,39 +1,39 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.baremetal.manager; - -import java.util.Map; - -import javax.ejb.Local; -import javax.naming.ConfigurationException; - -import com.cloud.deploy.AbstractDeployPlannerSelector; -import com.cloud.deploy.DeployPlannerSelector; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.vm.UserVmVO; -@Local(value = {DeployPlannerSelector.class}) -public class BaremetalPlannerSelector extends AbstractDeployPlannerSelector{ - - @Override - public String selectPlanner(UserVmVO vm) { - if (vm.getHypervisorType() == HypervisorType.BareMetal) { - return "BareMetalPlanner"; - } - return null; - } - -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.baremetal.manager; + +import java.util.Map; + +import javax.ejb.Local; +import javax.naming.ConfigurationException; + +import com.cloud.deploy.AbstractDeployPlannerSelector; +import com.cloud.deploy.DeployPlannerSelector; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.vm.UserVmVO; +@Local(value = {DeployPlannerSelector.class}) +public class BaremetalPlannerSelector extends AbstractDeployPlannerSelector{ + + @Override + public String selectPlanner(UserVmVO vm) { + if (vm.getHypervisorType() == HypervisorType.BareMetal) { + return "BareMetalPlanner"; + } + return null; + } + +} diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/AddBaremetalKickStartPxeCmd.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/AddBaremetalKickStartPxeCmd.java index 596a86dac8f..8bcc7c13f62 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/AddBaremetalKickStartPxeCmd.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/AddBaremetalKickStartPxeCmd.java @@ -14,24 +14,24 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// +// // Automatically generated by addcopyright.py at 01/29/2013 -package com.cloud.baremetal.networkservice; - +package com.cloud.baremetal.networkservice; + import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.BaseCmd.CommandType; import org.apache.cloudstack.api.Parameter; @APICommand(name="addBaremetalPxeKickStartServer", description="add a baremetal pxe server", responseObject = BaremetalPxeKickStartResponse.class) -public class AddBaremetalKickStartPxeCmd extends AddBaremetalPxeCmd { - @Parameter(name=ApiConstants.TFTP_DIR, type=CommandType.STRING, required = true, description="Tftp root directory of PXE server") - private String tftpDir; - - public String getTftpDir() { - return tftpDir; - } - - public void setTftpDir(String tftpDir) { - this.tftpDir = tftpDir; +public class AddBaremetalKickStartPxeCmd extends AddBaremetalPxeCmd { + @Parameter(name=ApiConstants.TFTP_DIR, type=CommandType.STRING, required = true, description="Tftp root directory of PXE server") + private String tftpDir; + + public String getTftpDir() { + return tftpDir; } -} + + public void setTftpDir(String tftpDir) { + this.tftpDir = tftpDir; + } +} diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java index 4c99f6bf544..86e41fea070 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BareMetalResourceBase.java @@ -97,7 +97,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource protected String _mac; protected String _username; protected String _password; - protected String _ip; + protected String _ip; protected boolean _isEchoScAgent; protected IAgentControl _agentControl; protected Script2 _pingCommand; @@ -146,7 +146,7 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource _mac = (String) params.get(ApiConstants.HOST_MAC); _username = (String) params.get(ApiConstants.USERNAME); _password = (String) params.get(ApiConstants.PASSWORD); - _vmName = (String) params.get("vmName"); + _vmName = (String) params.get("vmName"); String echoScAgent = (String) params.get(BaremetalManager.EchoSecurityGroupAgent); if (_pod == null) { @@ -172,9 +172,9 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource if (_uuid == null) { throw new ConfigurationException("Unable to get the uuid"); - } - - if (echoScAgent != null) { + } + + if (echoScAgent != null) { _isEchoScAgent = Boolean.valueOf(echoScAgent); } @@ -416,9 +416,9 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource protected CheckNetworkAnswer execute(CheckNetworkCommand cmd) { return new CheckNetworkAnswer(cmd, true, "Success"); } - - protected Answer execute(SecurityGroupRulesCmd cmd) { - SecurityGroupHttpClient hc = new SecurityGroupHttpClient(); + + protected Answer execute(SecurityGroupRulesCmd cmd) { + SecurityGroupHttpClient hc = new SecurityGroupHttpClient(); return hc.call(cmd.getGuestIp(), cmd); } @@ -531,13 +531,13 @@ public class BareMetalResourceBase extends ManagerBase implements ServerResource if (!doScript(_powerOnCommand)) { return new StartAnswer(cmd, "IPMI power on failed"); } - } - - if (_isEchoScAgent) { - SecurityGroupHttpClient hc = new SecurityGroupHttpClient(); - boolean echoRet = hc.echo(vm.getNics()[0].getIp(), TimeUnit.MINUTES.toMillis(30), TimeUnit.MINUTES.toMillis(1)); + } + + if (_isEchoScAgent) { + SecurityGroupHttpClient hc = new SecurityGroupHttpClient(); + boolean echoRet = hc.echo(vm.getNics()[0].getIp(), TimeUnit.MINUTES.toMillis(30), TimeUnit.MINUTES.toMillis(1)); if (!echoRet) { - return new StartAnswer(cmd, String.format("Call security group agent on vm[%s] timeout", vm.getNics()[0].getIp())); + return new StartAnswer(cmd, String.format("Call security group agent on vm[%s] timeout", vm.getNics()[0].getIp())); } } diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java index bec6e38b7c8..6d14e3f1a0c 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetaNetworkGuru.java @@ -14,10 +14,10 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// +// // Automatically generated by addcopyright.py at 01/29/2013 -package com.cloud.baremetal.networkservice; - +package com.cloud.baremetal.networkservice; + import java.net.URI; import javax.ejb.Local; @@ -56,11 +56,11 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; - -@Local(value = { NetworkGuru.class }) -public class BaremetaNetworkGuru extends DirectPodBasedNetworkGuru { - private static final Logger s_logger = Logger.getLogger(BaremetaNetworkGuru.class); - @Inject + +@Local(value = { NetworkGuru.class }) +public class BaremetaNetworkGuru extends DirectPodBasedNetworkGuru { + private static final Logger s_logger = Logger.getLogger(BaremetaNetworkGuru.class); + @Inject private HostDao _hostDao; @Inject DataCenterDao _dcDao; @@ -73,101 +73,101 @@ public class BaremetaNetworkGuru extends DirectPodBasedNetworkGuru { @Inject NetworkOfferingDao _networkOfferingDao; @Inject - PodVlanMapDao _podVlanDao; - - @Override - public void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) - throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException { - if (dest.getHost().getHypervisorType() != HypervisorType.BareMetal) { - super.reserve(nic, network, vm, dest, context); - return; - } - - HostVO host = _hostDao.findById(dest.getHost().getId()); - _hostDao.loadDetails(host); - String intentIp = host.getDetail(ApiConstants.IP_ADDRESS); - if (intentIp == null) { - super.reserve(nic, network, vm, dest, context); - return; - } - - String oldIp = nic.getIp4Address(); - boolean getNewIp = false; - if (oldIp == null) { - getNewIp = true; - } else { - // we need to get a new ip address if we try to deploy a vm in a - // different pod - IPAddressVO ipVO = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), oldIp); - if (ipVO != null) { - PodVlanMapVO mapVO = _podVlanDao.listPodVlanMapsByVlan(ipVO.getVlanId()); - if (mapVO.getPodId() != dest.getPod().getId()) { - Transaction txn = Transaction.currentTxn(); - txn.start(); - - // release the old ip here - _networkMgr.markIpAsUnavailable(ipVO.getId()); - _ipAddressDao.unassignIpAddress(ipVO.getId()); - - txn.commit(); - - nic.setIp4Address(null); - getNewIp = true; - } - } - } - - if (getNewIp) { - // we don't set reservationStrategy to Create because we need this - // method to be called again for the case when vm fails to deploy in - // Pod1, and we try to redeploy it in Pod2 - getBaremetalIp(nic, dest.getPod(), vm, network, intentIp); - } - - DataCenter dc = _dcDao.findById(network.getDataCenterId()); - nic.setDns1(dc.getDns1()); - nic.setDns2(dc.getDns2()); - - /* - * Pod pod = dest.getPod(); Pair ip = - * _dcDao.allocatePrivateIpAddress(dest.getDataCenter().getId(), - * dest.getPod().getId(), nic.getId(), context.getReservationId(), - * intentIp); if (ip == null) { throw new - * InsufficientAddressCapacityException - * ("Unable to get a management ip address", Pod.class, pod.getId()); } - * - * nic.setIp4Address(ip.first()); - * nic.setMacAddress(NetUtils.long2Mac(NetUtils - * .createSequenceBasedMacAddress(ip.second()))); - * nic.setGateway(pod.getGateway()); nic.setFormat(AddressFormat.Ip4); - * String netmask = NetUtils.getCidrNetmask(pod.getCidrSize()); - * nic.setNetmask(netmask); - * nic.setBroadcastType(BroadcastDomainType.Native); - * nic.setBroadcastUri(null); nic.setIsolationUri(null); - */ - - s_logger.debug("Allocated a nic " + nic + " for " + vm); - } + PodVlanMapDao _podVlanDao; - private void getBaremetalIp(NicProfile nic, Pod pod, VirtualMachineProfile vm, Network network, String requiredIp) - throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException { - DataCenter dc = _dcDao.findById(pod.getDataCenterId()); - if (nic.getIp4Address() == null) { - s_logger.debug(String.format("Requiring ip address: %s", nic.getIp4Address())); - PublicIp ip = _networkMgr.assignPublicIpAddress(dc.getId(), pod.getId(), vm.getOwner(), VlanType.DirectAttached, network.getId(), requiredIp, false); - nic.setIp4Address(ip.getAddress().toString()); - nic.setFormat(AddressFormat.Ip4); - nic.setGateway(ip.getGateway()); - nic.setNetmask(ip.getNetmask()); - if (ip.getVlanTag() != null && ip.getVlanTag().equalsIgnoreCase(Vlan.UNTAGGED)) { - nic.setIsolationUri(URI.create("ec2://" + Vlan.UNTAGGED)); - nic.setBroadcastUri(URI.create("vlan://" + Vlan.UNTAGGED)); - nic.setBroadcastType(BroadcastDomainType.Native); - } - nic.setReservationId(String.valueOf(ip.getVlanTag())); - nic.setMacAddress(ip.getMacAddress()); - } - nic.setDns1(dc.getDns1()); - nic.setDns2(dc.getDns2()); - } -} + @Override + public void reserve(NicProfile nic, Network network, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) + throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException { + if (dest.getHost().getHypervisorType() != HypervisorType.BareMetal) { + super.reserve(nic, network, vm, dest, context); + return; + } + + HostVO host = _hostDao.findById(dest.getHost().getId()); + _hostDao.loadDetails(host); + String intentIp = host.getDetail(ApiConstants.IP_ADDRESS); + if (intentIp == null) { + super.reserve(nic, network, vm, dest, context); + return; + } + + String oldIp = nic.getIp4Address(); + boolean getNewIp = false; + if (oldIp == null) { + getNewIp = true; + } else { + // we need to get a new ip address if we try to deploy a vm in a + // different pod + IPAddressVO ipVO = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), oldIp); + if (ipVO != null) { + PodVlanMapVO mapVO = _podVlanDao.listPodVlanMapsByVlan(ipVO.getVlanId()); + if (mapVO.getPodId() != dest.getPod().getId()) { + Transaction txn = Transaction.currentTxn(); + txn.start(); + + // release the old ip here + _networkMgr.markIpAsUnavailable(ipVO.getId()); + _ipAddressDao.unassignIpAddress(ipVO.getId()); + + txn.commit(); + + nic.setIp4Address(null); + getNewIp = true; + } + } + } + + if (getNewIp) { + // we don't set reservationStrategy to Create because we need this + // method to be called again for the case when vm fails to deploy in + // Pod1, and we try to redeploy it in Pod2 + getBaremetalIp(nic, dest.getPod(), vm, network, intentIp); + } + + DataCenter dc = _dcDao.findById(network.getDataCenterId()); + nic.setDns1(dc.getDns1()); + nic.setDns2(dc.getDns2()); + + /* + * Pod pod = dest.getPod(); Pair ip = + * _dcDao.allocatePrivateIpAddress(dest.getDataCenter().getId(), + * dest.getPod().getId(), nic.getId(), context.getReservationId(), + * intentIp); if (ip == null) { throw new + * InsufficientAddressCapacityException + * ("Unable to get a management ip address", Pod.class, pod.getId()); } + * + * nic.setIp4Address(ip.first()); + * nic.setMacAddress(NetUtils.long2Mac(NetUtils + * .createSequenceBasedMacAddress(ip.second()))); + * nic.setGateway(pod.getGateway()); nic.setFormat(AddressFormat.Ip4); + * String netmask = NetUtils.getCidrNetmask(pod.getCidrSize()); + * nic.setNetmask(netmask); + * nic.setBroadcastType(BroadcastDomainType.Native); + * nic.setBroadcastUri(null); nic.setIsolationUri(null); + */ + + s_logger.debug("Allocated a nic " + nic + " for " + vm); + } + + private void getBaremetalIp(NicProfile nic, Pod pod, VirtualMachineProfile vm, Network network, String requiredIp) + throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException, ConcurrentOperationException { + DataCenter dc = _dcDao.findById(pod.getDataCenterId()); + if (nic.getIp4Address() == null) { + s_logger.debug(String.format("Requiring ip address: %s", nic.getIp4Address())); + PublicIp ip = _networkMgr.assignPublicIpAddress(dc.getId(), pod.getId(), vm.getOwner(), VlanType.DirectAttached, network.getId(), requiredIp, false); + nic.setIp4Address(ip.getAddress().toString()); + nic.setFormat(AddressFormat.Ip4); + nic.setGateway(ip.getGateway()); + nic.setNetmask(ip.getNetmask()); + if (ip.getVlanTag() != null && ip.getVlanTag().equalsIgnoreCase(Vlan.UNTAGGED)) { + nic.setIsolationUri(URI.create("ec2://" + Vlan.UNTAGGED)); + nic.setBroadcastUri(URI.create("vlan://" + Vlan.UNTAGGED)); + nic.setBroadcastType(BroadcastDomainType.Native); + } + nic.setReservationId(String.valueOf(ip.getVlanTag())); + nic.setMacAddress(ip.getMacAddress()); + } + nic.setDns1(dc.getDns1()); + nic.setDns2(dc.getDns2()); + } +} diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java index 58c6e862d9f..7a7a5153e5c 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartPxeResource.java @@ -14,10 +14,10 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// +// // Automatically generated by addcopyright.py at 01/29/2013 -package com.cloud.baremetal.networkservice; - +package com.cloud.baremetal.networkservice; + import java.util.HashMap; import java.util.List; import java.util.Map; @@ -37,166 +37,166 @@ import com.cloud.utils.script.Script; import com.cloud.utils.ssh.SSHCmdHelper; import com.cloud.vm.VirtualMachine.State; import com.trilead.ssh2.SCPClient; - -public class BaremetalKickStartPxeResource extends BaremetalPxeResourceBase { - private static final Logger s_logger = Logger.getLogger(BaremetalKickStartPxeResource.class); - private static final String _name = "BaremetalKickStartPxeResource"; - String _tftpDir; - - @Override - public boolean configure(String name, Map params) throws ConfigurationException { - super.configure(name, params); - _tftpDir = (String) params.get(BaremetalPxeService.PXE_PARAM_TFTP_DIR); - if (_tftpDir == null) { - throw new ConfigurationException("No tftp directory specified"); - } - - com.trilead.ssh2.Connection sshConnection = new com.trilead.ssh2.Connection(_ip, 22); - - s_logger.debug(String.format("Trying to connect to kickstart PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, "******")); - try { - sshConnection.connect(null, 60000, 60000); - if (!sshConnection.authenticateWithPassword(_username, _password)) { - s_logger.debug("SSH Failed to authenticate"); - throw new ConfigurationException(String.format("Cannot connect to kickstart PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, - "******")); - } - - String cmd = String.format("[ -f /%1$s/pxelinux.0 ]", _tftpDir); - if (!SSHCmdHelper.sshExecuteCmd(sshConnection, cmd)) { - throw new ConfigurationException("Miss files in TFTP directory at " + _tftpDir + " check if pxelinux.0 are here"); - } - - SCPClient scp = new SCPClient(sshConnection); - String prepareScript = "scripts/network/ping/prepare_kickstart_bootfile.py"; - String prepareScriptPath = Script.findScript("", prepareScript); - if (prepareScriptPath == null) { - throw new ConfigurationException("Can not find prepare_kickstart_bootfile.py at " + prepareScript); - } - scp.put(prepareScriptPath, "/usr/bin/", "0755"); - String cpScript = "scripts/network/ping/prepare_kickstart_kernel_initrd.py"; - String cpScriptPath = Script.findScript("", cpScript); - if (cpScriptPath == null) { - throw new ConfigurationException("Can not find prepare_kickstart_kernel_initrd.py at " + cpScript); - } - scp.put(cpScriptPath, "/usr/bin/", "0755"); - - String userDataScript = "scripts/network/ping/baremetal_user_data.py"; - String userDataScriptPath = Script.findScript("", userDataScript); - if (userDataScriptPath == null) { - throw new ConfigurationException("Can not find baremetal_user_data.py at " + userDataScript); - } - scp.put(userDataScriptPath, "/usr/bin/", "0755"); - - return true; - } catch (Exception e) { - throw new CloudRuntimeException(e); - } finally { - if (sshConnection != null) { - sshConnection.close(); - } - } - } - - @Override - public PingCommand getCurrentStatus(long id) { - com.trilead.ssh2.Connection sshConnection = SSHCmdHelper.acquireAuthorizedConnection(_ip, _username, _password); - if (sshConnection == null) { - return null; - } else { - SSHCmdHelper.releaseSshConnection(sshConnection); - return new PingRoutingCommand(getType(), id, new HashMap()); - } - } - - private Answer execute(VmDataCommand cmd) { - com.trilead.ssh2.Connection sshConnection = new com.trilead.ssh2.Connection(_ip, 22); - try { - List vmData = cmd.getVmData(); - StringBuilder sb = new StringBuilder(); - for (String[] data : vmData) { - String folder = data[0]; - String file = data[1]; - String contents = (data[2] == null) ? "none" : data[2]; - sb.append(cmd.getVmIpAddress()); - sb.append(","); - sb.append(folder); - sb.append(","); - sb.append(file); - sb.append(","); - sb.append(contents); - sb.append(";"); - } - String arg = StringUtils.stripEnd(sb.toString(), ";"); - - sshConnection.connect(null, 60000, 60000); - if (!sshConnection.authenticateWithPassword(_username, _password)) { - s_logger.debug("SSH Failed to authenticate"); - throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, - _password)); - } - - String script = String.format("python /usr/bin/baremetal_user_data.py '%s'", arg); - if (!SSHCmdHelper.sshExecuteCmd(sshConnection, script)) { - return new Answer(cmd, false, "Failed to add user data, command:" + script); - } - - return new Answer(cmd, true, "Success"); - } catch (Exception e){ - s_logger.debug("Prepare for creating baremetal template failed", e); - return new Answer(cmd, false, e.getMessage()); - } finally { - if (sshConnection != null) { - sshConnection.close(); - } - } - } - - @Override - public Answer executeRequest(Command cmd) { - if (cmd instanceof PrepareKickstartPxeServerCommand) { - return execute((PrepareKickstartPxeServerCommand) cmd); - } else if (cmd instanceof VmDataCommand) { - return execute((VmDataCommand)cmd); - } else { - return super.executeRequest(cmd); - } - } - - private Answer execute(PrepareKickstartPxeServerCommand cmd) { - com.trilead.ssh2.Connection sshConnection = new com.trilead.ssh2.Connection(_ip, 22); - try { - sshConnection.connect(null, 60000, 60000); - if (!sshConnection.authenticateWithPassword(_username, _password)) { - s_logger.debug("SSH Failed to authenticate"); - throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, - _password)); +public class BaremetalKickStartPxeResource extends BaremetalPxeResourceBase { + private static final Logger s_logger = Logger.getLogger(BaremetalKickStartPxeResource.class); + private static final String _name = "BaremetalKickStartPxeResource"; + String _tftpDir; + + @Override + public boolean configure(String name, Map params) throws ConfigurationException { + super.configure(name, params); + _tftpDir = (String) params.get(BaremetalPxeService.PXE_PARAM_TFTP_DIR); + if (_tftpDir == null) { + throw new ConfigurationException("No tftp directory specified"); + } + + com.trilead.ssh2.Connection sshConnection = new com.trilead.ssh2.Connection(_ip, 22); + + s_logger.debug(String.format("Trying to connect to kickstart PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, "******")); + try { + sshConnection.connect(null, 60000, 60000); + if (!sshConnection.authenticateWithPassword(_username, _password)) { + s_logger.debug("SSH Failed to authenticate"); + throw new ConfigurationException(String.format("Cannot connect to kickstart PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, + "******")); } - + + String cmd = String.format("[ -f /%1$s/pxelinux.0 ]", _tftpDir); + if (!SSHCmdHelper.sshExecuteCmd(sshConnection, cmd)) { + throw new ConfigurationException("Miss files in TFTP directory at " + _tftpDir + " check if pxelinux.0 are here"); + } + + SCPClient scp = new SCPClient(sshConnection); + String prepareScript = "scripts/network/ping/prepare_kickstart_bootfile.py"; + String prepareScriptPath = Script.findScript("", prepareScript); + if (prepareScriptPath == null) { + throw new ConfigurationException("Can not find prepare_kickstart_bootfile.py at " + prepareScript); + } + scp.put(prepareScriptPath, "/usr/bin/", "0755"); + + String cpScript = "scripts/network/ping/prepare_kickstart_kernel_initrd.py"; + String cpScriptPath = Script.findScript("", cpScript); + if (cpScriptPath == null) { + throw new ConfigurationException("Can not find prepare_kickstart_kernel_initrd.py at " + cpScript); + } + scp.put(cpScriptPath, "/usr/bin/", "0755"); + + String userDataScript = "scripts/network/ping/baremetal_user_data.py"; + String userDataScriptPath = Script.findScript("", userDataScript); + if (userDataScriptPath == null) { + throw new ConfigurationException("Can not find baremetal_user_data.py at " + userDataScript); + } + scp.put(userDataScriptPath, "/usr/bin/", "0755"); + + return true; + } catch (Exception e) { + throw new CloudRuntimeException(e); + } finally { + if (sshConnection != null) { + sshConnection.close(); + } + } + } + + @Override + public PingCommand getCurrentStatus(long id) { + com.trilead.ssh2.Connection sshConnection = SSHCmdHelper.acquireAuthorizedConnection(_ip, _username, _password); + if (sshConnection == null) { + return null; + } else { + SSHCmdHelper.releaseSshConnection(sshConnection); + return new PingRoutingCommand(getType(), id, new HashMap()); + } + } + + private Answer execute(VmDataCommand cmd) { + com.trilead.ssh2.Connection sshConnection = new com.trilead.ssh2.Connection(_ip, 22); + try { + List vmData = cmd.getVmData(); + StringBuilder sb = new StringBuilder(); + for (String[] data : vmData) { + String folder = data[0]; + String file = data[1]; + String contents = (data[2] == null) ? "none" : data[2]; + sb.append(cmd.getVmIpAddress()); + sb.append(","); + sb.append(folder); + sb.append(","); + sb.append(file); + sb.append(","); + sb.append(contents); + sb.append(";"); + } + String arg = StringUtils.stripEnd(sb.toString(), ";"); + + sshConnection.connect(null, 60000, 60000); + if (!sshConnection.authenticateWithPassword(_username, _password)) { + s_logger.debug("SSH Failed to authenticate"); + throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, + _password)); + } + + String script = String.format("python /usr/bin/baremetal_user_data.py '%s'", arg); + if (!SSHCmdHelper.sshExecuteCmd(sshConnection, script)) { + return new Answer(cmd, false, "Failed to add user data, command:" + script); + } + + return new Answer(cmd, true, "Success"); + } catch (Exception e){ + s_logger.debug("Prepare for creating baremetal template failed", e); + return new Answer(cmd, false, e.getMessage()); + } finally { + if (sshConnection != null) { + sshConnection.close(); + } + } + } + + @Override + public Answer executeRequest(Command cmd) { + if (cmd instanceof PrepareKickstartPxeServerCommand) { + return execute((PrepareKickstartPxeServerCommand) cmd); + } else if (cmd instanceof VmDataCommand) { + return execute((VmDataCommand)cmd); + } else { + return super.executeRequest(cmd); + } + } + + private Answer execute(PrepareKickstartPxeServerCommand cmd) { + com.trilead.ssh2.Connection sshConnection = new com.trilead.ssh2.Connection(_ip, 22); + try { + sshConnection.connect(null, 60000, 60000); + if (!sshConnection.authenticateWithPassword(_username, _password)) { + s_logger.debug("SSH Failed to authenticate"); + throw new ConfigurationException(String.format("Cannot connect to PING PXE server(IP=%1$s, username=%2$s, password=%3$s", _ip, _username, + _password)); + } + String copyTo = String.format("%s/%s", _tftpDir, cmd.getTemplateUuid()); - String script = String.format("python /usr/bin/prepare_kickstart_kernel_initrd.py %s %s %s", cmd.getKernel(), cmd.getInitrd(), copyTo); - - if (!SSHCmdHelper.sshExecuteCmd(sshConnection, script)) { - return new Answer(cmd, false, "prepare kickstart at pxe server " + _ip + " failed, command:" + script); - } - - String kernelPath = String.format("%s/vmlinuz", cmd.getTemplateUuid()); - String initrdPath = String.format("%s/initrd.img", cmd.getTemplateUuid()); - script = String.format("python /usr/bin/prepare_kickstart_bootfile.py %s %s %s %s %s %s", _tftpDir, cmd.getMac(), kernelPath, initrdPath, cmd.getKsFile(), cmd.getMac()); - if (!SSHCmdHelper.sshExecuteCmd(sshConnection, script)) { - return new Answer(cmd, false, "prepare kickstart at pxe server " + _ip + " failed, command:" + script); - } - - s_logger.debug("Prepare kickstart PXE server successfully"); - return new Answer(cmd, true, "Success"); - } catch (Exception e){ - s_logger.debug("Prepare for kickstart server failed", e); - return new Answer(cmd, false, e.getMessage()); - } finally { - if (sshConnection != null) { - sshConnection.close(); - } - } - } -} + String script = String.format("python /usr/bin/prepare_kickstart_kernel_initrd.py %s %s %s", cmd.getKernel(), cmd.getInitrd(), copyTo); + + if (!SSHCmdHelper.sshExecuteCmd(sshConnection, script)) { + return new Answer(cmd, false, "prepare kickstart at pxe server " + _ip + " failed, command:" + script); + } + + String kernelPath = String.format("%s/vmlinuz", cmd.getTemplateUuid()); + String initrdPath = String.format("%s/initrd.img", cmd.getTemplateUuid()); + script = String.format("python /usr/bin/prepare_kickstart_bootfile.py %s %s %s %s %s %s", _tftpDir, cmd.getMac(), kernelPath, initrdPath, cmd.getKsFile(), cmd.getMac()); + if (!SSHCmdHelper.sshExecuteCmd(sshConnection, script)) { + return new Answer(cmd, false, "prepare kickstart at pxe server " + _ip + " failed, command:" + script); + } + + s_logger.debug("Prepare kickstart PXE server successfully"); + return new Answer(cmd, true, "Success"); + } catch (Exception e){ + s_logger.debug("Prepare for kickstart server failed", e); + return new Answer(cmd, false, e.getMessage()); + } finally { + if (sshConnection != null) { + sshConnection.close(); + } + } + } +} diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java index 8a5ac78729e..49582b07862 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java @@ -14,87 +14,87 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// +// // Automatically generated by addcopyright.py at 01/29/2013 -package com.cloud.baremetal.networkservice; - -import java.net.URI; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.ejb.Local; +package com.cloud.baremetal.networkservice; + +import java.net.URI; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.ejb.Local; import javax.inject.Inject; - -import org.apache.log4j.Logger; - -import com.cloud.agent.api.Answer; -import com.cloud.agent.api.baremetal.IpmISetBootDevCommand; -import com.cloud.agent.api.baremetal.IpmISetBootDevCommand.BootDev; -import com.cloud.baremetal.database.BaremetalPxeDao; -import com.cloud.baremetal.database.BaremetalPxeVO; -import com.cloud.baremetal.networkservice.BaremetalPxeManager.BaremetalPxeType; -import com.cloud.deploy.DeployDestination; -import com.cloud.host.Host; -import com.cloud.host.HostVO; -import com.cloud.host.dao.HostDetailsDao; -import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.dao.NetworkDao; + +import org.apache.log4j.Logger; + +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.baremetal.IpmISetBootDevCommand; +import com.cloud.agent.api.baremetal.IpmISetBootDevCommand.BootDev; +import com.cloud.baremetal.database.BaremetalPxeDao; +import com.cloud.baremetal.database.BaremetalPxeVO; +import com.cloud.baremetal.networkservice.BaremetalPxeManager.BaremetalPxeType; +import com.cloud.deploy.DeployDestination; +import com.cloud.host.Host; +import com.cloud.host.HostVO; +import com.cloud.host.dao.HostDetailsDao; +import com.cloud.network.PhysicalNetworkServiceProvider; +import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkVO; -import com.cloud.network.dao.PhysicalNetworkDao; -import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; -import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; +import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; +import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; import com.cloud.network.dao.PhysicalNetworkVO; -import com.cloud.resource.ResourceManager; -import com.cloud.resource.ServerResource; -import com.cloud.storage.VMTemplateVO; -import com.cloud.storage.dao.VMTemplateDao; -import com.cloud.uservm.UserVm; -import com.cloud.utils.db.DB; -import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.SearchCriteria2; -import com.cloud.utils.db.SearchCriteriaService; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.vm.NicProfile; -import com.cloud.vm.ReservationContext; -import com.cloud.vm.UserVmVO; -import com.cloud.vm.VirtualMachineProfile; - -@Local(value = BaremetalPxeService.class) -public class BaremetalKickStartServiceImpl extends BareMetalPxeServiceBase implements BaremetalPxeService { - private static final Logger s_logger = Logger.getLogger(BaremetalKickStartServiceImpl.class); - @Inject - ResourceManager _resourceMgr; - @Inject - PhysicalNetworkDao _physicalNetworkDao; - @Inject - PhysicalNetworkServiceProviderDao _physicalNetworkServiceProviderDao; - @Inject - HostDetailsDao _hostDetailsDao; - @Inject - BaremetalPxeDao _pxeDao; +import com.cloud.resource.ResourceManager; +import com.cloud.resource.ServerResource; +import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.dao.VMTemplateDao; +import com.cloud.uservm.UserVm; +import com.cloud.utils.db.DB; +import com.cloud.utils.db.SearchCriteria.Op; +import com.cloud.utils.db.SearchCriteria2; +import com.cloud.utils.db.SearchCriteriaService; +import com.cloud.utils.db.Transaction; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.vm.NicProfile; +import com.cloud.vm.ReservationContext; +import com.cloud.vm.UserVmVO; +import com.cloud.vm.VirtualMachineProfile; + +@Local(value = BaremetalPxeService.class) +public class BaremetalKickStartServiceImpl extends BareMetalPxeServiceBase implements BaremetalPxeService { + private static final Logger s_logger = Logger.getLogger(BaremetalKickStartServiceImpl.class); @Inject - NetworkDao _nwDao; + ResourceManager _resourceMgr; + @Inject + PhysicalNetworkDao _physicalNetworkDao; + @Inject + PhysicalNetworkServiceProviderDao _physicalNetworkServiceProviderDao; + @Inject + HostDetailsDao _hostDetailsDao; + @Inject + BaremetalPxeDao _pxeDao; + @Inject + NetworkDao _nwDao; @Inject VMTemplateDao _tmpDao; - - @Override + + @Override public boolean prepare(VirtualMachineProfile profile, NicProfile nic, DeployDestination dest, ReservationContext context) { NetworkVO nwVO = _nwDao.findById(nic.getNetworkId()); - SearchCriteriaService sc = SearchCriteria2.create(BaremetalPxeVO.class); + SearchCriteriaService sc = SearchCriteria2.create(BaremetalPxeVO.class); sc.addAnd(sc.getEntity().getDeviceType(), Op.EQ, BaremetalPxeType.KICK_START.toString()); - sc.addAnd(sc.getEntity().getPhysicalNetworkId(), Op.EQ, nwVO.getPhysicalNetworkId()); - BaremetalPxeVO pxeVo = sc.find(); - if (pxeVo == null) { - throw new CloudRuntimeException("No kickstart PXE server found in pod: " + dest.getPod().getId() + ", you need to add it before starting VM"); + sc.addAnd(sc.getEntity().getPhysicalNetworkId(), Op.EQ, nwVO.getPhysicalNetworkId()); + BaremetalPxeVO pxeVo = sc.find(); + if (pxeVo == null) { + throw new CloudRuntimeException("No kickstart PXE server found in pod: " + dest.getPod().getId() + ", you need to add it before starting VM"); } - VMTemplateVO template = _tmpDao.findById(profile.getTemplateId()); - - try { - String tpl = profile.getTemplate().getUrl(); - assert tpl != null : "How can a null template get here!!!"; + VMTemplateVO template = _tmpDao.findById(profile.getTemplateId()); + + try { + String tpl = profile.getTemplate().getUrl(); + assert tpl != null : "How can a null template get here!!!"; String[] tpls = tpl.split(";"); CloudRuntimeException err = new CloudRuntimeException(String.format("template url[%s] is not correctly encoded. it must be in format of ks=http_link_to_kickstartfile;kernel=nfs_path_to_pxe_kernel;initrd=nfs_path_to_pxe_initrd", tpl)); if (tpls.length != 3) { @@ -120,149 +120,149 @@ public class BaremetalKickStartServiceImpl extends BareMetalPxeServiceBase imple throw err; } } - - PrepareKickstartPxeServerCommand cmd = new PrepareKickstartPxeServerCommand(); + + PrepareKickstartPxeServerCommand cmd = new PrepareKickstartPxeServerCommand(); cmd.setKsFile(ks); cmd.setInitrd(initrd); - cmd.setKernel(kernel); + cmd.setKernel(kernel); cmd.setMac(nic.getMacAddress()); - cmd.setTemplateUuid(template.getUuid()); - Answer aws = _agentMgr.send(pxeVo.getHostId(), cmd); - if (!aws.getResult()) { - s_logger.warn("Unable to set host: " + dest.getHost().getId() + " to PXE boot because " + aws.getDetails()); - return aws.getResult(); + cmd.setTemplateUuid(template.getUuid()); + Answer aws = _agentMgr.send(pxeVo.getHostId(), cmd); + if (!aws.getResult()) { + s_logger.warn("Unable to set host: " + dest.getHost().getId() + " to PXE boot because " + aws.getDetails()); + return aws.getResult(); } - - IpmISetBootDevCommand bootCmd = new IpmISetBootDevCommand(BootDev.pxe); - aws = _agentMgr.send(dest.getHost().getId(), bootCmd); - if (!aws.getResult()) { - s_logger.warn("Unable to set host: " + dest.getHost().getId() + " to PXE boot because " + aws.getDetails()); + + IpmISetBootDevCommand bootCmd = new IpmISetBootDevCommand(BootDev.pxe); + aws = _agentMgr.send(dest.getHost().getId(), bootCmd); + if (!aws.getResult()) { + s_logger.warn("Unable to set host: " + dest.getHost().getId() + " to PXE boot because " + aws.getDetails()); } - - return aws.getResult(); - } catch (Exception e) { - s_logger.warn("Cannot prepare PXE server", e); - return false; - } - } - - @Override - public boolean prepareCreateTemplate(Long pxeServerId, UserVm vm, String templateUrl) { - // TODO Auto-generated method stub - return false; - } - + + return aws.getResult(); + } catch (Exception e) { + s_logger.warn("Cannot prepare PXE server", e); + return false; + } + } + @Override - @DB - public BaremetalPxeVO addPxeServer(AddBaremetalPxeCmd cmd) { - AddBaremetalKickStartPxeCmd kcmd = (AddBaremetalKickStartPxeCmd)cmd; - PhysicalNetworkVO pNetwork = null; - long zoneId; - - if (cmd.getPhysicalNetworkId() == null || cmd.getUrl() == null || cmd.getUsername() == null || cmd.getPassword() == null) { - throw new IllegalArgumentException("At least one of the required parameters(physical network id, url, username, password) is null"); - } - - pNetwork = _physicalNetworkDao.findById(cmd.getPhysicalNetworkId()); - if (pNetwork == null) { - throw new IllegalArgumentException("Could not find phyical network with ID: " + cmd.getPhysicalNetworkId()); - } - zoneId = pNetwork.getDataCenterId(); - - PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), BaremetalPxeManager.BAREMETAL_PXE_SERVICE_PROVIDER.getName()); - if (ntwkSvcProvider == null) { - throw new CloudRuntimeException("Network Service Provider: " + BaremetalPxeManager.BAREMETAL_PXE_SERVICE_PROVIDER.getName() + - " is not enabled in the physical network: " + cmd.getPhysicalNetworkId() + "to add this device"); - } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { - throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + - " is in shutdown state in the physical network: " + cmd.getPhysicalNetworkId() + "to add this device"); - } - - List pxes = _resourceMgr.listAllHostsInOneZoneByType(Host.Type.BaremetalPxe, zoneId); - if (!pxes.isEmpty()) { + public boolean prepareCreateTemplate(Long pxeServerId, UserVm vm, String templateUrl) { + // TODO Auto-generated method stub + return false; + } + + @Override + @DB + public BaremetalPxeVO addPxeServer(AddBaremetalPxeCmd cmd) { + AddBaremetalKickStartPxeCmd kcmd = (AddBaremetalKickStartPxeCmd)cmd; + PhysicalNetworkVO pNetwork = null; + long zoneId; + + if (cmd.getPhysicalNetworkId() == null || cmd.getUrl() == null || cmd.getUsername() == null || cmd.getPassword() == null) { + throw new IllegalArgumentException("At least one of the required parameters(physical network id, url, username, password) is null"); + } + + pNetwork = _physicalNetworkDao.findById(cmd.getPhysicalNetworkId()); + if (pNetwork == null) { + throw new IllegalArgumentException("Could not find phyical network with ID: " + cmd.getPhysicalNetworkId()); + } + zoneId = pNetwork.getDataCenterId(); + + PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(pNetwork.getId(), BaremetalPxeManager.BAREMETAL_PXE_SERVICE_PROVIDER.getName()); + if (ntwkSvcProvider == null) { + throw new CloudRuntimeException("Network Service Provider: " + BaremetalPxeManager.BAREMETAL_PXE_SERVICE_PROVIDER.getName() + + " is not enabled in the physical network: " + cmd.getPhysicalNetworkId() + "to add this device"); + } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { + throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + + " is in shutdown state in the physical network: " + cmd.getPhysicalNetworkId() + "to add this device"); + } + + List pxes = _resourceMgr.listAllHostsInOneZoneByType(Host.Type.BaremetalPxe, zoneId); + if (!pxes.isEmpty()) { throw new IllegalArgumentException("Already had a PXE server zone: " + zoneId); - } - - String tftpDir = kcmd.getTftpDir(); - if (tftpDir == null) { - throw new IllegalArgumentException("No TFTP directory specified"); - } - - URI uri; - try { - uri = new URI(cmd.getUrl()); - } catch (Exception e) { - s_logger.debug(e); - throw new IllegalArgumentException(e.getMessage()); - } - String ipAddress = uri.getHost(); - - String guid = getPxeServerGuid(Long.toString(zoneId), BaremetalPxeType.KICK_START.toString(), ipAddress); - - ServerResource resource = null; - Map params = new HashMap(); - params.put(BaremetalPxeService.PXE_PARAM_ZONE, Long.toString(zoneId)); - params.put(BaremetalPxeService.PXE_PARAM_IP, ipAddress); - params.put(BaremetalPxeService.PXE_PARAM_USERNAME, cmd.getUsername()); - params.put(BaremetalPxeService.PXE_PARAM_PASSWORD, cmd.getPassword()); - params.put(BaremetalPxeService.PXE_PARAM_TFTP_DIR, tftpDir); + } + + String tftpDir = kcmd.getTftpDir(); + if (tftpDir == null) { + throw new IllegalArgumentException("No TFTP directory specified"); + } + + URI uri; + try { + uri = new URI(cmd.getUrl()); + } catch (Exception e) { + s_logger.debug(e); + throw new IllegalArgumentException(e.getMessage()); + } + String ipAddress = uri.getHost(); + + String guid = getPxeServerGuid(Long.toString(zoneId), BaremetalPxeType.KICK_START.toString(), ipAddress); + + ServerResource resource = null; + Map params = new HashMap(); + params.put(BaremetalPxeService.PXE_PARAM_ZONE, Long.toString(zoneId)); + params.put(BaremetalPxeService.PXE_PARAM_IP, ipAddress); + params.put(BaremetalPxeService.PXE_PARAM_USERNAME, cmd.getUsername()); + params.put(BaremetalPxeService.PXE_PARAM_PASSWORD, cmd.getPassword()); + params.put(BaremetalPxeService.PXE_PARAM_TFTP_DIR, tftpDir); params.put(BaremetalPxeService.PXE_PARAM_GUID, guid); resource = new BaremetalKickStartPxeResource(); try { - resource.configure("KickStart PXE resource", params); - } catch (Exception e) { - throw new CloudRuntimeException(e.getMessage(), e); + resource.configure("KickStart PXE resource", params); + } catch (Exception e) { + throw new CloudRuntimeException(e.getMessage(), e); } - - Host pxeServer = _resourceMgr.addHost(zoneId, resource, Host.Type.BaremetalPxe, params); - if (pxeServer == null) { - throw new CloudRuntimeException("Cannot add PXE server as a host"); + + Host pxeServer = _resourceMgr.addHost(zoneId, resource, Host.Type.BaremetalPxe, params); + if (pxeServer == null) { + throw new CloudRuntimeException("Cannot add PXE server as a host"); } - - BaremetalPxeVO vo = new BaremetalPxeVO(); - Transaction txn = Transaction.currentTxn(); - vo.setHostId(pxeServer.getId()); - vo.setNetworkServiceProviderId(ntwkSvcProvider.getId()); - vo.setPhysicalNetworkId(kcmd.getPhysicalNetworkId()); - vo.setDeviceType(BaremetalPxeType.KICK_START.toString()); - txn.start(); - _pxeDao.persist(vo); - txn.commit(); - return vo; - } - - @Override - public BaremetalPxeResponse getApiResponse(BaremetalPxeVO vo) { - BaremetalPxeKickStartResponse response = new BaremetalPxeKickStartResponse(); - response.setId(String.valueOf(vo.getId())); - response.setPhysicalNetworkId(String.valueOf(vo.getPhysicalNetworkId())); - response.setPodId(String.valueOf(vo.getPodId())); - Map details = _hostDetailsDao.findDetails(vo.getHostId()); - response.setTftpDir(details.get(BaremetalPxeService.PXE_PARAM_TFTP_DIR)); - return response; - } - - @Override - public List listPxeServers(ListBaremetalPxePingServersCmd cmd) { - SearchCriteriaService sc = SearchCriteria2.create(BaremetalPxeVO.class); - sc.addAnd(sc.getEntity().getDeviceType(), Op.EQ, BaremetalPxeType.KICK_START.toString()); - if (cmd.getPodId() != null) { - sc.addAnd(sc.getEntity().getPodId(), Op.EQ, cmd.getPodId()); - if (cmd.getId() != null) { - sc.addAnd(sc.getEntity().getId(), Op.EQ, cmd.getId()); - } - } - List vos = sc.list(); - List responses = new ArrayList(vos.size()); - for (BaremetalPxeVO vo : vos) { - responses.add(getApiResponse(vo)); - } - return responses; + + BaremetalPxeVO vo = new BaremetalPxeVO(); + Transaction txn = Transaction.currentTxn(); + vo.setHostId(pxeServer.getId()); + vo.setNetworkServiceProviderId(ntwkSvcProvider.getId()); + vo.setPhysicalNetworkId(kcmd.getPhysicalNetworkId()); + vo.setDeviceType(BaremetalPxeType.KICK_START.toString()); + txn.start(); + _pxeDao.persist(vo); + txn.commit(); + return vo; + } + + @Override + public BaremetalPxeResponse getApiResponse(BaremetalPxeVO vo) { + BaremetalPxeKickStartResponse response = new BaremetalPxeKickStartResponse(); + response.setId(String.valueOf(vo.getId())); + response.setPhysicalNetworkId(String.valueOf(vo.getPhysicalNetworkId())); + response.setPodId(String.valueOf(vo.getPodId())); + Map details = _hostDetailsDao.findDetails(vo.getHostId()); + response.setTftpDir(details.get(BaremetalPxeService.PXE_PARAM_TFTP_DIR)); + return response; + } + + @Override + public List listPxeServers(ListBaremetalPxePingServersCmd cmd) { + SearchCriteriaService sc = SearchCriteria2.create(BaremetalPxeVO.class); + sc.addAnd(sc.getEntity().getDeviceType(), Op.EQ, BaremetalPxeType.KICK_START.toString()); + if (cmd.getPodId() != null) { + sc.addAnd(sc.getEntity().getPodId(), Op.EQ, cmd.getPodId()); + if (cmd.getId() != null) { + sc.addAnd(sc.getEntity().getId(), Op.EQ, cmd.getId()); + } + } + List vos = sc.list(); + List responses = new ArrayList(vos.size()); + for (BaremetalPxeVO vo : vos) { + responses.add(getApiResponse(vo)); + } + return responses; } @Override public String getPxeServiceType() { return BaremetalPxeManager.BaremetalPxeType.KICK_START.toString(); - } - -} + } + +} diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java index 64f22e0947e..116de440770 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeKickStartResponse.java @@ -14,10 +14,10 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// +// // Automatically generated by addcopyright.py at 01/29/2013 -package com.cloud.baremetal.networkservice; - +package com.cloud.baremetal.networkservice; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.EntityReference; @@ -25,16 +25,16 @@ import com.cloud.baremetal.database.BaremetalPxeVO; import com.cloud.serializer.Param; import com.google.gson.annotations.SerializedName; -@EntityReference(value=BaremetalPxeVO.class) -public class BaremetalPxeKickStartResponse extends BaremetalPxeResponse { - @SerializedName(ApiConstants.TFTP_DIR) @Param(description="Tftp root directory of PXE server") - private String tftpDir; - - public String getTftpDir() { - return tftpDir; - } - - public void setTftpDir(String tftpDir) { - this.tftpDir = tftpDir; - } -} +@EntityReference(value=BaremetalPxeVO.class) +public class BaremetalPxeKickStartResponse extends BaremetalPxeResponse { + @SerializedName(ApiConstants.TFTP_DIR) @Param(description="Tftp root directory of PXE server") + private String tftpDir; + + public String getTftpDir() { + return tftpDir; + } + + public void setTftpDir(String tftpDir) { + this.tftpDir = tftpDir; + } +} diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java index 6288f918567..59a28117cb5 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalPxeManagerImpl.java @@ -110,11 +110,11 @@ public class BaremetalPxeManagerImpl extends ManagerBase implements BaremetalPxe if (service.getPxeServiceType().equals(type)) { return service; } - } - + } + throw new CloudRuntimeException("Cannot find PXE service for " + type); } - + @Override public boolean prepare(VirtualMachineProfile profile, NicProfile nic, DeployDestination dest, ReservationContext context) { //TODO: select type from template diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java index 3d9f5819582..49c6fd9b957 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalUserdataElement.java @@ -14,144 +14,144 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// +// // Automatically generated by addcopyright.py at 01/29/2013 -package com.cloud.baremetal.networkservice; - +package com.cloud.baremetal.networkservice; + import java.util.HashMap; - -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.ejb.Local; + +import java.util.List; +import java.util.Map; +import java.util.Set; + +import javax.ejb.Local; import javax.inject.Inject; - -import com.cloud.baremetal.manager.BaremetalManager; -import com.cloud.dc.DataCenter.NetworkType; -import com.cloud.deploy.DeployDestination; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.network.Network; -import com.cloud.network.Network.Capability; -import com.cloud.network.Network.GuestType; -import com.cloud.network.Network.Provider; -import com.cloud.network.Network.Service; -import com.cloud.network.Networks.TrafficType; -import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.element.IpDeployer; -import com.cloud.network.element.NetworkElement; -import com.cloud.network.element.UserDataServiceProvider; -import com.cloud.offering.NetworkOffering; -import com.cloud.uservm.UserVm; -import com.cloud.utils.component.AdapterBase; -import com.cloud.vm.NicProfile; -import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; + +import com.cloud.baremetal.manager.BaremetalManager; +import com.cloud.dc.DataCenter.NetworkType; +import com.cloud.deploy.DeployDestination; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.network.Network; +import com.cloud.network.Network.Capability; +import com.cloud.network.Network.GuestType; +import com.cloud.network.Network.Provider; +import com.cloud.network.Network.Service; +import com.cloud.network.Networks.TrafficType; +import com.cloud.network.PhysicalNetworkServiceProvider; +import com.cloud.network.element.IpDeployer; +import com.cloud.network.element.NetworkElement; +import com.cloud.network.element.UserDataServiceProvider; +import com.cloud.offering.NetworkOffering; +import com.cloud.uservm.UserVm; +import com.cloud.utils.component.AdapterBase; +import com.cloud.vm.NicProfile; +import com.cloud.vm.ReservationContext; +import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; - -@Local(value = NetworkElement.class) -public class BaremetalUserdataElement extends AdapterBase implements NetworkElement, UserDataServiceProvider { + +@Local(value = NetworkElement.class) +public class BaremetalUserdataElement extends AdapterBase implements NetworkElement, UserDataServiceProvider { private static Map> capabilities; - - @Inject + + @Inject private BaremetalPxeManager pxeMgr; - - static { + + static { capabilities = new HashMap>(); - capabilities.put(Service.UserData, null); + capabilities.put(Service.UserData, null); } - - private boolean canHandle(DeployDestination dest) { - if (dest.getDataCenter().getNetworkType() == NetworkType.Basic && dest.getHost().getHypervisorType() == HypervisorType.BareMetal) { - return true; + + private boolean canHandle(DeployDestination dest) { + if (dest.getDataCenter().getNetworkType() == NetworkType.Basic && dest.getHost().getHypervisorType() == HypervisorType.BareMetal) { + return true; } - return false; + return false; } - - @Override - public boolean addPasswordAndUserdata(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, + + @Override + public boolean addPasswordAndUserdata(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, InsufficientCapacityException, ResourceUnavailableException { - if (!canHandle(dest)) { - return false; + if (!canHandle(dest)) { + return false; } - - if (vm.getType() != VirtualMachine.Type.User) { - return false; + + if (vm.getType() != VirtualMachine.Type.User) { + return false; } - - return pxeMgr.addUserData(nic, (VirtualMachineProfile) vm); - } - - @Override - public boolean savePassword(Network network, NicProfile nic, VirtualMachineProfile vm) throws ResourceUnavailableException { - // TODO Auto-generated method stub - return false; - } - - @Override + + return pxeMgr.addUserData(nic, (VirtualMachineProfile) vm); + } + + @Override + public boolean savePassword(Network network, NicProfile nic, VirtualMachineProfile vm) throws ResourceUnavailableException { + // TODO Auto-generated method stub + return false; + } + + @Override public boolean saveSSHKey(Network network, NicProfile nic, VirtualMachineProfile vm, String SSHPublicKey) throws ResourceUnavailableException { // TODO Auto-generated method stub return false; } @Override - public Map> getCapabilities() { - return capabilities; - } - - @Override - public Provider getProvider() { - return BaremetalPxeManager.BAREMETAL_USERDATA_PROVIDER; - } - - @Override - public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) - throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, - ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) - throws ConcurrentOperationException, ResourceUnavailableException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean isReady(PhysicalNetworkServiceProvider provider) { - return true; - } - - @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean canEnableIndividualServices() { - // TODO Auto-generated method stub - return true; - } - + public Map> getCapabilities() { + return capabilities; + } + + @Override + public Provider getProvider() { + return BaremetalPxeManager.BAREMETAL_USERDATA_PROVIDER; + } + + @Override + public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, + ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean isReady(PhysicalNetworkServiceProvider provider) { + return true; + } + + @Override + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean canEnableIndividualServices() { + // TODO Auto-generated method stub + return true; + } + @Override public boolean saveUserData(Network network, NicProfile nic, VirtualMachineProfile vm) @@ -162,12 +162,12 @@ public class BaremetalUserdataElement extends AdapterBase implements NetworkElem @Override public boolean destroy(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { - return true; - } - - @Override - public boolean verifyServicesCombination(Set services) { - return true; - } - -} + return true; + } + + @Override + public boolean verifyServicesCombination(Set services) { + return true; + } + +} diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java index 25dfeb70d30..a9899793885 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/PrepareKickstartPxeServerCommand.java @@ -14,32 +14,32 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// +// // Automatically generated by addcopyright.py at 01/29/2013 -package com.cloud.baremetal.networkservice; - -import com.cloud.agent.api.Command; - -public class PrepareKickstartPxeServerCommand extends Command { +package com.cloud.baremetal.networkservice; + +import com.cloud.agent.api.Command; + +public class PrepareKickstartPxeServerCommand extends Command { private String ksFile; - private String templateUuid; - private String mac; + private String templateUuid; + private String mac; private String ksDevice; private String kernel; - private String initrd; - - @Override - public boolean executeInSequence() { - return true; - } - - public String getKsFile() { - return ksFile; - } - - public void setKsFile(String ksFile) { - this.ksFile = ksFile; - } + private String initrd; + + @Override + public boolean executeInSequence() { + return true; + } + + public String getKsFile() { + return ksFile; + } + + public void setKsFile(String ksFile) { + this.ksFile = ksFile; + } public String getKernel() { return kernel; @@ -57,27 +57,27 @@ public class PrepareKickstartPxeServerCommand extends Command { this.initrd = initrd; } - public String getTemplateUuid() { - return templateUuid; - } - - public void setTemplateUuid(String templateUuid) { - this.templateUuid = templateUuid; - } - - public String getMac() { - return mac; - } - - public void setMac(String mac) { - this.mac = mac; - } - - public String getKsDevice() { - return ksDevice; - } - - public void setKsDevice(String ksDevice) { - this.ksDevice = ksDevice; - } -} + public String getTemplateUuid() { + return templateUuid; + } + + public void setTemplateUuid(String templateUuid) { + this.templateUuid = templateUuid; + } + + public String getMac() { + return mac; + } + + public void setMac(String mac) { + this.mac = mac; + } + + public String getKsDevice() { + return ksDevice; + } + + public void setKsDevice(String ksDevice) { + this.ksDevice = ksDevice; + } +} diff --git a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/SecurityGroupHttpClient.java b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/SecurityGroupHttpClient.java index 7ad351c2e33..b9c2e8484aa 100755 --- a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/SecurityGroupHttpClient.java +++ b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/SecurityGroupHttpClient.java @@ -1,38 +1,38 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -// -// Automatically generated by addcopyright.py at 01/29/2013 -// Apache License, Version 2.0 (the "License"); you may not use this -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -package com.cloud.baremetal.networkservice; - -import com.cloud.agent.api.Answer; -import com.cloud.agent.api.SecurityGroupRulesCmd; - -public class SecurityGroupHttpClient { - - public Answer call(String guestIp, SecurityGroupRulesCmd cmd) { - // TODO Auto-generated method stub - return null; - } - - public boolean echo(String ip, long millis, long millis2) { - // TODO Auto-generated method stub - return false; - } - -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +// +// Automatically generated by addcopyright.py at 01/29/2013 +// Apache License, Version 2.0 (the "License"); you may not use this +// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +package com.cloud.baremetal.networkservice; + +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.SecurityGroupRulesCmd; + +public class SecurityGroupHttpClient { + + public Answer call(String guestIp, SecurityGroupRulesCmd cmd) { + // TODO Auto-generated method stub + return null; + } + + public boolean echo(String ip, long millis, long millis2) { + // TODO Auto-generated method stub + return false; + } + +} diff --git a/plugins/hypervisors/kvm/pom.xml b/plugins/hypervisors/kvm/pom.xml index 3a1ba3ab8c8..613c817668e 100644 --- a/plugins/hypervisors/kvm/pom.xml +++ b/plugins/hypervisors/kvm/pom.xml @@ -1,22 +1,15 @@ - - + + 4.0.0 cloud-plugin-hypervisor-kvm Apache CloudStack Plugin - Hypervisor KVM @@ -45,29 +38,29 @@ - install - src - test - - - org.apache.maven.plugins - maven-dependency-plugin - 2.5.1 - - - copy-dependencies - package - - copy-dependencies - - - ${project.build.directory}/dependencies - runtime - - - - - + install + src + test + + + org.apache.maven.plugins + maven-dependency-plugin + 2.5.1 + + + copy-dependencies + package + + copy-dependencies + + + ${project.build.directory}/dependencies + runtime + + + + + org.apache.maven.plugins maven-surefire-plugin 2.14 @@ -77,6 +70,52 @@ + + maven-assembly-plugin + 2.3 + + kvm-agent + false + + agent-descriptor.xml + + + + + make-agent + package + + single + + + + + + maven-resources-plugin + 2.6 + + + copy-resources + + package + + copy-resources + + + dist + + + target + + kvm-agent.zip + + + + + + + + diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java index c4e121b8ae8..0e4d9eea8ac 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/KVMHAMonitor.java @@ -23,6 +23,15 @@ import java.util.concurrent.ConcurrentHashMap; import org.apache.log4j.Logger; import com.cloud.utils.script.Script; +import org.libvirt.Connect; +import org.libvirt.LibvirtException; +import org.libvirt.Secret; +import org.libvirt.StoragePool; +import org.libvirt.StoragePoolInfo; +import org.libvirt.StoragePoolInfo.StoragePoolState; + +import com.cloud.hypervisor.kvm.resource.LibvirtConnection; + public class KVMHAMonitor extends KVMHABase implements Runnable { private static final Logger s_logger = Logger.getLogger(KVMHAMonitor.class); private Map _storagePool = new ConcurrentHashMap(); @@ -45,7 +54,11 @@ public class KVMHAMonitor extends KVMHABase implements Runnable { public void removeStoragePool(String uuid) { synchronized (_storagePool) { - this._storagePool.remove(uuid); + NfsStoragePool pool = this._storagePool.get(uuid); + if (pool != null) { + Script.runSimpleBashScript("umount " + pool._mountDestPath); + this._storagePool.remove(uuid); + } } } @@ -60,7 +73,44 @@ public class KVMHAMonitor extends KVMHABase implements Runnable { @Override public void run() { synchronized (_storagePool) { - for (NfsStoragePool primaryStoragePool : _storagePool.values()) { + for (String uuid : _storagePool.keySet()) { + NfsStoragePool primaryStoragePool = _storagePool.get(uuid); + + // check for any that have been deregistered with libvirt and + // skip,remove them + + StoragePool storage = null; + try { + Connect conn = LibvirtConnection.getConnection(); + storage = conn.storagePoolLookupByUUIDString(uuid); + if (storage == null) { + s_logger.debug("Libvirt storage pool " + uuid + +" not found, removing from HA list"); + removeStoragePool(uuid); + continue; + + } else if (storage.getInfo().state != StoragePoolState.VIR_STORAGE_POOL_RUNNING) { + s_logger.debug("Libvirt storage pool " + uuid + +" found, but not running, removing from HA list"); + + removeStoragePool(uuid); + continue; + } + s_logger.debug("Found NFS storage pool " + uuid + " in libvirt, continuing"); + + } catch (LibvirtException e) { + s_logger.debug("Failed to lookup libvirt storage pool " + uuid + + " due to: " + e ); + + // we only want to remove pool if it's not found, not if libvirt + // connection fails + if (e.toString().contains("pool not found")) { + s_logger.debug("removing pool from HA monitor since it was deleted"); + removeStoragePool(uuid); + continue; + } + } + String result = null; for (int i = 0; i < 5; i++) { Script cmd = new Script(_heartBeatPath, diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java index 526107f8ae0..0064edf6a68 100755 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtComputingResource.java @@ -666,6 +666,9 @@ ServerResource { if (_localStoragePath == null) { _localStoragePath = "/var/lib/libvirt/images/"; } + + File storagePath = new File(_localStoragePath); + _localStoragePath = storagePath.getAbsolutePath(); _localStorageUUID = (String) params.get("local.storage.uuid"); if (_localStorageUUID == null) { @@ -1074,8 +1077,7 @@ ServerResource { */ conn.domainCreateXML(domainXML, 0); } catch (final LibvirtException e) { - s_logger.warn("Failed to start domain " + vmName + ": " - + e.getMessage(), e); + throw e; } return null; } @@ -1267,7 +1269,7 @@ ServerResource { secondaryStoragePool = _storagePoolMgr.getStoragePoolByURI( secondaryStorageUrl); secondaryStoragePool.createFolder(volumeDestPath); - secondaryStoragePool.delete(); + _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid()); secondaryStoragePool = _storagePoolMgr.getStoragePoolByURI( secondaryStorageUrl + volumeDestPath); @@ -1289,7 +1291,7 @@ ServerResource { return new CopyVolumeAnswer(cmd, false, e.toString(), null, null); } finally { if (secondaryStoragePool != null) { - secondaryStoragePool.delete(); + _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid()); } } } @@ -1412,7 +1414,7 @@ ServerResource { return null; } finally { if (secondaryPool != null) { - secondaryPool.delete(); + _storagePoolMgr.deleteStoragePool(secondaryPool.getType(),secondaryPool.getUuid()); } } } @@ -2005,7 +2007,7 @@ ServerResource { true); } finally { if (secondaryStoragePool != null) { - secondaryStoragePool.delete(); + _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid()); } } return new BackupSnapshotAnswer(cmd, true, null, snapshotRelPath @@ -2037,7 +2039,7 @@ ServerResource { return new DeleteSnapshotBackupAnswer(cmd, false, e.toString()); } finally { if (secondaryStoragePool != null) { - secondaryStoragePool.delete(); + _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid()); } } return new DeleteSnapshotBackupAnswer(cmd, true, null); @@ -2066,7 +2068,7 @@ ServerResource { return new Answer(cmd, false, e.toString()); } finally { if (secondaryStoragePool != null) { - secondaryStoragePool.delete(); + _storagePoolMgr.deleteStoragePool(secondaryStoragePool.getType(),secondaryStoragePool.getUuid()); } } @@ -2164,10 +2166,10 @@ ServerResource { return new CreatePrivateTemplateAnswer(cmd, false, e.getMessage()); } finally { if (secondaryPool != null) { - secondaryPool.delete(); + _storagePoolMgr.deleteStoragePool(secondaryPool.getType(), secondaryPool.getUuid()); } if (snapshotPool != null) { - snapshotPool.delete(); + _storagePoolMgr.deleteStoragePool(snapshotPool.getType(), snapshotPool.getUuid()); } } } @@ -2301,7 +2303,7 @@ ServerResource { return new CreatePrivateTemplateAnswer(cmd, false, e.toString()); } finally { if (secondaryStorage != null) { - secondaryStorage.delete(); + _storagePoolMgr.deleteStoragePool(secondaryStorage.getType(), secondaryStorage.getUuid()); } } } @@ -2359,7 +2361,7 @@ ServerResource { return new PrimaryStorageDownloadAnswer(e.toString()); } finally { if (secondaryPool != null) { - secondaryPool.delete(); + _storagePoolMgr.deleteStoragePool(secondaryPool.getType(),secondaryPool.getUuid()); } } } @@ -3451,7 +3453,7 @@ ServerResource { KVMStoragePool pool = _storagePoolMgr.getStoragePool( StoragePoolType.Filesystem, poolUuid); if (pool != null) { - pool.delete(); + _storagePoolMgr.deleteStoragePool(pool.getType(),pool.getUuid()); } return true; } catch (CloudRuntimeException e) { diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java index 2ad16166c42..2fc54253f57 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/resource/LibvirtConnection.java @@ -61,13 +61,19 @@ public class LibvirtConnection { static public Connect getConnectionByVmName(String vmName) throws LibvirtException { HypervisorType[] hypervisors = new HypervisorType[] {HypervisorType.KVM, Hypervisor.HypervisorType.LXC}; + for (HypervisorType hypervisor : hypervisors) { - Connect conn = LibvirtConnection.getConnectionByType(hypervisor.toString()); - if (conn.domainLookupByUUID(UUID.nameUUIDFromBytes(vmName.getBytes())) != null) { - return conn; - } + try { + Connect conn = LibvirtConnection.getConnectionByType(hypervisor.toString()); + if (conn.domainLookupByUUID(UUID.nameUUIDFromBytes(vmName.getBytes())) != null) { + return conn; + } + } catch (Exception e) { + s_logger.debug("can't find connection: " + hypervisor.toString() + ", for vm: " + vmName + ", continue"); + } } + s_logger.debug("can't find which hypervisor the vm used , then use the default hypervisor"); // return the default connection return getConnection(); } diff --git a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java index f5719baaf2a..31d491c9494 100644 --- a/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java +++ b/plugins/hypervisors/kvm/src/com/cloud/hypervisor/kvm/storage/KVMStoragePoolManager.java @@ -94,18 +94,26 @@ public class KVMStoragePoolManager { protocol = StoragePoolType.NetworkFilesystem; } - return createStoragePool(uuid, sourceHost, 0, sourcePath, "", protocol); + // secondary storage registers itself through here + return createStoragePool(uuid, sourceHost, 0, sourcePath, "", protocol, false); } public KVMStoragePool createStoragePool( String name, String host, int port, String path, String userInfo, StoragePoolType type) { + // primary storage registers itself through here + return createStoragePool(name, host, port, path, userInfo, type, true); + } + + private KVMStoragePool createStoragePool( String name, String host, int port, + String path, String userInfo, + StoragePoolType type, boolean primaryStorage) { StorageAdaptor adaptor = getStorageAdaptor(type); KVMStoragePool pool = adaptor.createStoragePool(name, host, port, path, userInfo, type); // LibvirtStorageAdaptor-specific statement - if (type == StoragePoolType.NetworkFilesystem) { + if (type == StoragePoolType.NetworkFilesystem && primaryStorage) { KVMHABase.NfsStoragePool nfspool = new KVMHABase.NfsStoragePool( pool.getUuid(), host, path, pool.getLocalPath(), PoolType.PrimaryStorage); diff --git a/plugins/hypervisors/simulator/pom.xml b/plugins/hypervisors/simulator/pom.xml index ff1664ad85f..e4ca9272853 100644 --- a/plugins/hypervisors/simulator/pom.xml +++ b/plugins/hypervisors/simulator/pom.xml @@ -40,5 +40,10 @@ cloud-utils ${project.version} + + org.apache.cloudstack + cloud-secondary-storage + ${project.version} + diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java index 2d81c2ab705..a012340d088 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/AgentStorageResource.java @@ -20,6 +20,7 @@ import java.util.Map; import javax.naming.ConfigurationException; +import org.apache.cloudstack.storage.resource.SecondaryStorageResource; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; @@ -35,7 +36,6 @@ import com.cloud.agent.manager.SimulatorManager; import com.cloud.agent.manager.SimulatorManager.AgentType; import com.cloud.host.Host; import com.cloud.host.Host.Type; -import com.cloud.storage.resource.SecondaryStorageResource; import com.cloud.vm.SecondaryStorageVm; diff --git a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java index 3a8cf17e24b..c121fbac5d9 100644 --- a/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java +++ b/plugins/hypervisors/simulator/src/com/cloud/resource/SimulatorSecondaryDiscoverer.java @@ -24,6 +24,7 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import org.apache.cloudstack.storage.resource.SecondaryStorageDiscoverer; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; @@ -40,9 +41,7 @@ import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.storage.SnapshotVO; import com.cloud.storage.dao.SnapshotDao; -import com.cloud.storage.secondary.SecondaryStorageDiscoverer; import com.cloud.utils.exception.CloudRuntimeException; -import org.springframework.stereotype.Component; @Local(value=Discoverer.class) diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java index 581096d07e7..e32fbc55f54 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDao.java @@ -14,11 +14,11 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.database; - -import com.cloud.utils.db.GenericDao; - -public interface UcsBladeDao extends GenericDao { - -} +// +package com.cloud.ucs.database; + +import com.cloud.utils.db.GenericDao; + +public interface UcsBladeDao extends GenericDao { + +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java index ae0980c85a9..5cb9b022bf4 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeDaoImpl.java @@ -14,17 +14,17 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.database; - -import javax.ejb.Local; +// +package com.cloud.ucs.database; + +import javax.ejb.Local; import org.springframework.stereotype.Component; - -import com.cloud.utils.db.DB; -import com.cloud.utils.db.GenericDaoBase; + +import com.cloud.utils.db.DB; +import com.cloud.utils.db.GenericDaoBase; @Local(value = { UcsBladeDao.class }) -@DB(txn = false) -public class UcsBladeDaoImpl extends GenericDaoBase implements UcsBladeDao { - -} +@DB(txn = false) +public class UcsBladeDaoImpl extends GenericDaoBase implements UcsBladeDao { + +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java index a8c6fd7fb3f..9f97b1a1f73 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsBladeVO.java @@ -14,80 +14,80 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.database; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +// +package com.cloud.ucs.database; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; - -@Entity -@Table(name="ucs_blade") -public class UcsBladeVO implements InternalIdentity, Identity { - @Id - @GeneratedValue(strategy=GenerationType.IDENTITY) - @Column(name="id") - private long id; - - @Column(name="uuid") - private String uuid; - - @Column(name="ucs_manager_id") - private long ucsManagerId; - - @Column(name="host_id") - private Long hostId; - - @Column(name="dn") + +@Entity +@Table(name="ucs_blade") +public class UcsBladeVO implements InternalIdentity, Identity { + @Id + @GeneratedValue(strategy=GenerationType.IDENTITY) + @Column(name="id") + private long id; + + @Column(name="uuid") + private String uuid; + + @Column(name="ucs_manager_id") + private long ucsManagerId; + + @Column(name="host_id") + private Long hostId; + + @Column(name="dn") private String dn; - - @Column(name="profile_dn") + + @Column(name="profile_dn") private String profileDn; - - public long getId() { - return id; - } - - public void setId(long id) { - this.id = id; - } - - public long getUcsManagerId() { - return ucsManagerId; - } - - public void setUcsManagerId(long ucsManagerId) { - this.ucsManagerId = ucsManagerId; - } - - public Long getHostId() { - return hostId; - } - - public void setHostId(Long hostId) { - this.hostId = hostId; - } - - public String getDn() { - return dn; - } - - public void setDn(String dn) { - this.dn = dn; - } - - public String getUuid() { - return uuid; - } - - public void setUuid(String uuid) { - this.uuid = uuid; + + public long getId() { + return id; + } + + public void setId(long id) { + this.id = id; + } + + public long getUcsManagerId() { + return ucsManagerId; + } + + public void setUcsManagerId(long ucsManagerId) { + this.ucsManagerId = ucsManagerId; + } + + public Long getHostId() { + return hostId; + } + + public void setHostId(Long hostId) { + this.hostId = hostId; + } + + public String getDn() { + return dn; + } + + public void setDn(String dn) { + this.dn = dn; + } + + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; } public String getProfileDn() { @@ -97,4 +97,4 @@ public class UcsBladeVO implements InternalIdentity, Identity { public void setProfileDn(String profileDn) { this.profileDn = profileDn; } -} +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java index 84fe29cac8b..f1664a1870a 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDao.java @@ -14,20 +14,20 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.database; - -import java.util.List; -import java.util.Map; - -import javax.naming.ConfigurationException; - -import com.cloud.utils.db.Filter; -import com.cloud.utils.db.GenericDao; -import com.cloud.utils.db.GenericSearchBuilder; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.SearchCriteria2; - +// +package com.cloud.ucs.database; + +import java.util.List; +import java.util.Map; + +import javax.naming.ConfigurationException; + +import com.cloud.utils.db.Filter; +import com.cloud.utils.db.GenericDao; +import com.cloud.utils.db.GenericSearchBuilder; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.SearchCriteria2; + public interface UcsManagerDao extends GenericDao { -} +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java index 39f978221f8..93c088566a1 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerDaoImpl.java @@ -14,18 +14,17 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.database; - -import javax.ejb.Local; +// +package com.cloud.ucs.database; + +import javax.ejb.Local; import org.springframework.stereotype.Component; - -import com.cloud.utils.db.DB; -import com.cloud.utils.db.GenericDaoBase; - + +import com.cloud.utils.db.DB; +import com.cloud.utils.db.GenericDaoBase; + @Local(value = { UcsManagerDao.class }) -@DB(txn = false) +@DB(txn = false) public class UcsManagerDaoImpl extends GenericDaoBase implements UcsManagerDao { -} - +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java index cd8371ba7be..416ba959e32 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/database/UcsManagerVO.java @@ -14,85 +14,85 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.database; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; +// +package com.cloud.ucs.database; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; -@Entity -@Table(name="ucs_manager") +@Entity +@Table(name="ucs_manager") public class UcsManagerVO implements InternalIdentity, Identity { - @Id - @GeneratedValue(strategy=GenerationType.IDENTITY) - @Column(name="id") + @Id + @GeneratedValue(strategy=GenerationType.IDENTITY) + @Column(name="id") private long id; - - @Column(name="zone_id") + + @Column(name="zone_id") private long zoneId; - - @Column(name="uuid") + + @Column(name="uuid") private String uuid; - - @Column(name="name") + + @Column(name="name") private String name; - - @Column(name="url") + + @Column(name="url") private String url; - - @Column(name="username") + + @Column(name="username") private String username; - - @Column(name="password") - private String password; - - public long getId() { - return id; - } - public void setId(long id) { - this.id = id; - } - public String getUuid() { - return uuid; - } - public void setUuid(String uuid) { - this.uuid = uuid; - } - public String getUrl() { - return url; - } - public void setUrl(String url) { - this.url = url; - } - public String getUsername() { - return username; - } - public void setUsername(String username) { - this.username = username; - } - public String getPassword() { - return password; - } - public void setPassword(String password) { - this.password = password; - } - public long getZoneId() { - return zoneId; - } - public void setZoneId(long zoneId) { - this.zoneId = zoneId; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; + + @Column(name="password") + private String password; + + public long getId() { + return id; + } + public void setId(long id) { + this.id = id; + } + public String getUuid() { + return uuid; + } + public void setUuid(String uuid) { + this.uuid = uuid; + } + public String getUrl() { + return url; + } + public void setUrl(String url) { + this.url = url; + } + public String getUsername() { + return username; + } + public void setUsername(String username) { + this.username = username; + } + public String getPassword() { + return password; + } + public void setPassword(String password) { + this.password = password; + } + public long getZoneId() { + return zoneId; } -} + public void setZoneId(long zoneId) { + this.zoneId = zoneId; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/AddUcsManagerCmd.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/AddUcsManagerCmd.java index ce8e40e7d65..274cfbd9fad 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/AddUcsManagerCmd.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/AddUcsManagerCmd.java @@ -14,113 +14,113 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.manager; - -import javax.inject.Inject; - -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseCmd.CommandType; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; +// +package com.cloud.ucs.manager; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.BaseCmd.CommandType; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.response.ZoneResponse; -import org.apache.log4j.Logger; - -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.NetworkRuleConflictException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.server.ManagementService; -import com.cloud.user.Account; - -@APICommand(name="addUcsManager", description="Adds a Ucs manager", responseObject=UcsManagerResponse.class) -public class AddUcsManagerCmd extends BaseCmd { +import org.apache.log4j.Logger; + +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.server.ManagementService; +import com.cloud.user.Account; + +@APICommand(name="addUcsManager", description="Adds a Ucs manager", responseObject=UcsManagerResponse.class) +public class AddUcsManagerCmd extends BaseCmd { public static final Logger s_logger = Logger.getLogger(AddUcsManagerCmd.class); - - @Inject - private UcsManager mgr; - - @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, description="the Zone id for the ucs manager", entityType=ZoneResponse.class, required=true) + + @Inject + private UcsManager mgr; + + @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.UUID, description="the Zone id for the ucs manager", entityType=ZoneResponse.class, required=true) private Long zoneId; - - @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, description="the name of UCS manager") + + @Parameter(name=ApiConstants.NAME, type=CommandType.STRING, description="the name of UCS manager") private String name; - - @Parameter(name=ApiConstants.URL, type=CommandType.STRING, description="the name of UCS url", required=true) + + @Parameter(name=ApiConstants.URL, type=CommandType.STRING, description="the name of UCS url", required=true) private String url; - - @Parameter(name=ApiConstants.USERNAME, type=CommandType.STRING, description="the username of UCS", required=true) + + @Parameter(name=ApiConstants.USERNAME, type=CommandType.STRING, description="the username of UCS", required=true) private String username; - - @Parameter(name=ApiConstants.PASSWORD, type=CommandType.STRING, description="the password of UCS", required=true) + + @Parameter(name=ApiConstants.PASSWORD, type=CommandType.STRING, description="the password of UCS", required=true) private String password; - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, - ResourceAllocationException, NetworkRuleConflictException { + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { try { - UcsManagerResponse rsp = mgr.addUcsManager(this); + UcsManagerResponse rsp = mgr.addUcsManager(this); rsp.setObjectName("ucsmanager"); rsp.setResponseName(getCommandName()); this.setResponseObject(rsp); - } catch (Exception e) { - s_logger.warn("Exception: ", e); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); - } - } - - @Override - public String getCommandName() { - return "addUcsManagerResponse"; - } - - @Override - public long getEntityOwnerId() { - return Account.ACCOUNT_ID_SYSTEM; - } - - public Long getZoneId() { - return zoneId; - } - - public void setZoneId(Long zoneId) { - this.zoneId = zoneId; - } - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getUsername() { - return username; - } - - public void setUsername(String username) { - this.username = username; - } - - public String getPassword() { - return password; - } - - public void setPassword(String password) { - this.password = password; - } - -} + } catch (Exception e) { + s_logger.warn("Exception: ", e); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } + } + + @Override + public String getCommandName() { + return "addUcsManagerResponse"; + } + + @Override + public long getEntityOwnerId() { + return Account.ACCOUNT_ID_SYSTEM; + } + + public Long getZoneId() { + return zoneId; + } + + public void setZoneId(Long zoneId) { + this.zoneId = zoneId; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public String getPassword() { + return password; + } + + public void setPassword(String password) { + this.password = password; + } + +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/AssociateUcsProfileToBladeCmd.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/AssociateUcsProfileToBladeCmd.java index c4638281a46..0f95bb9bd25 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/AssociateUcsProfileToBladeCmd.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/AssociateUcsProfileToBladeCmd.java @@ -14,83 +14,83 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.manager; - -import javax.inject.Inject; - -import org.apache.cloudstack.api.APICommand; +// +package com.cloud.ucs.manager; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.log4j.Logger; - -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.NetworkRuleConflictException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.user.Account; -@APICommand(name="associatesUscProfileToBlade", description="associate a profile to a blade", responseObject=UcsBladeResponse.class) -public class AssociateUcsProfileToBladeCmd extends BaseCmd { - public static final Logger s_logger = Logger.getLogger(AssociateUcsProfileToBladeCmd.class); - - @Inject - private UcsManager mgr; - - @Parameter(name=ApiConstants.UCS_MANAGER_ID, type=CommandType.UUID, description="ucs manager id", entityType=UcsManagerResponse.class, required=true) - private Long ucsManagerId; - @Parameter(name=ApiConstants.UCS_PROFILE_DN, type=CommandType.STRING, description="profile dn", required=true) - private String profileDn; - @Parameter(name=ApiConstants.UCS_BLADE_ID, type=CommandType.UUID, entityType=UcsBladeResponse.class, description="blade id", required=true) - private Long bladeId; - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, - ResourceAllocationException, NetworkRuleConflictException { - try { - UcsBladeResponse rsp = mgr.associateProfileToBlade(this); - rsp.setResponseName(getCommandName()); - this.setResponseObject(rsp); - } catch (Exception e) { - s_logger.warn("Exception: ", e); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); - } - } - - @Override - public String getCommandName() { - return "associateucsprofiletobladeresponse"; - } - - @Override - public long getEntityOwnerId() { - return Account.ACCOUNT_ID_SYSTEM; - } - - public Long getUcsManagerId() { - return ucsManagerId; - } - - public void setUcsManagerId(Long ucsManagerId) { - this.ucsManagerId = ucsManagerId; - } - - public String getProfileDn() { - return profileDn; - } - - public void setProfileDn(String profileDn) { - this.profileDn = profileDn; - } - - public Long getBladeId() { - return bladeId; - } - - public void setBladeId(Long bladeId) { - this.bladeId = bladeId; - } -} +import org.apache.cloudstack.api.ServerApiException; +import org.apache.log4j.Logger; + +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; +@APICommand(name="associatesUscProfileToBlade", description="associate a profile to a blade", responseObject=UcsBladeResponse.class) +public class AssociateUcsProfileToBladeCmd extends BaseCmd { + public static final Logger s_logger = Logger.getLogger(AssociateUcsProfileToBladeCmd.class); + + @Inject + private UcsManager mgr; + + @Parameter(name=ApiConstants.UCS_MANAGER_ID, type=CommandType.UUID, description="ucs manager id", entityType=UcsManagerResponse.class, required=true) + private Long ucsManagerId; + @Parameter(name=ApiConstants.UCS_PROFILE_DN, type=CommandType.STRING, description="profile dn", required=true) + private String profileDn; + @Parameter(name=ApiConstants.UCS_BLADE_ID, type=CommandType.UUID, entityType=UcsBladeResponse.class, description="blade id", required=true) + private Long bladeId; + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { + try { + UcsBladeResponse rsp = mgr.associateProfileToBlade(this); + rsp.setResponseName(getCommandName()); + this.setResponseObject(rsp); + } catch (Exception e) { + s_logger.warn("Exception: ", e); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } + } + + @Override + public String getCommandName() { + return "associateucsprofiletobladeresponse"; + } + + @Override + public long getEntityOwnerId() { + return Account.ACCOUNT_ID_SYSTEM; + } + + public Long getUcsManagerId() { + return ucsManagerId; + } + + public void setUcsManagerId(Long ucsManagerId) { + this.ucsManagerId = ucsManagerId; + } + + public String getProfileDn() { + return profileDn; + } + + public void setProfileDn(String profileDn) { + this.profileDn = profileDn; + } + + public Long getBladeId() { + return bladeId; + } + + public void setBladeId(Long bladeId) { + this.bladeId = bladeId; + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsBladeCmd.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsBladeCmd.java index 5440e4faee0..3c6587ed2b3 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsBladeCmd.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsBladeCmd.java @@ -1,87 +1,87 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.ucs.manager; - -import javax.inject.Inject; - -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; - -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.NetworkRuleConflictException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.user.Account; - -@APICommand(name="listUcsBlade", description="List ucs blades", responseObject=UcsBladeResponse.class) -public class ListUcsBladeCmd extends BaseListCmd { - public static final Logger s_logger = Logger.getLogger(ListUcsBladeCmd.class); - - @Inject - private UcsManager mgr; - - @Parameter(name=ApiConstants.UCS_MANAGER_ID, type=CommandType.UUID, description="ucs manager id", entityType=UcsManagerResponse.class, required=true) - private Long ucsManagerId; - - public UcsManager getMgr() { - return mgr; - } - - public void setMgr(UcsManager mgr) { - this.mgr = mgr; - } - - public Long getUcsManagerId() { - return ucsManagerId; - } - - public void setUcsManagerId(Long ucsManagerId) { - this.ucsManagerId = ucsManagerId; - } - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, - ResourceAllocationException, NetworkRuleConflictException { - try { - ListResponse response = mgr.listUcsBlades(this); - response.setResponseName(getCommandName()); - response.setObjectName("ucsblade"); - this.setResponseObject(response); - } catch (Exception e) { - s_logger.warn(e.getMessage(), e); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); - } - } - - @Override - public String getCommandName() { - return "listucsbladeresponse"; - } - - @Override - public long getEntityOwnerId() { - return Account.ACCOUNT_ID_SYSTEM; - } -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.ucs.manager; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.log4j.Logger; + +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; + +@APICommand(name="listUcsBlade", description="List ucs blades", responseObject=UcsBladeResponse.class) +public class ListUcsBladeCmd extends BaseListCmd { + public static final Logger s_logger = Logger.getLogger(ListUcsBladeCmd.class); + + @Inject + private UcsManager mgr; + + @Parameter(name=ApiConstants.UCS_MANAGER_ID, type=CommandType.UUID, description="ucs manager id", entityType=UcsManagerResponse.class, required=true) + private Long ucsManagerId; + + public UcsManager getMgr() { + return mgr; + } + + public void setMgr(UcsManager mgr) { + this.mgr = mgr; + } + + public Long getUcsManagerId() { + return ucsManagerId; + } + + public void setUcsManagerId(Long ucsManagerId) { + this.ucsManagerId = ucsManagerId; + } + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + ResourceAllocationException, NetworkRuleConflictException { + try { + ListResponse response = mgr.listUcsBlades(this); + response.setResponseName(getCommandName()); + response.setObjectName("ucsblade"); + this.setResponseObject(response); + } catch (Exception e) { + s_logger.warn(e.getMessage(), e); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } + } + + @Override + public String getCommandName() { + return "listucsbladeresponse"; + } + + @Override + public long getEntityOwnerId() { + return Account.ACCOUNT_ID_SYSTEM; + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsManagerCmd.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsManagerCmd.java index 862f6314338..e705b177d64 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsManagerCmd.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsManagerCmd.java @@ -23,66 +23,66 @@ // // Unless required by applicable law or agreed to in writing, // "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -package com.cloud.ucs.manager; - -import javax.inject.Inject; - -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; +package com.cloud.ucs.manager; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; - -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.NetworkRuleConflictException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.server.ManagementService; -import com.cloud.user.Account; -@APICommand(description="List ucs manager", responseObject=UcsManagerResponse.class) +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.log4j.Logger; + +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.server.ManagementService; +import com.cloud.user.Account; +@APICommand(description="List ucs manager", responseObject=UcsManagerResponse.class) public class ListUcsManagerCmd extends BaseListCmd { public static final Logger s_logger = Logger.getLogger(ListUcsManagerCmd.class); - - @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, description="the zone id", required=true) - private Long zoneId; - - @Inject - private UcsManager mgr; - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + + @Parameter(name=ApiConstants.ZONE_ID, type=CommandType.LONG, description="the zone id", required=true) + private Long zoneId; + + @Inject + private UcsManager mgr; + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { - try { - ListResponse response = mgr.listUcsManager(this); + try { + ListResponse response = mgr.listUcsManager(this); response.setResponseName(getCommandName()); response.setObjectName("ucsmanager"); - this.setResponseObject(response); - } catch (Exception e) { - s_logger.warn("Exception: ", e); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); - } - } - - @Override - public String getCommandName() { - return "listucsmanagerreponse"; - } - - @Override - public long getEntityOwnerId() { - return Account.ACCOUNT_ID_SYSTEM; - } - - public Long getZoneId() { - return zoneId; - } - - public void setZoneId(Long zoneId) { - this.zoneId = zoneId; - } -} + this.setResponseObject(response); + } catch (Exception e) { + s_logger.warn("Exception: ", e); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } + } + + @Override + public String getCommandName() { + return "listucsmanagerreponse"; + } + + @Override + public long getEntityOwnerId() { + return Account.ACCOUNT_ID_SYSTEM; + } + + public Long getZoneId() { + return zoneId; + } + + public void setZoneId(Long zoneId) { + this.zoneId = zoneId; + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsProfileCmd.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsProfileCmd.java index c8a2cc57378..7bc4dec4094 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsProfileCmd.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/ListUcsProfileCmd.java @@ -14,68 +14,68 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.manager; - -import javax.inject.Inject; - -import org.apache.cloudstack.api.APICommand; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.ApiErrorCode; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.BaseCmd.CommandType; +// +package com.cloud.ucs.manager; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.BaseCmd.CommandType; import org.apache.cloudstack.api.BaseListCmd; -import org.apache.cloudstack.api.Parameter; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.ListResponse; -import org.apache.log4j.Logger; - -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.NetworkRuleConflictException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.server.ManagementService; -import com.cloud.user.Account; -@APICommand(name="listUcsProfile", description="List profile in ucs manager", responseObject=UcsProfileResponse.class) +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.log4j.Logger; + +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.NetworkRuleConflictException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.server.ManagementService; +import com.cloud.user.Account; +@APICommand(name="listUcsProfile", description="List profile in ucs manager", responseObject=UcsProfileResponse.class) public class ListUcsProfileCmd extends BaseListCmd { - public static final Logger s_logger = Logger.getLogger(ListUcsProfileCmd.class); - + public static final Logger s_logger = Logger.getLogger(ListUcsProfileCmd.class); + @Inject UcsManager mgr; - - @Parameter(name=ApiConstants.UCS_MANAGER_ID, type=CommandType.UUID, entityType=UcsManagerResponse.class, description="the id for the ucs manager", required=true) - private Long ucsManagerId; - - public Long getUcsManagerId() { - return ucsManagerId; - } - - public void setUcsManagerId(Long ucsManagerId) { - this.ucsManagerId = ucsManagerId; - } - - @Override - public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, + + @Parameter(name=ApiConstants.UCS_MANAGER_ID, type=CommandType.UUID, entityType=UcsManagerResponse.class, description="the id for the ucs manager", required=true) + private Long ucsManagerId; + + public Long getUcsManagerId() { + return ucsManagerId; + } + + public void setUcsManagerId(Long ucsManagerId) { + this.ucsManagerId = ucsManagerId; + } + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException, NetworkRuleConflictException { - try { + try { ListResponse response = mgr.listUcsProfiles(this); response.setResponseName(getCommandName()); response.setObjectName("ucsprofiles"); this.setResponseObject(response); - } catch (Exception e) { - s_logger.warn("Exception: ", e); - throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); - } - } - - @Override - public String getCommandName() { - return "listucsprofileresponse"; - } - - @Override - public long getEntityOwnerId() { - return Account.ACCOUNT_ID_SYSTEM; - } - -} + } catch (Exception e) { + s_logger.warn("Exception: ", e); + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, e.getMessage()); + } + } + + @Override + public String getCommandName() { + return "listucsprofileresponse"; + } + + @Override + public long getEntityOwnerId() { + return Account.ACCOUNT_ID_SYSTEM; + } + +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java index 72bbfcb6f21..a6b17c923da 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/StringTemplate.java @@ -14,26 +14,26 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.manager; - -import java.util.Map; -import java.util.regex.Matcher; -import java.util.regex.Pattern; - -public class StringTemplate { - public static String replaceTokens(String text, Map replacements) { - Pattern pattern = Pattern.compile("\\[(.+?)\\]"); - Matcher matcher = pattern.matcher(text); - StringBuffer buffer = new StringBuffer(); - while (matcher.find()) { - String replacement = replacements.get(matcher.group(1)); - if (replacement != null) { - matcher.appendReplacement(buffer, ""); - buffer.append(replacement); - } - } - matcher.appendTail(buffer); - return buffer.toString(); - } -} +// +package com.cloud.ucs.manager; + +import java.util.Map; +import java.util.regex.Matcher; +import java.util.regex.Pattern; + +public class StringTemplate { + public static String replaceTokens(String text, Map replacements) { + Pattern pattern = Pattern.compile("\\[(.+?)\\]"); + Matcher matcher = pattern.matcher(text); + StringBuffer buffer = new StringBuffer(); + while (matcher.find()) { + String replacement = replacements.get(matcher.group(1)); + if (replacement != null) { + matcher.appendReplacement(buffer, ""); + buffer.append(replacement); + } + } + matcher.appendTail(buffer); + return buffer.toString(); + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsBladeResponse.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsBladeResponse.java index 862b206a507..b06d62ac377 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsBladeResponse.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsBladeResponse.java @@ -1,84 +1,84 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.ucs.manager; - -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseResponse; -import org.apache.cloudstack.api.EntityReference; - -import com.cloud.serializer.Param; -import com.cloud.ucs.database.UcsBladeVO; -import com.google.gson.annotations.SerializedName; -@EntityReference(value=UcsBladeVO.class) -public class UcsBladeResponse extends BaseResponse { - @SerializedName(ApiConstants.ID) - @Param(description = "ucs blade id") - private String id; - @SerializedName(ApiConstants.UCS_MANAGER_ID) - @Param(description = "ucs manager id") - private String ucsManagerId; - @SerializedName(ApiConstants.HOST_ID) - @Param(description = "cloudstack host id this blade associates to") - private String hostId; - @SerializedName(ApiConstants.UCS_BLADE_DN) - @Param(description = "ucs blade dn") - private String dn; - @SerializedName(ApiConstants.UCS_PROFILE_DN) - @Param(description = "associated ucs profile dn") - private String associatedProfileDn; - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getUcsManagerId() { - return ucsManagerId; - } - - public void setUcsManagerId(String ucsManagerId) { - this.ucsManagerId = ucsManagerId; - } - - public String getHostId() { - return hostId; - } - - public void setHostId(String hostId) { - this.hostId = hostId; - } - - public String getDn() { - return dn; - } - - public void setDn(String dn) { - this.dn = dn; - } - - public String getAssociatedProfileDn() { - return associatedProfileDn; - } - - public void setAssociatedProfileDn(String associatedProfileDn) { - this.associatedProfileDn = associatedProfileDn; - } - -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.ucs.manager; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; + +import com.cloud.serializer.Param; +import com.cloud.ucs.database.UcsBladeVO; +import com.google.gson.annotations.SerializedName; +@EntityReference(value=UcsBladeVO.class) +public class UcsBladeResponse extends BaseResponse { + @SerializedName(ApiConstants.ID) + @Param(description = "ucs blade id") + private String id; + @SerializedName(ApiConstants.UCS_MANAGER_ID) + @Param(description = "ucs manager id") + private String ucsManagerId; + @SerializedName(ApiConstants.HOST_ID) + @Param(description = "cloudstack host id this blade associates to") + private String hostId; + @SerializedName(ApiConstants.UCS_BLADE_DN) + @Param(description = "ucs blade dn") + private String dn; + @SerializedName(ApiConstants.UCS_PROFILE_DN) + @Param(description = "associated ucs profile dn") + private String associatedProfileDn; + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getUcsManagerId() { + return ucsManagerId; + } + + public void setUcsManagerId(String ucsManagerId) { + this.ucsManagerId = ucsManagerId; + } + + public String getHostId() { + return hostId; + } + + public void setHostId(String hostId) { + this.hostId = hostId; + } + + public String getDn() { + return dn; + } + + public void setDn(String dn) { + this.dn = dn; + } + + public String getAssociatedProfileDn() { + return associatedProfileDn; + } + + public void setAssociatedProfileDn(String associatedProfileDn) { + this.associatedProfileDn = associatedProfileDn; + } + +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java index eb999910992..9bb77a2b32d 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsCommands.java @@ -14,87 +14,87 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.manager; - -import com.cloud.utils.xmlobject.XmlObject; - -public class UcsCommands { - public static String loginCmd(String username, String password) { - XmlObject cmd = new XmlObject("aaaLogin"); - cmd.putElement("inName", username); - cmd.putElement("inPassword", password); - return cmd.dump(); - } - - public static String listComputeBlades(String cookie) { - XmlObject cmd = new XmlObject("configResolveClass"); - cmd.putElement("classId", "computeBlade"); - cmd.putElement("cookie", cookie); - cmd.putElement("inHierarchical", "false"); - return cmd.dump(); - } - - public static String listProfiles(String cookie) { - XmlObject cmd = new XmlObject("configFindDnsByClassId"); - cmd.putElement("classId", "lsServer"); - cmd.putElement("cookie", cookie); - return cmd.dump(); - } - - public static String cloneProfile(String cookie, String srcDn, String newProfileName) { - XmlObject cmd = new XmlObject("lsClone"); - cmd.putElement("cookie", cookie); - cmd.putElement("dn", srcDn); - cmd.putElement("inTargetOrg", "org-root"); - cmd.putElement("inServerName", newProfileName); - cmd.putElement("inHierarchical", "false"); - return cmd.dump(); - } - - public static String configResolveDn(String cookie, String dn) { - XmlObject cmd = new XmlObject("configResolveDn"); - cmd.putElement("cookie", cookie); - cmd.putElement("dn", dn); - return cmd.toString(); - } - - public static String associateProfileToBlade(String cookie, String profileDn, String bladeDn) { - XmlObject cmd = new XmlObject("configConfMos").putElement("inHierarchical", "true").putElement( - "inConfigs", new XmlObject("inConfigs").putElement( - "pair", new XmlObject("pair").putElement("key", profileDn).putElement( - "lsServer", new XmlObject("lsServer") - .putElement("agentPolicyName", "") - .putElement("biosProfileName", "") - .putElement("bootPolicyName", "") - .putElement("descr", "") - .putElement("dn", profileDn) - .putElement("dynamicConPolicyName", "") - .putElement("extIPState", "none") - .putElement("hostFwPolicyName", "") - .putElement("identPoolName", "") - .putElement("localDiskPolicyName", "") - .putElement("maintPolicyName", "") - .putElement("mgmtAccessPolicyName", "") - .putElement("mgmtFwPolicyName", "") - .putElement("powerPolicyName", "") - .putElement("scrubPolicyName", "") - .putElement("solPolicyName", "") - .putElement("srcTemplName", "") - .putElement("statsPolicyName", "default") - .putElement("status", "") - .putElement("usrLbl", "") - .putElement("uuid", "") - .putElement("vconProfileName", "") - .putElement("lsBinding", new XmlObject("lsBinding") - .putElement("pnDn", bladeDn) - .putElement("restrictMigration", "no") - .putElement("rn", "pn") - ) - ) - ) - ); - - return cmd.dump(); - } -} +// +package com.cloud.ucs.manager; + +import com.cloud.utils.xmlobject.XmlObject; + +public class UcsCommands { + public static String loginCmd(String username, String password) { + XmlObject cmd = new XmlObject("aaaLogin"); + cmd.putElement("inName", username); + cmd.putElement("inPassword", password); + return cmd.dump(); + } + + public static String listComputeBlades(String cookie) { + XmlObject cmd = new XmlObject("configResolveClass"); + cmd.putElement("classId", "computeBlade"); + cmd.putElement("cookie", cookie); + cmd.putElement("inHierarchical", "false"); + return cmd.dump(); + } + + public static String listProfiles(String cookie) { + XmlObject cmd = new XmlObject("configFindDnsByClassId"); + cmd.putElement("classId", "lsServer"); + cmd.putElement("cookie", cookie); + return cmd.dump(); + } + + public static String cloneProfile(String cookie, String srcDn, String newProfileName) { + XmlObject cmd = new XmlObject("lsClone"); + cmd.putElement("cookie", cookie); + cmd.putElement("dn", srcDn); + cmd.putElement("inTargetOrg", "org-root"); + cmd.putElement("inServerName", newProfileName); + cmd.putElement("inHierarchical", "false"); + return cmd.dump(); + } + + public static String configResolveDn(String cookie, String dn) { + XmlObject cmd = new XmlObject("configResolveDn"); + cmd.putElement("cookie", cookie); + cmd.putElement("dn", dn); + return cmd.toString(); + } + + public static String associateProfileToBlade(String cookie, String profileDn, String bladeDn) { + XmlObject cmd = new XmlObject("configConfMos").putElement("inHierarchical", "true").putElement( + "inConfigs", new XmlObject("inConfigs").putElement( + "pair", new XmlObject("pair").putElement("key", profileDn).putElement( + "lsServer", new XmlObject("lsServer") + .putElement("agentPolicyName", "") + .putElement("biosProfileName", "") + .putElement("bootPolicyName", "") + .putElement("descr", "") + .putElement("dn", profileDn) + .putElement("dynamicConPolicyName", "") + .putElement("extIPState", "none") + .putElement("hostFwPolicyName", "") + .putElement("identPoolName", "") + .putElement("localDiskPolicyName", "") + .putElement("maintPolicyName", "") + .putElement("mgmtAccessPolicyName", "") + .putElement("mgmtFwPolicyName", "") + .putElement("powerPolicyName", "") + .putElement("scrubPolicyName", "") + .putElement("solPolicyName", "") + .putElement("srcTemplName", "") + .putElement("statsPolicyName", "default") + .putElement("status", "") + .putElement("usrLbl", "") + .putElement("uuid", "") + .putElement("vconProfileName", "") + .putElement("lsBinding", new XmlObject("lsBinding") + .putElement("pnDn", bladeDn) + .putElement("restrictMigration", "no") + .putElement("rn", "pn") + ) + ) + ) + ); + + return cmd.dump(); + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java index 5c60601275e..66d2ed2cbf0 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsHttpClient.java @@ -14,42 +14,42 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.manager; - -import org.apache.commons.httpclient.HttpClient; -import org.apache.commons.httpclient.methods.PostMethod; -import org.apache.commons.httpclient.methods.StringRequestEntity; - -import com.cloud.utils.exception.CloudRuntimeException; - -public class UcsHttpClient { - private static HttpClient client = new HttpClient(); - private String url; - - public UcsHttpClient(String ip) { - this.url = String.format("http://%s/nuova", ip); - } - - public String call(String xml) { - PostMethod post = new PostMethod(url); - post.setRequestEntity(new StringRequestEntity(xml)); - post.setRequestHeader("Content-type", "text/xml"); - try { - int result = client.executeMethod(post); - if (result != 200) { - throw new CloudRuntimeException("Call failed: " + post.getResponseBodyAsString()); - } +// +package com.cloud.ucs.manager; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.commons.httpclient.methods.StringRequestEntity; + +import com.cloud.utils.exception.CloudRuntimeException; + +public class UcsHttpClient { + private static HttpClient client = new HttpClient(); + private String url; + + public UcsHttpClient(String ip) { + this.url = String.format("http://%s/nuova", ip); + } + + public String call(String xml) { + PostMethod post = new PostMethod(url); + post.setRequestEntity(new StringRequestEntity(xml)); + post.setRequestHeader("Content-type", "text/xml"); + try { + int result = client.executeMethod(post); + if (result != 200) { + throw new CloudRuntimeException("Call failed: " + post.getResponseBodyAsString()); + } String res = post.getResponseBodyAsString(); if (res.contains("errorCode")) { String err = String.format("ucs call failed:\nsubmitted doc:%s\nresponse:%s\n", xml, res); throw new CloudRuntimeException(err); } - return res; - } catch (Exception e) { - throw new CloudRuntimeException(e.getMessage(), e); - } finally { - post.releaseConnection(); - } - } -} + return res; + } catch (Exception e) { + throw new CloudRuntimeException(e.getMessage(), e); + } finally { + post.releaseConnection(); + } + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java index aa45f8c09fd..7250318f4c6 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManager.java @@ -14,22 +14,22 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.manager; - -import org.apache.cloudstack.api.response.ListResponse; - -import com.cloud.utils.component.Manager; +// +package com.cloud.ucs.manager; + +import org.apache.cloudstack.api.response.ListResponse; + +import com.cloud.utils.component.Manager; import com.cloud.utils.component.PluggableService; - -public interface UcsManager extends Manager, PluggableService { - UcsManagerResponse addUcsManager(AddUcsManagerCmd cmd); - + +public interface UcsManager extends Manager, PluggableService { + UcsManagerResponse addUcsManager(AddUcsManagerCmd cmd); + ListResponse listUcsProfiles(ListUcsProfileCmd cmd); - - ListResponse listUcsManager(ListUcsManagerCmd cmd); - + + ListResponse listUcsManager(ListUcsManagerCmd cmd); + UcsBladeResponse associateProfileToBlade(AssociateUcsProfileToBladeCmd cmd); - - ListResponse listUcsBlades(ListUcsBladeCmd cmd); -} + + ListResponse listUcsBlades(ListUcsBladeCmd cmd); +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java index f428e03b7c1..e0aefcfa230 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerImpl.java @@ -14,262 +14,262 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.manager; - -import java.io.File; -import java.io.StringReader; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.UUID; -import java.util.concurrent.TimeUnit; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import javax.xml.bind.JAXBContext; -import javax.xml.bind.Unmarshaller; - -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseCmd; -import org.apache.cloudstack.api.ResponseGenerator; -import org.apache.cloudstack.api.ServerApiException; -import org.apache.cloudstack.api.response.ClusterResponse; -import org.apache.cloudstack.api.response.ListResponse; -import org.apache.cxf.helpers.FileUtils; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - -import com.cloud.dc.ClusterDetailsDao; +// +package com.cloud.ucs.manager; + +import java.io.File; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.UUID; +import java.util.concurrent.TimeUnit; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; +import javax.xml.bind.JAXBContext; +import javax.xml.bind.Unmarshaller; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.ResponseGenerator; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cxf.helpers.FileUtils; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import com.cloud.dc.ClusterDetailsDao; import com.cloud.dc.DataCenterVO; -import com.cloud.dc.dao.ClusterDao; +import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.dao.DataCenterDao; -import com.cloud.host.HostVO; +import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.org.Cluster; -import com.cloud.resource.ResourceService; -import com.cloud.ucs.database.UcsBladeDao; -import com.cloud.ucs.database.UcsBladeVO; -import com.cloud.ucs.database.UcsManagerDao; -import com.cloud.ucs.database.UcsManagerVO; -import com.cloud.ucs.structure.ComputeBlade; -import com.cloud.ucs.structure.UcsProfile; -import com.cloud.utils.db.DB; -import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.SearchCriteria2; -import com.cloud.utils.db.SearchCriteriaService; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; -import com.cloud.utils.xmlobject.XmlObject; -import com.cloud.utils.xmlobject.XmlObjectParser; - -@Local(value = { UcsManager.class }) -public class UcsManagerImpl implements UcsManager { - public static final Logger s_logger = Logger.getLogger(UcsManagerImpl.class); - - @Inject - private UcsManagerDao ucsDao; - @Inject - private ResourceService resourceService; - @Inject - private ClusterDao clusterDao; - @Inject - private ClusterDetailsDao clusterDetailsDao; - @Inject - private UcsBladeDao bladeDao; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.org.Cluster; +import com.cloud.resource.ResourceService; +import com.cloud.ucs.database.UcsBladeDao; +import com.cloud.ucs.database.UcsBladeVO; +import com.cloud.ucs.database.UcsManagerDao; +import com.cloud.ucs.database.UcsManagerVO; +import com.cloud.ucs.structure.ComputeBlade; +import com.cloud.ucs.structure.UcsProfile; +import com.cloud.utils.db.DB; +import com.cloud.utils.db.SearchCriteria.Op; +import com.cloud.utils.db.SearchCriteria2; +import com.cloud.utils.db.SearchCriteriaService; +import com.cloud.utils.db.Transaction; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.script.Script; +import com.cloud.utils.xmlobject.XmlObject; +import com.cloud.utils.xmlobject.XmlObjectParser; + +@Local(value = { UcsManager.class }) +public class UcsManagerImpl implements UcsManager { + public static final Logger s_logger = Logger.getLogger(UcsManagerImpl.class); + @Inject - private HostDao hostDao; + private UcsManagerDao ucsDao; + @Inject + private ResourceService resourceService; + @Inject + private ClusterDao clusterDao; + @Inject + private ClusterDetailsDao clusterDetailsDao; + @Inject + private UcsBladeDao bladeDao; + @Inject + private HostDao hostDao; @Inject private DataCenterDao dcDao; - + private Map cookies = new HashMap(); private String name; private int runLevel; - private Map params; - - @Override - public boolean configure(String name, Map params) throws ConfigurationException { - return true; - } - - @Override - public boolean start() { - return true; - } - - @Override - public boolean stop() { - return true; - } - - @Override - public String getName() { - return name; - } - - private void discoverBlades(UcsManagerVO ucsMgrVo) { - List blades = listBlades(ucsMgrVo.getId()); - for (ComputeBlade b : blades) { - UcsBladeVO vo = new UcsBladeVO(); - vo.setDn(b.getDn()); - vo.setUcsManagerId(ucsMgrVo.getId()); - vo.setUuid(UUID.randomUUID().toString()); - bladeDao.persist(vo); - } - } - - @Override - @DB - public UcsManagerResponse addUcsManager(AddUcsManagerCmd cmd) { - UcsManagerVO vo = new UcsManagerVO(); - vo.setUuid(UUID.randomUUID().toString()); - vo.setPassword(cmd.getPassword()); - vo.setUrl(cmd.getUrl()); - vo.setUsername(cmd.getUsername()); - vo.setZoneId(cmd.getZoneId()); - vo.setName(cmd.getName()); - - Transaction txn = Transaction.currentTxn(); - txn.start(); - ucsDao.persist(vo); - txn.commit(); - UcsManagerResponse rsp = new UcsManagerResponse(); - rsp.setId(String.valueOf(vo.getId())); - rsp.setName(vo.getName()); - rsp.setUrl(vo.getUrl()); - rsp.setZoneId(String.valueOf(vo.getZoneId())); - - discoverBlades(vo); - - return rsp; - } - - private String getCookie(Long ucsMgrId) { - try { - String cookie = cookies.get(ucsMgrId); - if (cookie == null) { - UcsManagerVO mgrvo = ucsDao.findById(ucsMgrId); - UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); - String login = UcsCommands.loginCmd(mgrvo.getUsername(), mgrvo.getPassword()); + private Map params; + + @Override + public boolean configure(String name, Map params) throws ConfigurationException { + return true; + } + + @Override + public boolean start() { + return true; + } + + @Override + public boolean stop() { + return true; + } + + @Override + public String getName() { + return name; + } + + private void discoverBlades(UcsManagerVO ucsMgrVo) { + List blades = listBlades(ucsMgrVo.getId()); + for (ComputeBlade b : blades) { + UcsBladeVO vo = new UcsBladeVO(); + vo.setDn(b.getDn()); + vo.setUcsManagerId(ucsMgrVo.getId()); + vo.setUuid(UUID.randomUUID().toString()); + bladeDao.persist(vo); + } + } + + @Override + @DB + public UcsManagerResponse addUcsManager(AddUcsManagerCmd cmd) { + UcsManagerVO vo = new UcsManagerVO(); + vo.setUuid(UUID.randomUUID().toString()); + vo.setPassword(cmd.getPassword()); + vo.setUrl(cmd.getUrl()); + vo.setUsername(cmd.getUsername()); + vo.setZoneId(cmd.getZoneId()); + vo.setName(cmd.getName()); + + Transaction txn = Transaction.currentTxn(); + txn.start(); + ucsDao.persist(vo); + txn.commit(); + UcsManagerResponse rsp = new UcsManagerResponse(); + rsp.setId(String.valueOf(vo.getId())); + rsp.setName(vo.getName()); + rsp.setUrl(vo.getUrl()); + rsp.setZoneId(String.valueOf(vo.getZoneId())); + + discoverBlades(vo); + + return rsp; + } + + private String getCookie(Long ucsMgrId) { + try { + String cookie = cookies.get(ucsMgrId); + if (cookie == null) { + UcsManagerVO mgrvo = ucsDao.findById(ucsMgrId); + UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); + String login = UcsCommands.loginCmd(mgrvo.getUsername(), mgrvo.getPassword()); String ret = client.call(login); XmlObject xo = XmlObjectParser.parseFromString(ret); - cookie = xo.get("outCookie"); - cookies.put(ucsMgrId, cookie); - } - - return cookie; - } catch (Exception e) { - throw new CloudRuntimeException("Cannot get cookie", e); - } - } - - private List listBlades(Long ucsMgrId) { - String cookie = getCookie(ucsMgrId); - UcsManagerVO mgrvo = ucsDao.findById(ucsMgrId); - UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); - String cmd = UcsCommands.listComputeBlades(cookie); - String ret = client.call(cmd); - return ComputeBlade.fromXmString(ret); - } - - private List getUcsProfiles(Long ucsMgrId) { - String cookie = getCookie(ucsMgrId); - UcsManagerVO mgrvo = ucsDao.findById(ucsMgrId); - String cmd = UcsCommands.listProfiles(cookie); - UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); - String res = client.call(cmd); - List profiles = UcsProfile.fromXmlString(res); - return profiles; - } - - @Override - public ListResponse listUcsProfiles(ListUcsProfileCmd cmd) { - List profiles = getUcsProfiles(cmd.getUcsManagerId()); - ListResponse response = new ListResponse(); - List rs = new ArrayList(); - for (UcsProfile p : profiles) { - UcsProfileResponse r = new UcsProfileResponse(); - r.setObjectName("ucsprofile"); - r.setDn(p.getDn()); - rs.add(r); - } - response.setResponses(rs); - return response; - } - - private String cloneProfile(Long ucsMgrId, String srcDn, String newProfileName) { - UcsManagerVO mgrvo = ucsDao.findById(ucsMgrId); - UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); - String cookie = getCookie(ucsMgrId); - String cmd = UcsCommands.cloneProfile(cookie, srcDn, newProfileName); - String res = client.call(cmd); - XmlObject xo = XmlObjectParser.parseFromString(res); - return xo.get("outConfig.lsServer.dn"); - } - - private boolean isProfileAssociated(Long ucsMgrId, String dn) { - UcsManagerVO mgrvo = ucsDao.findById(ucsMgrId); - UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); - String cookie = getCookie(ucsMgrId); - String cmd = UcsCommands.configResolveDn(cookie, dn); - String res = client.call(cmd); - XmlObject xo = XmlObjectParser.parseFromString(res); - return xo.get("outConfig.computeBlade.association").equals("associated"); - } + cookie = xo.get("outCookie"); + cookies.put(ucsMgrId, cookie); + } + + return cookie; + } catch (Exception e) { + throw new CloudRuntimeException("Cannot get cookie", e); + } + } + + private List listBlades(Long ucsMgrId) { + String cookie = getCookie(ucsMgrId); + UcsManagerVO mgrvo = ucsDao.findById(ucsMgrId); + UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); + String cmd = UcsCommands.listComputeBlades(cookie); + String ret = client.call(cmd); + return ComputeBlade.fromXmString(ret); + } + + private List getUcsProfiles(Long ucsMgrId) { + String cookie = getCookie(ucsMgrId); + UcsManagerVO mgrvo = ucsDao.findById(ucsMgrId); + String cmd = UcsCommands.listProfiles(cookie); + UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); + String res = client.call(cmd); + List profiles = UcsProfile.fromXmlString(res); + return profiles; + } + + @Override + public ListResponse listUcsProfiles(ListUcsProfileCmd cmd) { + List profiles = getUcsProfiles(cmd.getUcsManagerId()); + ListResponse response = new ListResponse(); + List rs = new ArrayList(); + for (UcsProfile p : profiles) { + UcsProfileResponse r = new UcsProfileResponse(); + r.setObjectName("ucsprofile"); + r.setDn(p.getDn()); + rs.add(r); + } + response.setResponses(rs); + return response; + } + + private String cloneProfile(Long ucsMgrId, String srcDn, String newProfileName) { + UcsManagerVO mgrvo = ucsDao.findById(ucsMgrId); + UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); + String cookie = getCookie(ucsMgrId); + String cmd = UcsCommands.cloneProfile(cookie, srcDn, newProfileName); + String res = client.call(cmd); + XmlObject xo = XmlObjectParser.parseFromString(res); + return xo.get("outConfig.lsServer.dn"); + } + + private boolean isProfileAssociated(Long ucsMgrId, String dn) { + UcsManagerVO mgrvo = ucsDao.findById(ucsMgrId); + UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); + String cookie = getCookie(ucsMgrId); + String cmd = UcsCommands.configResolveDn(cookie, dn); + String res = client.call(cmd); + XmlObject xo = XmlObjectParser.parseFromString(res); + return xo.get("outConfig.computeBlade.association").equals("associated"); + } + + @Override + public UcsBladeResponse associateProfileToBlade(AssociateUcsProfileToBladeCmd cmd) { + SearchCriteriaService q = SearchCriteria2.create(UcsBladeVO.class); + q.addAnd(q.getEntity().getUcsManagerId(), Op.EQ, cmd.getUcsManagerId()); + q.addAnd(q.getEntity().getId(), Op.EQ, cmd.getBladeId()); + UcsBladeVO bvo = q.find(); + if (bvo == null) { + throw new IllegalArgumentException(String.format("cannot find UCS blade[id:%s, ucs manager id:%s]", cmd.getBladeId(), cmd.getUcsManagerId())); + } + + if (bvo.getHostId() != null) { + throw new CloudRuntimeException(String.format("blade[id:%s, dn:%s] has been associated with host[id:%s]", bvo.getId(), bvo.getDn(), bvo.getHostId())); + } + + UcsManagerVO mgrvo = ucsDao.findById(cmd.getUcsManagerId()); + String cookie = getCookie(cmd.getUcsManagerId()); + String pdn = cloneProfile(mgrvo.getId(), cmd.getProfileDn(), "profile-for-blade-" + bvo.getId()); + String ucscmd = UcsCommands.associateProfileToBlade(cookie, pdn, bvo.getDn()); + UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); + String res = client.call(ucscmd); + int count = 0; + int timeout = 600; + while (count < timeout) { + if (isProfileAssociated(mgrvo.getId(), bvo.getDn())) { + break; + } + + try { + TimeUnit.SECONDS.sleep(2); + } catch (InterruptedException e) { + throw new CloudRuntimeException(e); + } + + count += 2; + } + + if (count >= timeout) { + throw new CloudRuntimeException(String.format("associating profile[%s] to balde[%s] timeout after 600 seconds", pdn, bvo.getDn())); + } - @Override - public UcsBladeResponse associateProfileToBlade(AssociateUcsProfileToBladeCmd cmd) { - SearchCriteriaService q = SearchCriteria2.create(UcsBladeVO.class); - q.addAnd(q.getEntity().getUcsManagerId(), Op.EQ, cmd.getUcsManagerId()); - q.addAnd(q.getEntity().getId(), Op.EQ, cmd.getBladeId()); - UcsBladeVO bvo = q.find(); - if (bvo == null) { - throw new IllegalArgumentException(String.format("cannot find UCS blade[id:%s, ucs manager id:%s]", cmd.getBladeId(), cmd.getUcsManagerId())); - } - - if (bvo.getHostId() != null) { - throw new CloudRuntimeException(String.format("blade[id:%s, dn:%s] has been associated with host[id:%s]", bvo.getId(), bvo.getDn(), bvo.getHostId())); - } - - UcsManagerVO mgrvo = ucsDao.findById(cmd.getUcsManagerId()); - String cookie = getCookie(cmd.getUcsManagerId()); - String pdn = cloneProfile(mgrvo.getId(), cmd.getProfileDn(), "profile-for-blade-" + bvo.getId()); - String ucscmd = UcsCommands.associateProfileToBlade(cookie, pdn, bvo.getDn()); - UcsHttpClient client = new UcsHttpClient(mgrvo.getUrl()); - String res = client.call(ucscmd); - int count = 0; - int timeout = 600; - while (count < timeout) { - if (isProfileAssociated(mgrvo.getId(), bvo.getDn())) { - break; - } - - try { - TimeUnit.SECONDS.sleep(2); - } catch (InterruptedException e) { - throw new CloudRuntimeException(e); - } - - count += 2; - } - - if (count >= timeout) { - throw new CloudRuntimeException(String.format("associating profile[%s] to balde[%s] timeout after 600 seconds", pdn, bvo.getDn())); - } - bvo.setProfileDn(pdn); bladeDao.update(bvo.getId(), bvo); - + UcsBladeResponse rsp = bladeVOToResponse(bvo); - + s_logger.debug(String.format("successfully associated profile[%s] to blade[%s]", pdn, bvo.getDn())); - return rsp; + return rsp; } - + private String hostIdToUuid(Long hostId) { if (hostId == null) { return null; @@ -284,31 +284,31 @@ public class UcsManagerImpl implements UcsManager { } private String ucsManagerIdToUuid(Long ucsMgrId) { - UcsManagerVO vo = ucsDao.findById(ucsMgrId); + UcsManagerVO vo = ucsDao.findById(ucsMgrId); return vo.getUuid(); } - - @Override - public ListResponse listUcsManager(ListUcsManagerCmd cmd) { + + @Override + public ListResponse listUcsManager(ListUcsManagerCmd cmd) { SearchCriteriaService serv = SearchCriteria2.create(UcsManagerVO.class); serv.addAnd(serv.getEntity().getZoneId(), Op.EQ, cmd.getZoneId()); List vos = serv.list(); - + List rsps = new ArrayList(vos.size()); for (UcsManagerVO vo : vos) { - UcsManagerResponse rsp = new UcsManagerResponse(); + UcsManagerResponse rsp = new UcsManagerResponse(); rsp.setObjectName("ucsmanager"); - rsp.setId(vo.getUuid()); + rsp.setId(vo.getUuid()); rsp.setName(vo.getName()); - rsp.setUrl(vo.getUrl()); - rsp.setZoneId(zoneIdToUuid(vo.getZoneId())); + rsp.setUrl(vo.getUrl()); + rsp.setZoneId(zoneIdToUuid(vo.getZoneId())); rsps.add(rsp); } ListResponse response = new ListResponse(); - response.setResponses(rsps); - return response; + response.setResponses(rsps); + return response; } - + private UcsBladeResponse bladeVOToResponse(UcsBladeVO vo) { UcsBladeResponse rsp = new UcsBladeResponse(); rsp.setObjectName("ucsblade"); @@ -332,33 +332,33 @@ public class UcsManagerImpl implements UcsManager { ListResponse response = new ListResponse(); response.setResponses(rsps); - + return response; - } - - @Override + } + + @Override public void setName(String name) { - this.name = name; - } - - @Override + this.name = name; + } + + @Override public void setConfigParams(Map params) { - this.params = params; - } - - @Override - public Map getConfigParams() { - return this.params; - } - - @Override - public int getRunLevel() { - return runLevel; - } - - @Override + this.params = params; + } + + @Override + public Map getConfigParams() { + return this.params; + } + + @Override + public int getRunLevel() { + return runLevel; + } + + @Override public void setRunLevel(int level) { - this.runLevel = level; + this.runLevel = level; } @Override @@ -370,5 +370,5 @@ public class UcsManagerImpl implements UcsManager { cmds.add(AddUcsManagerCmd.class); cmds.add(AssociateUcsProfileToBladeCmd.class); return cmds; - } -} + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerResponse.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerResponse.java index 6a82daea816..e389a830139 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerResponse.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsManagerResponse.java @@ -14,60 +14,60 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.manager; - +// +package com.cloud.ucs.manager; + import org.apache.cloudstack.api.ApiConstants; import org.apache.cloudstack.api.EntityReference; - -import org.apache.cloudstack.api.BaseResponse; - -import com.cloud.serializer.Param; + +import org.apache.cloudstack.api.BaseResponse; + +import com.cloud.serializer.Param; import com.cloud.ucs.database.UcsManagerVO; -import com.google.gson.annotations.SerializedName; -@EntityReference(value=UcsManagerVO.class) -public class UcsManagerResponse extends BaseResponse { - @SerializedName(ApiConstants.ID) @Param(description="the ID of the ucs manager") +import com.google.gson.annotations.SerializedName; +@EntityReference(value=UcsManagerVO.class) +public class UcsManagerResponse extends BaseResponse { + @SerializedName(ApiConstants.ID) @Param(description="the ID of the ucs manager") private String id; - - @SerializedName(ApiConstants.NAME) @Param(description="the name of ucs manager") + + @SerializedName(ApiConstants.NAME) @Param(description="the name of ucs manager") private String name; - - @SerializedName(ApiConstants.URL) @Param(description="the url of ucs manager") + + @SerializedName(ApiConstants.URL) @Param(description="the url of ucs manager") private String url; - - @SerializedName(ApiConstants.ZONE_ID) @Param(description="the zone ID of ucs manager") - private String zoneId; - - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - public String getUrl() { - return url; - } - - public void setUrl(String url) { - this.url = url; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public String getZoneId() { - return zoneId; - } - - public void setZoneId(String zoneId) { - this.zoneId = zoneId; - } -} + + @SerializedName(ApiConstants.ZONE_ID) @Param(description="the zone ID of ucs manager") + private String zoneId; + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getUrl() { + return url; + } + + public void setUrl(String url) { + this.url = url; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getZoneId() { + return zoneId; + } + + public void setZoneId(String zoneId) { + this.zoneId = zoneId; + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsProfileResponse.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsProfileResponse.java index 0621f6fa983..14a22152633 100755 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsProfileResponse.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/manager/UcsProfileResponse.java @@ -14,24 +14,24 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.manager; - -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseResponse; - -import com.cloud.serializer.Param; -import com.google.gson.annotations.SerializedName; - -public class UcsProfileResponse extends BaseResponse { - @SerializedName(ApiConstants.UCS_DN) @Param(description="ucs profile dn") +// +package com.cloud.ucs.manager; + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; + +import com.cloud.serializer.Param; +import com.google.gson.annotations.SerializedName; + +public class UcsProfileResponse extends BaseResponse { + @SerializedName(ApiConstants.UCS_DN) @Param(description="ucs profile dn") private String dn; - - public String getDn() { - return dn; - } - - public void setDn(String dn) { - this.dn = dn; + + public String getDn() { + return dn; } -} + + public void setDn(String dn) { + this.dn = dn; + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java index e3b1cfda35c..4ac60c0a113 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/ComputeBlade.java @@ -14,169 +14,169 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.structure; - -import java.util.ArrayList; -import java.util.List; - -import com.cloud.utils.xmlobject.XmlObject; -import com.cloud.utils.xmlobject.XmlObjectParser; - -public class ComputeBlade { - String adminPower; - String adminState; - String assignedToDn; - String association; - String availability; - String availableMemory; - String chassisId; - String dn; - String name; - String numOfAdaptors; - String numOfCores; - String numOfCoresEnabled; - String numOfCpus; - String numOfEthHostIfs; - String numOfFcHostIfs; - String numOfThreads; - String operPower; - String totalMemory; - String uuid; - - public static List fromXmString(String xmlstr) { - XmlObject root = XmlObjectParser.parseFromString(xmlstr); - List lst = root.getAsList("outConfigs.computeBlade"); - List blades = new ArrayList(); - if (lst == null) { - return blades; - } - for (XmlObject xo : lst) { - blades.add(fromXmlObject(xo)); - } - return blades; - } - - public static ComputeBlade fromXmlObject(XmlObject obj) { - ComputeBlade ret = new ComputeBlade(); - return obj.evaluateObject(ret); - } - - public String getAdminPower() { - return adminPower; - } - public void setAdminPower(String adminPower) { - this.adminPower = adminPower; - } - public String getAdminState() { - return adminState; - } - public void setAdminState(String adminState) { - this.adminState = adminState; - } - public String getAssignedToDn() { - return assignedToDn; - } - public void setAssignedToDn(String assignedToDn) { - this.assignedToDn = assignedToDn; - } - public String getAssociation() { - return association; - } - public void setAssociation(String association) { - this.association = association; - } - public String getAvailability() { - return availability; - } - public void setAvailability(String availability) { - this.availability = availability; - } - public String getAvailableMemory() { - return availableMemory; - } - public void setAvailableMemory(String availableMemory) { - this.availableMemory = availableMemory; - } - public String getChassisId() { - return chassisId; - } - public void setChassisId(String chassisId) { - this.chassisId = chassisId; - } - public String getDn() { - return dn; - } - public void setDn(String dn) { - this.dn = dn; - } - public String getName() { - return name; - } - public void setName(String name) { - this.name = name; - } - public String getNumOfAdaptors() { - return numOfAdaptors; - } - public void setNumOfAdaptors(String numOfAdaptors) { - this.numOfAdaptors = numOfAdaptors; - } - public String getNumOfCores() { - return numOfCores; - } - public void setNumOfCores(String numOfCores) { - this.numOfCores = numOfCores; - } - public String getNumOfCoresEnabled() { - return numOfCoresEnabled; - } - public void setNumOfCoresEnabled(String numOfCoresEnabled) { - this.numOfCoresEnabled = numOfCoresEnabled; - } - public String getNumOfCpus() { - return numOfCpus; - } - public void setNumOfCpus(String numOfCpus) { - this.numOfCpus = numOfCpus; - } - public String getNumOfEthHostIfs() { - return numOfEthHostIfs; - } - public void setNumOfEthHostIfs(String numOfEthHostIfs) { - this.numOfEthHostIfs = numOfEthHostIfs; - } - public String getNumOfFcHostIfs() { - return numOfFcHostIfs; - } - public void setNumOfFcHostIfs(String numOfFcHostIfs) { - this.numOfFcHostIfs = numOfFcHostIfs; - } - public String getNumOfThreads() { - return numOfThreads; - } - public void setNumOfThreads(String numOfThreads) { - this.numOfThreads = numOfThreads; - } - public String getOperPower() { - return operPower; - } - public void setOperPower(String operPower) { - this.operPower = operPower; - } - public String getTotalMemory() { - return totalMemory; - } - public void setTotalMemory(String totalMemory) { - this.totalMemory = totalMemory; - } - public String getUuid() { - return uuid; - } - public void setUuid(String uuid) { - this.uuid = uuid; - } - public boolean isAssociated() { - return this.assignedToDn.equals(""); - } -} +// +package com.cloud.ucs.structure; + +import java.util.ArrayList; +import java.util.List; + +import com.cloud.utils.xmlobject.XmlObject; +import com.cloud.utils.xmlobject.XmlObjectParser; + +public class ComputeBlade { + String adminPower; + String adminState; + String assignedToDn; + String association; + String availability; + String availableMemory; + String chassisId; + String dn; + String name; + String numOfAdaptors; + String numOfCores; + String numOfCoresEnabled; + String numOfCpus; + String numOfEthHostIfs; + String numOfFcHostIfs; + String numOfThreads; + String operPower; + String totalMemory; + String uuid; + + public static List fromXmString(String xmlstr) { + XmlObject root = XmlObjectParser.parseFromString(xmlstr); + List lst = root.getAsList("outConfigs.computeBlade"); + List blades = new ArrayList(); + if (lst == null) { + return blades; + } + for (XmlObject xo : lst) { + blades.add(fromXmlObject(xo)); + } + return blades; + } + + public static ComputeBlade fromXmlObject(XmlObject obj) { + ComputeBlade ret = new ComputeBlade(); + return obj.evaluateObject(ret); + } + + public String getAdminPower() { + return adminPower; + } + public void setAdminPower(String adminPower) { + this.adminPower = adminPower; + } + public String getAdminState() { + return adminState; + } + public void setAdminState(String adminState) { + this.adminState = adminState; + } + public String getAssignedToDn() { + return assignedToDn; + } + public void setAssignedToDn(String assignedToDn) { + this.assignedToDn = assignedToDn; + } + public String getAssociation() { + return association; + } + public void setAssociation(String association) { + this.association = association; + } + public String getAvailability() { + return availability; + } + public void setAvailability(String availability) { + this.availability = availability; + } + public String getAvailableMemory() { + return availableMemory; + } + public void setAvailableMemory(String availableMemory) { + this.availableMemory = availableMemory; + } + public String getChassisId() { + return chassisId; + } + public void setChassisId(String chassisId) { + this.chassisId = chassisId; + } + public String getDn() { + return dn; + } + public void setDn(String dn) { + this.dn = dn; + } + public String getName() { + return name; + } + public void setName(String name) { + this.name = name; + } + public String getNumOfAdaptors() { + return numOfAdaptors; + } + public void setNumOfAdaptors(String numOfAdaptors) { + this.numOfAdaptors = numOfAdaptors; + } + public String getNumOfCores() { + return numOfCores; + } + public void setNumOfCores(String numOfCores) { + this.numOfCores = numOfCores; + } + public String getNumOfCoresEnabled() { + return numOfCoresEnabled; + } + public void setNumOfCoresEnabled(String numOfCoresEnabled) { + this.numOfCoresEnabled = numOfCoresEnabled; + } + public String getNumOfCpus() { + return numOfCpus; + } + public void setNumOfCpus(String numOfCpus) { + this.numOfCpus = numOfCpus; + } + public String getNumOfEthHostIfs() { + return numOfEthHostIfs; + } + public void setNumOfEthHostIfs(String numOfEthHostIfs) { + this.numOfEthHostIfs = numOfEthHostIfs; + } + public String getNumOfFcHostIfs() { + return numOfFcHostIfs; + } + public void setNumOfFcHostIfs(String numOfFcHostIfs) { + this.numOfFcHostIfs = numOfFcHostIfs; + } + public String getNumOfThreads() { + return numOfThreads; + } + public void setNumOfThreads(String numOfThreads) { + this.numOfThreads = numOfThreads; + } + public String getOperPower() { + return operPower; + } + public void setOperPower(String operPower) { + this.operPower = operPower; + } + public String getTotalMemory() { + return totalMemory; + } + public void setTotalMemory(String totalMemory) { + this.totalMemory = totalMemory; + } + public String getUuid() { + return uuid; + } + public void setUuid(String uuid) { + this.uuid = uuid; + } + public boolean isAssociated() { + return this.assignedToDn.equals(""); + } +} diff --git a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java b/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java index 16cf35d539f..5322bc83c2e 100644 --- a/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java +++ b/plugins/hypervisors/ucs/src/com/cloud/ucs/structure/UcsProfile.java @@ -14,43 +14,43 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -// -package com.cloud.ucs.structure; - -import java.util.ArrayList; -import java.util.List; - -import com.cloud.utils.xmlobject.XmlObject; -import com.cloud.utils.xmlobject.XmlObjectParser; - -public class UcsProfile { - private String dn; - - public static UcsProfile fromXmlObject(XmlObject xo) { - UcsProfile p = new UcsProfile(); - return xo.evaluateObject(p); - } - - public static List fromXmlString(String xmlstr) { - List ps = new ArrayList(); - XmlObject xo = XmlObjectParser.parseFromString(xmlstr); - List xos = xo.getAsList("outDns.dn"); - if (xos != null) { - for (XmlObject x : xos) { +// +package com.cloud.ucs.structure; + +import java.util.ArrayList; +import java.util.List; + +import com.cloud.utils.xmlobject.XmlObject; +import com.cloud.utils.xmlobject.XmlObjectParser; + +public class UcsProfile { + private String dn; + + public static UcsProfile fromXmlObject(XmlObject xo) { + UcsProfile p = new UcsProfile(); + return xo.evaluateObject(p); + } + + public static List fromXmlString(String xmlstr) { + List ps = new ArrayList(); + XmlObject xo = XmlObjectParser.parseFromString(xmlstr); + List xos = xo.getAsList("outDns.dn"); + if (xos != null) { + for (XmlObject x : xos) { //UcsProfile p = UcsProfile.fromXmlObject(x); UcsProfile p = new UcsProfile(); - p.setDn(x.get("value").toString()); - ps.add(p); - } - } - return ps; - } - - public String getDn() { - return dn; - } - - public void setDn(String dn) { - this.dn = dn; - } -} + p.setDn(x.get("value").toString()); + ps.add(p); + } + } + return ps; + } + + public String getDn() { + return dn; + } + + public void setDn(String dn) { + this.dn = dn; + } +} diff --git a/plugins/hypervisors/vmware/pom.xml b/plugins/hypervisors/vmware/pom.xml index 468e0a50599..d65ef640655 100644 --- a/plugins/hypervisors/vmware/pom.xml +++ b/plugins/hypervisors/vmware/pom.xml @@ -32,6 +32,11 @@ cloud-vmware-base ${project.version} + + org.apache.cloudstack + cloud-secondary-storage + ${project.version} + com.cloud.com.vmware vmware-vim25 diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java index bb7c29745d9..ee1b3245126 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java @@ -27,6 +27,7 @@ import java.util.Map; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.cloudstack.api.ApiConstants.VMDetails; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -35,11 +36,14 @@ import com.cloud.agent.api.Command; import com.cloud.agent.api.CreatePrivateTemplateFromSnapshotCommand; import com.cloud.agent.api.CreatePrivateTemplateFromVolumeCommand; import com.cloud.agent.api.CreateVolumeFromSnapshotCommand; +import com.cloud.agent.api.UnregisterVMCommand; import com.cloud.agent.api.storage.CopyVolumeCommand; import com.cloud.agent.api.storage.PrimaryStorageDownloadCommand; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.cluster.ClusterManager; +import com.cloud.configuration.Config; +import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.exception.InsufficientAddressCapacityException; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; @@ -49,7 +53,9 @@ import com.cloud.hypervisor.HypervisorGuru; import com.cloud.hypervisor.HypervisorGuruBase; import com.cloud.hypervisor.vmware.manager.VmwareManager; import com.cloud.hypervisor.vmware.mo.VirtualEthernetCardType; +import com.cloud.network.Network.Provider; import com.cloud.network.NetworkModel; +import com.cloud.network.Network.Service; import com.cloud.network.Networks.TrafficType; import com.cloud.network.dao.NetworkDao; import com.cloud.network.dao.NetworkVO; @@ -84,6 +90,7 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru { @Inject VmwareManager _vmwareMgr; @Inject SecondaryStorageVmManager _secStorageMgr; @Inject NetworkModel _networkMgr; + @Inject ConfigurationDao _configDao; protected VMwareGuru() { super(); @@ -135,18 +142,27 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru { if (!(vm.getVirtualMachine() instanceof DomainRouterVO || vm.getVirtualMachine() instanceof ConsoleProxyVO || vm.getVirtualMachine() instanceof SecondaryStorageVmVO)){ // user vm - if (diskDeviceType != null){ - details.remove(VmDetailConstants.ROOK_DISK_CONTROLLER); + if (diskDeviceType == null){ + details.put(VmDetailConstants.ROOK_DISK_CONTROLLER, _vmwareMgr.getRootDiskController()); } - details.put(VmDetailConstants.ROOK_DISK_CONTROLLER, _vmwareMgr.getRootDiskController()); } - + + List nicProfiles = vm.getNics(); + + for(NicProfile nicProfile : nicProfiles) { + if(nicProfile.getTrafficType() == TrafficType.Guest) { + if(_networkMgr.isProviderSupportServiceInNetwork(nicProfile.getNetworkId(), Service.Firewall, Provider.CiscoVnmc)) { + details.put("ConfigureVServiceInNexus", Boolean.TRUE.toString()); + } + break; + } + } + to.setDetails(details); if(vm.getVirtualMachine() instanceof DomainRouterVO) { - List nicProfiles = vm.getNics(); - NicProfile publicNicProfile = null; + NicProfile publicNicProfile = null; for(NicProfile nicProfile : nicProfiles) { if(nicProfile.getTrafficType() == TrafficType.Public) { publicNicProfile = nicProfile; @@ -213,8 +229,21 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru { sbMacSequence.deleteCharAt(sbMacSequence.length() - 1); String bootArgs = to.getBootArgs(); to.setBootArgs(bootArgs + " nic_macs=" + sbMacSequence.toString()); + + } + + // Don't do this if the virtual machine is one of the special types + // Should only be done on user machines + if(!(vm.getVirtualMachine() instanceof DomainRouterVO || vm.getVirtualMachine() instanceof ConsoleProxyVO + || vm.getVirtualMachine() instanceof SecondaryStorageVmVO)) { + String nestedVirt = _configDao.getValue(Config.VmwareEnableNestedVirtualization.key()); + if (nestedVirt != null) { + s_logger.debug("Nested virtualization requested, adding flag to vm configuration"); + details.put(VmDetailConstants.NESTED_VIRTUALIZATION_FLAG, nestedVirt); + to.setDetails(details); + + } } - // Determine the VM's OS description GuestOSVO guestOS = _guestOsDao.findById(vm.getVirtualMachine().getGuestOSId()); to.setOs(guestOS.getDisplayName()); @@ -325,4 +354,12 @@ public class VMwareGuru extends HypervisorGuruBase implements HypervisorGuru { return tokens[0] + "@" + vCenterIp; } + + @Override + public List finalizeExpunge(VirtualMachine vm) { + UnregisterVMCommand unregisterVMCommand = new UnregisterVMCommand(vm.getInstanceName()); + List commands = new ArrayList(); + commands.add(unregisterVMCommand); + return commands; + } } diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java index b2e37685d17..eb09af0d67e 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/manager/VmwareManagerImpl.java @@ -317,8 +317,7 @@ public class VmwareManagerImpl extends ManagerBase implements VmwareManager, Vmw } s_logger.info("Preparing network on host " + hostMo.getContext().toString() + " for " + privateTrafficLabel); - HypervisorHostHelper.prepareNetwork(vSwitchName, "cloud.private", hostMo, vlanId, null, null, 180000, false); - + HypervisorHostHelper.prepareNetwork(vSwitchName, "cloud.private", hostMo, vlanId, null, null, 180000, false); } @Override diff --git a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java index 634827b6468..99ad1ca60b2 100755 --- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/vmware/resource/VmwareResource.java @@ -73,6 +73,7 @@ import com.cloud.agent.api.CreateVolumeFromSnapshotCommand; import com.cloud.agent.api.DeleteStoragePoolCommand; import com.cloud.agent.api.DeleteVMSnapshotAnswer; import com.cloud.agent.api.DeleteVMSnapshotCommand; +import com.cloud.agent.api.UnregisterVMCommand; import com.cloud.agent.api.GetDomRVersionAnswer; import com.cloud.agent.api.GetDomRVersionCmd; import com.cloud.agent.api.GetHostStatsAnswer; @@ -232,6 +233,7 @@ import com.vmware.vim25.ClusterDasConfigInfo; import com.vmware.vim25.ComputeResourceSummary; import com.vmware.vim25.DatastoreSummary; import com.vmware.vim25.DynamicProperty; +import com.vmware.vim25.HostCapability; import com.vmware.vim25.HostFirewallInfo; import com.vmware.vim25.HostFirewallRuleset; import com.vmware.vim25.HostNetworkTrafficShapingPolicy; @@ -472,6 +474,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa answer = execute((CheckS2SVpnConnectionsCommand) cmd); } else if (clz == ResizeVolumeCommand.class) { return execute((ResizeVolumeCommand) cmd); + } else if (clz == UnregisterVMCommand.class) { + return execute((UnregisterVMCommand) cmd); } else { answer = Answer.createUnsupportedCommandAnswer(cmd); } @@ -1328,7 +1332,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa NicTO nicTo = cmd.getNic(); VirtualDevice nic; - Pair networkInfo = prepareNetworkFromNicInfo(vmMo.getRunningHost(), nicTo); + Pair networkInfo = prepareNetworkFromNicInfo(vmMo.getRunningHost(), nicTo, false); if (VmwareHelper.isDvPortGroup(networkInfo.first())) { String dvSwitchUuid; ManagedObjectReference dcMor = hyperHost.getHyperHostDatacenter(); @@ -1570,7 +1574,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa vmMo.getRunningHost(), vlanId, null, null, this._ops_timeout, true); } else { networkInfo = HypervisorHostHelper.prepareNetwork(this._publicTrafficInfo.getVirtualSwitchName(), "cloud.public", - vmMo.getRunningHost(), vlanId, null, null, this._ops_timeout, vSwitchType, _portsPerDvPortGroup); + vmMo.getRunningHost(), vlanId, null, null, this._ops_timeout, vSwitchType, _portsPerDvPortGroup, null, false); } int nicIndex = allocPublicNicIndex(vmMo); @@ -2147,6 +2151,23 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa VmwareHelper.setBasicVmConfig(vmConfigSpec, vmSpec.getCpus(), vmSpec.getMaxSpeed(), vmSpec.getMinSpeed(),(int) (vmSpec.getMaxRam()/(1024*1024)), ramMb, translateGuestOsIdentifier(vmSpec.getArch(), vmSpec.getOs()).value(), vmSpec.getLimitCpuUse()); + + if ("true".equals(vmSpec.getDetails().get(VmDetailConstants.NESTED_VIRTUALIZATION_FLAG))) { + s_logger.debug("Nested Virtualization enabled in configuration, checking hypervisor capability"); + ManagedObjectReference hostMor = vmMo.getRunningHost().getMor(); + ManagedObjectReference computeMor = context.getVimClient().getMoRefProp(hostMor, "parent"); + ManagedObjectReference environmentBrowser = + context.getVimClient().getMoRefProp(computeMor, "environmentBrowser"); + HostCapability hostCapability = context.getService().queryTargetCapabilities(environmentBrowser, hostMor); + if (hostCapability.isNestedHVSupported()) { + s_logger.debug("Hypervisor supports nested virtualization, enabling for VM " + vmSpec.getName()); + vmConfigSpec.setNestedHVEnabled(true); + } + else { + s_logger.warn("Hypervisor doesn't support nested virtualization, unable to set config for VM " +vmSpec.getName()); + vmConfigSpec.setNestedHVEnabled(false); + } + } VirtualDeviceConfigSpec[] deviceConfigSpecArray = new VirtualDeviceConfigSpec[totalChangeDevices]; int i = 0; @@ -2286,7 +2307,8 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa for (NicTO nicTo : sortNicsByDeviceId(nics)) { s_logger.info("Prepare NIC device based on NicTO: " + _gson.toJson(nicTo)); - Pair networkInfo = prepareNetworkFromNicInfo(vmMo.getRunningHost(), nicTo); + boolean configureVServiceInNexus = (nicTo.getType() == TrafficType.Guest) && (vmSpec.getDetails().containsKey("ConfigureVServiceInNexus")); + Pair networkInfo = prepareNetworkFromNicInfo(vmMo.getRunningHost(), nicTo, configureVServiceInNexus); if (VmwareHelper.isDvPortGroup(networkInfo.first())) { String dvSwitchUuid; ManagedObjectReference dcMor = hyperHost.getHyperHostDatacenter(); @@ -2486,7 +2508,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa return defaultVlan; } - private Pair prepareNetworkFromNicInfo(HostMO hostMo, NicTO nicTo) throws Exception { + private Pair prepareNetworkFromNicInfo(HostMO hostMo, NicTO nicTo, boolean configureVServiceInNexus) throws Exception { Pair switchName; TrafficType trafficType; VirtualSwitchType switchType; @@ -2516,7 +2538,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } else { networkInfo = HypervisorHostHelper.prepareNetwork(switchName.first(), namePrefix, hostMo, getVlanInfo(nicTo, switchName.second()), - nicTo.getNetworkRateMbps(), nicTo.getNetworkRateMulticastMbps(), _ops_timeout, switchType, _portsPerDvPortGroup); + nicTo.getNetworkRateMbps(), nicTo.getNetworkRateMulticastMbps(), _ops_timeout, switchType, _portsPerDvPortGroup, nicTo.getGateway(), configureVServiceInNexus); } return networkInfo; @@ -2834,10 +2856,6 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa vmMo.setCustomFieldValue(CustomFieldConstants.CLOUD_NIC_MASK, "0"); if (getVmState(vmMo) != State.Stopped) { - - // before we stop VM, remove all possible snapshots on the VM to let - // disk chain be collapsed - s_logger.info("Remove all snapshot before stopping VM " + cmd.getVmName()); if (vmMo.safePowerOff(_shutdown_waitMs)) { state = State.Stopped; return new StopAnswer(cmd, "Stop VM " + cmd.getVmName() + " Succeed", 0, true); @@ -3006,7 +3024,7 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa NicTO[] nics = vm.getNics(); for (NicTO nic : nics) { // prepare network on the host - prepareNetworkFromNicInfo(new HostMO(getServiceContext(), _morHyperHost), nic); + prepareNetworkFromNicInfo(new HostMO(getServiceContext(), _morHyperHost), nic, false); } String secStoreUrl = mgr.getSecondaryStorageStoreUrl(Long.parseLong(_dcId)); @@ -3670,6 +3688,43 @@ public class VmwareResource implements StoragePoolResource, ServerResource, Vmwa } } + protected Answer execute(UnregisterVMCommand cmd){ + if (s_logger.isInfoEnabled()) { + s_logger.info("Executing resource UnregisterVMCommand: " + _gson.toJson(cmd)); + } + + VmwareContext context = getServiceContext(); + VmwareHypervisorHost hyperHost = getHyperHost(context); + try { + VirtualMachineMO vmMo = hyperHost.findVmOnHyperHost(cmd.getVmName()); + if (vmMo != null) { + try { + context.getService().unregisterVM(vmMo.getMor()); + return new Answer(cmd, true, "unregister succeeded"); + } catch(Exception e) { + s_logger.warn("We are not able to unregister VM " + VmwareHelper.getExceptionMessage(e)); + } + + String msg = "Expunge failed in vSphere. vm: " + cmd.getVmName(); + s_logger.warn(msg); + return new Answer(cmd, false, msg); + } else { + String msg = "Unable to find the VM in vSphere to unregister, assume it is already removed. VM: " + cmd.getVmName(); + s_logger.warn(msg); + return new Answer(cmd, true, msg); + } + } catch (Exception e) { + if (e instanceof RemoteException) { + s_logger.warn("Encounter remote exception to vCenter, invalidate VMware session context"); + invalidateServiceContext(); + } + + String msg = "UnregisterVMCommand failed due to " + VmwareHelper.getExceptionMessage(e); + s_logger.error(msg); + return new Answer(cmd, false, msg); + } + } + @Override public Answer execute(DestroyCommand cmd) { if (s_logger.isInfoEnabled()) { diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java index 856982a8e0e..3966e0242d9 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/PremiumSecondaryStorageResource.java @@ -21,6 +21,8 @@ import java.util.Map; import javax.naming.ConfigurationException; +import org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource; +import org.apache.cloudstack.storage.resource.SecondaryStorageResourceHandler; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; diff --git a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java index 566e750c3fe..ce42f67bf1d 100644 --- a/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java +++ b/plugins/hypervisors/vmware/src/com/cloud/storage/resource/VmwareSecondaryStorageResourceHandler.java @@ -18,6 +18,7 @@ package com.cloud.storage.resource; import java.util.List; +import org.apache.cloudstack.storage.resource.SecondaryStorageResourceHandler; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java index c50f13ce7e5..46ae35a4a54 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/CitrixResourceBase.java @@ -3358,7 +3358,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe vm.setMemoryLimits(conn, maxMemsize, maxMemsize, minMemsize, maxMemsize); } - private void waitForTask(Connection c, Task task, long pollInterval, long timeout) throws XenAPIException, XmlRpcException { + protected void waitForTask(Connection c, Task task, long pollInterval, long timeout) throws XenAPIException, XmlRpcException { long beginTime = System.currentTimeMillis(); while (task.getStatus(c) == Types.TaskStatusType.PENDING) { try { @@ -3374,7 +3374,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe } } - private void checkForSuccess(Connection c, Task task) throws XenAPIException, XmlRpcException { + protected void checkForSuccess(Connection c, Task task) throws XenAPIException, XmlRpcException { if (task.getStatus(c) == Types.TaskStatusType.SUCCESS) { return; } else { @@ -6380,7 +6380,7 @@ public abstract class CitrixResourceBase implements ServerResource, HypervisorRe String guestOSType = cmd.getGuestOSType(); boolean snapshotMemory = cmd.getTarget().getType() == VMSnapshot.Type.DiskAndMemory; - long timeout = 600; + long timeout = cmd.getWait(); Connection conn = getConnection(); VM vm = null; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java index d64e17337a1..96a90a61fff 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer56FP1Resource.java @@ -132,6 +132,7 @@ public class XenServer56FP1Resource extends XenServer56Resource { record.affinity = host; record.otherConfig.remove("disks"); record.otherConfig.remove("default_template"); + record.otherConfig.remove("mac_seed"); record.isATemplate = false; record.nameLabel = vmSpec.getName(); record.actionsAfterCrash = Types.OnCrashBehaviour.DESTROY; diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java index 8d267b114fa..bb31136f38e 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServer610Resource.java @@ -20,6 +20,9 @@ package com.cloud.hypervisor.xen.resource; import java.io.File; import java.util.ArrayList; import java.util.List; +import java.util.HashMap; +import java.util.Map; +import java.util.Set; import javax.ejb.Local; @@ -28,7 +31,34 @@ import org.apache.log4j.Logger; import com.cloud.resource.ServerResource; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.script.Script; - +import com.cloud.vm.VirtualMachine.State; +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.Command; +import com.cloud.agent.api.storage.MigrateVolumeAnswer; +import com.cloud.agent.api.storage.MigrateVolumeCommand; +import com.cloud.agent.api.MigrateWithStorageAnswer; +import com.cloud.agent.api.MigrateWithStorageCommand; +import com.cloud.agent.api.MigrateWithStorageReceiveAnswer; +import com.cloud.agent.api.MigrateWithStorageReceiveCommand; +import com.cloud.agent.api.MigrateWithStorageSendAnswer; +import com.cloud.agent.api.MigrateWithStorageSendCommand; +import com.cloud.agent.api.MigrateWithStorageCompleteAnswer; +import com.cloud.agent.api.MigrateWithStorageCompleteCommand; +import com.cloud.agent.api.to.StorageFilerTO; +import com.cloud.network.Networks.TrafficType; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.agent.api.to.VolumeTO; +import com.cloud.agent.api.to.NicTO; +import com.xensource.xenapi.Connection; +import com.xensource.xenapi.Host; +import com.xensource.xenapi.Network; +import com.xensource.xenapi.SR; +import com.xensource.xenapi.Task; +import com.xensource.xenapi.Types; +import com.xensource.xenapi.VBD; +import com.xensource.xenapi.VDI; +import com.xensource.xenapi.VIF; +import com.xensource.xenapi.VM; @Local(value=ServerResource.class) public class XenServer610Resource extends XenServer56FP1Resource { @@ -55,4 +85,331 @@ public class XenServer610Resource extends XenServer56FP1Resource { files.add(file); return files; } + + @Override + public Answer executeRequest(Command cmd) { + if (cmd instanceof MigrateWithStorageCommand) { + return execute((MigrateWithStorageCommand) cmd); + } else if (cmd instanceof MigrateWithStorageReceiveCommand) { + return execute((MigrateWithStorageReceiveCommand) cmd); + } else if (cmd instanceof MigrateWithStorageSendCommand) { + return execute((MigrateWithStorageSendCommand) cmd); + } else if (cmd instanceof MigrateWithStorageCompleteCommand) { + return execute((MigrateWithStorageCompleteCommand) cmd); + } else if (cmd instanceof MigrateVolumeCommand) { + return execute((MigrateVolumeCommand) cmd); + } else { + return super.executeRequest(cmd); + } + } + + private List getUpdatedVolumePathsOfMigratedVm(Connection connection, VM migratedVm, + VolumeTO[] volumes) throws CloudRuntimeException { + List volumeToList = new ArrayList(); + + try { + // Volume paths would have changed. Return that information. + Set vbds = migratedVm.getVBDs(connection); + Map deviceIdToVdiMap = new HashMap(); + // get vdi:vbdr to a map + for (VBD vbd : vbds) { + VBD.Record vbdr = vbd.getRecord(connection); + if (vbdr.type == Types.VbdType.DISK) { + VDI vdi = vbdr.VDI; + deviceIdToVdiMap.put(vbdr.userdevice, vdi); + } + } + + for (VolumeTO volumeTo : volumes) { + Long deviceId = volumeTo.getDeviceId(); + VDI vdi = deviceIdToVdiMap.get(deviceId.toString()); + volumeTo.setPath(vdi.getUuid(connection)); + volumeToList.add(volumeTo); + } + } catch (Exception e) { + s_logger.error("Unable to get the updated VDI paths of the migrated vm " + e.toString(), e); + throw new CloudRuntimeException("Unable to get the updated VDI paths of the migrated vm " + e.toString(), e); + } + + return volumeToList; + } + + protected MigrateWithStorageAnswer execute(MigrateWithStorageCommand cmd) { + Connection connection = getConnection(); + VirtualMachineTO vmSpec = cmd.getVirtualMachine(); + Map volumeToFiler = cmd.getVolumeToFiler(); + final String vmName = vmSpec.getName(); + State state = s_vms.getState(_cluster, vmName); + Task task = null; + + synchronized (_cluster.intern()) { + s_vms.put(_cluster, _name, vmName, State.Stopping); + } + + try { + prepareISO(connection, vmSpec.getName()); + Map other = new HashMap(); + other.put("live", "true"); + Network networkForSm = getNativeNetworkForTraffic(connection, TrafficType.Storage, null).getNetwork(); + Host host = Host.getByUuid(connection, _host.uuid); + Map token = host.migrateReceive(connection, networkForSm, other); + + // Get the vm to migrate. + Set vms = VM.getByNameLabel(connection, vmSpec.getName()); + VM vmToMigrate = vms.iterator().next(); + + // Create the vif map. The vm stays in the same cluster so we have to pass an empty vif map. + Map vifMap = new HashMap(); + Map vdiMap = new HashMap(); + for (Map.Entry entry : volumeToFiler.entrySet()) { + vdiMap.put(getVDIbyUuid(connection, entry.getKey().getPath()), + getStorageRepository(connection, entry.getValue().getUuid())); + } + + // Check migration with storage is possible. + task = vmToMigrate.assertCanMigrateAsync(connection, token, true, vdiMap, vifMap, other); + try { + // poll every 1 seconds + long timeout = (_migratewait) * 1000L; + waitForTask(connection, task, 1000, timeout); + checkForSuccess(connection, task); + } catch (Types.HandleInvalid e) { + s_logger.error("Error while checking if vm " + vmName + " can be migrated to the destination host " + + host, e); + throw new CloudRuntimeException("Error while checking if vm " + vmName + " can be migrated to the " + + "destination host " + host, e); + } + + // Migrate now. + task = vmToMigrate.migrateSendAsync(connection, token, true, vdiMap, vifMap, other); + try { + // poll every 1 seconds. + long timeout = (_migratewait) * 1000L; + waitForTask(connection, task, 1000, timeout); + checkForSuccess(connection, task); + } catch (Types.HandleInvalid e) { + s_logger.error("Error while migrating vm " + vmName + " to the destination host " + host, e); + throw new CloudRuntimeException("Error while migrating vm " + vmName + " to the destination host " + + host, e); + } + + // Volume paths would have changed. Return that information. + List volumeToList = getUpdatedVolumePathsOfMigratedVm(connection, vmToMigrate, vmSpec.getDisks()); + vmToMigrate.setAffinity(connection, host); + state = State.Stopping; + + return new MigrateWithStorageAnswer(cmd, volumeToList); + } catch (Exception e) { + s_logger.warn("Catch Exception " + e.getClass().getName() + ". Storage motion failed due to " + + e.toString(), e); + return new MigrateWithStorageAnswer(cmd, e); + } finally { + if (task != null) { + try { + task.destroy(connection); + } catch (Exception e) { + s_logger.debug("Unable to destroy task " + task.toString() + " on host " + _host.uuid +" due to " + + e.toString()); + } + } + + synchronized (_cluster.intern()) { + s_vms.put(_cluster, _name, vmName, state); + } + } + } + + protected MigrateWithStorageReceiveAnswer execute(MigrateWithStorageReceiveCommand cmd) { + Connection connection = getConnection(); + VirtualMachineTO vmSpec = cmd.getVirtualMachine(); + Map volumeToFiler = cmd.getVolumeToFiler(); + + try { + // Get a map of all the SRs to which the vdis will be migrated. + Map volumeToSr = new HashMap(); + for (Map.Entry entry : volumeToFiler.entrySet()) { + SR sr = getStorageRepository(connection, entry.getValue().getUuid()); + volumeToSr.put(entry.getKey(), sr); + } + + // Get the list of networks to which the vifs will attach. + Map nicToNetwork = new HashMap(); + for (NicTO nicTo : vmSpec.getNics()) { + Network network = getNetwork(connection, nicTo); + nicToNetwork.put(nicTo, network); + } + + Map other = new HashMap(); + other.put("live", "true"); + Network network = getNativeNetworkForTraffic(connection, TrafficType.Storage, null).getNetwork(); + Host host = Host.getByUuid(connection, _host.uuid); + Map token = host.migrateReceive(connection, network, other); + + return new MigrateWithStorageReceiveAnswer(cmd, volumeToSr, nicToNetwork, token); + } catch (CloudRuntimeException e) { + s_logger.error("Migration of vm " + vmSpec.getName() + " with storage failed due to " + e.toString(), e); + return new MigrateWithStorageReceiveAnswer(cmd, e); + } catch (Exception e) { + s_logger.error("Migration of vm " + vmSpec.getName() + " with storage failed due to " + e.toString(), e); + return new MigrateWithStorageReceiveAnswer(cmd, e); + } + } + + protected MigrateWithStorageSendAnswer execute(MigrateWithStorageSendCommand cmd) { + Connection connection = getConnection(); + VirtualMachineTO vmSpec = cmd.getVirtualMachine(); + Map volumeToSr = cmd.getVolumeToSr(); + Map nicToNetwork = cmd.getNicToNetwork(); + Map token = cmd.getToken(); + final String vmName = vmSpec.getName(); + State state = s_vms.getState(_cluster, vmName); + Set volumeToSet = null; + boolean migrated = false; + Task task = null; + + synchronized (_cluster.intern()) { + s_vms.put(_cluster, _name, vmName, State.Stopping); + } + + try { + Set vms = VM.getByNameLabel(connection, vmSpec.getName()); + VM vmToMigrate = vms.iterator().next(); + Map other = new HashMap(); + other.put("live", "true"); + + // Create the vdi map which tells what volumes of the vm need to go on which sr on the destination. + Map vdiMap = new HashMap(); + for (Map.Entry entry : volumeToSr.entrySet()) { + if (entry.getValue() instanceof SR) { + SR sr = (SR)entry.getValue(); + VDI vdi = getVDIbyUuid(connection, entry.getKey().getPath()); + vdiMap.put(vdi, sr); + } else { + throw new CloudRuntimeException("The object " + entry.getValue() + " passed is not of type SR."); + } + } + + // Create the vif map. + Map vifMap = new HashMap(); + for (Map.Entry entry : nicToNetwork.entrySet()) { + if (entry.getValue() instanceof Network) { + Network network = (Network)entry.getValue(); + VIF vif = getVifByMac(connection, vmToMigrate, entry.getKey().getMac()); + vifMap.put(vif, network); + } else { + throw new CloudRuntimeException("The object " + entry.getValue() + " passed is not of type Network."); + } + } + + // Check migration with storage is possible. + task = vmToMigrate.assertCanMigrateAsync(connection, token, true, vdiMap, vifMap, other); + try { + // poll every 1 seconds. + long timeout = (_migratewait) * 1000L; + waitForTask(connection, task, 1000, timeout); + checkForSuccess(connection, task); + } catch (Types.HandleInvalid e) { + s_logger.error("Error while checking if vm " + vmName + " can be migrated.", e); + throw new CloudRuntimeException("Error while checking if vm " + vmName + " can be migrated.", e); + } + + // Migrate now. + task = vmToMigrate.migrateSendAsync(connection, token, true, vdiMap, vifMap, other); + try { + // poll every 1 seconds. + long timeout = (_migratewait) * 1000L; + waitForTask(connection, task, 1000, timeout); + checkForSuccess(connection, task); + } catch (Types.HandleInvalid e) { + s_logger.error("Error while migrating vm " + vmName, e); + throw new CloudRuntimeException("Error while migrating vm " + vmName, e); + } + + migrated = true; + return new MigrateWithStorageSendAnswer(cmd, volumeToSet); + } catch (CloudRuntimeException e) { + s_logger.error("Migration of vm " + vmName + " with storage failed due to " + e.toString(), e); + return new MigrateWithStorageSendAnswer(cmd, e); + } catch (Exception e) { + s_logger.error("Migration of vm " + vmName + " with storage failed due to " + e.toString(), e); + return new MigrateWithStorageSendAnswer(cmd, e); + } finally { + if (task != null) { + try { + task.destroy(connection); + } catch (Exception e) { + s_logger.debug("Unable to destroy task " + task.toString() + " on host " + _host.uuid +" due to " + + e.toString()); + } + } + + // Keep cluster/vm sync happy. + synchronized (_cluster.intern()) { + if (migrated) { + s_vms.remove(_cluster, _name, vmName); + } else { + s_vms.put(_cluster, _name, vmName, state); + } + } + } + } + + protected MigrateWithStorageCompleteAnswer execute(MigrateWithStorageCompleteCommand cmd) { + Connection connection = getConnection(); + VirtualMachineTO vmSpec = cmd.getVirtualMachine(); + + try { + Host host = Host.getByUuid(connection, _host.uuid); + Set vms = VM.getByNameLabel(connection, vmSpec.getName()); + VM migratedVm = vms.iterator().next(); + + // Check the vm is present on the new host. + if (migratedVm == null) { + throw new CloudRuntimeException("Couldn't find the migrated vm " + vmSpec.getName() + + " on the destination host."); + } + + // Volume paths would have changed. Return that information. + List volumeToSet = getUpdatedVolumePathsOfMigratedVm(connection, migratedVm, vmSpec.getDisks()); + migratedVm.setAffinity(connection, host); + + synchronized (_cluster.intern()) { + s_vms.put(_cluster, _name, vmSpec.getName(), State.Running); + } + + return new MigrateWithStorageCompleteAnswer(cmd, volumeToSet); + } catch (CloudRuntimeException e) { + s_logger.error("Migration of vm " + vmSpec.getName() + " with storage failed due to " + e.toString(), e); + return new MigrateWithStorageCompleteAnswer(cmd, e); + } catch (Exception e) { + s_logger.error("Migration of vm " + vmSpec.getName() + " with storage failed due to " + e.toString(), e); + return new MigrateWithStorageCompleteAnswer(cmd, e); + } + } + + protected MigrateVolumeAnswer execute(MigrateVolumeCommand cmd) { + Connection connection = getConnection(); + String volumeUUID = cmd.getVolumePath(); + StorageFilerTO poolTO = cmd.getPool(); + + try { + SR destinationPool = getStorageRepository(connection, poolTO.getUuid()); + VDI srcVolume = getVDIbyUuid(connection, volumeUUID); + Map other = new HashMap(); + other.put("live", "true"); + + // Live migrate the vdi across pool. + Task task = srcVolume.poolMigrateAsync(connection, destinationPool, other); + long timeout = (_migratewait) * 1000L; + waitForTask(connection, task, 1000, timeout); + checkForSuccess(connection, task); + VDI dvdi = Types.toVDI(task, connection); + + return new MigrateVolumeAnswer(cmd, true, null, dvdi.getUuid(connection)); + } catch (Exception e) { + String msg = "Catch Exception " + e.getClass().getName() + " due to " + e.toString(); + s_logger.error(msg, e); + return new MigrateVolumeAnswer(cmd, false, msg, null); + } + } } diff --git a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java index 9c291491114..7e0ccbed39c 100644 --- a/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java +++ b/plugins/hypervisors/xen/src/com/cloud/hypervisor/xen/resource/XenServerStorageResource.java @@ -39,7 +39,7 @@ import org.apache.cloudstack.storage.command.CreatePrimaryDataStoreCmd; import org.apache.cloudstack.storage.command.CreateVolumeFromBaseImageCommand; import org.apache.cloudstack.storage.command.StorageSubSystemCommand; import org.apache.cloudstack.storage.datastore.protocol.DataStoreProtocol; -import org.apache.cloudstack.storage.to.ImageOnPrimayDataStoreTO; +import org.apache.cloudstack.storage.to.ImageOnPrimaryDataStoreTO; import org.apache.cloudstack.storage.to.VolumeTO; import org.apache.http.HttpEntity; import org.apache.http.HttpResponse; @@ -207,7 +207,7 @@ public class XenServerStorageResource { protected Answer execute(CreateVolumeFromBaseImageCommand cmd) { VolumeTO volume = cmd.getVolume(); - ImageOnPrimayDataStoreTO baseImage = cmd.getImage(); + ImageOnPrimaryDataStoreTO baseImage = cmd.getImage(); Connection conn = hypervisorResource.getConnection(); try { diff --git a/plugins/hypervisors/xen/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java b/plugins/hypervisors/xen/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java new file mode 100644 index 00000000000..353f2b58d08 --- /dev/null +++ b/plugins/hypervisors/xen/src/org/apache/cloudstack/storage/motion/XenServerStorageMotionStrategy.java @@ -0,0 +1,239 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ +package org.apache.cloudstack.storage.motion; + +import java.util.HashMap; +import java.util.Map; +import java.util.List; + +import javax.inject.Inject; + +import org.apache.cloudstack.engine.subsystem.api.storage.CopyCommandResult; +import org.apache.cloudstack.engine.subsystem.api.storage.DataObject; +import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; +import org.apache.cloudstack.framework.async.AsyncCompletionCallback; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import com.cloud.agent.AgentManager; +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.MigrateWithStorageAnswer; +import com.cloud.agent.api.MigrateWithStorageCommand; +import com.cloud.agent.api.MigrateWithStorageCompleteAnswer; +import com.cloud.agent.api.MigrateWithStorageCompleteCommand; +import com.cloud.agent.api.MigrateWithStorageReceiveAnswer; +import com.cloud.agent.api.MigrateWithStorageReceiveCommand; +import com.cloud.agent.api.MigrateWithStorageSendAnswer; +import com.cloud.agent.api.MigrateWithStorageSendCommand; +import com.cloud.agent.api.to.StorageFilerTO; +import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.agent.api.to.VolumeTO; +import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.OperationTimedoutException; +import com.cloud.host.Host; +import com.cloud.storage.StoragePool; +import com.cloud.storage.VolumeVO; +import com.cloud.storage.dao.VolumeDao; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.vm.VMInstanceVO; +import com.cloud.vm.dao.VMInstanceDao; + +@Component +public class XenServerStorageMotionStrategy implements DataMotionStrategy { + private static final Logger s_logger = Logger.getLogger(XenServerStorageMotionStrategy.class); + @Inject AgentManager agentMgr; + @Inject VolumeDao volDao; + @Inject VolumeDataFactory volFactory; + @Inject PrimaryDataStoreDao storagePoolDao; + @Inject VMInstanceDao instanceDao; + + @Override + public boolean canHandle(DataObject srcData, DataObject destData) { + return false; + } + + @Override + public boolean canHandle(Map volumeMap, Host srcHost, Host destHost) { + return true; + } + + @Override + public Void copyAsync(DataObject srcData, DataObject destData, + AsyncCompletionCallback callback) { + CopyCommandResult result = new CopyCommandResult(null, null); + result.setResult("Unsupported operation requested for copying data."); + callback.complete(result); + + return null; + } + + @Override + public Void copyAsync(Map volumeMap, VirtualMachineTO vmTo, Host srcHost, Host destHost, + AsyncCompletionCallback callback) { + Answer answer = null; + String errMsg = null; + try { + VMInstanceVO instance = instanceDao.findById(vmTo.getId()); + if (instance != null) { + if (srcHost.getClusterId() == destHost.getClusterId()) { + answer = migrateVmWithVolumesWithinCluster(instance, vmTo, srcHost, destHost, volumeMap); + } else { + answer = migrateVmWithVolumesAcrossCluster(instance, vmTo, srcHost, destHost, volumeMap); + } + } else { + throw new CloudRuntimeException("Unsupported operation requested for moving data."); + } + } catch (Exception e) { + s_logger.error("copy failed", e); + errMsg = e.toString(); + } + + CopyCommandResult result = new CopyCommandResult(null, answer); + result.setResult(errMsg); + callback.complete(result); + return null; + } + + private Answer migrateVmWithVolumesAcrossCluster(VMInstanceVO vm, VirtualMachineTO to, Host srcHost, + Host destHost, Map volumeToPool) throws AgentUnavailableException { + + // Initiate migration of a virtual machine with it's volumes. + try { + Map volumeToFilerto = new HashMap(); + for (Map.Entry entry : volumeToPool.entrySet()) { + VolumeInfo volume = entry.getKey(); + VolumeTO volumeTo = new VolumeTO(volume, storagePoolDao.findById(volume.getPoolId())); + StorageFilerTO filerTo = new StorageFilerTO((StoragePool)entry.getValue()); + volumeToFilerto.put(volumeTo, filerTo); + } + + // Migration across cluster needs to be done in three phases. + // 1. Send a migrate receive command to the destination host so that it is ready to receive a vm. + // 2. Send a migrate send command to the source host. This actually migrates the vm to the destination. + // 3. Complete the process. Update the volume details. + MigrateWithStorageReceiveCommand receiveCmd = new MigrateWithStorageReceiveCommand(to, volumeToFilerto); + MigrateWithStorageReceiveAnswer receiveAnswer = (MigrateWithStorageReceiveAnswer) agentMgr.send( + destHost.getId(), receiveCmd); + if (receiveAnswer == null) { + s_logger.error("Migration with storage of vm " + vm+ " to host " + destHost + " failed."); + throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost); + } else if (!receiveAnswer.getResult()) { + s_logger.error("Migration with storage of vm " + vm+ " failed. Details: " + receiveAnswer.getDetails()); + throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost + + ". " + receiveAnswer.getDetails()); + } + + MigrateWithStorageSendCommand sendCmd = new MigrateWithStorageSendCommand(to, receiveAnswer.getVolumeToSr(), + receiveAnswer.getNicToNetwork(), receiveAnswer.getToken()); + MigrateWithStorageSendAnswer sendAnswer = (MigrateWithStorageSendAnswer) agentMgr.send( + srcHost.getId(), sendCmd); + if (sendAnswer == null) { + s_logger.error("Migration with storage of vm " + vm+ " to host " + destHost + " failed."); + throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost); + } else if (!sendAnswer.getResult()) { + s_logger.error("Migration with storage of vm " + vm+ " failed. Details: " + sendAnswer.getDetails()); + throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost + + ". " + sendAnswer.getDetails()); + } + + MigrateWithStorageCompleteCommand command = new MigrateWithStorageCompleteCommand(to); + MigrateWithStorageCompleteAnswer answer = (MigrateWithStorageCompleteAnswer) agentMgr.send( + destHost.getId(), command); + if (answer == null) { + s_logger.error("Migration with storage of vm " + vm + " failed."); + throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost); + } else if (!answer.getResult()) { + s_logger.error("Migration with storage of vm " + vm+ " failed. Details: " + answer.getDetails()); + throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost + + ". " + answer.getDetails()); + } else { + // Update the volume details after migration. + updateVolumePathsAfterMigration(volumeToPool, answer.getVolumeTos()); + } + + return answer; + } catch (OperationTimedoutException e) { + s_logger.error("Error while migrating vm " + vm + " to host " + destHost, e); + throw new AgentUnavailableException("Operation timed out on storage motion for " + vm, destHost.getId()); + } + } + + private Answer migrateVmWithVolumesWithinCluster(VMInstanceVO vm, VirtualMachineTO to, Host srcHost, + Host destHost, Map volumeToPool) throws AgentUnavailableException { + + // Initiate migration of a virtual machine with it's volumes. + try { + Map volumeToFilerto = new HashMap(); + for (Map.Entry entry : volumeToPool.entrySet()) { + VolumeInfo volume = entry.getKey(); + VolumeTO volumeTo = new VolumeTO(volume, storagePoolDao.findById(volume.getPoolId())); + StorageFilerTO filerTo = new StorageFilerTO((StoragePool)entry.getValue()); + volumeToFilerto.put(volumeTo, filerTo); + } + + MigrateWithStorageCommand command = new MigrateWithStorageCommand(to, volumeToFilerto); + MigrateWithStorageAnswer answer = (MigrateWithStorageAnswer) agentMgr.send(destHost.getId(), command); + if (answer == null) { + s_logger.error("Migration with storage of vm " + vm + " failed."); + throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost); + } else if (!answer.getResult()) { + s_logger.error("Migration with storage of vm " + vm+ " failed. Details: " + answer.getDetails()); + throw new CloudRuntimeException("Error while migrating the vm " + vm + " to host " + destHost + + ". " + answer.getDetails()); + } else { + // Update the volume details after migration. + updateVolumePathsAfterMigration(volumeToPool, answer.getVolumeTos()); + } + + return answer; + } catch (OperationTimedoutException e) { + s_logger.error("Error while migrating vm " + vm + " to host " + destHost, e); + throw new AgentUnavailableException("Operation timed out on storage motion for " + vm, destHost.getId()); + } + } + + private void updateVolumePathsAfterMigration(Map volumeToPool, List volumeTos) { + for (Map.Entry entry : volumeToPool.entrySet()) { + boolean updated = false; + VolumeInfo volume = entry.getKey(); + StoragePool pool = (StoragePool)entry.getValue(); + for (VolumeTO volumeTo : volumeTos) { + if (volume.getId() == volumeTo.getId()) { + VolumeVO volumeVO = volDao.findById(volume.getId()); + Long oldPoolId = volumeVO.getPoolId(); + volumeVO.setPath(volumeTo.getPath()); + volumeVO.setFolder(pool.getPath()); + volumeVO.setPodId(pool.getPodId()); + volumeVO.setPoolId(pool.getId()); + volumeVO.setLastPoolId(oldPoolId); + volDao.update(volume.getId(), volumeVO); + updated = true; + break; + } + } + + if (!updated) { + s_logger.error("Volume path wasn't updated for volume " + volume + " after it was migrated."); + } + } + } +} diff --git a/plugins/network-elements/cisco-vnmc/pom.xml b/plugins/network-elements/cisco-vnmc/pom.xml new file mode 100644 index 00000000000..1ac6bd8d8c9 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/pom.xml @@ -0,0 +1,42 @@ + + + 4.0.0 + cloud-plugin-network-cisco-vnmc + Apache CloudStack Plugin - Cisco VNMC + + org.apache.cloudstack + cloudstack-plugins + 4.2.0-SNAPSHOT + ../../pom.xml + + + + org.apache.cloudstack + cloud-plugin-hypervisor-vmware + ${project.version} + + + org.apache.cloudstack + cloud-vmware-base + ${project.version} + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml new file mode 100644 index 00000000000..b0249db741b --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/assoc-asa1000v.xml @@ -0,0 +1,34 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-acl-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-acl-policy-set.xml new file mode 100755 index 00000000000..e3113ae22c7 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-acl-policy-set.xml @@ -0,0 +1,37 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-policy.xml new file mode 100644 index 00000000000..e866f51e366 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-policy.xml @@ -0,0 +1,34 @@ + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-server.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-server.xml new file mode 100644 index 00000000000..930e4ec77a2 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-dhcp-server.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-nat-policy-set.xml new file mode 100644 index 00000000000..6d67c31c5d6 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-nat-policy-set.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-route-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-route-policy.xml new file mode 100644 index 00000000000..8884a1b9686 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/associate-route-policy.xml @@ -0,0 +1,33 @@ + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml new file mode 100755 index 00000000000..c534c327194 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-ref.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml new file mode 100755 index 00000000000..b475d2ca564 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy-set.xml @@ -0,0 +1,36 @@ + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml new file mode 100755 index 00000000000..e71cd429858 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-policy.xml @@ -0,0 +1,35 @@ + + + + + + + + \ No newline at end of file diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml new file mode 100755 index 00000000000..5b6aaa3f59b --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-dnat.xml @@ -0,0 +1,82 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml new file mode 100755 index 00000000000..1a1d9cbf3e2 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-acl-rule-for-pf.xml @@ -0,0 +1,156 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml new file mode 100644 index 00000000000..5bb4abcd8e1 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dhcp-policy.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml new file mode 100755 index 00000000000..bd8dbff6d32 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-dnat-rule.xml @@ -0,0 +1,91 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-profile.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-profile.xml new file mode 100644 index 00000000000..c4bdd026186 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-profile.xml @@ -0,0 +1,32 @@ + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route-policy.xml new file mode 100644 index 00000000000..69f4a5f7bfd --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route-policy.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route.xml new file mode 100644 index 00000000000..126c188f979 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-device-route.xml @@ -0,0 +1,35 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml new file mode 100644 index 00000000000..e5447e39e63 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-firewall.xml @@ -0,0 +1,89 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml new file mode 100644 index 00000000000..e2f5eaf0686 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-edge-security-profile.xml @@ -0,0 +1,41 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml new file mode 100755 index 00000000000..930272ed8ee --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-egress-acl-rule.xml @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml new file mode 100755 index 00000000000..92c25043dad --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-egress-acl-rule.xml @@ -0,0 +1,122 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml new file mode 100755 index 00000000000..7c1164138bc --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-generic-ingress-acl-rule.xml @@ -0,0 +1,121 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml new file mode 100755 index 00000000000..1af30b44416 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ingress-acl-rule.xml @@ -0,0 +1,201 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml new file mode 100755 index 00000000000..4cf0451c33d --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-ip-pool.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml new file mode 100755 index 00000000000..450d40c9d6d --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-ref.xml @@ -0,0 +1,38 @@ + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml new file mode 100644 index 00000000000..090caf15cb4 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy-set.xml @@ -0,0 +1,37 @@ + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy.xml new file mode 100755 index 00000000000..0b556f42a84 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-nat-policy.xml @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml new file mode 100755 index 00000000000..a8a631f5d7f --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-pf-rule.xml @@ -0,0 +1,166 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml new file mode 100755 index 00000000000..e1b7be024f7 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-port-pool.xml @@ -0,0 +1,72 @@ + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml new file mode 100644 index 00000000000..2ad1e8798a5 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-pool.xml @@ -0,0 +1,58 @@ + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml new file mode 100644 index 00000000000..a3ee9875e19 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-source-nat-rule.xml @@ -0,0 +1,103 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-tenant.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-tenant.xml new file mode 100644 index 00000000000..085b7a2e533 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-tenant.xml @@ -0,0 +1,29 @@ + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-vdc.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-vdc.xml new file mode 100644 index 00000000000..4cb805ecf7e --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/create-vdc.xml @@ -0,0 +1,30 @@ + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy-set.xml new file mode 100755 index 00000000000..2c5578659c7 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy-set.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy.xml new file mode 100755 index 00000000000..b1a27650419 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-acl-policy.xml @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-firewall.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-firewall.xml new file mode 100755 index 00000000000..992d6a1ab62 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-firewall.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-security-profile.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-security-profile.xml new file mode 100755 index 00000000000..f394fe91d9e --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-edge-security-profile.xml @@ -0,0 +1,38 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy-set.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy-set.xml new file mode 100755 index 00000000000..3f4c08d747f --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy-set.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy.xml new file mode 100755 index 00000000000..6c3ed7b9f48 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-nat-policy.xml @@ -0,0 +1,33 @@ + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-rule.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-rule.xml new file mode 100755 index 00000000000..e56e9190496 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-rule.xml @@ -0,0 +1,31 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-tenant.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-tenant.xml new file mode 100755 index 00000000000..05bef9a2906 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-tenant.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-vdc.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-vdc.xml new file mode 100755 index 00000000000..fbc2312c208 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/delete-vdc.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/disassoc-asa1000v.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/disassoc-asa1000v.xml new file mode 100755 index 00000000000..448b65f0d53 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/disassoc-asa1000v.xml @@ -0,0 +1,30 @@ + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml new file mode 100755 index 00000000000..aec800e9f4a --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-acl-policies.xml @@ -0,0 +1,31 @@ + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml new file mode 100755 index 00000000000..f272999a76c --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-children.xml @@ -0,0 +1,27 @@ + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml new file mode 100755 index 00000000000..720ced06d8a --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-nat-policies.xml @@ -0,0 +1,31 @@ + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml new file mode 100755 index 00000000000..c53af90369d --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-policyrefs-in-policyset.xml @@ -0,0 +1,31 @@ + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-tenants.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-tenants.xml new file mode 100644 index 00000000000..63ae848b3e1 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-tenants.xml @@ -0,0 +1,26 @@ + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml new file mode 100644 index 00000000000..539f330da8a --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/list-unassigned-asa1000v.xml @@ -0,0 +1,39 @@ + + + + + + + + + + + + diff --git a/plugins/network-elements/cisco-vnmc/scripts/network/cisco/login.xml b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/login.xml new file mode 100644 index 00000000000..8e1c435ea15 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/scripts/network/cisco/login.xml @@ -0,0 +1,20 @@ + + + diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java new file mode 100755 index 00000000000..a438cbc0e59 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/AssociateAsaWithLogicalEdgeFirewallCommand.java @@ -0,0 +1,53 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +/** + * Associates an ASA 1000v appliance with logical edge firewall in VNMC + */ +public class AssociateAsaWithLogicalEdgeFirewallCommand extends Command { + private long _vlanId; + private String _asaMgmtIp; + + public AssociateAsaWithLogicalEdgeFirewallCommand(long vlanId, String asaMgmtIp) { + super(); + this._vlanId = vlanId; + this._asaMgmtIp = asaMgmtIp; + } + + @Override + public boolean executeInSequence() { + return false; + } + + public long getVlanId() { + return _vlanId; + } + + public void setVlanId(long vlanId) { + this._vlanId = vlanId; + } + + public String getAsaMgmtIp() { + return _asaMgmtIp; + } + + public void setAsaMgmtIp(String asaMgmtIp) { + this._asaMgmtIp = asaMgmtIp; + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java new file mode 100755 index 00000000000..c9f7f8c4c83 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CleanupLogicalEdgeFirewallCommand.java @@ -0,0 +1,43 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +/** + * Command for cleaning up logical edge firewall in VNMC + */ +public class CleanupLogicalEdgeFirewallCommand extends Command { + private long _vlanId; + + public CleanupLogicalEdgeFirewallCommand(long vlanId) { + super(); + this._vlanId = vlanId; + } + + @Override + public boolean executeInSequence() { + return false; + } + + public long getVlanId() { + return _vlanId; + } + + public void setVlanId(long vlanId) { + this._vlanId = vlanId; + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java new file mode 100755 index 00000000000..b20ad1f2df6 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/ConfigureNexusVsmForAsaCommand.java @@ -0,0 +1,95 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +/** + * Command for configuring n1kv VSM for asa1kv device. It does the following in VSM: + * a. creating vservice node for asa1kv + * b. updating vlan of inside port profile associated with asa1kv + */ +public class ConfigureNexusVsmForAsaCommand extends Command { + private long _vlanId; + private String _ipAddress; + private String _vsmUsername; + private String _vsmPassword; + private String _vsmIp; + private String _asaInPortProfile; + + public ConfigureNexusVsmForAsaCommand(long vlanId, String ipAddress, + String vsmUsername, String vsmPassword, String vsmIp, String asaInPortProfile) { + super(); + this._vlanId = vlanId; + this._ipAddress = ipAddress; + this._vsmUsername = vsmUsername; + this._vsmPassword = vsmPassword; + this._vsmIp = vsmIp; + this._asaInPortProfile = asaInPortProfile; + } + + @Override + public boolean executeInSequence() { + return false; + } + + public long getVlanId() { + return _vlanId; + } + + public void setVlanId(long _vlanId) { + this._vlanId = _vlanId; + } + + public String getIpAddress() { + return _ipAddress; + } + + public void setIpAddress(String _ipAddress) { + this._ipAddress = _ipAddress; + } + + public String getVsmUsername() { + return _vsmUsername; + } + + public void setVsmUsername(String _vsmUsername) { + this._vsmUsername = _vsmUsername; + } + + public String getVsmPassword() { + return _vsmPassword; + } + + public void setVsmPassword(String _vsmPassword) { + this._vsmPassword = _vsmPassword; + } + + public String getVsmIp() { + return _vsmIp; + } + + public void setVsmIp(String _vsmIp) { + this._vsmIp = _vsmIp; + } + + public String getAsaInPortProfile() { + return _asaInPortProfile; + } + + public void setAsaInPortProfile(String _asaInPortProfile) { + this._asaInPortProfile = _asaInPortProfile; + } +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java new file mode 100755 index 00000000000..def8225acf1 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/agent/api/CreateLogicalEdgeFirewallCommand.java @@ -0,0 +1,94 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.agent.api; + +import java.util.ArrayList; +import java.util.List; + +/** + * Command for creating a logical edge firewall in VNMC + */ +public class CreateLogicalEdgeFirewallCommand extends Command { + private long _vlanId; + private String _publicIp; + private String _internalIp; + private String _publicSubnet; + private String _internalSubnet; + private List _publicGateways; + + public CreateLogicalEdgeFirewallCommand(long vlanId, + String publicIp, String internalIp, + String publicSubnet, String internalSubnet) { + super(); + this._vlanId = vlanId; + this._publicIp = publicIp; + this._internalIp = internalIp; + this._publicSubnet = publicSubnet; + this.setInternalSubnet(internalSubnet); + _publicGateways = new ArrayList(); + } + + @Override + public boolean executeInSequence() { + return false; + } + + public long getVlanId() { + return _vlanId; + } + + public void setVlanId(long vlanId) { + this._vlanId = vlanId; + } + + public String getPublicIp() { + return _publicIp; + } + + public void setPublicIp(String publicIp) { + this._publicIp = publicIp; + } + + public String getInternalIp() { + return _internalIp; + } + + public void setInternalIp(String internalIp) { + this._internalIp = internalIp; + } + + public String getPublicSubnet() { + return _publicSubnet; + } + + public void setPublicSubnet(String publicSubnet) { + this._publicSubnet = publicSubnet; + } + + public String getInternalSubnet() { + return _internalSubnet; + } + + public void setInternalSubnet(String _internalSubnet) { + this._internalSubnet = _internalSubnet; + } + + public List getPublicGateways() { + return _publicGateways; + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java new file mode 100755 index 00000000000..c880199f5c4 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoAsa1000vResourceCmd.java @@ -0,0 +1,116 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.commands; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ClusterResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import org.apache.log4j.Logger; + +import com.cloud.api.response.CiscoAsa1000vResourceResponse; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.cisco.CiscoAsa1000vDevice; +import com.cloud.network.element.CiscoAsa1000vService; +import com.cloud.user.UserContext; +import com.cloud.utils.exception.CloudRuntimeException; + +@APICommand(name="addCiscoAsa1000vResource", responseObject=CiscoAsa1000vResourceResponse.class, description="Adds a Cisco Asa 1000v appliance") +public class AddCiscoAsa1000vResourceCmd extends BaseCmd { + private static final Logger s_logger = Logger.getLogger(AddCiscoAsa1000vResourceCmd.class.getName()); + private static final String s_name = "addCiscoAsa1000vResource"; + @Inject CiscoAsa1000vService _ciscoAsa1000vService; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.PHYSICAL_NETWORK_ID, type=CommandType.UUID, entityType = PhysicalNetworkResponse.class, required=true, description="the Physical Network ID") + private Long physicalNetworkId; + + @Parameter(name=ApiConstants.HOST_NAME, type=CommandType.STRING, required = true, description="Hostname or ip address of the Cisco ASA 1000v appliance.") + private String host; + + @Parameter(name=ApiConstants.ASA_INSIDE_PORT_PROFILE, type=CommandType.STRING, required = true, description="Nexus port profile associated with inside interface of ASA 1000v") + private String inPortProfile; + + @Parameter(name=ApiConstants.CLUSTER_ID, type=CommandType.UUID, entityType = ClusterResponse.class, required=true, description="the Cluster ID") + private Long clusterId; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getPhysicalNetworkId() { + return physicalNetworkId; + } + + public String getManagementIp() { + return host; + } + + public String getInPortProfile() { + return inPortProfile; + } + + public Long getClusterId() { + return clusterId; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + try { + CiscoAsa1000vDevice ciscoAsa1000v = _ciscoAsa1000vService.addCiscoAsa1000vResource(this); + if (ciscoAsa1000v != null) { + CiscoAsa1000vResourceResponse response = _ciscoAsa1000vService.createCiscoAsa1000vResourceResponse(ciscoAsa1000v); + response.setObjectName("CiscoAsa1000vResource"); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add Cisco ASA 1000v appliance due to internal error."); + } + } catch (InvalidParameterValueException invalidParamExcp) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); + } catch (CloudRuntimeException runtimeExcp) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); + } + } + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + return UserContext.current().getCaller().getId(); + } +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java new file mode 100644 index 00000000000..bfd6db95434 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/AddCiscoVnmcResourceCmd.java @@ -0,0 +1,115 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.commands; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import org.apache.log4j.Logger; + +import com.cloud.api.response.CiscoVnmcResourceResponse; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.cisco.CiscoVnmcController; +import com.cloud.network.element.CiscoVnmcElementService; +import com.cloud.user.UserContext; +import com.cloud.utils.exception.CloudRuntimeException; + +@APICommand(name="addCiscoVnmcResource", responseObject=CiscoVnmcResourceResponse.class, description="Adds a Cisco Vnmc Controller") +public class AddCiscoVnmcResourceCmd extends BaseCmd { + private static final Logger s_logger = Logger.getLogger(AddCiscoVnmcResourceCmd.class.getName()); + private static final String s_name = "addCiscoVnmcResource"; + @Inject CiscoVnmcElementService _ciscoVnmcElementService; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.PHYSICAL_NETWORK_ID, type=CommandType.UUID, entityType = PhysicalNetworkResponse.class, required=true, description="the Physical Network ID") + private Long physicalNetworkId; + + @Parameter(name=ApiConstants.HOST_NAME, type=CommandType.STRING, required = true, description="Hostname or ip address of the Cisco VNMC Controller.") + private String host; + + @Parameter(name=ApiConstants.USERNAME, type=CommandType.STRING, required = true, description="Credentials to access the Cisco VNMC Controller API") + private String username; + + @Parameter(name=ApiConstants.PASSWORD, type=CommandType.STRING, required = true, description="Credentials to access the Cisco VNMC Controller API") + private String password; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getPhysicalNetworkId() { + return physicalNetworkId; + } + + public String getHost() { + return host; + } + + public String getUsername() { + return username; + } + + public String getPassword() { + return password; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + try { + CiscoVnmcController CiscoVnmcResourceVO = _ciscoVnmcElementService.addCiscoVnmcResource(this); + if (CiscoVnmcResourceVO != null) { + CiscoVnmcResourceResponse response = _ciscoVnmcElementService.createCiscoVnmcResourceResponse(CiscoVnmcResourceVO); + response.setObjectName("CiscoVnmcResource"); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to add Cisco VNMC controller due to internal error."); + } + } catch (InvalidParameterValueException invalidParamExcp) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); + } catch (CloudRuntimeException runtimeExcp) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); + } + } + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + return UserContext.current().getCaller().getId(); + } +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java new file mode 100755 index 00000000000..d4f86fa527a --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoAsa1000vResourceCmd.java @@ -0,0 +1,93 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.commands; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.log4j.Logger; + +import com.cloud.api.response.CiscoAsa1000vResourceResponse; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.element.CiscoAsa1000vService; +import com.cloud.user.UserContext; +import com.cloud.utils.exception.CloudRuntimeException; + +@APICommand(name="deleteCiscoAsa1000vResource", responseObject=SuccessResponse.class, description="Deletes a Cisco ASA 1000v appliance") +public class DeleteCiscoAsa1000vResourceCmd extends BaseCmd { + private static final Logger s_logger = Logger.getLogger(DeleteCiscoAsa1000vResourceCmd.class.getName()); + private static final String s_name = "deleteCiscoAsa1000vResource"; + @Inject CiscoAsa1000vService _ciscoAsa1000vService; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.RESOURCE_ID, type=CommandType.UUID, required=true, entityType=CiscoAsa1000vResourceResponse.class, description="Cisco ASA 1000v resource ID") + private Long ciscoAsa1000vResourceId; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getCiscoAsa1000vResourceId() { + return ciscoAsa1000vResourceId; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + try { + boolean result = _ciscoAsa1000vService.deleteCiscoAsa1000vResource(this); + if (result) { + SuccessResponse response = new SuccessResponse(getCommandName()); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete Cisco ASA 1000v appliance."); + } + } catch (InvalidParameterValueException invalidParamExcp) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); + } catch (CloudRuntimeException runtimeExcp) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); + } + } + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + return UserContext.current().getCaller().getId(); + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java new file mode 100644 index 00000000000..d2a37202f0a --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/DeleteCiscoVnmcResourceCmd.java @@ -0,0 +1,93 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.commands; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.SuccessResponse; +import org.apache.log4j.Logger; + +import com.cloud.api.response.CiscoVnmcResourceResponse; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.element.CiscoVnmcElementService; +import com.cloud.user.UserContext; +import com.cloud.utils.exception.CloudRuntimeException; + +@APICommand(name="deleteCiscoVnmcResource", responseObject=SuccessResponse.class, description="Deletes a Cisco Vnmc controller") +public class DeleteCiscoVnmcResourceCmd extends BaseCmd { + private static final Logger s_logger = Logger.getLogger(DeleteCiscoVnmcResourceCmd.class.getName()); + private static final String s_name = "deleteCiscoVnmcResource"; + @Inject CiscoVnmcElementService _ciscoVnmcElementService; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.RESOURCE_ID, type=CommandType.UUID, required=true, entityType=CiscoVnmcResourceResponse.class, description="Cisco Vnmc resource ID") + private Long ciscoVnmcResourceId; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getCiscoVnmcResourceId() { + return ciscoVnmcResourceId; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + try { + boolean result = _ciscoVnmcElementService.deleteCiscoVnmcResource(this); + if (result) { + SuccessResponse response = new SuccessResponse(getCommandName()); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } else { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, "Failed to delete Cisco Vnmc resource."); + } + } catch (InvalidParameterValueException invalidParamExcp) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); + } catch (CloudRuntimeException runtimeExcp) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); + } + } + + @Override + public String getCommandName() { + return s_name; + } + + @Override + public long getEntityOwnerId() { + return UserContext.current().getCaller().getId(); + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java new file mode 100755 index 00000000000..509d39fb5f9 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoAsa1000vResourcesCmd.java @@ -0,0 +1,110 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.commands; + +import java.util.ArrayList; +import java.util.List; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import org.apache.log4j.Logger; + +import com.cloud.api.response.CiscoAsa1000vResourceResponse; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.cisco.CiscoAsa1000vDevice; +import com.cloud.network.cisco.CiscoAsa1000vDeviceVO; +import com.cloud.network.element.CiscoAsa1000vService; +import com.cloud.utils.exception.CloudRuntimeException; + +@APICommand(name="listCiscoAsa1000vResources", responseObject=CiscoAsa1000vResourceResponse.class, description="Lists Cisco ASA 1000v appliances") +public class ListCiscoAsa1000vResourcesCmd extends BaseListCmd { + private static final Logger s_logger = Logger.getLogger(ListCiscoAsa1000vResourcesCmd.class.getName()); + private static final String s_name = "listCiscoAsa1000vResources"; + @Inject CiscoAsa1000vService _ciscoAsa1000vService; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.PHYSICAL_NETWORK_ID, type=CommandType.UUID, entityType = PhysicalNetworkResponse.class, description="the Physical Network ID") + private Long physicalNetworkId; + + @Parameter(name=ApiConstants.RESOURCE_ID, type=CommandType.UUID, entityType=CiscoAsa1000vResourceResponse.class, description="Cisco ASA 1000v resource ID") + private Long ciscoAsa1000vResourceId; + + @Parameter(name=ApiConstants.HOST_NAME, type=CommandType.STRING, description="Hostname or ip address of the Cisco ASA 1000v appliance.") + private String host; + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getCiscoAsa1000vResourceId() { + return ciscoAsa1000vResourceId; + } + + public Long getPhysicalNetworkId() { + return physicalNetworkId; + } + + public String getManagementIp() { + return host; + } + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + try { + List ciscoAsa1000vDevices = _ciscoAsa1000vService.listCiscoAsa1000vResources(this); + ListResponse response = new ListResponse(); + List ciscoAsa1000vResourcesResponse = new ArrayList(); + + if (ciscoAsa1000vDevices != null && !ciscoAsa1000vDevices.isEmpty()) { + for (CiscoAsa1000vDevice ciscoAsa1000vDeviceVO : ciscoAsa1000vDevices) { + CiscoAsa1000vResourceResponse ciscoAsa1000vResourceResponse = _ciscoAsa1000vService.createCiscoAsa1000vResourceResponse(ciscoAsa1000vDeviceVO); + ciscoAsa1000vResourcesResponse.add(ciscoAsa1000vResourceResponse); + } + } + + response.setResponses(ciscoAsa1000vResourcesResponse); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } catch (InvalidParameterValueException invalidParamExcp) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); + } catch (CloudRuntimeException runtimeExcp) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); + } + } + + @Override + public String getCommandName() { + return s_name; + } +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java new file mode 100644 index 00000000000..ab553ee94ac --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/commands/ListCiscoVnmcResourcesCmd.java @@ -0,0 +1,106 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.commands; + +import java.util.ArrayList; +import java.util.List; + +import javax.inject.Inject; + +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.ServerApiException; +import org.apache.cloudstack.api.response.ListResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; +import org.apache.log4j.Logger; + +import com.cloud.api.response.CiscoVnmcResourceResponse; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.cisco.CiscoVnmcController; +import com.cloud.network.cisco.CiscoVnmcControllerVO; +import com.cloud.network.element.CiscoVnmcElementService; +import com.cloud.utils.exception.CloudRuntimeException; + +@APICommand(name="listCiscoVnmcResources", responseObject=CiscoVnmcResourceResponse.class, description="Lists Cisco VNMC controllers") +public class ListCiscoVnmcResourcesCmd extends BaseListCmd { + private static final Logger s_logger = Logger.getLogger(ListCiscoVnmcResourcesCmd.class.getName()); + private static final String s_name = "listCiscoVnmcResources"; + @Inject CiscoVnmcElementService _ciscoVnmcElementService; + + ///////////////////////////////////////////////////// + //////////////// API parameters ///////////////////// + ///////////////////////////////////////////////////// + + @Parameter(name=ApiConstants.PHYSICAL_NETWORK_ID, type=CommandType.UUID, entityType = PhysicalNetworkResponse.class, description="the Physical Network ID") + private Long physicalNetworkId; + + @Parameter(name=ApiConstants.RESOURCE_ID, type=CommandType.UUID, entityType=CiscoVnmcResourceResponse.class, description="Cisco VNMC resource ID") + private Long ciscoVnmcResourceId; + + ///////////////////////////////////////////////////// + /////////////////// Accessors /////////////////////// + ///////////////////////////////////////////////////// + + public Long getCiscoVnmcResourceId() { + return ciscoVnmcResourceId; + } + + public Long getPhysicalNetworkId() { + return physicalNetworkId; + } + + ///////////////////////////////////////////////////// + /////////////// API Implementation/////////////////// + ///////////////////////////////////////////////////// + + @Override + public void execute() throws ResourceUnavailableException, InsufficientCapacityException, ServerApiException, ConcurrentOperationException, ResourceAllocationException { + try { + List CiscoVnmcResources = _ciscoVnmcElementService.listCiscoVnmcResources(this); + ListResponse response = new ListResponse(); + List CiscoVnmcResourcesResponse = new ArrayList(); + + if (CiscoVnmcResources != null && !CiscoVnmcResources.isEmpty()) { + for (CiscoVnmcController CiscoVnmcResourceVO : CiscoVnmcResources) { + CiscoVnmcResourceResponse CiscoVnmcResourceResponse = _ciscoVnmcElementService.createCiscoVnmcResourceResponse(CiscoVnmcResourceVO); + CiscoVnmcResourcesResponse.add(CiscoVnmcResourceResponse); + } + } + + response.setResponses(CiscoVnmcResourcesResponse); + response.setResponseName(getCommandName()); + this.setResponseObject(response); + } catch (InvalidParameterValueException invalidParamExcp) { + throw new ServerApiException(ApiErrorCode.PARAM_ERROR, invalidParamExcp.getMessage()); + } catch (CloudRuntimeException runtimeExcp) { + throw new ServerApiException(ApiErrorCode.INTERNAL_ERROR, runtimeExcp.getMessage()); + } + } + + @Override + public String getCommandName() { + return s_name; + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoAsa1000vResourceResponse.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoAsa1000vResourceResponse.java new file mode 100755 index 00000000000..9cd87da66a1 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoAsa1000vResourceResponse.java @@ -0,0 +1,88 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.response; + + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.NetworkResponse; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; + +import com.cloud.network.cisco.CiscoAsa1000vDevice; +import com.google.gson.annotations.SerializedName; + +@EntityReference(value = CiscoAsa1000vDevice.class) +public class CiscoAsa1000vResourceResponse extends BaseResponse { + public static final String RESOURCE_NAME = "resourcename"; + + @SerializedName(ApiConstants.RESOURCE_ID) @Parameter(description="resource id of the Cisco ASA 1000v appliance") + private String id; + + @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) + @Parameter(description="the physical network to which this ASA 1000v belongs to", entityType = PhysicalNetworkResponse.class) + private Long physicalNetworkId ; + + public Long getPhysicalNetworkId() { + return physicalNetworkId; + } + + @SerializedName(ApiConstants.HOST_NAME) + @Parameter(description="management ip address of ASA 1000v") + private String managementIp; + + public String getManagementIp() { + return managementIp; + } + + @SerializedName(ApiConstants.ASA_INSIDE_PORT_PROFILE) + @Parameter(description="management ip address of ASA 1000v") + private String inPortProfile; + + public String getInPortProfile() { + return inPortProfile; + } + + @SerializedName(ApiConstants.NETWORK_ID) + @Parameter(description="the guest network to which ASA 1000v is associated", entityType = NetworkResponse.class) + private Long guestNetworkId; + + public Long getGuestNetworkId() { + return guestNetworkId; + } + + public void setId(String ciscoAsa1000vResourceId) { + this.id = ciscoAsa1000vResourceId; + } + + public void setPhysicalNetworkId(Long physicalNetworkId) { + this.physicalNetworkId = physicalNetworkId; + } + + public void setManagementIp(String managementIp) { + this.managementIp = managementIp; + } + + public void setInPortProfile(String inPortProfile) { + this.inPortProfile = inPortProfile; + } + + public void setGuestNetworkId(Long guestNetworkId) { + this.guestNetworkId = guestNetworkId; + } +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java new file mode 100644 index 00000000000..f5c9b727f8f --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/api/response/CiscoVnmcResourceResponse.java @@ -0,0 +1,75 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.response; + + +import org.apache.cloudstack.api.ApiConstants; +import org.apache.cloudstack.api.BaseResponse; +import org.apache.cloudstack.api.EntityReference; +import org.apache.cloudstack.api.Parameter; +import org.apache.cloudstack.api.response.PhysicalNetworkResponse; + +import com.cloud.network.cisco.CiscoVnmcController; +import com.google.gson.annotations.SerializedName; +@EntityReference(value = CiscoVnmcController.class) +public class CiscoVnmcResourceResponse extends BaseResponse { + public static final String RESOURCE_NAME = "resourcename"; + + @SerializedName(ApiConstants.RESOURCE_ID) + @Parameter(description="resource id of the Cisco VNMC controller") + private String id; + + @SerializedName(ApiConstants.PHYSICAL_NETWORK_ID) + @Parameter(description="the physical network to which this VNMC belongs to", entityType = PhysicalNetworkResponse.class) + private Long physicalNetworkId; + + public Long getPhysicalNetworkId() { + return physicalNetworkId; + } + + public String getProviderName() { + return providerName; + } + + public String getResourceName() { + return resourceName; + } + + @SerializedName(ApiConstants.PROVIDER) @Parameter(description="name of the provider") + private String providerName; + + @SerializedName(RESOURCE_NAME) + @Parameter(description="Cisco VNMC resource name") + private String resourceName; + + public void setId(String ciscoVnmcResourceId) { + this.id = ciscoVnmcResourceId; + } + + public void setPhysicalNetworkId(Long physicalNetworkId) { + this.physicalNetworkId = physicalNetworkId; + } + + public void setProviderName(String providerName) { + this.providerName = providerName; + } + + public void setResourceName(String resourceName) { + this.resourceName = resourceName; + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java new file mode 100755 index 00000000000..3c5f6827718 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDevice.java @@ -0,0 +1,39 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.cisco; + +import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; + +import com.cloud.org.Grouping; + +public interface CiscoAsa1000vDevice extends Grouping, InternalIdentity, Identity { + + long getId(); + + String getUuid(); + + void setUuid(String uuid); + + long getPhysicalNetworkId(); + + String getManagementIp(); + + String getInPortProfile(); + + long getClusterId(); +} \ No newline at end of file diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java new file mode 100755 index 00000000000..ba85fb105c8 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoAsa1000vDeviceVO.java @@ -0,0 +1,101 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.cisco; + +import java.util.UUID; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name="external_cisco_asa1000v_devices") +public class CiscoAsa1000vDeviceVO implements CiscoAsa1000vDevice { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="id") + private long id; + + @Column(name="uuid") + private String uuid; + + @Column(name="physical_network_id") + private long physicalNetworkId; + + @Column(name="management_ip") + private String managementIp; + + @Column(name="in_Port_profile") + private String inPortProfile; + + @Column(name="cluster_id") + private long clusterId; + + public CiscoAsa1000vDeviceVO() { + this.uuid = UUID.randomUUID().toString(); + } + + public CiscoAsa1000vDeviceVO(long physicalNetworkId, + String managementIp, String inPortProfile, long clusterId) { + super(); + this.physicalNetworkId = physicalNetworkId; + this.managementIp = managementIp; + this.inPortProfile = inPortProfile; + this.uuid = UUID.randomUUID().toString(); + this.clusterId = clusterId; + } + + @Override + public long getId() { + return id; + } + + @Override + public String getUuid() { + return uuid; + } + + @Override + public void setUuid(String uuid) { + this.uuid = uuid; + } + + @Override + public long getPhysicalNetworkId() { + return physicalNetworkId; + } + + @Override + public String getManagementIp() { + return managementIp; + } + + @Override + public String getInPortProfile() { + return inPortProfile; + } + + @Override + public long getClusterId() { + return clusterId; + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnection.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnection.java new file mode 100644 index 00000000000..f137148ab48 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnection.java @@ -0,0 +1,196 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.cisco; + +import java.util.Map; + +import com.cloud.utils.exception.ExecutionException; + +public interface CiscoVnmcConnection { + + public boolean createTenant(String tenantName) throws ExecutionException; + + public boolean deleteTenant(String tenantName) throws ExecutionException; + + public boolean createTenantVDC(String tenantName) throws ExecutionException; + + public boolean deleteTenantVDC(String tenantName) throws ExecutionException; + + public boolean createTenantVDCEdgeDeviceProfile(String tenantName) + throws ExecutionException; + + public boolean createTenantVDCEdgeStaticRoutePolicy(String tenantName) + throws ExecutionException; + + public boolean createTenantVDCEdgeStaticRoute(String tenantName, + String nextHopIp, String destination, String netmask) throws ExecutionException; + + public boolean associateTenantVDCEdgeStaticRoutePolicy(String tenantName) + throws ExecutionException; + + public boolean associateTenantVDCEdgeDhcpPolicy(String tenantName, + String intfName) throws ExecutionException; + + public boolean createTenantVDCEdgeDhcpPolicy(String tenantName, + String startIp, String endIp, String subnet, String nameServerIp, + String domain) throws ExecutionException; + + public boolean associateTenantVDCEdgeDhcpServerPolicy(String tenantName, + String intfName) throws ExecutionException; + + public boolean createTenantVDCEdgeSecurityProfile(String tenantName) + throws ExecutionException; + + public boolean deleteTenantVDCEdgeSecurityProfile(String tenantName) + throws ExecutionException; + + public boolean createTenantVDCSourceNatIpPool(String tenantName, String identifier, + String publicIp) throws ExecutionException; + + public boolean createTenantVDCSourceNatRule(String tenantName, String identifier, + String startSourceIp, String endSourceIp) throws ExecutionException; + + public boolean createTenantVDCSourceNatPolicy(String tenantName, String identifier) + throws ExecutionException; + + public boolean createTenantVDCSourceNatPolicyRef(String tenantName, String identifier) + throws ExecutionException; + + public boolean createTenantVDCDNatIpPool(String tenantName, String identifier, + String ipAddress) throws ExecutionException; + + public boolean createTenantVDCDNatRule(String tenantName, + String identifier, String policyIdentifier, + String publicIp) + throws ExecutionException; + + public boolean deleteTenantVDCDNatRule(String tenantName, + String identifier, String policyIdentifier) + throws ExecutionException; + + public boolean createTenantVDCAclRuleForDNat(String tenantName, + String identifier, String policyIdentifier, + String ipAddress) + throws ExecutionException; + + public boolean createTenantVDCDNatPolicy(String tenantName, String identifier) + throws ExecutionException; + + public boolean deleteTenantVDCDNatPolicy(String tenantName, String identifier) + throws ExecutionException; + + public boolean createTenantVDCDNatPolicyRef(String tenantName, String identifier) + throws ExecutionException; + + public boolean createTenantVDCPFPortPool(String tenantName, String identifier, + String startPort, String endPort) + throws ExecutionException; + + public boolean createTenantVDCPFIpPool(String tenantName, String identifier, + String ipAddress) throws ExecutionException; + + public boolean createTenantVDCPFRule(String tenantName, + String identifier, String policyIdentifier, + String protocol, String publicIp, + String startPort, String endPort) + throws ExecutionException; + + public boolean deleteTenantVDCPFRule(String tenantName, + String identifier, String policyIdentifier) + throws ExecutionException; + + public boolean createTenantVDCAclRuleForPF(String tenantName, + String identifier, String policyIdentifier, + String protocol, String ipAddress, + String startPort, String endPort) + throws ExecutionException; + + public boolean createTenantVDCPFPolicy(String tenantName, String identifier) + throws ExecutionException; + + public boolean deleteTenantVDCPFPolicy(String tenantName, String identifier) + throws ExecutionException; + + public boolean createTenantVDCPFPolicyRef(String tenantName, String identifier) + throws ExecutionException; + + public boolean createTenantVDCNatPolicySet(String tenantName) + throws ExecutionException; + + public boolean deleteTenantVDCNatPolicySet(String tenantName) + throws ExecutionException; + + public boolean associateNatPolicySet(String tenantName) + throws ExecutionException; + + public boolean createTenantVDCIngressAclRule(String tenantName, + String identifier, String policyIdentifier, + String protocol, String sourceStartIp, String sourceEndIp, + String destStartPort, String destEndPort, String destIp) + throws ExecutionException; + + public boolean createTenantVDCIngressAclRule(String tenantName, + String identifier, String policyIdentifier, + String protocol, String sourceStartIp, String sourceEndIp, String destIp) + throws ExecutionException; + + public boolean createTenantVDCEgressAclRule(String tenantName, + String identifier, String policyIdentifier, + String protocol, String sourceStartPort, String sourceEndPort, String sourceIp, + String destStartIp, String destEndIp) + throws ExecutionException; + + public boolean createTenantVDCEgressAclRule(String tenantName, + String identifier, String policyIdentifier, + String protocol, String sourceIp, String destStartIp, String destEndIp) + throws ExecutionException; + + public boolean deleteTenantVDCAclRule(String tenantName, + String identifier, String policyIdentifier) throws ExecutionException; + + public boolean createTenantVDCAclPolicy(String tenantName, + String identifier) throws ExecutionException; + + public boolean createTenantVDCAclPolicyRef(String tenantName, String identifier, + boolean ingress) throws ExecutionException; + + public boolean deleteTenantVDCAclPolicy(String tenantName, String identifier) + throws ExecutionException; + + public boolean createTenantVDCAclPolicySet(String tenantName, boolean ingress) + throws ExecutionException; + + public boolean deleteTenantVDCAclPolicySet(String tenantName, boolean ingress) + throws ExecutionException; + + public boolean associateAclPolicySet(String tenantName) + throws ExecutionException; + + public boolean createEdgeFirewall(String tenantName, String publicIp, + String insideIp, String publicSubnet, String insideSubnet) + throws ExecutionException; + + public boolean deleteEdgeFirewall(String tenantName) throws ExecutionException; + + public Map listUnAssocAsa1000v() throws ExecutionException; + + public boolean assignAsa1000v(String tenantName, String firewallDn) + throws ExecutionException; + + public boolean unassignAsa1000v(String tenantName, String firewallDn) + throws ExecutionException; +} \ No newline at end of file diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java new file mode 100644 index 00000000000..527fb04698e --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcConnectionImpl.java @@ -0,0 +1,1415 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.cisco; + +import java.io.BufferedReader; +import java.io.FileReader; +import java.io.StringReader; +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.xml.parsers.DocumentBuilderFactory; + +import org.apache.commons.httpclient.HttpClient; +import org.apache.commons.httpclient.HttpStatus; +import org.apache.commons.httpclient.contrib.ssl.EasySSLProtocolSocketFactory; +import org.apache.commons.httpclient.methods.PostMethod; +import org.apache.log4j.Logger; +import org.w3c.dom.Document; +import org.w3c.dom.Node; +import org.w3c.dom.NodeList; +import org.xml.sax.InputSource; + +import com.cloud.utils.exception.ExecutionException; +import com.cloud.utils.script.Script; + +public class CiscoVnmcConnectionImpl implements CiscoVnmcConnection { + + private String _ip; + private String _username; + private String _password; + private String _cookie; + + private final Logger s_logger = Logger.getLogger(CiscoVnmcConnectionImpl.class); + + private enum VnmcXml { + LOGIN("login.xml", "mgmt-controller"), + + CREATE_TENANT("create-tenant.xml", "service-reg"), + DELETE_TENANT("delete-tenant.xml", "service-reg"), + CREATE_VDC("create-vdc.xml", "service-reg"), + DELETE_VDC("delete-vdc.xml", "service-reg"), + + CREATE_EDGE_DEVICE_PROFILE("create-edge-device-profile.xml", "policy-mgr"), + CREATE_EDGE_ROUTE_POLICY("create-edge-device-route-policy.xml", "policy-mgr"), + CREATE_EDGE_ROUTE("create-edge-device-route.xml", "policy-mgr"), + RESOLVE_EDGE_ROUTE_POLICY("associate-route-policy.xml", "policy-mgr"), + + CREATE_DHCP_POLICY("create-dhcp-policy.xml", "policy-mgr"), + RESOLVE_EDGE_DHCP_POLICY("associate-dhcp-policy.xml", "policy-mgr"), + RESOLVE_EDGE_DHCP_SERVER_POLICY("associate-dhcp-server.xml", "policy-mgr"), + + CREATE_EDGE_SECURITY_PROFILE("create-edge-security-profile.xml", "policy-mgr"), + DELETE_EDGE_SECURITY_PROFILE("delete-edge-security-profile.xml", "policy-mgr"), + + CREATE_NAT_POLICY_SET("create-nat-policy-set.xml", "policy-mgr"), + DELETE_NAT_POLICY_SET("delete-nat-policy-set.xml", "policy-mgr"), + RESOLVE_NAT_POLICY_SET("associate-nat-policy-set.xml", "policy-mgr"), + CREATE_NAT_POLICY("create-nat-policy.xml", "policy-mgr"), + DELETE_NAT_POLICY("delete-nat-policy.xml", "policy-mgr"), + LIST_NAT_POLICIES("list-nat-policies.xml", "policy-mgr"), + CREATE_NAT_POLICY_REF("create-nat-policy-ref.xml", "policy-mgr"), + CREATE_PORT_POOL("create-port-pool.xml", "policy-mgr"), + CREATE_IP_POOL("create-ip-pool.xml", "policy-mgr"), + + CREATE_PF_RULE("create-pf-rule.xml", "policy-mgr"), + CREATE_ACL_RULE_FOR_PF("create-acl-rule-for-pf.xml", "policy-mgr"), + CREATE_DNAT_RULE("create-dnat-rule.xml", "policy-mgr"), + CREATE_ACL_RULE_FOR_DNAT("create-acl-rule-for-dnat.xml", "policy-mgr"), + CREATE_SOURCE_NAT_RULE("create-source-nat-rule.xml", "policy-mgr"), + + CREATE_ACL_POLICY_SET("create-acl-policy-set.xml", "policy-mgr"), + DELETE_ACL_POLICY_SET("delete-acl-policy-set.xml", "policy-mgr"), + RESOLVE_ACL_POLICY_SET("associate-acl-policy-set.xml", "policy-mgr"), + CREATE_ACL_POLICY("create-acl-policy.xml", "policy-mgr"), + DELETE_ACL_POLICY("delete-acl-policy.xml", "policy-mgr"), + LIST_ACL_POLICIES("list-acl-policies.xml", "policy-mgr"), + CREATE_ACL_POLICY_REF("create-acl-policy-ref.xml", "policy-mgr"), + CREATE_INGRESS_ACL_RULE("create-ingress-acl-rule.xml", "policy-mgr"), + CREATE_EGRESS_ACL_RULE("create-egress-acl-rule.xml", "policy-mgr"), + CREATE_GENERIC_INGRESS_ACL_RULE("create-generic-ingress-acl-rule.xml", "policy-mgr"), + CREATE_GENERIC_EGRESS_ACL_RULE("create-generic-egress-acl-rule.xml", "policy-mgr"), + + DELETE_RULE("delete-rule.xml", "policy-mgr"), + + LIST_CHILDREN("list-children.xml", "policy-mgr"), + + CREATE_EDGE_FIREWALL("create-edge-firewall.xml", "resource-mgr"), + DELETE_EDGE_FIREWALL("delete-edge-firewall.xml", "resource-mgr"), + + LIST_UNASSOC_ASA1000V("list-unassigned-asa1000v.xml", "resource-mgr"), + ASSIGN_ASA1000V("assoc-asa1000v.xml", "resource-mgr"), + UNASSIGN_ASA1000V("disassoc-asa1000v.xml", "resource-mgr"); + + private String scriptsDir = "scripts/network/cisco"; + private String xml; + private String service; + private final Logger s_logger = Logger.getLogger(CiscoVnmcConnectionImpl.class); + + + private VnmcXml(String filename, String service) { + this.xml = getXml(filename); + this.service = service; + } + + public String getXml() { + return xml; + } + + private String getXml(String filename) { + try { + String xmlFilePath = Script.findScript(scriptsDir, filename); + + if (xmlFilePath == null) { + throw new Exception("Failed to find Cisco VNMC XML file: " + filename); + } + + FileReader fr = new FileReader(xmlFilePath); + BufferedReader br = new BufferedReader(fr); + + String xml = ""; + String line; + while ((line = br.readLine()) != null) { + //xml += line.replaceAll("\n"," "); + xml += line; + } + + return xml; + } catch (Exception e) { + s_logger.debug(e); + return null; + } + } + + public String getService() { + return service; + } + } + + public CiscoVnmcConnectionImpl(String hostIp, String userName, String password) { + this._ip = hostIp; + this._username = userName; + this._password = password; + + } + + public boolean login() throws ExecutionException { + String xml = VnmcXml.LOGIN.getXml(); + String service = VnmcXml.LOGIN.getService(); + xml = replaceXmlValue(xml, "username", _username); + xml = replaceXmlValue(xml, "password", _password); + String response = sendRequest(service, xml); + Map checked = checkResponse(response, "outCookie", "errorCode", "response"); + + if (checked.get("errorCode") != null) + return false; + _cookie = checked.get("outCookie"); + if (_cookie == null) { + return false; + } + return true; + } + + private String getDnForTenant(String tenantName) { + return "org-root/org-" + tenantName; + } + + private String getDnForTenantVDC(String tenantName) { + return getDnForTenant(tenantName) + "/org-VDC-" + tenantName; + } + + private String getDnForTenantVDCEdgeDeviceProfile(String tenantName) { + return getDnForTenantVDC(tenantName) + "/edsp-" + getNameForEdgeDeviceServiceProfile(tenantName); + } + + private String getDnForTenantVDCEdgeSecurityProfile(String tenantName) { + return getDnForTenantVDC(tenantName) + "/vnep-" + getNameForEdgeDeviceSecurityProfile(tenantName); + } + + private String getDnForEdgeDeviceRoutingPolicy(String tenantName) { + return getDnForTenantVDC(tenantName) + "/routing-policy-" + getNameForEdgeDeviceRoutePolicy(tenantName); + //FIXME: any other construct is unreliable. why? + } + + private String getDnForDhcpPolicy(String tenantName, String intfName) { + return getDnForTenantVDCEdgeDeviceProfile(tenantName) + "/dhcp-" + intfName; + } + + private String getNameForDhcpPolicy(String tenantName) { + return tenantName + "-Dhcp-Policy"; + } + + private String getNameForDhcpServer(String tenantName) { + return tenantName + "-Dhcp-Server"; + } + + private String getDnForDhcpServerPolicy(String tenantName) { + return getDnForTenantVDC(tenantName) + "/dhcp-server-" + getNameForDhcpPolicy(tenantName); + } + + private String getNameForIpRange() { + return "iprange"; + } + + private String getDnForDhcpIpRange(String tenantName) { + return getDnForDhcpServerPolicy(tenantName) + "/ip-range-" + getNameForIpRange(); + } + + private String getNameForDNSService(String tenantName) { + return tenantName + "-DNS"; + } + + private String getDnForDnsService(String tenantName) { + return getDnForDhcpServerPolicy(tenantName) + "/dns-svc-" + getNameForDNSService(tenantName); + } + + private String getDnForDnsServer(String tenantName, String dnsip) { + return getDnForDnsService(tenantName) + "/dns-" + dnsip; + } + + private String getNameForTenantVDC(String tenantName) { + return "VDC-" + tenantName; + } + + private String getNameForEdgeDeviceServiceProfile(String tenantName) { + return "EDSP-" + tenantName; + } + + private String getNameForEdgeDeviceSecurityProfile(String tenantName) { + return "ESP-" + tenantName; + } + + private String getNameForEdgeDeviceRoutePolicy(String tenantName) { + return "EDSP-" + tenantName + "-Routes"; + } + + @Override + public boolean createTenant(String tenantName) throws ExecutionException { + String xml = VnmcXml.CREATE_TENANT.getXml(); + String service = VnmcXml.CREATE_TENANT.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "descr", "Tenant for account " + tenantName); + xml = replaceXmlValue(xml, "name", tenantName); + xml = replaceXmlValue(xml, "dn", getDnForTenant(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean deleteTenant(String tenantName) throws ExecutionException { + String xml = VnmcXml.DELETE_TENANT.getXml(); + String service = VnmcXml.DELETE_TENANT.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "name", tenantName); + xml = replaceXmlValue(xml, "dn", getDnForTenant(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDC(String tenantName) throws ExecutionException { + String xml = VnmcXml.CREATE_VDC.getXml(); + String service = VnmcXml.CREATE_VDC.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "descr", "VDC for Tenant" + tenantName); + xml = replaceXmlValue(xml, "name", getNameForTenantVDC(tenantName)); + xml = replaceXmlValue(xml, "dn", getDnForTenantVDC(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean deleteTenantVDC(String tenantName) throws ExecutionException { + String xml = VnmcXml.DELETE_VDC.getXml(); + String service = VnmcXml.DELETE_VDC.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "name", getNameForTenantVDC(tenantName)); + xml = replaceXmlValue(xml, "dn", getDnForTenantVDC(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCEdgeDeviceProfile(String tenantName) throws ExecutionException { + String xml = VnmcXml.CREATE_EDGE_DEVICE_PROFILE.getXml(); + String service = VnmcXml.CREATE_EDGE_DEVICE_PROFILE.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "descr", "Edge Device Profile for Tenant VDC" + tenantName); + xml = replaceXmlValue(xml, "name", getNameForEdgeDeviceServiceProfile(tenantName)); + xml = replaceXmlValue(xml, "dn", getDnForTenantVDCEdgeDeviceProfile(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCEdgeStaticRoutePolicy(String tenantName) throws ExecutionException { + String xml = VnmcXml.CREATE_EDGE_ROUTE_POLICY.getXml(); + String service = VnmcXml.CREATE_EDGE_ROUTE_POLICY.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "name", getNameForEdgeDeviceRoutePolicy(tenantName)); + xml = replaceXmlValue(xml, "routepolicydn", getDnForEdgeDeviceRoutingPolicy(tenantName)); + xml = replaceXmlValue(xml, "descr", "Routing Policy for Edge Device for Tenant " + tenantName); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCEdgeStaticRoute(String tenantName, + String nextHopIp, String destination, String netmask) throws ExecutionException { + String xml = VnmcXml.CREATE_EDGE_ROUTE.getXml(); + String service = VnmcXml.CREATE_EDGE_ROUTE.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "routepolicydn", getDnForEdgeDeviceRoutingPolicy(tenantName)); + xml = replaceXmlValue(xml, "nexthop", nextHopIp); + xml = replaceXmlValue(xml, "nexthopintf", getNameForEdgeOutsideIntf(tenantName)); + xml = replaceXmlValue(xml, "destination", destination); + xml = replaceXmlValue(xml, "netmask", netmask); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean associateTenantVDCEdgeStaticRoutePolicy(String tenantName) throws ExecutionException { + String xml = VnmcXml.RESOLVE_EDGE_ROUTE_POLICY.getXml(); + String service = VnmcXml.RESOLVE_EDGE_ROUTE_POLICY.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "name", getNameForEdgeDeviceServiceProfile(tenantName)); + xml = replaceXmlValue(xml, "dn", getDnForTenantVDCEdgeDeviceProfile(tenantName)); + xml = replaceXmlValue(xml, "routepolicyname", getNameForEdgeDeviceRoutePolicy(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean associateTenantVDCEdgeDhcpPolicy(String tenantName, String intfName) throws ExecutionException { + String xml = VnmcXml.RESOLVE_EDGE_DHCP_POLICY.getXml(); + String service = VnmcXml.RESOLVE_EDGE_DHCP_POLICY.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "dhcpdn", getDnForDhcpPolicy(tenantName, intfName)); + xml = replaceXmlValue(xml, "insideintf", intfName); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCEdgeDhcpPolicy(String tenantName, + String startIp, String endIp, String subnet, String nameServerIp, String domain) throws ExecutionException { + String xml = VnmcXml.CREATE_DHCP_POLICY.getXml(); + String service = VnmcXml.CREATE_DHCP_POLICY.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "dhcpserverdn", getDnForDhcpServerPolicy(tenantName)); + xml = replaceXmlValue(xml, "dhcpserverdescr", "DHCP server for " + tenantName); + xml = replaceXmlValue(xml, "dhcpservername", getNameForDhcpPolicy(tenantName)); + xml = replaceXmlValue(xml, "iprangedn", getDnForDhcpIpRange(tenantName)); + xml = replaceXmlValue(xml, "startip", startIp); + xml = replaceXmlValue(xml, "endip", endIp); + xml = replaceXmlValue(xml, "subnet", subnet); + xml = replaceXmlValue(xml, "domain", domain); + xml = replaceXmlValue(xml, "dnsservicedn", getDnForDnsService(tenantName)); + xml = replaceXmlValue(xml, "dnsservicename", getNameForDNSService(tenantName)); + xml = replaceXmlValue(xml, "nameserverip", nameServerIp); + xml = replaceXmlValue(xml, "nameserverdn", getDnForDnsServer(tenantName, nameServerIp)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean associateTenantVDCEdgeDhcpServerPolicy(String tenantName, String intfName) throws ExecutionException { + String xml = VnmcXml.RESOLVE_EDGE_DHCP_SERVER_POLICY.getXml(); + String service = VnmcXml.RESOLVE_EDGE_DHCP_SERVER_POLICY.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "dhcpdn", getDnForDhcpPolicy(tenantName, intfName)); + xml = replaceXmlValue(xml, "insideintf", intfName); + xml = replaceXmlValue(xml, "dhcpserverpolicyname", getNameForDhcpServer(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCEdgeSecurityProfile(String tenantName) throws ExecutionException { + String xml = VnmcXml.CREATE_EDGE_SECURITY_PROFILE.getXml(); + String service = VnmcXml.CREATE_EDGE_SECURITY_PROFILE.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "descr", "Edge Security Profile for Tenant VDC" + tenantName); + xml = replaceXmlValue(xml, "name", getNameForEdgeDeviceSecurityProfile(tenantName)); + xml = replaceXmlValue(xml, "espdn", getDnForTenantVDCEdgeSecurityProfile(tenantName)); + xml = replaceXmlValue(xml, "egressref", "default-egress"); + xml = replaceXmlValue(xml, "ingressref", "default-ingress"); //FIXME: allows everything + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean deleteTenantVDCEdgeSecurityProfile(String tenantName) throws ExecutionException { + String xml = VnmcXml.DELETE_EDGE_SECURITY_PROFILE.getXml(); + String service = VnmcXml.DELETE_EDGE_SECURITY_PROFILE.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "name", getNameForEdgeDeviceSecurityProfile(tenantName)); + xml = replaceXmlValue(xml, "espdn", getDnForTenantVDCEdgeSecurityProfile(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + private String getNameForSourceNatIpPool(String tenantName) { + return "SNATIp-" + tenantName; + } + + private String getDnForSourceNatPool(String tenantName) { + return getDnForTenantVDC(tenantName) + "/objgrp-" + getNameForSourceNatIpPool(tenantName); + } + + @Override + public boolean createTenantVDCSourceNatIpPool(String tenantName, String identifier, + String publicIp) throws ExecutionException { + return createTenantVDCIpPool( + getDnForSourceNatPool(tenantName), + getNameForSourceNatIpPool(tenantName), + "Source NAT ip pool for Tenant VDC " + tenantName, + publicIp); + } + + private String getNameForSourceNatPolicy(String tenantName) { + return "SNAT-Policy-" + tenantName; + } + + private String getDnForSourceNatPolicy(String tenantName) { + return getDnForTenantVDC(tenantName) + "/natpol-" + getNameForSourceNatPolicy(tenantName); + } + + private String getNameForSourceNatRule(String tenantName) { + return "SNAT-Rule-" + tenantName; + } + + private String getDnForSourceNatRule(String tenantName) { + return getDnForSourceNatPolicy(tenantName) + "/rule-" + getNameForSourceNatRule(tenantName); + } + + private String getNameForNatPolicySet(String tenantName) { + return "NAT-PolicySet-" + tenantName; + } + + private String getDnForNatPolicySet(String tenantName) { + return getDnForTenantVDC(tenantName) + "/natpset-" + getNameForNatPolicySet(tenantName) ; + } + + private String getDnForSourceNatPolicyRef(String tenantName) { + return getDnForNatPolicySet(tenantName) + "/polref-" + getNameForSourceNatPolicy(tenantName) ; + } + + @Override + public boolean createTenantVDCSourceNatRule(String tenantName, String identifier, + String startSourceIp, String endSourceIp) throws ExecutionException { + + String xml = VnmcXml.CREATE_SOURCE_NAT_RULE.getXml(); + String service = VnmcXml.CREATE_SOURCE_NAT_RULE.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "natruledn", getDnForSourceNatRule(tenantName)); + xml = replaceXmlValue(xml, "natrulename", getNameForSourceNatRule(tenantName)); + xml = replaceXmlValue(xml, "descr", "Source NAT rule for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "srcstartip", startSourceIp); + xml = replaceXmlValue(xml, "srcendip", endSourceIp); + xml = replaceXmlValue(xml, "ippoolname", getNameForSourceNatIpPool(tenantName)); + + List rules = listChildren(getDnForSourceNatPolicy(tenantName)); + int order = 100; + if (rules != null) { + order += rules.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCSourceNatPolicyRef(String tenantName, String identifier) throws ExecutionException { + return createTenantVDCNatPolicyRef( + getDnForSourceNatPolicyRef(tenantName), + getNameForSourceNatPolicy(tenantName), + tenantName); + } + + @Override + public boolean createTenantVDCSourceNatPolicy(String tenantName, String identifier) throws ExecutionException { + return createTenantVDCNatPolicy( + getDnForSourceNatPolicy(tenantName), + getNameForSourceNatPolicy(tenantName)); + } + + @Override + public boolean createTenantVDCNatPolicySet(String tenantName) throws ExecutionException { + String xml = VnmcXml.CREATE_NAT_POLICY_SET.getXml(); + String service = VnmcXml.CREATE_NAT_POLICY_SET.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "descr", "NAT policy set for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "natpolicysetname", getNameForNatPolicySet(tenantName)); + xml = replaceXmlValue(xml, "natpolicysetdn", getDnForNatPolicySet(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean deleteTenantVDCNatPolicySet(String tenantName) throws ExecutionException { + String xml = VnmcXml.DELETE_NAT_POLICY_SET.getXml(); + String service = VnmcXml.DELETE_NAT_POLICY_SET.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "natpolicysetname", getNameForNatPolicySet(tenantName)); + xml = replaceXmlValue(xml, "natpolicysetdn", getDnForNatPolicySet(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean associateNatPolicySet(String tenantName) throws ExecutionException { + String xml = VnmcXml.RESOLVE_NAT_POLICY_SET.getXml(); + String service = VnmcXml.RESOLVE_NAT_POLICY_SET.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "descr", "Edge Security Profile for Tenant VDC" + tenantName); + xml = replaceXmlValue(xml, "name", getNameForEdgeDeviceSecurityProfile(tenantName)); + xml = replaceXmlValue(xml, "espdn", getDnForTenantVDCEdgeSecurityProfile(tenantName)); + xml = replaceXmlValue(xml, "natpolicysetname", getNameForNatPolicySet(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + private String getNameForAclPolicySet(String tenantName, boolean ingress) { + return (ingress ? "Ingress-" : "Egress-") + "ACL-PolicySet-" + tenantName; + } + + private String getDnForAclPolicySet(String tenantName, boolean ingress) { + return getDnForTenantVDC(tenantName) + "/pset-" + getNameForAclPolicySet(tenantName, ingress) ; + } + + private String getNameForAclPolicy(String tenantName, String identifier) { + return "ACL-" + tenantName + "-" + identifier; + } + + private String getDnForAclPolicy(String tenantName, String identifier) { + return getDnForTenantVDC(tenantName) + "/pol-" + getNameForAclPolicy(tenantName, identifier); + } + + private String getDnForAclPolicyRef(String tenantName, String identifier, boolean ingress) { + return getDnForAclPolicySet(tenantName, ingress) + "/polref-" + getNameForAclPolicy(tenantName, identifier); + } + + private String getNameForAclRule(String tenantName, String identifier) { + return "Rule-" + tenantName + "-" + identifier; + } + + private String getDnForAclRule(String tenantName, String identifier, String policyIdentifier) { + return getDnForAclPolicy(tenantName, policyIdentifier) + "/rule-" + getNameForAclRule(tenantName, identifier); + } + + @Override + public boolean createTenantVDCAclPolicy(String tenantName, String identifier) throws ExecutionException { + String xml = VnmcXml.CREATE_ACL_POLICY.getXml(); + String service = VnmcXml.CREATE_ACL_POLICY.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "aclpolicyname", getNameForAclPolicy(tenantName, identifier)); + xml = replaceXmlValue(xml, "aclpolicydn", getDnForAclPolicy(tenantName, identifier)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean deleteTenantVDCAclPolicy(String tenantName, String identifier) throws ExecutionException { + String xml = VnmcXml.DELETE_ACL_POLICY.getXml(); + String service = VnmcXml.DELETE_ACL_POLICY.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "aclpolicyname", getNameForAclPolicy(tenantName, identifier)); + xml = replaceXmlValue(xml, "aclpolicydn", getDnForAclPolicy(tenantName, identifier)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCAclPolicyRef(String tenantName, String identifier, boolean ingress) throws ExecutionException { + String xml = VnmcXml.CREATE_ACL_POLICY_REF.getXml(); + String service = VnmcXml.CREATE_ACL_POLICY_REF.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "aclpolicyname", getNameForAclPolicy(tenantName, identifier)); + xml = replaceXmlValue(xml, "aclpolicydn", getDnForAclPolicy(tenantName, identifier)); + xml = replaceXmlValue(xml, "aclpolicyrefdn", getDnForAclPolicyRef(tenantName, identifier, ingress)); + + List policies = listAclPolicies(tenantName); + int order = 100; + if (policies != null) { + order += policies.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCAclPolicySet(String tenantName, boolean ingress) throws ExecutionException { + String xml = VnmcXml.CREATE_ACL_POLICY_SET.getXml(); + String service = VnmcXml.CREATE_ACL_POLICY_SET.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "descr", "ACL policy set for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "aclpolicysetname", getNameForAclPolicySet(tenantName, ingress)); + xml = replaceXmlValue(xml, "aclpolicysetdn", getDnForAclPolicySet(tenantName, ingress)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean deleteTenantVDCAclPolicySet(String tenantName, boolean ingress) throws ExecutionException { + String xml = VnmcXml.DELETE_ACL_POLICY_SET.getXml(); + String service = VnmcXml.DELETE_ACL_POLICY_SET.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "aclpolicysetname", getNameForAclPolicySet(tenantName, ingress)); + xml = replaceXmlValue(xml, "aclpolicysetdn", getDnForAclPolicySet(tenantName, ingress)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean associateAclPolicySet(String tenantName) throws ExecutionException { + String xml = VnmcXml.RESOLVE_ACL_POLICY_SET.getXml(); + String service = VnmcXml.RESOLVE_ACL_POLICY_SET.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "descr", "Edge Security Profile for Tenant VDC" + tenantName); + xml = replaceXmlValue(xml, "name", getNameForEdgeDeviceSecurityProfile(tenantName)); + xml = replaceXmlValue(xml, "espdn", getDnForTenantVDCEdgeSecurityProfile(tenantName)); + //xml = replaceXmlValue(xml, "egresspolicysetname", getNameForAclPolicySet(tenantName, false)); + xml = replaceXmlValue(xml, "egresspolicysetname", "default-egress"); + xml = replaceXmlValue(xml, "ingresspolicysetname", getNameForAclPolicySet(tenantName, true)); + xml = replaceXmlValue(xml, "natpolicysetname", getNameForNatPolicySet(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCIngressAclRule(String tenantName, + String identifier, String policyIdentifier, + String protocol, String sourceStartIp, String sourceEndIp, + String destStartPort, String destEndPort, String destIp) throws ExecutionException { + String xml = VnmcXml.CREATE_INGRESS_ACL_RULE.getXml(); + String service = VnmcXml.CREATE_INGRESS_ACL_RULE.getService(); + + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "aclruledn", getDnForAclRule(tenantName, identifier, policyIdentifier)); + xml = replaceXmlValue(xml, "aclrulename", getNameForAclRule(tenantName, identifier)); + xml = replaceXmlValue(xml, "descr", "Ingress ACL rule for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "actiontype", "permit"); + xml = replaceXmlValue(xml, "protocolvalue", protocol); + xml = replaceXmlValue(xml, "sourcestartip", sourceStartIp); + xml = replaceXmlValue(xml, "sourceendip", sourceEndIp); + xml = replaceXmlValue(xml, "deststartport", destStartPort); + xml = replaceXmlValue(xml, "destendport", destEndPort); + xml = replaceXmlValue(xml, "destip", destIp); + + List rules = listChildren(getDnForAclPolicy(tenantName, policyIdentifier)); + int order = 100; + if (rules != null) { + order += rules.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCIngressAclRule(String tenantName, + String identifier, String policyIdentifier, + String protocol, String sourceStartIp, String sourceEndIp, + String destIp) throws ExecutionException { + String xml = VnmcXml.CREATE_GENERIC_INGRESS_ACL_RULE.getXml(); + String service = VnmcXml.CREATE_GENERIC_INGRESS_ACL_RULE.getService(); + + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "aclruledn", getDnForAclRule(tenantName, identifier, policyIdentifier)); + xml = replaceXmlValue(xml, "aclrulename", getNameForAclRule(tenantName, identifier)); + xml = replaceXmlValue(xml, "descr", "Ingress ACL rule for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "actiontype", "permit"); + xml = replaceXmlValue(xml, "protocolvalue", protocol); + xml = replaceXmlValue(xml, "sourcestartip", sourceStartIp); + xml = replaceXmlValue(xml, "sourceendip", sourceEndIp); + + List rules = listChildren(getDnForAclPolicy(tenantName, policyIdentifier)); + int order = 100; + if (rules != null) { + order += rules.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCEgressAclRule(String tenantName, + String identifier, String policyIdentifier, + String protocol, String sourceStartPort, String sourceEndPort, String sourceIp, + String destStartIp, String destEndIp) throws ExecutionException { + String xml = VnmcXml.CREATE_EGRESS_ACL_RULE.getXml(); + String service = VnmcXml.CREATE_EGRESS_ACL_RULE.getService(); + + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "aclruledn", getDnForAclRule(tenantName, identifier, policyIdentifier)); + xml = replaceXmlValue(xml, "aclrulename", getNameForAclRule(tenantName, identifier)); + xml = replaceXmlValue(xml, "descr", "Egress ACL rule for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "actiontype", "permit"); + xml = replaceXmlValue(xml, "protocolvalue", protocol); + xml = replaceXmlValue(xml, "deststartip", destStartIp); + xml = replaceXmlValue(xml, "destendip", destEndIp); + xml = replaceXmlValue(xml, "sourcestartport", sourceStartPort); + xml = replaceXmlValue(xml, "sourceendport", sourceEndPort); + xml = replaceXmlValue(xml, "sourceip", sourceIp); + + List rules = listChildren(getDnForAclPolicy(tenantName, policyIdentifier)); + int order = 100; + if (rules != null) { + order += rules.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCEgressAclRule(String tenantName, + String identifier, String policyIdentifier, + String protocol, String sourceIp, + String destStartIp, String destEndIp) throws ExecutionException { + String xml = VnmcXml.CREATE_GENERIC_EGRESS_ACL_RULE.getXml(); + String service = VnmcXml.CREATE_GENERIC_EGRESS_ACL_RULE.getService(); + + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "aclruledn", getDnForAclRule(tenantName, identifier, policyIdentifier)); + xml = replaceXmlValue(xml, "aclrulename", getNameForAclRule(tenantName, identifier)); + xml = replaceXmlValue(xml, "descr", "Egress ACL rule for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "actiontype", "permit"); + xml = replaceXmlValue(xml, "protocolvalue", protocol); + xml = replaceXmlValue(xml, "deststartip", destStartIp); + xml = replaceXmlValue(xml, "destendip", destEndIp); + + List rules = listChildren(getDnForAclPolicy(tenantName, policyIdentifier)); + int order = 100; + if (rules != null) { + order += rules.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean deleteTenantVDCAclRule(String tenantName, String identifier, String policyIdentifier) throws ExecutionException { + return deleteTenantVDCRule( + getDnForAclRule(tenantName, identifier, policyIdentifier), + getNameForAclRule(tenantName, identifier)); + } + + private String getNameForPFPortPool(String tenantName, String identifier) { + return "PFPort-" + tenantName + "-" + identifier; + } + + private String getDnForPFPortPool(String tenantName, String identifier) { + return getDnForTenantVDC(tenantName) + "/objgrp-" + getNameForPFPortPool(tenantName, identifier); + } + + private String getNameForPFIpPool(String tenantName, String identifier) { + return "PFIp-" + tenantName + "-" + identifier; + } + + private String getDnForPFIpPool(String tenantName, String identifier) { + return getDnForTenantVDC(tenantName) + "/objgrp-" + getNameForPFIpPool(tenantName, identifier); + } + + private boolean createTenantVDCPortPool(String poolDn, String name, + String description, String startPort, String endPort) throws ExecutionException { + String xml = VnmcXml.CREATE_PORT_POOL.getXml(); + String service = VnmcXml.CREATE_PORT_POOL.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "portpooldn", poolDn); + xml = replaceXmlValue(xml, "portpoolname", name); + xml = replaceXmlValue(xml, "descr", description); + xml = replaceXmlValue(xml, "startport", startPort); + xml = replaceXmlValue(xml, "endport", endPort); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + private boolean createTenantVDCIpPool(String poolDn, String name, + String description, String ipAddress) throws ExecutionException { + String xml = VnmcXml.CREATE_IP_POOL.getXml(); + String service = VnmcXml.CREATE_IP_POOL.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "ippooldn", poolDn); + xml = replaceXmlValue(xml, "ippoolname", name); + xml = replaceXmlValue(xml, "descr", description); + xml = replaceXmlValue(xml, "ipvalue", ipAddress); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + private boolean createTenantVDCNatPolicyRef(String policyRefDn, String name, String tenantName) throws ExecutionException { + String xml = VnmcXml.CREATE_NAT_POLICY_REF.getXml(); + String service = VnmcXml.CREATE_NAT_POLICY_REF.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "natpolicyrefdn", policyRefDn); + xml = replaceXmlValue(xml, "natpolicyname", name); + + List policies = listNatPolicies(tenantName); + int order = 100; + if (policies != null) { + order += policies.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + private boolean createTenantVDCNatPolicy(String policyDn, String name) throws ExecutionException { + String xml = VnmcXml.CREATE_NAT_POLICY.getXml(); + String service = VnmcXml.CREATE_NAT_POLICY.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "natpolicydn", policyDn); + xml = replaceXmlValue(xml, "natpolicyname", name); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + private boolean deleteTenantVDCNatPolicy(String policyDn, String name) throws ExecutionException { + String xml = VnmcXml.DELETE_NAT_POLICY.getXml(); + String service = VnmcXml.DELETE_NAT_POLICY.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "natpolicydn", policyDn); + xml = replaceXmlValue(xml, "natpolicyname", name); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + private boolean deleteTenantVDCRule(String ruledn, String ruleName) throws ExecutionException { + String xml = VnmcXml.DELETE_RULE.getXml(); + String service = VnmcXml.DELETE_RULE.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "ruledn", ruledn); + xml = replaceXmlValue(xml, "rulename", ruleName); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + private List listNatPolicies(String tenantName) throws ExecutionException { + + String xml = VnmcXml.LIST_NAT_POLICIES.getXml(); + String service = VnmcXml.LIST_NAT_POLICIES.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "vdcdn", getDnForTenantVDC(tenantName)); + + String response = sendRequest(service, xml); + + List result = new ArrayList(); + Document xmlDoc = getDocument(response); + xmlDoc.normalize(); + NodeList policyList = xmlDoc.getElementsByTagName("pair"); + for (int i=0; i < policyList.getLength(); i++) { + Node policyNode = policyList.item(i); + result.add(policyNode.getAttributes().getNamedItem("key").getNodeValue()); + } + + return result; + } + + private List listAclPolicies(String tenantName) throws ExecutionException { + + String xml = VnmcXml.LIST_ACL_POLICIES.getXml(); + String service = VnmcXml.LIST_ACL_POLICIES.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "vdcdn", getDnForTenantVDC(tenantName)); + + String response = sendRequest(service, xml); + + List result = new ArrayList(); + Document xmlDoc = getDocument(response); + xmlDoc.normalize(); + NodeList policyList = xmlDoc.getElementsByTagName("pair"); + for (int i=0; i < policyList.getLength(); i++) { + Node policyNode = policyList.item(i); + result.add(policyNode.getAttributes().getNamedItem("key").getNodeValue()); + } + + return result; + } + + private List listChildren(String dn) throws ExecutionException { + + String xml = VnmcXml.LIST_CHILDREN.getXml(); + String service = VnmcXml.LIST_CHILDREN.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "dn", dn); + + String response = sendRequest(service, xml); + + List result = new ArrayList(); + Document xmlDoc = getDocument(response); + xmlDoc.normalize(); + NodeList policyList = xmlDoc.getElementsByTagName("policyRule"); + for (int i=0; i < policyList.getLength(); i++) { + Node policyNode = policyList.item(i); + result.add(policyNode.getAttributes().getNamedItem("name").getNodeValue()); + } + + return result; + } + + @Override + public boolean createTenantVDCPFPortPool(String tenantName, String identifier, + String startPort, String endPort) throws ExecutionException { + return createTenantVDCPortPool( + getDnForPFPortPool(tenantName, identifier), + getNameForPFPortPool(tenantName, identifier), + "PF port pool for " + getNameForPFPortPool(tenantName, identifier), + startPort, endPort); + } + + @Override + public boolean createTenantVDCPFIpPool(String tenantName, String identifier, + String ipAddress) throws ExecutionException { + return createTenantVDCIpPool( + getDnForPFIpPool(tenantName, identifier), + getNameForPFIpPool(tenantName, identifier), + "PF ip pool for " + getNameForPFIpPool(tenantName, identifier), + ipAddress); + } + + private String getNameForPFPolicy(String tenantName, String identifier) { + return "PF-" + tenantName + "-" + identifier; + } + + private String getDnForPFPolicy(String tenantName, String identifier) { + return getDnForTenantVDC(tenantName) + "/natpol-" + getNameForPFPolicy(tenantName, identifier); + } + + private String getDnForPFPolicyRef(String tenantName, String identifier) { + return getDnForNatPolicySet(tenantName) + "/polref-" + getNameForPFPolicy(tenantName, identifier); + } + + private String getNameForPFRule(String tenantName, String identifier) { + return "Rule-" + tenantName + "-" + identifier; + } + + private String getDnForPFRule(String tenantName, String identifier, String policyIdentifier) { + return getDnForPFPolicy(tenantName, policyIdentifier) + "/rule-" + getNameForPFRule(tenantName, identifier); + } + + @Override + public boolean createTenantVDCPFRule(String tenantName, + String identifier, String policyIdentifier, + String protocol, String publicIp, + String startPort, String endPort) throws ExecutionException { + String xml = VnmcXml.CREATE_PF_RULE.getXml(); + String service = VnmcXml.CREATE_PF_RULE.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "natruledn", getDnForPFRule(tenantName, identifier, policyIdentifier)); + xml = replaceXmlValue(xml, "natrulename", getNameForPFRule(tenantName, identifier)); + xml = replaceXmlValue(xml, "descr", "PF rule for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "ippoolname", getNameForPFIpPool(tenantName, policyIdentifier + "-" + identifier)); + xml = replaceXmlValue(xml, "portpoolname", getNameForPFPortPool(tenantName, policyIdentifier + "-" + identifier)); + xml = replaceXmlValue(xml, "ip", publicIp); + xml = replaceXmlValue(xml, "startport", startPort); + xml = replaceXmlValue(xml, "endport", endPort); + xml = replaceXmlValue(xml, "protocolvalue", protocol); + + List rules = listChildren(getDnForPFPolicy(tenantName, policyIdentifier)); + int order = 100; + if (rules != null) { + order += rules.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean deleteTenantVDCPFRule(String tenantName, String identifier, + String policyIdentifier) throws ExecutionException { + return deleteTenantVDCRule( + getDnForPFRule(tenantName, identifier, policyIdentifier), + getNameForPFRule(tenantName, identifier)); + } + + @Override + public boolean createTenantVDCAclRuleForPF(String tenantName, + String identifier, String policyIdentifier, String protocol, + String ipAddress, String startPort, String endPort) + throws ExecutionException { + String xml = VnmcXml.CREATE_ACL_RULE_FOR_PF.getXml(); + String service = VnmcXml.CREATE_ACL_RULE_FOR_PF.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "aclruledn", getDnForAclRule(tenantName, identifier, policyIdentifier)); + xml = replaceXmlValue(xml, "aclrulename", getNameForAclRule(tenantName, identifier)); + xml = replaceXmlValue(xml, "descr", "ACL rule for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "actiontype", "permit"); + xml = replaceXmlValue(xml, "protocolvalue", protocol); + xml = replaceXmlValue(xml, "ip", ipAddress); + xml = replaceXmlValue(xml, "startport", startPort); + xml = replaceXmlValue(xml, "endport", endPort); + + List rules = listChildren(getDnForAclPolicy(tenantName, policyIdentifier)); + int order = 100; + if (rules != null) { + order += rules.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCPFPolicyRef(String tenantName, String identifier) throws ExecutionException { + return createTenantVDCNatPolicyRef( + getDnForPFPolicyRef(tenantName, identifier), + getNameForPFPolicy(tenantName, identifier), + tenantName); + } + + @Override + public boolean createTenantVDCPFPolicy(String tenantName, String identifier) throws ExecutionException { + return createTenantVDCNatPolicy( + getDnForPFPolicy(tenantName, identifier), + getNameForPFPolicy(tenantName, identifier)); + } + + @Override + public boolean deleteTenantVDCPFPolicy(String tenantName, String identifier) throws ExecutionException { + return deleteTenantVDCNatPolicy( + getDnForPFPolicy(tenantName, identifier), + getNameForPFPolicy(tenantName, identifier)); + } + + private String getNameForDNatIpPool(String tenantName, String identifier) { + return "DNATIp-" + tenantName + "-" + identifier; + } + + private String getDnForDNatIpPool(String tenantName, String identifier) { + return getDnForTenantVDC(tenantName) + "/objgrp-" + getNameForDNatIpPool(tenantName, identifier); + } + + @Override + public boolean createTenantVDCDNatIpPool(String tenantName, + String identifier, String ipAddress) throws ExecutionException { + return createTenantVDCIpPool( + getDnForDNatIpPool(tenantName, identifier), + getNameForDNatIpPool(tenantName, identifier), + "DNAT ip pool for " + getNameForDNatIpPool(tenantName, identifier), + ipAddress); + } + + private String getNameForDNatRule(String tenantName, String identifier) { + return "Rule-" + tenantName + "-" + identifier; + } + + private String getDnForDNatRule(String tenantName, String identifier, String policyIdentifier) { + return getDnForDNatPolicy(tenantName, policyIdentifier) + "/rule-" + getNameForDNatRule(tenantName, identifier); + } + + private String getNameForDNatPolicy(String tenantName, String identifier) { + return "DNAT-" + tenantName + "-" + identifier; + } + + private String getDnForDNatPolicy(String tenantName, String identifier) { + return getDnForTenantVDC(tenantName) + "/natpol-" + getNameForDNatPolicy(tenantName, identifier); + } + + private String getDnForDNatPolicyRef(String tenantName, String identifier) { + return getDnForNatPolicySet(tenantName) + "/polref-" + getNameForDNatPolicy(tenantName, identifier); + } + + @Override + public boolean createTenantVDCDNatRule(String tenantName, + String identifier, String policyIdentifier, String publicIp) + throws ExecutionException { + String xml = VnmcXml.CREATE_DNAT_RULE.getXml(); + String service = VnmcXml.CREATE_DNAT_RULE.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "natruledn", getDnForDNatRule(tenantName, identifier, policyIdentifier)); + xml = replaceXmlValue(xml, "natrulename", getNameForDNatRule(tenantName, identifier)); + xml = replaceXmlValue(xml, "descr", "DNAT rule for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "ippoolname", getNameForDNatIpPool(tenantName, policyIdentifier + "-" + identifier)); + xml = replaceXmlValue(xml, "ip", publicIp); + + List rules = listChildren(getDnForDNatPolicy(tenantName, policyIdentifier)); + int order = 100; + if (rules != null) { + order += rules.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean deleteTenantVDCDNatRule(String tenantName, + String identifier, String policyIdentifier) + throws ExecutionException { + return deleteTenantVDCRule( + getDnForDNatRule(tenantName, identifier, policyIdentifier), + getNameForDNatRule(tenantName, identifier)); + } + + @Override + public boolean createTenantVDCAclRuleForDNat(String tenantName, + String identifier, String policyIdentifier, String ipAddress) + throws ExecutionException { + String xml = VnmcXml.CREATE_ACL_RULE_FOR_DNAT.getXml(); + String service = VnmcXml.CREATE_ACL_RULE_FOR_DNAT.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "aclruledn", getDnForAclRule(tenantName, identifier, policyIdentifier)); + xml = replaceXmlValue(xml, "aclrulename", getNameForAclRule(tenantName, identifier)); + xml = replaceXmlValue(xml, "descr", "ACL rule for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "actiontype", "permit"); + xml = replaceXmlValue(xml, "ip", ipAddress); + + List rules = listChildren(getDnForAclPolicy(tenantName, policyIdentifier)); + int order = 100; + if (rules != null) { + order += rules.size(); + } + xml = replaceXmlValue(xml, "order", Integer.toString(order)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean createTenantVDCDNatPolicyRef(String tenantName, + String identifier) throws ExecutionException { + return createTenantVDCNatPolicyRef( + getDnForDNatPolicyRef(tenantName, identifier), + getNameForDNatPolicy(tenantName, identifier), + tenantName); + } + + @Override + public boolean createTenantVDCDNatPolicy(String tenantName, + String identifier) throws ExecutionException { + return createTenantVDCNatPolicy( + getDnForDNatPolicy(tenantName, identifier), + getNameForDNatPolicy(tenantName, identifier)); + } + + @Override + public boolean deleteTenantVDCDNatPolicy(String tenantName, + String identifier) throws ExecutionException { + return deleteTenantVDCNatPolicy( + getDnForDNatPolicy(tenantName, identifier), + getNameForDNatPolicy(tenantName, identifier)); + } + + private String getNameForEdgeFirewall(String tenantName) { + return "ASA-1000v-" + tenantName; + } + + private String getDnForEdgeFirewall(String tenantName) { + return getDnForTenantVDC(tenantName) + "/efw-" + getNameForEdgeFirewall(tenantName); + } + + private String getNameForEdgeInsideIntf(String tenantName) { + return "Edge_Inside"; //TODO: make this configurable + } + + private String getNameForEdgeOutsideIntf(String tenantName) { + return "Edge_Outside"; //TODO: make this configurable + } + + private String getDnForOutsideIntf(String tenantName) { + return getDnForEdgeFirewall(tenantName) + "/interface-" + getNameForEdgeOutsideIntf(tenantName); + } + + private String getDnForInsideIntf(String tenantName) { + return getDnForEdgeFirewall(tenantName) + "/interface-" + getNameForEdgeInsideIntf(tenantName); + } + + @Override + public boolean createEdgeFirewall(String tenantName, String publicIp, String insideIp, + String publicSubnet, String insideSubnet) throws ExecutionException { + String xml = VnmcXml.CREATE_EDGE_FIREWALL.getXml(); + String service = VnmcXml.CREATE_EDGE_FIREWALL.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "edgefwdescr", "Edge Firewall for Tenant VDC " + tenantName); + xml = replaceXmlValue(xml, "edgefwname", getNameForEdgeFirewall(tenantName)); + xml = replaceXmlValue(xml, "edgefwdn", getDnForEdgeFirewall(tenantName)); + xml = replaceXmlValue(xml, "insideintfname", getNameForEdgeInsideIntf(tenantName)); + xml = replaceXmlValue(xml, "outsideintfname", getNameForEdgeOutsideIntf(tenantName)); + + xml = replaceXmlValue(xml, "insideintfdn", getDnForInsideIntf(tenantName)); + xml = replaceXmlValue(xml, "outsideintfdn", getDnForOutsideIntf(tenantName)); + + xml = replaceXmlValue(xml, "deviceserviceprofiledn", getDnForEdgeFirewall(tenantName) + "/device-service-profile"); + xml = replaceXmlValue(xml, "outsideintfsp", getDnForOutsideIntf(tenantName) + "/interface-service-profile"); + + xml = replaceXmlValue(xml, "secprofileref", getNameForEdgeDeviceSecurityProfile(tenantName)); + xml = replaceXmlValue(xml, "deviceserviceprofile", getNameForEdgeDeviceServiceProfile(tenantName)); + + xml = replaceXmlValue(xml, "insideip", insideIp); + xml = replaceXmlValue(xml, "publicip", publicIp); + xml = replaceXmlValue(xml, "insidesubnet", insideSubnet); + xml = replaceXmlValue(xml, "outsidesubnet", publicSubnet); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean deleteEdgeFirewall(String tenantName) throws ExecutionException { + String xml = VnmcXml.DELETE_EDGE_FIREWALL.getXml(); + String service = VnmcXml.DELETE_EDGE_FIREWALL.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "edgefwname", getNameForEdgeFirewall(tenantName)); + xml = replaceXmlValue(xml, "edgefwdn", getDnForEdgeFirewall(tenantName)); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public Map listUnAssocAsa1000v() throws ExecutionException { + String xml = VnmcXml.LIST_UNASSOC_ASA1000V.getXml(); + String service = VnmcXml.LIST_UNASSOC_ASA1000V.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + + String response = sendRequest(service, xml); + + Map result = new HashMap(); + Document xmlDoc = getDocument(response); + xmlDoc.normalize(); + NodeList fwList = xmlDoc.getElementsByTagName("fwInstance"); + for (int j=0; j < fwList.getLength(); j++) { + Node fwNode = fwList.item(j); + result.put(fwNode.getAttributes().getNamedItem("mgmtIp").getNodeValue(), + fwNode.getAttributes().getNamedItem("dn").getNodeValue()); + } + + return result; + } + + @Override + public boolean assignAsa1000v(String tenantName, String firewallDn) throws ExecutionException { + String xml = VnmcXml.ASSIGN_ASA1000V.getXml(); + String service = VnmcXml.ASSIGN_ASA1000V.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "binddn", getDnForEdgeFirewall(tenantName) + "/binding"); + xml = replaceXmlValue(xml, "fwdn", firewallDn); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + @Override + public boolean unassignAsa1000v(String tenantName, String firewallDn) throws ExecutionException { + String xml = VnmcXml.UNASSIGN_ASA1000V.getXml(); + String service = VnmcXml.UNASSIGN_ASA1000V.getService(); + xml = replaceXmlValue(xml, "cookie", _cookie); + xml = replaceXmlValue(xml, "binddn", getDnForEdgeFirewall(tenantName) + "/binding"); + xml = replaceXmlValue(xml, "fwdn", firewallDn); + + String response = sendRequest(service, xml); + return verifySuccess(response); + } + + private String sendRequest(String service, String xmlRequest) throws ExecutionException { + org.apache.commons.httpclient.protocol.Protocol myhttps = + new org.apache.commons.httpclient.protocol.Protocol("https", new EasySSLProtocolSocketFactory(), 443); + HttpClient client = new HttpClient(); + client.getHostConfiguration().setHost(_ip, 443, myhttps); + byte[] response = null; + PostMethod method = new PostMethod("/xmlIM/" + service); + + method.setRequestBody(xmlRequest); + + try{ + int statusCode = client.executeMethod(method); + + if (statusCode != HttpStatus.SC_OK) { + throw new Exception("Error code : " + statusCode); + } + response = method.getResponseBody(); + }catch(Exception e){ + System.out.println(e.getMessage()); + throw new ExecutionException(e.getMessage()); + } + System.out.println(new String(response)); + return new String(response); + } + + private Map checkResponse(String xmlResponse, String... keys) throws ExecutionException { + Document xmlDoc = getDocument(xmlResponse); + Map result = new HashMap(); + Node topElement = xmlDoc.getChildNodes().item(0); + if (topElement != null) { + for (String key: keys){ + Node valueNode = topElement.getAttributes().getNamedItem(key); + result.put(key, valueNode==null?null:valueNode.getNodeValue()); + } + } + return result; + } + + private boolean verifySuccess(String xmlResponse) throws ExecutionException { + Map checked = checkResponse(xmlResponse, "errorCode", "errorDescr"); + + if (checked.get("errorCode") != null) { + String errorCode = checked.get("errorCode"); + if (errorCode.equals("103")) { + //tenant already exists + return true; + } + String errorDescr = checked.get("errorDescr"); + throw new ExecutionException(errorDescr); + } + return true; + } + + /* + * XML utils + */ + + private Document getDocument(String xml) throws ExecutionException { + StringReader xmlReader = new StringReader(" \n" + xml.trim()); + InputSource xmlSource = new InputSource(xmlReader); + Document doc = null; + + try { + doc = DocumentBuilderFactory.newInstance().newDocumentBuilder().parse(xmlSource); + + } catch (Exception e) { + s_logger.error(e); + throw new ExecutionException(e.getMessage()); + } + + if (doc == null) { + throw new ExecutionException("Failed to parse xml " + xml); + } else { + return doc; + } + } + + private String replaceXmlTag(String xml, String oldTag, String newTag) { + return xml.replaceAll(oldTag, newTag); + } + + private String replaceXmlValue(String xml, String marker, String value) { + marker = "\\s*%" + marker + "%\\s*"; + + if (value == null) { + value = ""; + } + + return xml.replaceAll(marker, value); + } + + private String extractXml(String xml, String marker) { + String startMarker = "<" + marker + ">"; + String endMarker = ""; + if (xml.contains(startMarker) && xml.contains(endMarker)) { + return xml.substring(xml.indexOf(startMarker) + startMarker.length(), xml.indexOf(endMarker)); + } else { + return null; + } + + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java new file mode 100644 index 00000000000..e756165bdaa --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcController.java @@ -0,0 +1,40 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.cisco; + +import org.apache.cloudstack.api.Identity; +import org.apache.cloudstack.api.InternalIdentity; + +import com.cloud.org.Grouping; + +public interface CiscoVnmcController extends Grouping, InternalIdentity, Identity { + + long getId(); + + String getUuid(); + + void setUuid(String uuid); + + long getPhysicalNetworkId(); + + long getHostId(); + + String getProviderName(); + + String getDeviceName(); + +} \ No newline at end of file diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcControllerVO.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcControllerVO.java new file mode 100644 index 00000000000..4207f1dac4c --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/CiscoVnmcControllerVO.java @@ -0,0 +1,102 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.cisco; + +import java.util.UUID; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name="external_cisco_vnmc_devices") +public class CiscoVnmcControllerVO implements CiscoVnmcController { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="id") + private long id; + + @Column(name="uuid") + private String uuid; + + @Column(name="host_id") + private long hostId; + + @Column(name="physical_network_id") + private long physicalNetworkId; + + @Column(name="provider_name") + private String providerName; + + @Column(name="device_name") + private String deviceName; + + + public CiscoVnmcControllerVO() { + this.uuid = UUID.randomUUID().toString(); + } + + public CiscoVnmcControllerVO(long hostId, long physicalNetworkId, + String providerName, String deviceName) { + super(); + this.hostId = hostId; + this.physicalNetworkId = physicalNetworkId; + this.providerName = providerName; + this.deviceName = deviceName; + this.uuid = UUID.randomUUID().toString(); + } + + @Override + public long getId() { + return id; + } + + @Override + public String getUuid() { + return uuid; + } + + @Override + public void setUuid(String uuid) { + this.uuid = uuid; + } + + @Override + public long getPhysicalNetworkId() { + return physicalNetworkId; + } + + @Override + public long getHostId() { + return hostId; + } + + @Override + public String getProviderName() { + return providerName; + } + + @Override + public String getDeviceName() { + return deviceName; + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java new file mode 100755 index 00000000000..2e004dccd41 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMap.java @@ -0,0 +1,31 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.cisco; + +import org.apache.cloudstack.api.InternalIdentity; + +import com.cloud.org.Grouping; + +public interface NetworkAsa1000vMap extends Grouping, InternalIdentity { + + long getId(); + + long getNetworkId(); + + long getAsa1000vId(); + +} \ No newline at end of file diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMapVO.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMapVO.java new file mode 100755 index 00000000000..9638b6f8ae2 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/cisco/NetworkAsa1000vMapVO.java @@ -0,0 +1,73 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.cisco; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + +@Entity +@Table(name="network_asa1000v_map") +public class NetworkAsa1000vMapVO implements NetworkAsa1000vMap { + + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name="id") + private long id; + + @Column(name="network_id") + private long networkId; + + @Column(name="asa1000v_id") + private long asa1000vId; + + public NetworkAsa1000vMapVO() { + } + + public NetworkAsa1000vMapVO(long networkId, long asa1000vId) { + super(); + this.networkId = networkId; + this.asa1000vId = asa1000vId; + } + + @Override + public long getId() { + return id; + } + + @Override + public long getAsa1000vId() { + return asa1000vId; + } + + public void setAsa1000vId(long asa1000vId) { + this.asa1000vId = asa1000vId; + } + + @Override + public long getNetworkId() { + return networkId; + } + + public void setNetworkId(long networkId) { + this.networkId = networkId; + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDao.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDao.java new file mode 100755 index 00000000000..1a380b13691 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDao.java @@ -0,0 +1,33 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.dao; + +import java.util.List; + +import com.cloud.network.cisco.CiscoAsa1000vDeviceVO; +import com.cloud.utils.db.GenericDao; + +public interface CiscoAsa1000vDao extends GenericDao{ + /** + * list all the Cisco Asa 1000v devices added in to this physical network + * @param physicalNetworkId physical Network Id + * @return list of CiscoAsa1000vDeviceVO for this physical network. + */ + List listByPhysicalNetwork(long physicalNetworkId); + + CiscoAsa1000vDeviceVO findByManagementIp(String managementIp); +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java new file mode 100755 index 00000000000..a5820dea48b --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoAsa1000vDaoImpl.java @@ -0,0 +1,63 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.dao; + +import java.util.List; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + +import com.cloud.network.cisco.CiscoAsa1000vDeviceVO; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.SearchCriteria.Op; + +@Component +@Local(value=CiscoAsa1000vDao.class) +public class CiscoAsa1000vDaoImpl extends GenericDaoBase + implements CiscoAsa1000vDao { + + protected final SearchBuilder physicalNetworkIdSearch; + protected final SearchBuilder managementIpSearch; + + public CiscoAsa1000vDaoImpl() { + physicalNetworkIdSearch = createSearchBuilder(); + physicalNetworkIdSearch.and("physicalNetworkId", physicalNetworkIdSearch.entity().getPhysicalNetworkId(), Op.EQ); + physicalNetworkIdSearch.done(); + + managementIpSearch = createSearchBuilder(); + managementIpSearch.and("managementIp", managementIpSearch.entity().getManagementIp(), Op.EQ); + managementIpSearch.done(); + } + + @Override + public List listByPhysicalNetwork(long physicalNetworkId) { + SearchCriteria sc = physicalNetworkIdSearch.create(); + sc.setParameters("physicalNetworkId", physicalNetworkId); + return search(sc, null); + } + + @Override + public CiscoAsa1000vDeviceVO findByManagementIp(String managementIp) { + SearchCriteria sc = managementIpSearch.create(); + sc.setParameters("managementIp", managementIp); + return findOneBy(sc); + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDao.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDao.java new file mode 100644 index 00000000000..f0b394834a0 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDao.java @@ -0,0 +1,32 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.dao; + +import java.util.List; + +import com.cloud.network.cisco.CiscoVnmcControllerVO; +import com.cloud.utils.db.GenericDao; + +public interface CiscoVnmcDao extends GenericDao{ + /** + * list all the Cisco VNMC devices added in to this physical network + * @param physicalNetworkId physical Network Id + * @return list of CiscoVnmcDeviceVO for this physical network. + */ + List listByPhysicalNetwork(long physicalNetworkId); + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java new file mode 100644 index 00000000000..89518104851 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/CiscoVnmcDaoImpl.java @@ -0,0 +1,51 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.dao; + +import java.util.List; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + +import com.cloud.network.cisco.CiscoVnmcControllerVO; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.SearchCriteria.Op; + +@Component +@Local(value=CiscoVnmcDao.class) +public class CiscoVnmcDaoImpl extends GenericDaoBase + implements CiscoVnmcDao { + + protected final SearchBuilder physicalNetworkIdSearch; + + public CiscoVnmcDaoImpl() { + physicalNetworkIdSearch = createSearchBuilder(); + physicalNetworkIdSearch.and("physicalNetworkId", physicalNetworkIdSearch.entity().getPhysicalNetworkId(), Op.EQ); + physicalNetworkIdSearch.done(); + } + + @Override + public List listByPhysicalNetwork(long physicalNetworkId) { + SearchCriteria sc = physicalNetworkIdSearch.create(); + sc.setParameters("physicalNetworkId", physicalNetworkId); + return search(sc, null); + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDao.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDao.java new file mode 100755 index 00000000000..053f4afef54 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDao.java @@ -0,0 +1,28 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.dao; + +import com.cloud.network.cisco.NetworkAsa1000vMapVO; +import com.cloud.utils.db.GenericDao; + +public interface NetworkAsa1000vMapDao extends GenericDao{ + + NetworkAsa1000vMapVO findByNetworkId(long networkId); + + NetworkAsa1000vMapVO findByAsa1000vId(long asa1000vId); + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java new file mode 100755 index 00000000000..692b3d6fda6 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/dao/NetworkAsa1000vMapDaoImpl.java @@ -0,0 +1,61 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.dao; + +import javax.ejb.Local; + +import org.springframework.stereotype.Component; + +import com.cloud.network.cisco.NetworkAsa1000vMapVO; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.SearchCriteria.Op; + +@Component +@Local(value=NetworkAsa1000vMapDao.class) +public class NetworkAsa1000vMapDaoImpl extends GenericDaoBase + implements NetworkAsa1000vMapDao { + + protected final SearchBuilder networkSearch; + protected final SearchBuilder asa1000vSearch; + + public NetworkAsa1000vMapDaoImpl() { + networkSearch = createSearchBuilder(); + networkSearch.and("networkId", networkSearch.entity().getNetworkId(), Op.EQ); + networkSearch.done(); + + asa1000vSearch = createSearchBuilder(); + asa1000vSearch.and("asa1000vId", asa1000vSearch.entity().getAsa1000vId(), Op.EQ); + asa1000vSearch.done(); + } + + @Override + public NetworkAsa1000vMapVO findByNetworkId(long networkId) { + SearchCriteria sc = networkSearch.create(); + sc.setParameters("networkId", networkId); + return findOneBy(sc); + } + + @Override + public NetworkAsa1000vMapVO findByAsa1000vId(long asa1000vId) { + SearchCriteria sc = asa1000vSearch.create(); + sc.setParameters("asa1000vId", asa1000vId); + return findOneBy(sc); + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoAsa1000vService.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoAsa1000vService.java new file mode 100755 index 00000000000..dff9288b0ff --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoAsa1000vService.java @@ -0,0 +1,43 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.element; + +import java.util.List; + +import com.cloud.api.commands.AddCiscoAsa1000vResourceCmd; +import com.cloud.api.commands.DeleteCiscoAsa1000vResourceCmd; +import com.cloud.api.commands.ListCiscoAsa1000vResourcesCmd; +import com.cloud.api.response.CiscoAsa1000vResourceResponse; +import com.cloud.network.Network; +import com.cloud.network.cisco.CiscoAsa1000vDevice; +import com.cloud.network.cisco.CiscoAsa1000vDeviceVO; +import com.cloud.utils.component.PluggableService; + +public interface CiscoAsa1000vService extends PluggableService { + + public CiscoAsa1000vDevice addCiscoAsa1000vResource(AddCiscoAsa1000vResourceCmd cmd); + + public CiscoAsa1000vResourceResponse createCiscoAsa1000vResourceResponse( + CiscoAsa1000vDevice ciscoAsa1000vDeviceVO); + + boolean deleteCiscoAsa1000vResource(DeleteCiscoAsa1000vResourceCmd cmd); + + List listCiscoAsa1000vResources(ListCiscoAsa1000vResourcesCmd cmd); + + CiscoAsa1000vDevice assignAsa1000vToNetwork(Network network); + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java new file mode 100644 index 00000000000..443bb40f57f --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElement.java @@ -0,0 +1,928 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package com.cloud.network.element; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.UUID; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; +import org.apache.log4j.Logger; + +import com.cloud.agent.AgentManager; +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.AssociateAsaWithLogicalEdgeFirewallCommand; +import com.cloud.agent.api.CleanupLogicalEdgeFirewallCommand; +import com.cloud.agent.api.ConfigureNexusVsmForAsaCommand; +import com.cloud.agent.api.CreateLogicalEdgeFirewallCommand; +import com.cloud.agent.api.StartupCommand; +import com.cloud.agent.api.StartupExternalFirewallCommand; +import com.cloud.agent.api.routing.NetworkElementCommand; +import com.cloud.agent.api.routing.SetFirewallRulesCommand; +import com.cloud.agent.api.routing.SetPortForwardingRulesCommand; +import com.cloud.agent.api.routing.SetSourceNatCommand; +import com.cloud.agent.api.routing.SetStaticNatRulesCommand; +import com.cloud.agent.api.to.FirewallRuleTO; +import com.cloud.agent.api.to.IpAddressTO; +import com.cloud.agent.api.to.PortForwardingRuleTO; +import com.cloud.agent.api.to.StaticNatRuleTO; +import com.cloud.api.commands.AddCiscoAsa1000vResourceCmd; +import com.cloud.api.commands.AddCiscoVnmcResourceCmd; +import com.cloud.api.commands.DeleteCiscoAsa1000vResourceCmd; +import com.cloud.api.commands.DeleteCiscoVnmcResourceCmd; +import com.cloud.api.commands.ListCiscoAsa1000vResourcesCmd; +import com.cloud.api.commands.ListCiscoVnmcResourcesCmd; +import com.cloud.api.response.CiscoAsa1000vResourceResponse; +import com.cloud.api.response.CiscoVnmcResourceResponse; +import com.cloud.configuration.ConfigurationManager; +import com.cloud.dc.ClusterVO; +import com.cloud.dc.ClusterVSMMapVO; +import com.cloud.dc.DataCenter; +import com.cloud.dc.Vlan; +import com.cloud.dc.DataCenter.NetworkType; +import com.cloud.dc.VlanVO; +import com.cloud.dc.dao.ClusterDao; +import com.cloud.dc.dao.ClusterVSMMapDao; +import com.cloud.dc.dao.VlanDao; +import com.cloud.deploy.DeployDestination; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.host.DetailVO; +import com.cloud.host.Host; +import com.cloud.host.HostVO; +import com.cloud.host.dao.HostDao; +import com.cloud.host.dao.HostDetailsDao; +import com.cloud.network.CiscoNexusVSMDeviceVO; +import com.cloud.network.IpAddress; +import com.cloud.network.Network; +import com.cloud.network.NetworkManager; +import com.cloud.network.NetworkModel; +import com.cloud.network.PhysicalNetworkServiceProvider; +import com.cloud.network.dao.PhysicalNetworkVO; +import com.cloud.network.Network.Capability; +import com.cloud.network.Network.Provider; +import com.cloud.network.Network.Service; +import com.cloud.network.Networks.BroadcastDomainType; +import com.cloud.network.PublicIpAddress; +import com.cloud.network.addr.PublicIp; +import com.cloud.network.cisco.CiscoAsa1000vDevice; +import com.cloud.network.cisco.CiscoAsa1000vDeviceVO; +import com.cloud.network.cisco.CiscoVnmcController; +import com.cloud.network.cisco.CiscoVnmcControllerVO; +import com.cloud.network.cisco.NetworkAsa1000vMapVO; +import com.cloud.network.dao.CiscoAsa1000vDao; +import com.cloud.network.dao.CiscoNexusVSMDeviceDao; +import com.cloud.network.dao.CiscoVnmcDao; +import com.cloud.network.dao.NetworkAsa1000vMapDao; +import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; +import com.cloud.network.dao.PhysicalNetworkServiceProviderVO; +import com.cloud.network.resource.CiscoVnmcResource; +import com.cloud.network.rules.FirewallRule; +import com.cloud.network.rules.PortForwardingRule; +import com.cloud.network.rules.StaticNat; +import com.cloud.offering.NetworkOffering; +import com.cloud.resource.ResourceManager; +import com.cloud.resource.ResourceState; +import com.cloud.resource.ResourceStateAdapter; +import com.cloud.resource.ServerResource; +import com.cloud.resource.UnableDeleteHostException; +import com.cloud.user.Account; +import com.cloud.utils.component.AdapterBase; +import com.cloud.utils.db.Transaction; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.net.NetUtils; +import com.cloud.vm.NicProfile; +import com.cloud.vm.ReservationContext; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachine.Type; +import com.cloud.vm.VirtualMachineProfile; + +@Local(value = NetworkElement.class) +public class CiscoVnmcElement extends AdapterBase implements SourceNatServiceProvider, FirewallServiceProvider, + PortForwardingServiceProvider, IpDeployer, StaticNatServiceProvider, ResourceStateAdapter, NetworkElement, + CiscoVnmcElementService, CiscoAsa1000vService { + private static final Logger s_logger = Logger.getLogger(CiscoVnmcElement.class); + private static final Map> capabilities = setCapabilities(); + + @Inject + AgentManager _agentMgr; + @Inject + ResourceManager _resourceMgr; + @Inject + ConfigurationManager _configMgr; + @Inject + NetworkManager _networkMgr; + @Inject + NetworkModel _networkModel; + + @Inject + PhysicalNetworkDao _physicalNetworkDao; + @Inject + PhysicalNetworkServiceProviderDao _physicalNetworkServiceProviderDao; + @Inject + HostDetailsDao _hostDetailsDao; + @Inject + HostDao _hostDao; + @Inject + NetworkDao _networkDao; + @Inject + ClusterDao _clusterDao; + @Inject + VlanDao _vlanDao; + @Inject + ClusterVSMMapDao _clusterVsmMapDao; + @Inject + CiscoNexusVSMDeviceDao _vsmDeviceDao; + @Inject + CiscoVnmcDao _ciscoVnmcDao; + @Inject + CiscoAsa1000vDao _ciscoAsa1000vDao; + @Inject + NetworkAsa1000vMapDao _networkAsa1000vMapDao; + + protected boolean canHandle(Network network) { + if (network.getBroadcastDomainType() != BroadcastDomainType.Vlan) { + return false; //TODO: should handle VxLAN as well + } + + return true; + } + + @Override + public boolean configure(String name, Map params) + throws ConfigurationException { + super.configure(name, params); + _resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this); + return true; + } + + private static Map> setCapabilities() { + Map> capabilities = new HashMap>(); + capabilities.put(Service.Gateway, null); + + Map firewallCapabilities = new HashMap(); + firewallCapabilities.put(Capability.TrafficStatistics, "per public ip"); + firewallCapabilities.put(Capability.SupportedTrafficDirection, "ingress,egress"); + firewallCapabilities.put(Capability.SupportedProtocols, "tcp,udp,icmp"); + firewallCapabilities.put(Capability.SupportedEgressProtocols, "tcp,udp,icmp"); + firewallCapabilities.put(Capability.MultipleIps, "true"); + capabilities.put(Service.Firewall, firewallCapabilities); + + capabilities.put(Service.StaticNat, null); + capabilities.put(Service.PortForwarding, null); + + Map sourceNatCapabilities = new HashMap(); + sourceNatCapabilities.put(Capability.SupportedSourceNatTypes, "peraccount"); + sourceNatCapabilities.put(Capability.RedundantRouter, "false"); //TODO: + capabilities.put(Service.SourceNat, sourceNatCapabilities); + return capabilities; + } + + @Override + public Map> getCapabilities() { + return capabilities; + } + + @Override + public Provider getProvider() { + return Provider.CiscoVnmc; + } + + private boolean createLogicalEdgeFirewall(long vlanId, + String gateway, String gatewayNetmask, + String publicIp, String publicNetmask, + List publicGateways, long hostId) { + CreateLogicalEdgeFirewallCommand cmd = new CreateLogicalEdgeFirewallCommand(vlanId, publicIp, gateway, publicNetmask, gatewayNetmask); + for (String publicGateway : publicGateways) { + cmd.getPublicGateways().add(publicGateway); + } + Answer answer = _agentMgr.easySend(hostId, cmd); + return answer.getResult(); + } + + private boolean configureNexusVsmForAsa(long vlanId, String gateway, + String vsmUsername, String vsmPassword, String vsmIp, + String asaInPortProfile, long hostId) { + ConfigureNexusVsmForAsaCommand cmd = new ConfigureNexusVsmForAsaCommand(vlanId, gateway, vsmUsername, vsmPassword, vsmIp, asaInPortProfile); + Answer answer = _agentMgr.easySend(hostId, cmd); + return answer.getResult(); + } + + private boolean configureSourceNat(long vlanId, String guestCidr, + PublicIp sourceNatIp, long hostId) { + boolean add = (sourceNatIp.getState() == IpAddress.State.Releasing ? false : true); + IpAddressTO ip = new IpAddressTO(sourceNatIp.getAccountId(), sourceNatIp.getAddress().addr(), add, false, + sourceNatIp.isSourceNat(), sourceNatIp.getVlanTag(), sourceNatIp.getGateway(), sourceNatIp.getNetmask(), sourceNatIp.getMacAddress(), + null, sourceNatIp.isOneToOneNat()); + boolean addSourceNat = false; + if (sourceNatIp.isSourceNat()) { + addSourceNat = add; + } + + SetSourceNatCommand cmd = new SetSourceNatCommand(ip, addSourceNat); + cmd.setContextParam(NetworkElementCommand.GUEST_VLAN_TAG, Long.toString(vlanId)); + cmd.setContextParam(NetworkElementCommand.GUEST_NETWORK_CIDR, guestCidr); + Answer answer = _agentMgr.easySend(hostId, cmd); + return answer.getResult(); + } + + private boolean associateAsaWithLogicalEdgeFirewall(long vlanId, + String asaMgmtIp, long hostId) { + AssociateAsaWithLogicalEdgeFirewallCommand cmd = + new AssociateAsaWithLogicalEdgeFirewallCommand(vlanId, asaMgmtIp); + Answer answer = _agentMgr.easySend(hostId, cmd); + return answer.getResult(); + } + + @Override + public boolean implement(Network network, NetworkOffering offering, + DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException { + DataCenter zone = _configMgr.getZone(network.getDataCenterId()); + + if (zone.getNetworkType() == NetworkType.Basic) { + s_logger.debug("Not handling network implement in zone of type " + NetworkType.Basic); + return false; + } + + if (!canHandle(network)) { + return false; + } + + List devices = _ciscoVnmcDao.listByPhysicalNetwork(network.getPhysicalNetworkId()); + if (devices.isEmpty()) { + s_logger.error("No Cisco Vnmc device on network " + network.getName()); + return false; + } + + List asaList = _ciscoAsa1000vDao.listByPhysicalNetwork(network.getPhysicalNetworkId()); + if (asaList.isEmpty()) { + s_logger.debug("No Cisco ASA 1000v device on network " + network.getName()); + return false; + } + + NetworkAsa1000vMapVO asaForNetwork = _networkAsa1000vMapDao.findByNetworkId(network.getId()); + if (asaForNetwork != null) { + s_logger.debug("Cisco ASA 1000v device already associated with network " + network.getName()); + return true; + } + + if (!_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, Provider.CiscoVnmc)) { + s_logger.error("SourceNat service is not provided by Cisco Vnmc device on network " + network.getName()); + return false; + } + + Transaction txn = Transaction.currentTxn(); + boolean status = false; + try { + txn.start(); + + // ensure that there is an ASA 1000v assigned to this network + CiscoAsa1000vDevice assignedAsa = assignAsa1000vToNetwork(network); + if (assignedAsa == null) { + s_logger.error("Unable to assign ASA 1000v device to network " + network.getName()); + return false; + } + + ClusterVO asaCluster = _clusterDao.findById(assignedAsa.getClusterId()); + ClusterVSMMapVO clusterVsmMap = _clusterVsmMapDao.findByClusterId(assignedAsa.getClusterId()); + if (clusterVsmMap == null) { + s_logger.error("Vmware cluster " + asaCluster.getName() + " has no Cisco Nexus VSM device associated with it"); + return false; + } + + CiscoNexusVSMDeviceVO vsmDevice = _vsmDeviceDao.findById(clusterVsmMap.getVsmId()); + if (vsmDevice == null) { + s_logger.error("Unable to load details of Cisco Nexus VSM device associated with cluster " + asaCluster.getName()); + return false; + } + + CiscoVnmcControllerVO ciscoVnmcDevice = devices.get(0); + HostVO ciscoVnmcHost = _hostDao.findById(ciscoVnmcDevice.getHostId()); + _hostDao.loadDetails(ciscoVnmcHost); + Account owner = context.getAccount(); + PublicIp sourceNatIp = _networkMgr.assignSourceNatIpAddressToGuestNetwork(owner, network); + String vlan = network.getBroadcastUri().getHost(); + long vlanId = Long.parseLong(vlan); + + List vlanVOList = _vlanDao.listVlansByPhysicalNetworkId(network.getPhysicalNetworkId()); + List publicGateways = new ArrayList(); + for (VlanVO vlanVO : vlanVOList) { + publicGateways.add(vlanVO.getVlanGateway()); + } + + // create logical edge firewall in VNMC + String gatewayNetmask = NetUtils.getCidrNetmask(network.getCidr()); + if (!createLogicalEdgeFirewall(vlanId, network.getGateway(), gatewayNetmask, + sourceNatIp.getAddress().addr(), sourceNatIp.getNetmask(), publicGateways, ciscoVnmcHost.getId())) { + s_logger.error("Failed to create logical edge firewall in Cisco VNMC device for network " + network.getName()); + return false; + } + + // create stuff in VSM for ASA device + if (!configureNexusVsmForAsa(vlanId, network.getGateway(), + vsmDevice.getUserName(), vsmDevice.getPassword(), vsmDevice.getipaddr(), + assignedAsa.getInPortProfile(), ciscoVnmcHost.getId())) { + s_logger.error("Failed to configure Cisco Nexus VSM " + vsmDevice.getipaddr() + + " for ASA device for network " + network.getName()); + return false; + } + + // configure source NAT + //if (!configureSourceNat(vlanId, network.getCidr(), sourceNatIp, ciscoVnmcHost.getId())) { + // s_logger.error("Failed to configure source NAT in Cisco VNMC device for network " + network.getName()); + // return false; + //} + + // associate Asa 1000v instance with logical edge firewall + if (!associateAsaWithLogicalEdgeFirewall(vlanId, assignedAsa.getManagementIp(), ciscoVnmcHost.getId())) { + s_logger.error("Failed to associate Cisco ASA 1000v (" + assignedAsa.getManagementIp() + + ") with logical edge firewall in VNMC for network " + network.getName()); + return false; + } + + status = true; + txn.commit(); + } finally { + if (!status) { + txn.rollback(); + //FIXME: also undo changes in VNMC, VSM if anything failed + } + } + + return true; + } + + @Override + public boolean prepare(Network network, NicProfile nic, + VirtualMachineProfile vm, + DeployDestination dest, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException { + if (vm.getType() != Type.User) { + return false; + } + + // ensure that there is an ASA 1000v assigned to this network + NetworkAsa1000vMapVO asaForNetwork = _networkAsa1000vMapDao.findByNetworkId(network.getId()); + if (asaForNetwork == null) { + return false; + } + + return true; + } + + @Override + public boolean release(Network network, NicProfile nic, + VirtualMachineProfile vm, + ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException { + return true; + } + + private boolean cleanupLogicalEdgeFirewall(long vlanId, long hostId) { + CleanupLogicalEdgeFirewallCommand cmd = new CleanupLogicalEdgeFirewallCommand(vlanId); + Answer answer = _agentMgr.easySend(hostId, cmd); + return answer.getResult(); + } + + @Override + public boolean shutdown(Network network, ReservationContext context, + boolean cleanup) throws ConcurrentOperationException, + ResourceUnavailableException { + + unassignAsa1000vFromNetwork(network); + + String vlan = network.getBroadcastUri().getHost(); + long vlanId = Long.parseLong(vlan); + List devices = _ciscoVnmcDao.listByPhysicalNetwork(network.getPhysicalNetworkId()); + if (!devices.isEmpty()) { + CiscoVnmcControllerVO ciscoVnmcDevice = devices.get(0); + HostVO ciscoVnmcHost = _hostDao.findById(ciscoVnmcDevice.getHostId()); + cleanupLogicalEdgeFirewall(vlanId, ciscoVnmcHost.getId()); + } + + return true; + } + + @Override + public boolean isReady(PhysicalNetworkServiceProvider provider) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean shutdownProviderInstances( + PhysicalNetworkServiceProvider provider, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean canEnableIndividualServices() { + return true; + } + + @Override + public boolean verifyServicesCombination(Set services) { + if (!services.contains(Service.Firewall)) { + s_logger.warn("CiscoVnmc must be used as Firewall Service Provider in the network"); + return false; + } + return true; + } + + @Override + public boolean destroy(Network network, ReservationContext context) + throws ConcurrentOperationException, ResourceUnavailableException { + return true; + } + + @Override + public List> getCommands() { + List> cmdList = new ArrayList>(); + cmdList.add(AddCiscoVnmcResourceCmd.class); + cmdList.add(DeleteCiscoVnmcResourceCmd.class); + cmdList.add(ListCiscoVnmcResourcesCmd.class); + cmdList.add(AddCiscoAsa1000vResourceCmd.class); + cmdList.add(DeleteCiscoAsa1000vResourceCmd.class); + cmdList.add(ListCiscoAsa1000vResourcesCmd.class); + return cmdList; + } + + @Override + public CiscoVnmcController addCiscoVnmcResource(AddCiscoVnmcResourceCmd cmd) { + String deviceName = Provider.CiscoVnmc.getName(); + NetworkDevice networkDevice = NetworkDevice.getNetworkDevice(deviceName); + Long physicalNetworkId = cmd.getPhysicalNetworkId(); + CiscoVnmcController ciscoVnmcResource = null; + + PhysicalNetworkVO physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId); + if (physicalNetwork == null) { + throw new InvalidParameterValueException("Could not find phyical network with ID: " + physicalNetworkId); + } + long zoneId = physicalNetwork.getDataCenterId(); + + PhysicalNetworkServiceProviderVO ntwkSvcProvider = _physicalNetworkServiceProviderDao.findByServiceProvider(physicalNetwork.getId(), networkDevice.getNetworkServiceProvder()); + if (ntwkSvcProvider == null) { + throw new CloudRuntimeException("Network Service Provider: " + networkDevice.getNetworkServiceProvder() + + " is not enabled in the physical network: " + physicalNetworkId + "to add this device"); + } else if (ntwkSvcProvider.getState() == PhysicalNetworkServiceProvider.State.Shutdown) { + throw new CloudRuntimeException("Network Service Provider: " + ntwkSvcProvider.getProviderName() + + " is in shutdown state in the physical network: " + physicalNetworkId + "to add this device"); + } + + if (_ciscoVnmcDao.listByPhysicalNetwork(physicalNetworkId).size() != 0) { + throw new CloudRuntimeException("A Cisco Vnmc device is already configured on this physical network"); + } + + Map params = new HashMap(); + params.put("guid", UUID.randomUUID().toString()); + params.put("zoneId", String.valueOf(physicalNetwork.getDataCenterId())); + params.put("physicalNetworkId", String.valueOf(physicalNetwork.getId())); + params.put("name", "Cisco VNMC Controller - " + cmd.getHost()); + params.put("ip", cmd.getHost()); + params.put("username", cmd.getUsername()); + params.put("password", cmd.getPassword()); + params.put("transportzoneisotype", physicalNetwork.getIsolationMethods().get(0).toLowerCase()); // FIXME What to do with multiple isolation types + + Map hostdetails = new HashMap(); + hostdetails.putAll(params); + + ServerResource resource = new CiscoVnmcResource(); + Transaction txn = Transaction.currentTxn(); + try { + resource.configure(cmd.getHost(), hostdetails); + + Host host = _resourceMgr.addHost(zoneId, resource, Host.Type.ExternalFirewall, params); + if (host != null) { + txn.start(); + + ciscoVnmcResource = new CiscoVnmcControllerVO(host.getId(), physicalNetworkId, ntwkSvcProvider.getProviderName(), deviceName); + _ciscoVnmcDao.persist((CiscoVnmcControllerVO)ciscoVnmcResource); + + DetailVO detail = new DetailVO(host.getId(), "deviceid", String.valueOf(ciscoVnmcResource.getId())); + _hostDetailsDao.persist(detail); + + txn.commit(); + return ciscoVnmcResource; + } else { + throw new CloudRuntimeException("Failed to add Cisco Vnmc device due to internal error."); + } + } catch (ConfigurationException e) { + txn.rollback(); + throw new CloudRuntimeException(e.getMessage()); + } + } + + @Override + public CiscoVnmcResourceResponse createCiscoVnmcResourceResponse( + CiscoVnmcController ciscoVnmcResourceVO) { + HostVO ciscoVnmcHost = _hostDao.findById(ciscoVnmcResourceVO.getHostId()); + + CiscoVnmcResourceResponse response = new CiscoVnmcResourceResponse(); + response.setId(ciscoVnmcResourceVO.getUuid()); + response.setPhysicalNetworkId(ciscoVnmcResourceVO.getPhysicalNetworkId()); + response.setProviderName(ciscoVnmcResourceVO.getProviderName()); + response.setResourceName(ciscoVnmcHost.getName()); + + return response; + } + + @Override + public boolean deleteCiscoVnmcResource(DeleteCiscoVnmcResourceCmd cmd) { + Long vnmcResourceId = cmd.getCiscoVnmcResourceId(); + CiscoVnmcControllerVO vnmcResource = _ciscoVnmcDao.findById(vnmcResourceId); + if (vnmcResource == null) { + throw new InvalidParameterValueException( + "Could not find a Cisco VNMC appliance with id " + vnmcResourceId); + } + + // Check if there any ASA 1000v appliances + Long physicalNetworkId = vnmcResource.getPhysicalNetworkId(); + PhysicalNetworkVO physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId); + if (physicalNetwork != null) { + List responseList = _ciscoAsa1000vDao.listByPhysicalNetwork(physicalNetworkId); + if (responseList.size() > 0) { + throw new CloudRuntimeException( + "Cisco VNMC appliance with id " + vnmcResourceId + + " cannot be deleted as there Cisco ASA 1000v appliances using it"); + } + } + + HostVO vnmcHost = _hostDao.findById(vnmcResource.getHostId()); + Long hostId = vnmcHost.getId(); + vnmcHost.setResourceState(ResourceState.Maintenance); + _hostDao.update(hostId, vnmcHost); + _resourceMgr.deleteHost(hostId, false, false); + _ciscoVnmcDao.remove(vnmcResourceId); + + return true; + } + + @Override + public List listCiscoVnmcResources( + ListCiscoVnmcResourcesCmd cmd) { + Long physicalNetworkId = cmd.getPhysicalNetworkId(); + Long ciscoVnmcResourceId = cmd.getCiscoVnmcResourceId(); + List responseList = new ArrayList(); + + if (physicalNetworkId == null && ciscoVnmcResourceId == null) { + throw new InvalidParameterValueException("Either physical network Id or vnmc device Id must be specified"); + } + + if (ciscoVnmcResourceId != null) { + CiscoVnmcControllerVO ciscoVnmcResource = _ciscoVnmcDao.findById(ciscoVnmcResourceId); + if (ciscoVnmcResource == null) { + throw new InvalidParameterValueException("Could not find Cisco Vnmc device with id: " + ciscoVnmcResource); + } + responseList.add(ciscoVnmcResource); + } + else { + PhysicalNetworkVO physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId); + if (physicalNetwork == null) { + throw new InvalidParameterValueException("Could not find a physical network with id: " + physicalNetworkId); + } + responseList = _ciscoVnmcDao.listByPhysicalNetwork(physicalNetworkId); + } + + return responseList; + } + + @Override + public IpDeployer getIpDeployer(Network network) { + return this; + } + + @Override + public boolean applyFWRules(Network network, + List rules) + throws ResourceUnavailableException { + + if (!_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Firewall, Provider.CiscoVnmc)) { + s_logger.error("Firewall service is not provided by Cisco Vnmc device on network " + network.getName()); + return false; + } + + // Find VNMC host for physical network + List devices = _ciscoVnmcDao.listByPhysicalNetwork(network.getPhysicalNetworkId()); + if (devices.isEmpty()) { + s_logger.error("No Cisco Vnmc device on network " + network.getName()); + return true; + } + + // Find if ASA 1000v is associated with network + NetworkAsa1000vMapVO asaForNetwork = _networkAsa1000vMapDao.findByNetworkId(network.getId()); + if (asaForNetwork == null) { + s_logger.debug("Cisco ASA 1000v device is not associated with network " + network.getName()); + return true; + } + + if (network.getState() == Network.State.Allocated) { + s_logger.debug("External firewall was asked to apply firewall rules for network with ID " + network.getId() + "; this network is not implemented. Skipping backend commands."); + return true; + } + + CiscoVnmcControllerVO ciscoVnmcDevice = devices.get(0); + HostVO ciscoVnmcHost = _hostDao.findById(ciscoVnmcDevice.getHostId()); + + List rulesTO = new ArrayList(); + for (FirewallRule rule : rules) { + IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId()); + FirewallRuleTO ruleTO = new FirewallRuleTO(rule, null, sourceIp.getAddress().addr(), rule.getPurpose(), rule.getTrafficType()); + rulesTO.add(ruleTO); + } + + if (!rulesTO.isEmpty()) { + SetFirewallRulesCommand cmd = new SetFirewallRulesCommand(rulesTO); + cmd.setContextParam(NetworkElementCommand.GUEST_VLAN_TAG, network.getBroadcastUri().getHost()); + cmd.setContextParam(NetworkElementCommand.GUEST_NETWORK_CIDR, network.getCidr()); + Answer answer = _agentMgr.easySend(ciscoVnmcHost.getId(), cmd); + if (answer == null || !answer.getResult()) { + String details = (answer != null) ? answer.getDetails() : "details unavailable"; + String msg = "Unable to apply firewall rules to Cisco ASA 1000v appliance due to: " + details + "."; + s_logger.error(msg); + throw new ResourceUnavailableException(msg, DataCenter.class, network.getDataCenterId()); + } + } + + return true; + } + + @Override + public boolean applyPFRules(Network network, List rules) + throws ResourceUnavailableException { + + if (!_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.PortForwarding, Provider.CiscoVnmc)) { + s_logger.error("Port forwarding service is not provided by Cisco Vnmc device on network " + network.getName()); + return false; + } + + // Find VNMC host for physical network + List devices = _ciscoVnmcDao.listByPhysicalNetwork(network.getPhysicalNetworkId()); + if (devices.isEmpty()) { + s_logger.error("No Cisco Vnmc device on network " + network.getName()); + return true; + } + + // Find if ASA 1000v is associated with network + NetworkAsa1000vMapVO asaForNetwork = _networkAsa1000vMapDao.findByNetworkId(network.getId()); + if (asaForNetwork == null) { + s_logger.debug("Cisco ASA 1000v device is not associated with network " + network.getName()); + return true; + } + + if (network.getState() == Network.State.Allocated) { + s_logger.debug("External firewall was asked to apply port forwarding rules for network with ID " + network.getId() + "; this network is not implemented. Skipping backend commands."); + return true; + } + + CiscoVnmcControllerVO ciscoVnmcDevice = devices.get(0); + HostVO ciscoVnmcHost = _hostDao.findById(ciscoVnmcDevice.getHostId()); + + List rulesTO = new ArrayList(); + for (PortForwardingRule rule : rules) { + IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId()); + Vlan vlan = _vlanDao.findById(sourceIp.getVlanId()); + PortForwardingRuleTO ruleTO = new PortForwardingRuleTO(rule, vlan.getVlanTag(), sourceIp.getAddress().addr()); + rulesTO.add(ruleTO); + } + + if (!rulesTO.isEmpty()) { + SetPortForwardingRulesCommand cmd = new SetPortForwardingRulesCommand(rulesTO); + cmd.setContextParam(NetworkElementCommand.GUEST_VLAN_TAG, network.getBroadcastUri().getHost()); + cmd.setContextParam(NetworkElementCommand.GUEST_NETWORK_CIDR, network.getCidr()); + Answer answer = _agentMgr.easySend(ciscoVnmcHost.getId(), cmd); + if (answer == null || !answer.getResult()) { + String details = (answer != null) ? answer.getDetails() : "details unavailable"; + String msg = "Unable to apply port forwarding rules to Cisco ASA 1000v appliance due to: " + details + "."; + s_logger.error(msg); + throw new ResourceUnavailableException(msg, DataCenter.class, network.getDataCenterId()); + } + } + + return true; + } + + @Override + public boolean applyStaticNats(Network network, + List rules) + throws ResourceUnavailableException { + if (!_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.StaticNat, Provider.CiscoVnmc)) { + s_logger.error("Static NAT service is not provided by Cisco Vnmc device on network " + network.getName()); + return false; + } + + // Find VNMC host for physical network + List devices = _ciscoVnmcDao.listByPhysicalNetwork(network.getPhysicalNetworkId()); + if (devices.isEmpty()) { + s_logger.error("No Cisco Vnmc device on network " + network.getName()); + return true; + } + + // Find if ASA 1000v is associated with network + NetworkAsa1000vMapVO asaForNetwork = _networkAsa1000vMapDao.findByNetworkId(network.getId()); + if (asaForNetwork == null) { + s_logger.debug("Cisco ASA 1000v device is not associated with network " + network.getName()); + return true; + } + + if (network.getState() == Network.State.Allocated) { + s_logger.debug("External firewall was asked to apply static NAT rules for network with ID " + network.getId() + "; this network is not implemented. Skipping backend commands."); + return true; + } + + CiscoVnmcControllerVO ciscoVnmcDevice = devices.get(0); + HostVO ciscoVnmcHost = _hostDao.findById(ciscoVnmcDevice.getHostId()); + + List rulesTO = new ArrayList(); + for (StaticNat rule : rules) { + IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId()); + StaticNatRuleTO ruleTO = new StaticNatRuleTO(0, sourceIp.getAddress().addr(), null, + null, rule.getDestIpAddress(), null, null, null, rule.isForRevoke(), false); + rulesTO.add(ruleTO); + } + + if (!rulesTO.isEmpty()) { + SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rulesTO, null); + cmd.setContextParam(NetworkElementCommand.GUEST_VLAN_TAG, network.getBroadcastUri().getHost()); + cmd.setContextParam(NetworkElementCommand.GUEST_NETWORK_CIDR, network.getCidr()); + Answer answer = _agentMgr.easySend(ciscoVnmcHost.getId(), cmd); + if (answer == null || !answer.getResult()) { + String details = (answer != null) ? answer.getDetails() : "details unavailable"; + String msg = "Unable to apply static NAT rules to Cisco ASA 1000v appliance due to: " + details + "."; + s_logger.error(msg); + throw new ResourceUnavailableException(msg, DataCenter.class, network.getDataCenterId()); + } + } + + return true; + } + + @Override + public boolean applyIps(Network network, + List ipAddress, Set services) + throws ResourceUnavailableException { + // TODO Auto-generated method stub + return false; + } + + @Override + public HostVO createHostVOForConnectedAgent(HostVO host, + StartupCommand[] cmd) { + // TODO Auto-generated method stub + return null; + } + + @Override + public HostVO createHostVOForDirectConnectAgent(HostVO host, + StartupCommand[] startup, ServerResource resource, + Map details, List hostTags) { + if (!(startup[0] instanceof StartupExternalFirewallCommand)) { + return null; + } + host.setType(Host.Type.ExternalFirewall); + return host; + } + + @Override + public DeleteHostAnswer deleteHost(HostVO host, boolean isForced, + boolean isForceDeleteStorage) throws UnableDeleteHostException { + if (host.getType() != com.cloud.host.Host.Type.ExternalFirewall) { + return null; + } + return new DeleteHostAnswer(true); + } + + @Override + public CiscoAsa1000vDevice addCiscoAsa1000vResource( + AddCiscoAsa1000vResourceCmd cmd) { + Long physicalNetworkId = cmd.getPhysicalNetworkId(); + CiscoAsa1000vDevice ciscoAsa1000vResource = null; + + PhysicalNetworkVO physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId); + if (physicalNetwork == null) { + throw new InvalidParameterValueException("Could not find phyical network with ID: " + physicalNetworkId); + } + + ciscoAsa1000vResource = new CiscoAsa1000vDeviceVO(physicalNetworkId, cmd.getManagementIp(), cmd.getInPortProfile(), cmd.getClusterId()); + _ciscoAsa1000vDao.persist((CiscoAsa1000vDeviceVO)ciscoAsa1000vResource); + + return ciscoAsa1000vResource; + } + + @Override + public CiscoAsa1000vResourceResponse createCiscoAsa1000vResourceResponse( + CiscoAsa1000vDevice ciscoAsa1000vDeviceVO) { + CiscoAsa1000vResourceResponse response = new CiscoAsa1000vResourceResponse(); + response.setId(ciscoAsa1000vDeviceVO.getUuid()); + response.setManagementIp(ciscoAsa1000vDeviceVO.getManagementIp()); + response.setInPortProfile(ciscoAsa1000vDeviceVO.getInPortProfile()); + + NetworkAsa1000vMapVO networkAsaMap = _networkAsa1000vMapDao.findByAsa1000vId(ciscoAsa1000vDeviceVO.getId()); + if (networkAsaMap != null) { + response.setGuestNetworkId(networkAsaMap.getNetworkId()); + } + + return response; + } + + @Override + public boolean deleteCiscoAsa1000vResource( + DeleteCiscoAsa1000vResourceCmd cmd) { + Long asaResourceId = cmd.getCiscoAsa1000vResourceId(); + CiscoAsa1000vDeviceVO asaResource = _ciscoAsa1000vDao.findById(asaResourceId); + if (asaResource == null) { + throw new InvalidParameterValueException( + "Could not find a Cisco ASA 1000v appliance with id " + asaResourceId); + } + + NetworkAsa1000vMapVO networkAsaMap = _networkAsa1000vMapDao.findByAsa1000vId(asaResource.getId()); + if (networkAsaMap != null) { + throw new CloudRuntimeException( + "Cisco ASA 1000v appliance with id " + asaResourceId + + " cannot be deleted as it is associated with guest network"); + } + + _ciscoAsa1000vDao.remove(asaResourceId); + + return true; + } + + @Override + public List listCiscoAsa1000vResources( + ListCiscoAsa1000vResourcesCmd cmd) { + Long physicalNetworkId = cmd.getPhysicalNetworkId(); + Long ciscoAsa1000vResourceId = cmd.getCiscoAsa1000vResourceId(); + List responseList = new ArrayList(); + + if (physicalNetworkId == null && ciscoAsa1000vResourceId == null) { + throw new InvalidParameterValueException("Either physical network Id or Asa 1000v device Id must be specified"); + } + + if (ciscoAsa1000vResourceId != null) { + CiscoAsa1000vDeviceVO ciscoAsa1000vResource = _ciscoAsa1000vDao.findById(ciscoAsa1000vResourceId); + if (ciscoAsa1000vResource == null) { + throw new InvalidParameterValueException("Could not find Cisco Asa 1000v device with id: " + ciscoAsa1000vResourceId); + } + responseList.add(ciscoAsa1000vResource); + } else { + PhysicalNetworkVO physicalNetwork = _physicalNetworkDao.findById(physicalNetworkId); + if (physicalNetwork == null) { + throw new InvalidParameterValueException("Could not find a physical network with id: " + physicalNetworkId); + } + responseList = _ciscoAsa1000vDao.listByPhysicalNetwork(physicalNetworkId); + } + + return responseList; + } + + @Override + public CiscoAsa1000vDevice assignAsa1000vToNetwork(Network network) { + List asaList = _ciscoAsa1000vDao.listByPhysicalNetwork(network.getPhysicalNetworkId()); + for (CiscoAsa1000vDeviceVO asa : asaList) { + NetworkAsa1000vMapVO assignedToNetwork = _networkAsa1000vMapDao.findByAsa1000vId(asa.getId()); + if (assignedToNetwork == null) { + NetworkAsa1000vMapVO networkAsaMap = new NetworkAsa1000vMapVO(network.getId(), asa.getId()); + _networkAsa1000vMapDao.persist(networkAsaMap); + return asa; + } + } + return null; + } + + private void unassignAsa1000vFromNetwork(Network network) { + NetworkAsa1000vMapVO networkAsaMap = _networkAsa1000vMapDao.findByNetworkId(network.getId()); + if (networkAsaMap != null) { + _networkAsa1000vMapDao.remove(networkAsaMap.getId()); + } + } +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElementService.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElementService.java new file mode 100644 index 00000000000..e8eb473154a --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/element/CiscoVnmcElementService.java @@ -0,0 +1,42 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.element; + +import java.util.List; + +import com.cloud.api.commands.AddCiscoVnmcResourceCmd; +import com.cloud.api.commands.DeleteCiscoVnmcResourceCmd; +import com.cloud.api.commands.ListCiscoVnmcResourcesCmd; +import com.cloud.api.response.CiscoVnmcResourceResponse; +import com.cloud.network.cisco.CiscoVnmcController; +import com.cloud.network.cisco.CiscoVnmcControllerVO; +import com.cloud.utils.component.PluggableService; + +public interface CiscoVnmcElementService extends PluggableService { + + //public static final Provider CiscoVnmc = new Provider("CiscoVnmc", true); + + public CiscoVnmcController addCiscoVnmcResource(AddCiscoVnmcResourceCmd cmd); + + public CiscoVnmcResourceResponse createCiscoVnmcResourceResponse( + CiscoVnmcController CiscoVnmcResourceVO); + + boolean deleteCiscoVnmcResource(DeleteCiscoVnmcResourceCmd cmd); + + List listCiscoVnmcResources(ListCiscoVnmcResourcesCmd cmd); + +} diff --git a/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java new file mode 100644 index 00000000000..91559782304 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/com/cloud/network/resource/CiscoVnmcResource.java @@ -0,0 +1,780 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.resource; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.naming.ConfigurationException; + +import org.apache.log4j.Logger; + +import com.cloud.agent.IAgentControl; +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.AssociateAsaWithLogicalEdgeFirewallCommand; +import com.cloud.agent.api.CleanupLogicalEdgeFirewallCommand; +import com.cloud.agent.api.Command; +import com.cloud.agent.api.ConfigureNexusVsmForAsaCommand; +import com.cloud.agent.api.CreateLogicalEdgeFirewallCommand; +import com.cloud.agent.api.ExternalNetworkResourceUsageAnswer; +import com.cloud.agent.api.ExternalNetworkResourceUsageCommand; +import com.cloud.agent.api.MaintainAnswer; +import com.cloud.agent.api.MaintainCommand; +import com.cloud.agent.api.PingCommand; +import com.cloud.agent.api.ReadyAnswer; +import com.cloud.agent.api.ReadyCommand; +import com.cloud.agent.api.StartupCommand; +import com.cloud.agent.api.StartupExternalFirewallCommand; +import com.cloud.agent.api.routing.IpAssocAnswer; +import com.cloud.agent.api.routing.IpAssocCommand; +import com.cloud.agent.api.routing.NetworkElementCommand; +import com.cloud.agent.api.routing.SetFirewallRulesCommand; +import com.cloud.agent.api.routing.SetPortForwardingRulesCommand; +import com.cloud.agent.api.routing.SetSourceNatCommand; +import com.cloud.agent.api.routing.SetStaticNatRulesCommand; +import com.cloud.agent.api.to.FirewallRuleTO; +import com.cloud.agent.api.to.PortForwardingRuleTO; +import com.cloud.agent.api.to.StaticNatRuleTO; +import com.cloud.host.Host; +import com.cloud.network.cisco.CiscoVnmcConnectionImpl; +import com.cloud.network.rules.FirewallRule.TrafficType; +import com.cloud.resource.ServerResource; +import com.cloud.utils.NumbersUtil; +import com.cloud.utils.Pair; +import com.cloud.utils.cisco.n1kv.vsm.NetconfHelper; +import com.cloud.utils.cisco.n1kv.vsm.VsmCommand.OperationType; +import com.cloud.utils.cisco.n1kv.vsm.VsmCommand.SwitchPortMode; +import com.cloud.utils.exception.ExecutionException; +import com.cloud.utils.net.NetUtils; + +public class CiscoVnmcResource implements ServerResource { + + private String _name; + private String _zoneId; + private String _physicalNetworkId; + private String _ip; + private String _username; + private String _password; + private String _guid; + private Integer _numRetries; + + private CiscoVnmcConnectionImpl _connection; + + public void setConnection(CiscoVnmcConnectionImpl connection) { + this._connection = connection; + } + + private final Logger s_logger = Logger.getLogger(CiscoVnmcResource.class); + + public Answer executeRequest(Command cmd) { + if (cmd instanceof ReadyCommand) { + return execute((ReadyCommand) cmd); + } else if (cmd instanceof MaintainCommand) { + return execute((MaintainCommand) cmd); + } else if (cmd instanceof IpAssocCommand) { + return execute((IpAssocCommand) cmd); + } else if (cmd instanceof SetSourceNatCommand) { + return execute((SetSourceNatCommand) cmd); + } else if (cmd instanceof SetFirewallRulesCommand) { + return execute((SetFirewallRulesCommand) cmd); + } else if (cmd instanceof SetStaticNatRulesCommand) { + return execute((SetStaticNatRulesCommand) cmd); + } else if (cmd instanceof SetPortForwardingRulesCommand) { + return execute((SetPortForwardingRulesCommand) cmd); + } else if (cmd instanceof ExternalNetworkResourceUsageCommand) { + return execute((ExternalNetworkResourceUsageCommand) cmd); + } else if (cmd instanceof CreateLogicalEdgeFirewallCommand) { + return execute((CreateLogicalEdgeFirewallCommand)cmd); + } else if (cmd instanceof CleanupLogicalEdgeFirewallCommand) { + return execute((CleanupLogicalEdgeFirewallCommand)cmd); + } else if (cmd instanceof ConfigureNexusVsmForAsaCommand) { + return execute((ConfigureNexusVsmForAsaCommand)cmd); + } else if (cmd instanceof AssociateAsaWithLogicalEdgeFirewallCommand) { + return execute((AssociateAsaWithLogicalEdgeFirewallCommand)cmd); + } else { + return Answer.createUnsupportedCommandAnswer(cmd); + } + } + + public boolean configure(String name, Map params) throws ConfigurationException { + try { + _name = (String) params.get("name"); + if (_name == null) { + throw new ConfigurationException("Unable to find name"); + } + + _zoneId = (String) params.get("zoneId"); + if (_zoneId == null) { + throw new ConfigurationException("Unable to find zone"); + } + + _physicalNetworkId = (String) params.get("physicalNetworkId"); + if (_physicalNetworkId == null) { + throw new ConfigurationException("Unable to find physical network id in the configuration parameters"); + } + + _ip = (String) params.get("ip"); + if (_ip == null) { + throw new ConfigurationException("Unable to find IP"); + } + + _username = (String) params.get("username"); + if (_username == null) { + throw new ConfigurationException("Unable to find username"); + } + + _password = (String) params.get("password"); + if (_password == null) { + throw new ConfigurationException("Unable to find password"); + } + + _guid = (String)params.get("guid"); + if (_guid == null) { + throw new ConfigurationException("Unable to find the guid"); + } + + _numRetries = NumbersUtil.parseInt((String) params.get("numretries"), 1); + + NumbersUtil.parseInt((String) params.get("timeout"), 300); + + // Open a socket and login + _connection = new CiscoVnmcConnectionImpl(_ip, _username, _password); + //if (!refreshVnmcConnection()) { + // throw new ConfigurationException("Unable to open a connection to the VNMC."); + //} + + return true; + } catch (Exception e) { + throw new ConfigurationException(e.getMessage()); + } + + } + + public StartupCommand[] initialize() { + StartupExternalFirewallCommand cmd = new StartupExternalFirewallCommand(); + cmd.setName(_name); + cmd.setDataCenter(_zoneId); + cmd.setPod(""); + cmd.setPrivateIpAddress(_ip); + cmd.setStorageIpAddress(""); + cmd.setVersion(""); + cmd.setGuid(_guid); + return new StartupCommand[] { cmd }; + } + + public Host.Type getType() { + return Host.Type.ExternalFirewall; + } + + @Override + public String getName() { + return _name; + } + + @Override + public boolean start() { + return true; + } + + @Override + public boolean stop() { + return true; + } + + @Override + public PingCommand getCurrentStatus(final long id) { + if (!refreshVnmcConnection()) { + return null; + } + return new PingCommand(Host.Type.ExternalFirewall, id); + } + + @Override + public void disconnected() { + } + + public IAgentControl getAgentControl() { + return null; + } + + public void setAgentControl(IAgentControl agentControl) { + return; + } + + private Answer execute(ReadyCommand cmd) { + return new ReadyAnswer(cmd); + } + + private Answer execute(MaintainCommand cmd) { + return new MaintainAnswer(cmd); + } + + private ExternalNetworkResourceUsageAnswer execute(ExternalNetworkResourceUsageCommand cmd) { + return new ExternalNetworkResourceUsageAnswer(cmd); + } + + /* + * Login + */ + private boolean refreshVnmcConnection() { + boolean ret = false; + try { + ret = _connection.login(); + } catch (ExecutionException ex) { + s_logger.error("Login to Vnmc failed", ex); + } + return ret; + } + + private synchronized Answer execute(IpAssocCommand cmd) { + refreshVnmcConnection(); + return execute(cmd, _numRetries); + } + + private Answer execute(IpAssocCommand cmd, int numRetries) { + String[] results = new String[cmd.getIpAddresses().length]; + return new IpAssocAnswer(cmd, results); + } + + private String[] getIpRangeFromCidr(String cidr) { + String[] result = new String[2]; + String[] cidrData = cidr.split("\\/"); + assert (cidrData.length == 2) : "Something is wrong with source cidr " + cidr; + long size = Long.valueOf(cidrData[1]); + result[0] = cidrData[0]; + result[1] = cidrData[0]; + if (size < 32) { + result[0] = NetUtils.getIpRangeStartIpFromCidr(cidrData[0], size); + result[1] = NetUtils.getIpRangeEndIpFromCidr(cidrData[0], size); + } + return result; + } + + /* + * Source NAT + */ + private synchronized Answer execute(SetSourceNatCommand cmd) { + refreshVnmcConnection(); + return execute(cmd, _numRetries); + } + + private Answer execute(SetSourceNatCommand cmd, int numRetries) { + String vlanId = cmd.getContextParam(NetworkElementCommand.GUEST_VLAN_TAG); + String tenant = "vlan-" + vlanId; + String policyIdentifier = cmd.getIpAddress().getPublicIp().replace('.', '-'); + try { + if (!_connection.createTenantVDCNatPolicySet(tenant)) { + throw new Exception("Failed to create NAT policy set in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCSourceNatPolicy(tenant, policyIdentifier)) { + throw new Exception("Failed to create source NAT policy in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCSourceNatPolicyRef(tenant, policyIdentifier)) { + throw new Exception("Failed to associate source NAT policy with NAT policy set in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCSourceNatIpPool(tenant, policyIdentifier, cmd.getIpAddress().getPublicIp())) { + throw new Exception("Failed to create source NAT ip pool in VNMC for guest network with vlan " + vlanId); + } + + String[] ipRange = getIpRangeFromCidr(cmd.getContextParam(NetworkElementCommand.GUEST_NETWORK_CIDR)); + if (!_connection.createTenantVDCSourceNatRule(tenant, policyIdentifier, ipRange[0], ipRange[1])) { + throw new Exception("Failed to create source NAT rule in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.associateNatPolicySet(tenant)) { + throw new Exception("Failed to associate source NAT policy set with edge security profile in VNMC for guest network with vlan " + vlanId); + } + } catch (Throwable e) { + String msg = "SetSourceNatCommand failed due to " + e.getMessage(); + s_logger.error(msg, e); + return new Answer(cmd, false, msg); + } + + return new Answer(cmd, true, "Success"); + } + + /* + * Firewall rule + */ + private synchronized Answer execute(SetFirewallRulesCommand cmd) { + refreshVnmcConnection(); + return execute(cmd, _numRetries); + } + + private Answer execute(SetFirewallRulesCommand cmd, int numRetries) { + String vlanId = cmd.getContextParam(NetworkElementCommand.GUEST_VLAN_TAG); + String tenant = "vlan-" + vlanId; + + FirewallRuleTO[] rules = cmd.getRules(); + Map> publicIpRulesMap = new HashMap>(); + for (FirewallRuleTO rule : rules) { + String publicIp = rule.getSrcIp(); + if (!publicIpRulesMap.containsKey(publicIp)) { + List publicIpRulesList = new ArrayList(); + publicIpRulesMap.put(publicIp, publicIpRulesList); + } + publicIpRulesMap.get(publicIp).add(rule); + } + + try { + if (!_connection.createTenantVDCAclPolicySet(tenant, true)) { + throw new Exception("Failed to create ACL ingress policy set in VNMC for guest network with vlan " + vlanId); + } + if (!_connection.createTenantVDCAclPolicySet(tenant, false)) { + throw new Exception("Failed to create ACL egress policy set in VNMC for guest network with vlan " + vlanId); + } + + for (String publicIp : publicIpRulesMap.keySet()) { + String policyIdentifier = publicIp.replace('.', '-'); + + if (!_connection.createTenantVDCAclPolicy(tenant, policyIdentifier)) { + throw new Exception("Failed to create ACL policy in VNMC for guest network with vlan " + vlanId); + } + if (!_connection.createTenantVDCAclPolicyRef(tenant, policyIdentifier, true)) { + throw new Exception("Failed to associate ACL policy with ACL ingress policy set in VNMC for guest network with vlan " + vlanId); + } + if (!_connection.createTenantVDCAclPolicyRef(tenant, policyIdentifier, false)) { + throw new Exception("Failed to associate ACL policy with ACL egress policy set in VNMC for guest network with vlan " + vlanId); + } + + for (FirewallRuleTO rule : publicIpRulesMap.get(publicIp)) { + if (rule.revoked()) { + if (!_connection.deleteTenantVDCAclRule(tenant, Long.toString(rule.getId()), policyIdentifier)) { + throw new Exception("Failed to delete ACL rule in VNMC for guest network with vlan " + vlanId); + } + } else { + String[] externalIpRange = getIpRangeFromCidr(rule.getSourceCidrList().get(0)); + if (rule.getTrafficType() == TrafficType.Ingress) { + if (!rule.getProtocol().equalsIgnoreCase("icmp")) { + if (!_connection.createTenantVDCIngressAclRule(tenant, + Long.toString(rule.getId()), policyIdentifier, + rule.getProtocol().toUpperCase(), externalIpRange[0], externalIpRange[1], + Integer.toString(rule.getSrcPortRange()[0]), Integer.toString(rule.getSrcPortRange()[1]), publicIp)) { + throw new Exception("Failed to create ACL ingress rule in VNMC for guest network with vlan " + vlanId); + } + } else { + if (!_connection.createTenantVDCIngressAclRule(tenant, + Long.toString(rule.getId()), policyIdentifier, + rule.getProtocol().toUpperCase(), externalIpRange[0], externalIpRange[1], publicIp)) { + throw new Exception("Failed to create ACL ingress rule in VNMC for guest network with vlan " + vlanId); + } + } + } else { + if (!rule.getProtocol().equalsIgnoreCase("icmp")) { + if (!_connection.createTenantVDCEgressAclRule(tenant, + Long.toString(rule.getId()), policyIdentifier, + rule.getProtocol().toUpperCase(), + Integer.toString(rule.getSrcPortRange()[0]), Integer.toString(rule.getSrcPortRange()[1]), publicIp, + externalIpRange[0], externalIpRange[1])) { + throw new Exception("Failed to create ACL egress rule in VNMC for guest network with vlan " + vlanId); + } + } else { + if (!_connection.createTenantVDCEgressAclRule(tenant, + Long.toString(rule.getId()), policyIdentifier, + rule.getProtocol().toUpperCase(), publicIp, externalIpRange[0], externalIpRange[1])) { + throw new Exception("Failed to create ACL egress rule in VNMC for guest network with vlan " + vlanId); + } + } + } + } + } + } + + if (!_connection.associateAclPolicySet(tenant)) { + throw new Exception("Failed to associate ACL policy set with edge security profile in VNMC for guest network with vlan " + vlanId); + } + } catch (Throwable e) { + String msg = "SetFirewallRulesCommand failed due to " + e.getMessage(); + s_logger.error(msg, e); + return new Answer(cmd, false, msg); + } + + return new Answer(cmd, true, "Success"); + } + + /* + * Static NAT + */ + private synchronized Answer execute(SetStaticNatRulesCommand cmd) { + refreshVnmcConnection(); + return execute(cmd, _numRetries); + } + + private Answer execute(SetStaticNatRulesCommand cmd, int numRetries) { + String vlanId = cmd.getContextParam(NetworkElementCommand.GUEST_VLAN_TAG); + String tenant = "vlan-" + vlanId; + + StaticNatRuleTO[] rules = cmd.getRules(); + Map> publicIpRulesMap = new HashMap>(); + for (StaticNatRuleTO rule : rules) { + String publicIp = rule.getSrcIp(); + if (!publicIpRulesMap.containsKey(publicIp)) { + List publicIpRulesList = new ArrayList(); + publicIpRulesMap.put(publicIp, publicIpRulesList); + } + publicIpRulesMap.get(publicIp).add(rule); + } + + try { + if (!_connection.createTenantVDCNatPolicySet(tenant)) { + throw new Exception("Failed to create NAT policy set in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCAclPolicySet(tenant, true)) { + throw new Exception("Failed to create ACL ingress policy set in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCAclPolicySet(tenant, false)) { + throw new Exception("Failed to create ACL egress policy set in VNMC for guest network with vlan " + vlanId); + } + + for (String publicIp : publicIpRulesMap.keySet()) { + String policyIdentifier = publicIp.replace('.', '-'); + + if (!_connection.createTenantVDCDNatPolicy(tenant, policyIdentifier)) { + throw new Exception("Failed to create DNAT policy in VNMC for guest network with vlan " + vlanId); + } + if (!_connection.createTenantVDCDNatPolicyRef(tenant, policyIdentifier)) { + throw new Exception("Failed to associate DNAT policy with NAT policy set in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCAclPolicy(tenant, policyIdentifier)) { + throw new Exception("Failed to create ACL policy in VNMC for guest network with vlan " + vlanId); + } + if (!_connection.createTenantVDCAclPolicyRef(tenant, policyIdentifier, true)) { + throw new Exception("Failed to associate ACL policy with ACL ingress policy set in VNMC for guest network with vlan " + vlanId); + } + if (!_connection.createTenantVDCAclPolicyRef(tenant, policyIdentifier, false)) { + throw new Exception("Failed to associate ACL policy with ACL egress policy set in VNMC for guest network with vlan " + vlanId); + } + + for (StaticNatRuleTO rule : publicIpRulesMap.get(publicIp)) { + if (rule.revoked()) { + if (!_connection.deleteTenantVDCDNatRule(tenant, Long.toString(rule.getId()), policyIdentifier)) { + throw new Exception("Failed to delete DNAT rule in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.deleteTenantVDCAclRule(tenant, Long.toString(rule.getId()), policyIdentifier)) { + throw new Exception("Failed to delete ACL ingress rule for DNAT in VNMC for guest network with vlan " + vlanId); + } + } else { + if (!_connection.createTenantVDCDNatIpPool(tenant, policyIdentifier + "-" + rule.getId(), rule.getDstIp())) { + throw new Exception("Failed to create DNAT ip pool in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCDNatRule(tenant, + Long.toString(rule.getId()), policyIdentifier, rule.getSrcIp())) { + throw new Exception("Failed to create DNAT rule in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCAclRuleForDNat(tenant, + Long.toString(rule.getId()), policyIdentifier, rule.getDstIp())) { + throw new Exception("Failed to create ACL rule for DNAT in VNMC for guest network with vlan " + vlanId); + } + } + } + } + + if (!_connection.associateAclPolicySet(tenant)) { + throw new Exception("Failed to associate source NAT policy set with edge security profile in VNMC for guest network with vlan " + vlanId); + } + } catch (Throwable e) { + String msg = "SetSourceNatCommand failed due to " + e.getMessage(); + s_logger.error(msg, e); + return new Answer(cmd, false, msg); + } + + return new Answer(cmd, true, "Success"); + } + + /* + * Destination NAT + */ + private synchronized Answer execute(SetPortForwardingRulesCommand cmd) { + refreshVnmcConnection(); + return execute(cmd, _numRetries); + } + + private Answer execute(SetPortForwardingRulesCommand cmd, int numRetries) { + String vlanId = cmd.getContextParam(NetworkElementCommand.GUEST_VLAN_TAG); + String tenant = "vlan-" + vlanId; + + PortForwardingRuleTO[] rules = cmd.getRules(); + Map> publicIpRulesMap = new HashMap>(); + for (PortForwardingRuleTO rule : rules) { + String publicIp = rule.getSrcIp(); + if (!publicIpRulesMap.containsKey(publicIp)) { + List publicIpRulesList = new ArrayList(); + publicIpRulesMap.put(publicIp, publicIpRulesList); + } + publicIpRulesMap.get(publicIp).add(rule); + } + + try { + if (!_connection.createTenantVDCNatPolicySet(tenant)) { + throw new Exception("Failed to create NAT policy set in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCAclPolicySet(tenant, true)) { + throw new Exception("Failed to create ACL ingress policy set in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCAclPolicySet(tenant, false)) { + throw new Exception("Failed to create ACL egress policy set in VNMC for guest network with vlan " + vlanId); + } + + for (String publicIp : publicIpRulesMap.keySet()) { + String policyIdentifier = publicIp.replace('.', '-'); + + if (!_connection.createTenantVDCPFPolicy(tenant, policyIdentifier)) { + throw new Exception("Failed to create PF policy in VNMC for guest network with vlan " + vlanId); + } + if (!_connection.createTenantVDCPFPolicyRef(tenant, policyIdentifier)) { + throw new Exception("Failed to associate PF policy with NAT policy set in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCAclPolicy(tenant, policyIdentifier)) { + throw new Exception("Failed to create ACL policy in VNMC for guest network with vlan " + vlanId); + } + if (!_connection.createTenantVDCAclPolicyRef(tenant, policyIdentifier, true)) { + throw new Exception("Failed to associate ACL policy with ACL ingress policy set in VNMC for guest network with vlan " + vlanId); + } + if (!_connection.createTenantVDCAclPolicyRef(tenant, policyIdentifier, false)) { + throw new Exception("Failed to associate ACL policy with ACL egress policy set in VNMC for guest network with vlan " + vlanId); + } + + for (PortForwardingRuleTO rule : publicIpRulesMap.get(publicIp)) { + if (rule.revoked()) { + if (!_connection.deleteTenantVDCPFRule(tenant, Long.toString(rule.getId()), policyIdentifier)) { + throw new Exception("Failed to delete PF rule in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.deleteTenantVDCAclRule(tenant, Long.toString(rule.getId()), policyIdentifier)) { + throw new Exception("Failed to delete ACL ingress rule for PF in VNMC for guest network with vlan " + vlanId); + } + } else { + if (!_connection.createTenantVDCPFIpPool(tenant, policyIdentifier + "-" + rule.getId(), rule.getDstIp())) { + throw new Exception("Failed to create PF ip pool in VNMC for guest network with vlan " + vlanId); + } + if (!_connection.createTenantVDCPFPortPool(tenant, policyIdentifier + "-" + rule.getId(), + Integer.toString(rule.getDstPortRange()[0]), Integer.toString(rule.getDstPortRange()[1]))) { + throw new Exception("Failed to create PF port pool in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCPFRule(tenant, + Long.toString(rule.getId()), policyIdentifier, + rule.getProtocol().toUpperCase(), rule.getSrcIp(), + Integer.toString(rule.getSrcPortRange()[0]), Integer.toString(rule.getSrcPortRange()[1]))) { + throw new Exception("Failed to create PF rule in VNMC for guest network with vlan " + vlanId); + } + + if (!_connection.createTenantVDCAclRuleForPF(tenant, + Long.toString(rule.getId()), policyIdentifier, + rule.getProtocol().toUpperCase(), rule.getDstIp(), + Integer.toString(rule.getDstPortRange()[0]), Integer.toString(rule.getDstPortRange()[1]))) { + throw new Exception("Failed to create ACL rule for PF in VNMC for guest network with vlan " + vlanId); + } + } + } + } + + if (!_connection.associateAclPolicySet(tenant)) { + throw new Exception("Failed to associate source NAT policy set with edge security profile in VNMC for guest network with vlan " + vlanId); + } + } catch (Throwable e) { + String msg = "SetSourceNatCommand failed due to " + e.getMessage(); + s_logger.error(msg, e); + return new Answer(cmd, false, msg); + } + + return new Answer(cmd, true, "Success"); + } + + /* + * Logical edge firewall + */ + private synchronized Answer execute(CreateLogicalEdgeFirewallCommand cmd) { + refreshVnmcConnection(); + return execute(cmd, _numRetries); + } + + private void createEdgeDeviceProfile(String tenant, List gateways, Long vlanId) throws Exception { + // create edge device profile + if (!_connection.createTenantVDCEdgeDeviceProfile(tenant)) + throw new Exception("Failed to create tenant edge device profile in VNMC for guest network with vlan " + vlanId); + + // create edge static route policy + if (!_connection.createTenantVDCEdgeStaticRoutePolicy(tenant)) + throw new Exception("Failed to create tenant edge static route policy in VNMC for guest network with vlan " + vlanId); + + // create edge static route for all gateways + for (String gateway : gateways) { + if (!_connection.createTenantVDCEdgeStaticRoute(tenant, gateway, "0.0.0.0", "0.0.0.0")) + throw new Exception("Failed to create tenant edge static route in VNMC for guest network with vlan " + vlanId); + } + + // associate edge + if (!_connection.associateTenantVDCEdgeStaticRoutePolicy(tenant)) + throw new Exception("Failed to associate edge static route policy with edge device profile in VNMC for guest network with vlan " + vlanId); + } + + private Answer execute(CreateLogicalEdgeFirewallCommand cmd, int numRetries) { + String tenant = "vlan-" + cmd.getVlanId(); + try { + // create tenant + if (!_connection.createTenant(tenant)) + throw new Exception("Failed to create tenant in VNMC for guest network with vlan " + cmd.getVlanId()); + + // create tenant VDC + if (!_connection.createTenantVDC(tenant)) + throw new Exception("Failed to create tenant VDC in VNMC for guest network with vlan " + cmd.getVlanId()); + + // create edge security profile + if (!_connection.createTenantVDCEdgeSecurityProfile(tenant)) + throw new Exception("Failed to create tenant edge security profile in VNMC for guest network with vlan " + cmd.getVlanId()); + + // create edge device profile and associated route + createEdgeDeviceProfile(tenant, cmd.getPublicGateways(), cmd.getVlanId()); + + // create logical edge firewall + if (!_connection.createEdgeFirewall(tenant, cmd.getPublicIp(), cmd.getInternalIp(), cmd.getPublicSubnet(), cmd.getInternalSubnet())) + throw new Exception("Failed to create edge firewall in VNMC for guest network with vlan " + cmd.getVlanId()); + } catch (Throwable e) { + String msg = "CreateLogicalEdgeFirewallCommand failed due to " + e.getMessage(); + s_logger.error(msg, e); + return new Answer(cmd, false, msg); + } + + return new Answer(cmd, true, "Success"); + } + + /* + * Create vservice node and update inside port profile for ASA appliance in VSM + */ + private synchronized Answer execute(ConfigureNexusVsmForAsaCommand cmd) { + return execute(cmd, _numRetries); + } + + private Answer execute(ConfigureNexusVsmForAsaCommand cmd, int numRetries) { + String vlanId = Long.toString(cmd.getVlanId()); + NetconfHelper helper = null; + List> params = new ArrayList>(); + params.add(new Pair(OperationType.addvlanid, vlanId)); + try { + helper = new NetconfHelper(cmd.getVsmIp(), cmd.getVsmUsername(), cmd.getVsmPassword()); + s_logger.debug("Connected to Cisco VSM " + cmd.getVsmIp()); + helper.addVServiceNode(vlanId, cmd.getIpAddress()); + s_logger.debug("Created vservice node for ASA appliance in Cisco VSM for vlan " + vlanId); + helper.updatePortProfile(cmd.getAsaInPortProfile(), SwitchPortMode.access, params); + s_logger.debug("Updated inside port profile for ASA appliance in Cisco VSM with new vlan " + vlanId); + } catch (Throwable e) { + String msg = "ConfigureVSMForASACommand failed due to " + e.getMessage(); + s_logger.error(msg, e); + return new Answer(cmd, false, msg); + } finally { + helper.disconnect(); + } + + return new Answer(cmd, true, "Success"); + } + + /* + * Associates ASA 1000v with logical edge firewall in VNMC + */ + private synchronized Answer execute(AssociateAsaWithLogicalEdgeFirewallCommand cmd) { + return execute(cmd, _numRetries); + } + + private Answer execute(AssociateAsaWithLogicalEdgeFirewallCommand cmd, int numRetries) { + String tenant = "vlan-" + cmd.getVlanId(); + try { + Map availableAsaAppliances = _connection.listUnAssocAsa1000v(); + if (availableAsaAppliances.isEmpty()) { + throw new Exception("No ASA 1000v available to associate with logical edge firewall for guest vlan " + cmd.getVlanId()); + } + + String asaInstanceDn = availableAsaAppliances.get(cmd.getAsaMgmtIp()); + if (asaInstanceDn == null) { + throw new Exception("Requested ASA 1000v (" + cmd.getAsaMgmtIp() + ") is not available"); + } + + if (!_connection.assignAsa1000v(tenant, asaInstanceDn)) { + throw new Exception("Failed to associate ASA 1000v (" + cmd.getAsaMgmtIp() + ") with logical edge firewall for guest vlan " + cmd.getVlanId()); + } + } catch (Throwable e) { + String msg = "AssociateAsaWithLogicalEdgeFirewallCommand failed due to " + e.getMessage(); + s_logger.error(msg, e); + return new Answer(cmd, false, msg); + } + + return new Answer(cmd, true, "Success"); + } + + /* + * Cleanup + */ + private synchronized Answer execute(CleanupLogicalEdgeFirewallCommand cmd) { + refreshVnmcConnection(); + return execute(cmd, _numRetries); + } + + private Answer execute(CleanupLogicalEdgeFirewallCommand cmd, int numRetries) { + String tenant = "vlan-" + cmd.getVlanId(); + try { + _connection.deleteTenant(tenant); + } catch (Throwable e) { + String msg = "CleanupLogicalEdgeFirewallCommand failed due to " + e.getMessage(); + s_logger.error(msg, e); + return new Answer(cmd, false, msg); + } + + return new Answer(cmd, true, "Success"); + } + + @Override + public void setName(String name) { + // TODO Auto-generated method stub + } + + @Override + public void setConfigParams(Map params) { + // TODO Auto-generated method stub + } + + @Override + public Map getConfigParams() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getRunLevel() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public void setRunLevel(int level) { + // TODO Auto-generated method stub + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java b/plugins/network-elements/cisco-vnmc/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java new file mode 100644 index 00000000000..52f0ea66f50 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/org/apache/commons/httpclient/contrib/ssl/EasySSLProtocolSocketFactory.java @@ -0,0 +1,232 @@ +/* + * $HeadURL$ + * $Revision$ + * $Date$ + * + * ==================================================================== + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.commons.httpclient.contrib.ssl; + +import java.io.IOException; +import java.net.InetAddress; +import java.net.InetSocketAddress; +import java.net.Socket; +import java.net.SocketAddress; +import java.net.UnknownHostException; + +import javax.net.SocketFactory; +import javax.net.ssl.SSLContext; +import javax.net.ssl.TrustManager; + +import org.apache.commons.httpclient.ConnectTimeoutException; +import org.apache.commons.httpclient.HttpClientError; +import org.apache.commons.httpclient.params.HttpConnectionParams; +import org.apache.commons.httpclient.protocol.SecureProtocolSocketFactory; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + *

+ * EasySSLProtocolSocketFactory can be used to creats SSL {@link Socket}s + * that accept self-signed certificates. + *

+ *

+ * This socket factory SHOULD NOT be used for productive systems + * due to security reasons, unless it is a concious decision and + * you are perfectly aware of security implications of accepting + * self-signed certificates + *

+ * + *

+ * Example of using custom protocol socket factory for a specific host: + * 

+ *     Protocol easyhttps = new Protocol("https", new EasySSLProtocolSocketFactory(), 443);
+ *
+ *     URI uri = new URI("https://localhost/", true);
+ *     // use relative url only
+ *     GetMethod httpget = new GetMethod(uri.getPathQuery());
+ *     HostConfiguration hc = new HostConfiguration();
+ *     hc.setHost(uri.getHost(), uri.getPort(), easyhttps);
+ *     HttpClient client = new HttpClient();
+ *     client.executeMethod(hc, httpget);
+ *
+ *

+ *

+ * Example of using custom protocol socket factory per default instead of the standard one: + * 

+ *     Protocol easyhttps = new Protocol("https", new EasySSLProtocolSocketFactory(), 443);
+ *     Protocol.registerProtocol("https", easyhttps);
+ *
+ *     HttpClient client = new HttpClient();
+ *     GetMethod httpget = new GetMethod("https://localhost/");
+ *     client.executeMethod(httpget);
+ *
+ *

+ * + * @author Oleg Kalnichevski + * + *

+ * DISCLAIMER: HttpClient developers DO NOT actively support this component. + * The component is provided as a reference material, which may be inappropriate + * for use without additional customization. + *

+ */ + +public class EasySSLProtocolSocketFactory implements SecureProtocolSocketFactory { + + /** Log object for this class. */ + private static final Log LOG = LogFactory.getLog(EasySSLProtocolSocketFactory.class); + + private SSLContext sslcontext = null; + + /** + * Constructor for EasySSLProtocolSocketFactory. + */ + public EasySSLProtocolSocketFactory() { + super(); + } + + private static SSLContext createEasySSLContext() { + try { + SSLContext context = SSLContext.getInstance("SSL"); + context.init( + null, + new TrustManager[] {new EasyX509TrustManager(null)}, + null); + return context; + } catch (Exception e) { + LOG.error(e.getMessage(), e); + throw new HttpClientError(e.toString()); + } + } + + private SSLContext getSSLContext() { + if (this.sslcontext == null) { + this.sslcontext = createEasySSLContext(); + } + return this.sslcontext; + } + + /** + * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int,java.net.InetAddress,int) + */ + public Socket createSocket( + String host, + int port, + InetAddress clientHost, + int clientPort) + throws IOException, UnknownHostException { + + return getSSLContext().getSocketFactory().createSocket( + host, + port, + clientHost, + clientPort + ); + } + + /** + * Attempts to get a new socket connection to the given host within the given time limit. + *

+ * To circumvent the limitations of older JREs that do not support connect timeout a + * controller thread is executed. The controller thread attempts to create a new socket + * within the given limit of time. If socket constructor does not return until the + * timeout expires, the controller terminates and throws an {@link ConnectTimeoutException} + *

+ * + * @param host the host name/IP + * @param port the port on the host + * @param clientHost the local host name/IP to bind the socket to + * @param clientPort the port on the local machine + * @param params {@link HttpConnectionParams Http connection parameters} + * + * @return Socket a new socket + * + * @throws IOException if an I/O error occurs while creating the socket + * @throws UnknownHostException if the IP address of the host cannot be + * determined + */ + public Socket createSocket( + final String host, + final int port, + final InetAddress localAddress, + final int localPort, + final HttpConnectionParams params + ) throws IOException, UnknownHostException, ConnectTimeoutException { + if (params == null) { + throw new IllegalArgumentException("Parameters may not be null"); + } + int timeout = params.getConnectionTimeout(); + SocketFactory socketfactory = getSSLContext().getSocketFactory(); + if (timeout == 0) { + return socketfactory.createSocket(host, port, localAddress, localPort); + } else { + Socket socket = socketfactory.createSocket(); + SocketAddress localaddr = new InetSocketAddress(localAddress, localPort); + SocketAddress remoteaddr = new InetSocketAddress(host, port); + socket.bind(localaddr); + socket.connect(remoteaddr, timeout); + return socket; + } + } + + /** + * @see SecureProtocolSocketFactory#createSocket(java.lang.String,int) + */ + public Socket createSocket(String host, int port) + throws IOException, UnknownHostException { + return getSSLContext().getSocketFactory().createSocket( + host, + port + ); + } + + /** + * @see SecureProtocolSocketFactory#createSocket(java.net.Socket,java.lang.String,int,boolean) + */ + public Socket createSocket( + Socket socket, + String host, + int port, + boolean autoClose) + throws IOException, UnknownHostException { + return getSSLContext().getSocketFactory().createSocket( + socket, + host, + port, + autoClose + ); + } + + public boolean equals(Object obj) { + return ((obj != null) && obj.getClass().equals(EasySSLProtocolSocketFactory.class)); + } + + public int hashCode() { + return EasySSLProtocolSocketFactory.class.hashCode(); + } + +} diff --git a/plugins/network-elements/cisco-vnmc/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java b/plugins/network-elements/cisco-vnmc/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java new file mode 100644 index 00000000000..ae9f9380b31 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/src/org/apache/commons/httpclient/contrib/ssl/EasyX509TrustManager.java @@ -0,0 +1,114 @@ +/* + * ==================================================================== + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed with + * this work for additional information regarding copyright ownership. + * The ASF licenses this file to You under the Apache License, Version 2.0 + * (the "License"); you may not use this file except in compliance with + * the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * ==================================================================== + * + * This software consists of voluntary contributions made by many + * individuals on behalf of the Apache Software Foundation. For more + * information on the Apache Software Foundation, please see + * . + * + */ + +package org.apache.commons.httpclient.contrib.ssl; + +import java.security.KeyStore; +import java.security.KeyStoreException; +import java.security.NoSuchAlgorithmException; +import java.security.cert.CertificateException; +import java.security.cert.X509Certificate; + +import javax.net.ssl.TrustManagerFactory; +import javax.net.ssl.TrustManager; +import javax.net.ssl.X509TrustManager; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +/** + *

+ * EasyX509TrustManager unlike default {@link X509TrustManager} accepts + * self-signed certificates. + *

+ *

+ * This trust manager SHOULD NOT be used for productive systems + * due to security reasons, unless it is a concious decision and + * you are perfectly aware of security implications of accepting + * self-signed certificates + *

+ * + * @author Adrian Sutton + * @author Oleg Kalnichevski + * + *

+ * DISCLAIMER: HttpClient developers DO NOT actively support this component. + * The component is provided as a reference material, which may be inappropriate + * for use without additional customization. + *

+ */ + +public class EasyX509TrustManager implements X509TrustManager +{ + private X509TrustManager standardTrustManager = null; + + /** Log object for this class. */ + private static final Log LOG = LogFactory.getLog(EasyX509TrustManager.class); + + /** + * Constructor for EasyX509TrustManager. + */ + public EasyX509TrustManager(KeyStore keystore) throws NoSuchAlgorithmException, KeyStoreException { + super(); + TrustManagerFactory factory = TrustManagerFactory.getInstance(TrustManagerFactory.getDefaultAlgorithm()); + factory.init(keystore); + TrustManager[] trustmanagers = factory.getTrustManagers(); + if (trustmanagers.length == 0) { + throw new NoSuchAlgorithmException("no trust manager found"); + } + this.standardTrustManager = (X509TrustManager)trustmanagers[0]; + } + + /** + * @see javax.net.ssl.X509TrustManager#checkClientTrusted(X509Certificate[],String authType) + */ + public void checkClientTrusted(X509Certificate[] certificates,String authType) throws CertificateException { + standardTrustManager.checkClientTrusted(certificates,authType); + } + + /** + * @see javax.net.ssl.X509TrustManager#checkServerTrusted(X509Certificate[],String authType) + */ + public void checkServerTrusted(X509Certificate[] certificates,String authType) throws CertificateException { + if ((certificates != null) && LOG.isDebugEnabled()) { + LOG.debug("Server certificate chain:"); + for (int i = 0; i < certificates.length; i++) { + LOG.debug("X509Certificate[" + i + "]=" + certificates[i]); + } + } + if ((certificates != null) && (certificates.length == 1)) { + certificates[0].checkValidity(); + } else { + standardTrustManager.checkServerTrusted(certificates,authType); + } + } + + /** + * @see javax.net.ssl.X509TrustManager#getAcceptedIssuers() + */ + public X509Certificate[] getAcceptedIssuers() { + return this.standardTrustManager.getAcceptedIssuers(); + } +} diff --git a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java new file mode 100644 index 00000000000..bf52356779e --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/cisco/CiscoVnmcConnectionTest.java @@ -0,0 +1,248 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.cisco; + +import static org.junit.Assert.assertTrue; + +import java.util.Map; + +import org.junit.BeforeClass; +import org.junit.Ignore; +import org.junit.Test; + +import com.cloud.network.cisco.CiscoVnmcConnectionImpl; +import com.cloud.utils.exception.ExecutionException; + + +@Ignore("Requires actual VNMC to connect to") +public class CiscoVnmcConnectionTest { + static CiscoVnmcConnectionImpl connection; + static String tenantName = "TenantE"; + static Map fwDns = null; + + @BeforeClass + public static void setUpClass() throws Exception { + connection = new CiscoVnmcConnectionImpl("10.223.56.5", "admin", "C1sco123"); + try { + boolean response = connection.login(); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + + @Test + public void testLogin() { + //fail("Not yet implemented"); + try { + boolean response = connection.login(); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + + @Test + public void testCreateTenant() { + //fail("Not yet implemented"); + try { + boolean response = connection.createTenant(tenantName); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testCreateTenantVDC() { + //fail("Not yet implemented"); + try { + boolean response = connection.createTenantVDC(tenantName); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testCreateTenantVDCEdgeDeviceProfile() { + //fail("Not yet implemented"); + try { + boolean response = connection.createTenantVDCEdgeDeviceProfile(tenantName); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testCreateTenantVDCEdgeDeviceRoutePolicy() { + try { + boolean response = connection.createTenantVDCEdgeStaticRoutePolicy(tenantName); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testCreateTenantVDCEdgeDeviceRoute() { + try { + boolean response = connection.createTenantVDCEdgeStaticRoute(tenantName, + "10.223.136.1", "0.0.0.0", "0.0.0.0"); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testAssociateRoutePolicyWithEdgeProfile() { + try { + boolean response = connection.associateTenantVDCEdgeStaticRoutePolicy(tenantName); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testAssociateTenantVDCEdgeDhcpPolicy() { + try { + boolean response = connection.associateTenantVDCEdgeDhcpPolicy(tenantName, "Edge_Inside"); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testCreateTenantVDCEdgeDhcpPolicy() { + try { + boolean response = connection.createTenantVDCEdgeDhcpPolicy(tenantName, + "10.1.1.2", "10.1.1.254", "255.255.255.0","4.4.4.4", tenantName+ ".net"); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testCreateTenantVDCEdgeSecurityProfile() { + try { + boolean response = connection.createTenantVDCEdgeSecurityProfile(tenantName); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testCreateTenantVDCSourceNatIpPool() { + try { + boolean response = connection.createTenantVDCSourceNatIpPool(tenantName, "1", "10.223.136.10"); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testCreateTenantVDCSourceNatPolicy() { + try { + boolean response = connection.createTenantVDCSourceNatPolicy(tenantName, "1"); + assertTrue(response); + response = connection.createTenantVDCSourceNatPolicyRef(tenantName, "1"); + assertTrue(response); + response = connection.createTenantVDCSourceNatRule(tenantName, "1", "10.1.1.2", "10.1.1.254"); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testCreateTenantVDCNatPolicySet() { + try { + boolean response = connection.createTenantVDCNatPolicySet(tenantName); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testAssociateNatPolicySet() { + try { + boolean response = connection.associateNatPolicySet(tenantName); + assertTrue(response); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void testCreateEdgeFirewall() { + try { + boolean response = connection.createEdgeFirewall(tenantName, + "44.44.44.44", "192.168.1.1", "255.255.255.0", "255.255.255.192"); + assertTrue(response); + } catch (ExecutionException e) { + e.printStackTrace(); + } + } + + @Test + public void testListUnassocAsa1000v() { + try { + Map response = connection.listUnAssocAsa1000v(); + assertTrue(response.size() >=0); + fwDns = response; + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + @Test + public void assocAsa1000v() { + try { + boolean result = connection.assignAsa1000v(tenantName, fwDns.get(0)); + assertTrue(result); + } catch (ExecutionException e) { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } +} diff --git a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/element/CiscoVnmcElementTest.java b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/element/CiscoVnmcElementTest.java new file mode 100755 index 00000000000..a16733b5135 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/element/CiscoVnmcElementTest.java @@ -0,0 +1,401 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.element; + +import java.net.URI; +import java.util.ArrayList; +import java.util.Collections; +import java.util.List; + +import javax.naming.ConfigurationException; + +import org.junit.Before; +import org.junit.Test; +import org.mockito.internal.matchers.Any; + +import com.cloud.agent.AgentManager; +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.AssociateAsaWithLogicalEdgeFirewallCommand; +import com.cloud.agent.api.CleanupLogicalEdgeFirewallCommand; +import com.cloud.agent.api.ConfigureNexusVsmForAsaCommand; +import com.cloud.agent.api.CreateLogicalEdgeFirewallCommand; +import com.cloud.agent.api.routing.SetFirewallRulesCommand; +import com.cloud.agent.api.routing.SetPortForwardingRulesCommand; +import com.cloud.agent.api.routing.SetSourceNatCommand; +import com.cloud.agent.api.routing.SetStaticNatRulesCommand; +import com.cloud.configuration.ConfigurationManager; +import com.cloud.dc.ClusterVSMMapVO; +import com.cloud.dc.DataCenter; +import com.cloud.dc.VlanVO; +import com.cloud.dc.DataCenter.NetworkType; +import com.cloud.dc.dao.ClusterVSMMapDao; +import com.cloud.dc.dao.VlanDao; +import com.cloud.deploy.DeployDestination; +import com.cloud.domain.Domain; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.host.HostVO; +import com.cloud.host.dao.HostDao; +import com.cloud.network.Network; +import com.cloud.network.Network.GuestType; +import com.cloud.network.Network.Provider; +import com.cloud.network.Network.Service; +import com.cloud.network.CiscoNexusVSMDeviceVO; +import com.cloud.network.IpAddress; +import com.cloud.network.NetworkManager; +import com.cloud.network.NetworkModel; +import com.cloud.network.Networks.BroadcastDomainType; +import com.cloud.network.Networks.TrafficType; +import com.cloud.network.addr.PublicIp; +import com.cloud.network.cisco.CiscoAsa1000vDeviceVO; +import com.cloud.network.cisco.CiscoVnmcControllerVO; +import com.cloud.network.cisco.NetworkAsa1000vMapVO; +import com.cloud.network.dao.CiscoAsa1000vDao; +import com.cloud.network.dao.CiscoNexusVSMDeviceDao; +import com.cloud.network.dao.CiscoVnmcDao; +import com.cloud.network.dao.NetworkAsa1000vMapDao; +import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.rules.FirewallRule; +import com.cloud.network.rules.PortForwardingRule; +import com.cloud.network.rules.StaticNat; +import com.cloud.network.rules.StaticNatRule; +import com.cloud.offering.NetworkOffering; +import com.cloud.resource.ResourceManager; +import com.cloud.user.Account; +import com.cloud.utils.net.Ip; +import com.cloud.vm.ReservationContext; + +import static org.junit.Assert.*; +import static org.mockito.Mockito.*; + +public class CiscoVnmcElementTest { + + CiscoVnmcElement _element = new CiscoVnmcElement(); + AgentManager _agentMgr = mock(AgentManager.class); + NetworkManager _networkMgr = mock(NetworkManager.class); + NetworkModel _networkModel = mock(NetworkModel.class); + HostDao _hostDao = mock(HostDao.class); + NetworkServiceMapDao _ntwkSrvcDao = mock(NetworkServiceMapDao.class); + ConfigurationManager _configMgr = mock(ConfigurationManager.class); + CiscoVnmcDao _ciscoVnmcDao = mock(CiscoVnmcDao.class); + CiscoAsa1000vDao _ciscoAsa1000vDao = mock(CiscoAsa1000vDao.class); + NetworkAsa1000vMapDao _networkAsa1000vMapDao = mock(NetworkAsa1000vMapDao.class); + ClusterVSMMapDao _clusterVsmMapDao = mock(ClusterVSMMapDao.class); + CiscoNexusVSMDeviceDao _vsmDeviceDao = mock(CiscoNexusVSMDeviceDao.class); + VlanDao _vlanDao = mock(VlanDao.class); + + @Before + public void setUp() throws ConfigurationException { + _element._resourceMgr = mock(ResourceManager.class); + _element._agentMgr = _agentMgr; + _element._networkMgr = _networkMgr; + _element._networkModel = _networkModel; + _element._hostDao = _hostDao; + _element._configMgr = _configMgr; + _element._ciscoVnmcDao = _ciscoVnmcDao; + _element._ciscoAsa1000vDao = _ciscoAsa1000vDao; + _element._networkAsa1000vMapDao = _networkAsa1000vMapDao; + _element._clusterVsmMapDao = _clusterVsmMapDao; + _element._vsmDeviceDao = _vsmDeviceDao; + _element._vlanDao = _vlanDao; + + // Standard responses + when(_networkModel.isProviderForNetwork(Provider.CiscoVnmc, 1L)).thenReturn(true); + + _element.configure("CiscoVnmcTestElement", Collections. emptyMap()); + } + + @Test + public void canHandleTest() { + Network network = mock(Network.class); + when(network.getId()).thenReturn(1L); + when(network.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Vlan); + assertTrue(_element.canHandle(network)); + + when(network.getBroadcastDomainType()).thenReturn(BroadcastDomainType.UnDecided); + assertFalse(_element.canHandle(network)); + } + + @Test + public void implementTest() throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + URI uri = URI.create("vlan://123"); + + Network network = mock(Network.class); + when(network.getId()).thenReturn(1L); + when(network.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Vlan); + when(network.getDataCenterId()).thenReturn(1L); + when(network.getGateway()).thenReturn("1.1.1.1"); + when(network.getBroadcastUri()).thenReturn(uri); + when(network.getCidr()).thenReturn("1.1.1.0/24"); + + NetworkOffering offering = mock(NetworkOffering.class); + when(offering.getId()).thenReturn(1L); + when(offering.getTrafficType()).thenReturn(TrafficType.Guest); + when(offering.getGuestType()).thenReturn(GuestType.Isolated); + + DeployDestination dest = mock(DeployDestination.class); + + Domain dom = mock(Domain.class); + when(dom.getName()).thenReturn("d1"); + Account acc = mock(Account.class); + when(acc.getAccountName()).thenReturn("a1"); + ReservationContext context = mock(ReservationContext.class); + when(context.getDomain()).thenReturn(dom); + when(context.getAccount()).thenReturn(acc); + + DataCenter dc = mock(DataCenter.class); + when(dc.getNetworkType()).thenReturn(NetworkType.Advanced); + when(_configMgr.getZone(network.getDataCenterId())).thenReturn(dc); + + List devices = new ArrayList(); + devices.add(mock(CiscoVnmcControllerVO.class)); + when(_ciscoVnmcDao.listByPhysicalNetwork(network.getPhysicalNetworkId())).thenReturn(devices); + + CiscoAsa1000vDeviceVO asaVO = mock(CiscoAsa1000vDeviceVO.class); + when(asaVO.getInPortProfile()).thenReturn("foo"); + when(asaVO.getManagementIp()).thenReturn("1.2.3.4"); + + List asaList = new ArrayList(); + asaList.add(asaVO); + when(_ciscoAsa1000vDao.listByPhysicalNetwork(network.getPhysicalNetworkId())).thenReturn(asaList); + + when(_networkAsa1000vMapDao.findByNetworkId(network.getId())).thenReturn(mock(NetworkAsa1000vMapVO.class)); + when(_networkAsa1000vMapDao.findByAsa1000vId(anyLong())).thenReturn(null); + when(_networkAsa1000vMapDao.persist(any(NetworkAsa1000vMapVO.class))).thenReturn(mock(NetworkAsa1000vMapVO.class)); + + when(_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.SourceNat, Provider.CiscoVnmc)).thenReturn(true); + + ClusterVSMMapVO clusterVsmMap = mock(ClusterVSMMapVO.class); + when(_clusterVsmMapDao.findByClusterId(anyLong())).thenReturn(clusterVsmMap); + + CiscoNexusVSMDeviceVO vsmDevice = mock(CiscoNexusVSMDeviceVO.class); + when(vsmDevice.getUserName()).thenReturn("foo"); + when(vsmDevice.getPassword()).thenReturn("bar"); + when(vsmDevice.getipaddr()).thenReturn("1.2.3.4"); + when(_vsmDeviceDao.findById(anyLong())).thenReturn(vsmDevice); + + HostVO hostVO = mock(HostVO.class); + when(hostVO.getId()).thenReturn(1L); + when(_hostDao.findById(anyLong())).thenReturn(hostVO); + + Ip ip = mock(Ip.class); + when(ip.addr()).thenReturn("1.2.3.4"); + + PublicIp publicIp = mock(PublicIp.class); + when(publicIp.getAddress()).thenReturn(ip); + when(publicIp.getState()).thenReturn(IpAddress.State.Releasing); + when(publicIp.getAccountId()).thenReturn(1L); + when(publicIp.isSourceNat()).thenReturn(true); + when(publicIp.getVlanTag()).thenReturn("123"); + when(publicIp.getGateway()).thenReturn("1.1.1.1"); + when(publicIp.getNetmask()).thenReturn("1.1.1.1"); + when(publicIp.getMacAddress()).thenReturn(null); + when(publicIp.isOneToOneNat()).thenReturn(true); + when(_networkMgr.assignSourceNatIpAddressToGuestNetwork(acc, network)).thenReturn(publicIp); + + VlanVO vlanVO = mock(VlanVO.class); + when(vlanVO.getVlanGateway()).thenReturn("1.1.1.1"); + List vlanVOList = new ArrayList(); + when(_vlanDao.listVlansByPhysicalNetworkId(network.getPhysicalNetworkId())).thenReturn(vlanVOList); + + Answer answer = mock(Answer.class); + when(answer.getResult()).thenReturn(true); + + when(_agentMgr.easySend(anyLong(), any(CreateLogicalEdgeFirewallCommand.class))).thenReturn(answer); + when(_agentMgr.easySend(anyLong(), any(ConfigureNexusVsmForAsaCommand.class))).thenReturn(answer); + when(_agentMgr.easySend(anyLong(), any(SetSourceNatCommand.class))).thenReturn(answer); + when(_agentMgr.easySend(anyLong(), any(AssociateAsaWithLogicalEdgeFirewallCommand.class))).thenReturn(answer); + + assertTrue(_element.implement(network, offering, dest, context)); + } + + @Test + public void shutdownTest() throws ConcurrentOperationException, ResourceUnavailableException { + URI uri = URI.create("vlan://123"); + + Network network = mock(Network.class); + when(network.getId()).thenReturn(1L); + when(network.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Vlan); + when(network.getDataCenterId()).thenReturn(1L); + when(network.getBroadcastUri()).thenReturn(uri); + + ReservationContext context = mock(ReservationContext.class); + + when(_networkAsa1000vMapDao.findByNetworkId(network.getId())).thenReturn(mock(NetworkAsa1000vMapVO.class)); + + List devices = new ArrayList(); + devices.add(mock(CiscoVnmcControllerVO.class)); + when(_ciscoVnmcDao.listByPhysicalNetwork(network.getPhysicalNetworkId())).thenReturn(devices); + + HostVO hostVO = mock(HostVO.class); + when(hostVO.getId()).thenReturn(1L); + when(_hostDao.findById(anyLong())).thenReturn(hostVO); + + Answer answer = mock(Answer.class); + when(answer.getResult()).thenReturn(true); + + when(_agentMgr.easySend(anyLong(), any(CleanupLogicalEdgeFirewallCommand.class))).thenReturn(answer); + + assertTrue(_element.shutdown(network, context, true)); + } + + @Test + public void applyFWRulesTest() throws ResourceUnavailableException { + URI uri = URI.create("vlan://123"); + + Network network = mock(Network.class); + when(network.getId()).thenReturn(1L); + when(network.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Vlan); + when(network.getDataCenterId()).thenReturn(1L); + when(network.getBroadcastUri()).thenReturn(uri); + when(network.getCidr()).thenReturn("1.1.1.0/24"); + when(network.getState()).thenReturn(Network.State.Implemented); + + Ip ip = mock(Ip.class); + when(ip.addr()).thenReturn("1.2.3.4"); + + IpAddress ipAddress = mock(IpAddress.class); + when(ipAddress.getAddress()).thenReturn(ip); + + when(_networkModel.getIp(anyLong())).thenReturn(ipAddress); + when(_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.Firewall, Provider.CiscoVnmc)).thenReturn(true); + + List devices = new ArrayList(); + devices.add(mock(CiscoVnmcControllerVO.class)); + when(_ciscoVnmcDao.listByPhysicalNetwork(network.getPhysicalNetworkId())).thenReturn(devices); + + when(_networkAsa1000vMapDao.findByNetworkId(network.getId())).thenReturn(mock(NetworkAsa1000vMapVO.class)); + + HostVO hostVO = mock(HostVO.class); + when(hostVO.getId()).thenReturn(1L); + when(_hostDao.findById(anyLong())).thenReturn(hostVO); + + FirewallRule rule = mock(FirewallRule.class); + when(rule.getSourceIpAddressId()).thenReturn(1L); + List rules = new ArrayList(); + rules.add(rule); + + Answer answer = mock(Answer.class); + when(answer.getResult()).thenReturn(true); + + when(_agentMgr.easySend(anyLong(), any(SetFirewallRulesCommand.class))).thenReturn(answer); + + assertTrue(_element.applyFWRules(network, rules)); + } + + @Test + public void applyPRulesTest() throws ResourceUnavailableException { + URI uri = URI.create("vlan://123"); + + Network network = mock(Network.class); + when(network.getId()).thenReturn(1L); + when(network.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Vlan); + when(network.getDataCenterId()).thenReturn(1L); + when(network.getBroadcastUri()).thenReturn(uri); + when(network.getCidr()).thenReturn("1.1.1.0/24"); + when(network.getState()).thenReturn(Network.State.Implemented); + + Ip ip = mock(Ip.class); + when(ip.addr()).thenReturn("1.2.3.4"); + + IpAddress ipAddress = mock(IpAddress.class); + when(ipAddress.getAddress()).thenReturn(ip); + when(ipAddress.getVlanId()).thenReturn(1L); + + when(_networkModel.getIp(anyLong())).thenReturn(ipAddress); + when(_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.PortForwarding, Provider.CiscoVnmc)).thenReturn(true); + + List devices = new ArrayList(); + devices.add(mock(CiscoVnmcControllerVO.class)); + when(_ciscoVnmcDao.listByPhysicalNetwork(network.getPhysicalNetworkId())).thenReturn(devices); + + when(_networkAsa1000vMapDao.findByNetworkId(network.getId())).thenReturn(mock(NetworkAsa1000vMapVO.class)); + + HostVO hostVO = mock(HostVO.class); + when(hostVO.getId()).thenReturn(1L); + when(_hostDao.findById(anyLong())).thenReturn(hostVO); + + VlanVO vlanVO = mock(VlanVO.class); + when(vlanVO.getVlanTag()).thenReturn(null); + when(_vlanDao.findById(anyLong())).thenReturn(vlanVO); + + PortForwardingRule rule = mock(PortForwardingRule.class); + when(rule.getSourceIpAddressId()).thenReturn(1L); + when(rule.getDestinationIpAddress()).thenReturn(ip); + List rules = new ArrayList(); + rules.add(rule); + + Answer answer = mock(Answer.class); + when(answer.getResult()).thenReturn(true); + + when(_agentMgr.easySend(anyLong(), any(SetPortForwardingRulesCommand.class))).thenReturn(answer); + + assertTrue(_element.applyPFRules(network, rules)); + } + + @Test + public void applyStaticNatsTest() throws ResourceUnavailableException { + URI uri = URI.create("vlan://123"); + + Network network = mock(Network.class); + when(network.getId()).thenReturn(1L); + when(network.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Vlan); + when(network.getDataCenterId()).thenReturn(1L); + when(network.getBroadcastUri()).thenReturn(uri); + when(network.getCidr()).thenReturn("1.1.1.0/24"); + when(network.getState()).thenReturn(Network.State.Implemented); + + Ip ip = mock(Ip.class); + when(ip.addr()).thenReturn("1.2.3.4"); + + IpAddress ipAddress = mock(IpAddress.class); + when(ipAddress.getAddress()).thenReturn(ip); + when(ipAddress.getVlanId()).thenReturn(1L); + + when(_networkModel.getIp(anyLong())).thenReturn(ipAddress); + when(_networkModel.isProviderSupportServiceInNetwork(network.getId(), Service.StaticNat, Provider.CiscoVnmc)).thenReturn(true); + + List devices = new ArrayList(); + devices.add(mock(CiscoVnmcControllerVO.class)); + when(_ciscoVnmcDao.listByPhysicalNetwork(network.getPhysicalNetworkId())).thenReturn(devices); + + when(_networkAsa1000vMapDao.findByNetworkId(network.getId())).thenReturn(mock(NetworkAsa1000vMapVO.class)); + + HostVO hostVO = mock(HostVO.class); + when(hostVO.getId()).thenReturn(1L); + when(_hostDao.findById(anyLong())).thenReturn(hostVO); + + VlanVO vlanVO = mock(VlanVO.class); + when(vlanVO.getVlanTag()).thenReturn(null); + when(_vlanDao.findById(anyLong())).thenReturn(vlanVO); + + StaticNat rule = mock(StaticNat.class); + when(rule.getSourceIpAddressId()).thenReturn(1L); + when(rule.getDestIpAddress()).thenReturn("1.2.3.4"); + when(rule.isForRevoke()).thenReturn(false); + List rules = new ArrayList(); + rules.add(rule); + + Answer answer = mock(Answer.class); + when(answer.getResult()).thenReturn(true); + + when(_agentMgr.easySend(anyLong(), any(SetStaticNatRulesCommand.class))).thenReturn(answer); + + assertTrue(_element.applyStaticNats(network, rules)); + } +} diff --git a/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java new file mode 100755 index 00000000000..e814fdcd4d5 --- /dev/null +++ b/plugins/network-elements/cisco-vnmc/test/com/cloud/network/resource/CiscoVnmcResourceTest.java @@ -0,0 +1,285 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network.resource; + +import static org.junit.Assert.*; +import static org.mockito.Matchers.any; +import static org.mockito.Mockito.*; + +import java.util.ArrayList; +import java.util.Collections; +import java.util.HashMap; +import java.util.List; +import java.util.Map; + +import javax.naming.ConfigurationException; + +import org.junit.Before; +import org.junit.Test; + +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.CreateLogicalEdgeFirewallCommand; +import com.cloud.agent.api.PingCommand; +import com.cloud.agent.api.StartupCommand; +import com.cloud.agent.api.routing.NetworkElementCommand; +import com.cloud.agent.api.routing.SetFirewallRulesCommand; +import com.cloud.agent.api.routing.SetPortForwardingRulesCommand; +import com.cloud.agent.api.routing.SetSourceNatCommand; +import com.cloud.agent.api.routing.SetStaticNatRulesCommand; +import com.cloud.agent.api.to.FirewallRuleTO; +import com.cloud.agent.api.to.IpAddressTO; +import com.cloud.agent.api.to.PortForwardingRuleTO; +import com.cloud.agent.api.to.StaticNatRuleTO; +import com.cloud.dc.Vlan; +import com.cloud.host.Host; +import com.cloud.network.IpAddress; +import com.cloud.network.cisco.CiscoVnmcConnectionImpl; +import com.cloud.network.rules.FirewallRule; +import com.cloud.network.rules.PortForwardingRule; +import com.cloud.network.rules.StaticNat; +import com.cloud.network.rules.FirewallRule.Purpose; +import com.cloud.network.rules.FirewallRule.TrafficType; +import com.cloud.network.rules.FirewallRuleVO; +import com.cloud.utils.exception.ExecutionException; + +public class CiscoVnmcResourceTest { + CiscoVnmcConnectionImpl _connection = mock(CiscoVnmcConnectionImpl.class); + CiscoVnmcResource _resource; + Map _parameters; + + @Before + public void setUp() throws ConfigurationException { + _resource = new CiscoVnmcResource(); + + _parameters = new HashMap(); + _parameters.put("name", "CiscoVnmc"); + _parameters.put("zoneId", "1"); + _parameters.put("physicalNetworkId", "100"); + _parameters.put("ip", "1.2.3.4"); + _parameters.put("username", "admin"); + _parameters.put("password", "pass"); + _parameters.put("guid", "e8e13097-0a08-4e82-b0af-1101589ec3b8"); + _parameters.put("numretries", "3"); + _parameters.put("timeout", "300"); + } + + @Test(expected=ConfigurationException.class) + public void resourceConfigureFailure() throws ConfigurationException { + _resource.configure("CiscoVnmcResource", Collections.emptyMap()); + } + + @Test + public void resourceConfigure() throws ConfigurationException { + _resource.configure("CiscoVnmcResource", _parameters); + assertTrue("CiscoVnmc".equals(_resource.getName())); + assertTrue(_resource.getType() == Host.Type.ExternalFirewall); + } + + @Test + public void testInitialization() throws ConfigurationException { + _resource.configure("CiscoVnmcResource", _parameters); + StartupCommand[] sc = _resource.initialize(); + assertTrue(sc.length ==1); + assertTrue("e8e13097-0a08-4e82-b0af-1101589ec3b8".equals(sc[0].getGuid())); + assertTrue("CiscoVnmc".equals(sc[0].getName())); + assertTrue("1".equals(sc[0].getDataCenter())); + } + + @Test + public void testPingCommandStatusOk() throws ConfigurationException, ExecutionException { + _resource.configure("CiscoVnmcResource", _parameters); + _resource.setConnection(_connection); + when(_connection.login()).thenReturn(true); + PingCommand ping = _resource.getCurrentStatus(1); + assertTrue(ping != null); + assertTrue(ping.getHostId() == 1); + assertTrue(ping.getHostType() == Host.Type.ExternalFirewall); + } + + @Test + public void testPingCommandStatusFail() throws ConfigurationException, ExecutionException { + _resource.configure("CiscoVnmcResource", _parameters); + _resource.setConnection(_connection); + when(_connection.login()).thenReturn(false); + PingCommand ping = _resource.getCurrentStatus(1); + assertTrue(ping == null); + } + + @Test + public void testSourceNat() throws ConfigurationException, Exception { + long vlanId = 123; + IpAddressTO ip = new IpAddressTO(1, "1.2.3.4", true, false, + false, null, "1.2.3.1", "255.255.255.0", null, null, false); + SetSourceNatCommand cmd = new SetSourceNatCommand(ip, true); + cmd.setContextParam(NetworkElementCommand.GUEST_VLAN_TAG, Long.toString(vlanId)); + cmd.setContextParam(NetworkElementCommand.GUEST_NETWORK_CIDR, "1.2.3.4/32"); + + _resource.configure("CiscoVnmcResource", _parameters); + _resource.setConnection(_connection); + when(_connection.login()).thenReturn(true); + when(_connection.createTenantVDCNatPolicySet(anyString())).thenReturn(true); + when(_connection.createTenantVDCSourceNatPolicy(anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCSourceNatPolicyRef(anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCSourceNatIpPool(anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCSourceNatRule(anyString(), anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.associateNatPolicySet(anyString())).thenReturn(true); + + Answer answer = _resource.executeRequest(cmd); + System.out.println(answer.getDetails()); + assertTrue(answer.getResult()); + } + + @Test + public void testFirewall() throws ConfigurationException, Exception { + long vlanId = 123; + List rules = new ArrayList(); + List cidrList = new ArrayList(); + cidrList.add("2.3.2.3/32"); + FirewallRuleTO active = new FirewallRuleTO(1, + null, "1.2.3.4", "tcp", 22, 22, false, false, + FirewallRule.Purpose.Firewall, cidrList, null, null); + rules.add(active); + FirewallRuleTO revoked = new FirewallRuleTO(1, + null, "1.2.3.4", "tcp", 22, 22, true, false, + FirewallRule.Purpose.Firewall, null, null, null); + rules.add(revoked); + + SetFirewallRulesCommand cmd = new SetFirewallRulesCommand(rules); + cmd.setContextParam(NetworkElementCommand.GUEST_VLAN_TAG, Long.toString(vlanId)); + cmd.setContextParam(NetworkElementCommand.GUEST_NETWORK_CIDR, "1.2.3.4/32"); + + _resource.configure("CiscoVnmcResource", _parameters); + _resource.setConnection(_connection); + when(_connection.createTenantVDCAclPolicySet(anyString(), anyBoolean())).thenReturn(true); + when(_connection.createTenantVDCAclPolicy(anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCAclPolicyRef(anyString(), anyString(), anyBoolean())).thenReturn(true); + when(_connection.deleteTenantVDCAclRule(anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCIngressAclRule( + anyString(), anyString(), anyString(), + anyString(), anyString(), anyString(), + anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCEgressAclRule( + anyString(), anyString(), anyString(), + anyString(), anyString(), anyString(), + anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.associateAclPolicySet(anyString())).thenReturn(true); + + Answer answer = _resource.executeRequest(cmd); + System.out.println(answer.getDetails()); + assertTrue(answer.getResult()); + } + + @Test + public void testStaticNat() throws ConfigurationException, Exception { + long vlanId = 123; + List rules = new ArrayList(); + StaticNatRuleTO active = new StaticNatRuleTO(0, "1.2.3.4", null, + null, "5.6.7.8", null, null, null, false, false); + rules.add(active); + StaticNatRuleTO revoked = new StaticNatRuleTO(0, "1.2.3.4", null, + null, "5.6.7.8", null, null, null, true, false); + rules.add(revoked); + + SetStaticNatRulesCommand cmd = new SetStaticNatRulesCommand(rules, null); + cmd.setContextParam(NetworkElementCommand.GUEST_VLAN_TAG, Long.toString(vlanId)); + cmd.setContextParam(NetworkElementCommand.GUEST_NETWORK_CIDR, "1.2.3.4/32"); + + _resource.configure("CiscoVnmcResource", _parameters); + _resource.setConnection(_connection); + when(_connection.createTenantVDCNatPolicySet(anyString())).thenReturn(true); + when(_connection.createTenantVDCAclPolicySet(anyString(), anyBoolean())).thenReturn(true); + when(_connection.createTenantVDCDNatPolicy(anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCDNatPolicyRef(anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCAclPolicy(anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCAclPolicyRef(anyString(), anyString(), anyBoolean())).thenReturn(true); + when(_connection.deleteTenantVDCDNatRule(anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.deleteTenantVDCAclRule(anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCDNatIpPool(anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCDNatRule(anyString(), + anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCAclRuleForDNat(anyString(), + anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.associateAclPolicySet(anyString())).thenReturn(true); + + Answer answer = _resource.executeRequest(cmd); + System.out.println(answer.getDetails()); + assertTrue(answer.getResult()); + } + + @Test + public void testPortForwarding() throws ConfigurationException, Exception { + long vlanId = 123; + List rules = new ArrayList(); + PortForwardingRuleTO active = new PortForwardingRuleTO(1, "1.2.3.4", 22, 22, + "5.6.7.8", 22, 22, "tcp", false, false); + rules.add(active); + PortForwardingRuleTO revoked = new PortForwardingRuleTO(1, "1.2.3.4", 22, 22, + "5.6.7.8", 22, 22, "tcp", false, false); + rules.add(revoked); + + SetPortForwardingRulesCommand cmd = new SetPortForwardingRulesCommand(rules); + cmd.setContextParam(NetworkElementCommand.GUEST_VLAN_TAG, Long.toString(vlanId)); + cmd.setContextParam(NetworkElementCommand.GUEST_NETWORK_CIDR, "1.2.3.4/32"); + + _resource.configure("CiscoVnmcResource", _parameters); + _resource.setConnection(_connection); + when(_connection.createTenantVDCNatPolicySet(anyString())).thenReturn(true); + when(_connection.createTenantVDCAclPolicySet(anyString(), anyBoolean())).thenReturn(true); + when(_connection.createTenantVDCPFPolicy(anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCPFPolicyRef(anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCAclPolicy(anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCAclPolicyRef(anyString(), anyString(), anyBoolean())).thenReturn(true); + when(_connection.deleteTenantVDCPFRule(anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.deleteTenantVDCAclRule(anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCPFIpPool(anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCPFPortPool(anyString(), anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCPFRule(anyString(), + anyString(), anyString(), anyString(), + anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.createTenantVDCAclRuleForPF(anyString(), + anyString(), anyString(), anyString(), + anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.associateAclPolicySet(anyString())).thenReturn(true); + + Answer answer = _resource.executeRequest(cmd); + System.out.println(answer.getDetails()); + assertTrue(answer.getResult()); + } + + @Test + public void testCreateEdgeFirewall() throws ConfigurationException, Exception { + long vlanId = 123; + CreateLogicalEdgeFirewallCommand cmd = new CreateLogicalEdgeFirewallCommand(vlanId, "1.2.3.4", "5.6.7.8", "255.255.255.0", "255.255.255.0"); + cmd.getPublicGateways().add("1.1.1.1"); + cmd.getPublicGateways().add("2.2.2.2"); + + _resource.configure("CiscoVnmcResource", _parameters); + _resource.setConnection(_connection); + when(_connection.createTenant(anyString())).thenReturn(true); + when(_connection.createTenantVDC(anyString())).thenReturn(true); + when(_connection.createTenantVDCEdgeSecurityProfile(anyString())).thenReturn(true); + when(_connection.createTenantVDCEdgeDeviceProfile(anyString())).thenReturn(true); + when(_connection.createTenantVDCEdgeStaticRoutePolicy(anyString())).thenReturn(true); + when(_connection.createTenantVDCEdgeStaticRoute(anyString(), anyString(), anyString(), anyString())).thenReturn(true); + when(_connection.associateTenantVDCEdgeStaticRoutePolicy(anyString())).thenReturn(true); + when(_connection.createEdgeFirewall(anyString(), anyString(), anyString(), anyString(), anyString())).thenReturn(true); + + Answer answer = _resource.executeRequest(cmd); + System.out.println(answer.getDetails()); + assertTrue(answer.getResult()); + } +} diff --git a/plugins/network-elements/dns-notifier/resources/components-example.xml b/plugins/network-elements/dns-notifier/resources/components-example.xml index 6493e748fae..2e9c5bedc63 100755 --- a/plugins/network-elements/dns-notifier/resources/components-example.xml +++ b/plugins/network-elements/dns-notifier/resources/components-example.xml @@ -86,7 +86,7 @@ under the License. - + diff --git a/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java b/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java index 907e8e7219e..c421344baba 100644 --- a/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java +++ b/plugins/network-elements/dns-notifier/src/org/apache/cloudstack/network/element/DnsNotifier.java @@ -1,122 +1,122 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package org.apache.cloudstack.network.element; - -import java.util.HashMap; -import java.util.Map; -import java.util.Set; - -import javax.ejb.Local; -import javax.naming.ConfigurationException; - -import com.cloud.deploy.DeployDestination; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.Network; -import com.cloud.network.Network.Capability; -import com.cloud.network.Network.Provider; -import com.cloud.network.Network.Service; -import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.element.NetworkElement; -import com.cloud.offering.NetworkOffering; -import com.cloud.utils.component.AdapterBase; -import com.cloud.vm.NicProfile; -import com.cloud.vm.ReservationContext; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachineProfile; - -/** - * @author ahuang - * - */ -@Local(NetworkElement.class) -public class DnsNotifier extends AdapterBase implements NetworkElement { - - public DnsNotifier() { - - } - - @Override - public Map> getCapabilities() { - Map> caps = new HashMap>(); - caps.put(Service.Dns, new HashMap()); - return caps; - } - - @Override - public Provider getProvider() { - return null; - } - - @Override - public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, - InsufficientCapacityException { - return true; - } - - @Override - public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, - ResourceUnavailableException, InsufficientCapacityException { - // signal to the dns server that this vm is up and running and set the ip address to hostname mapping. - vm.getHostName(); - nic.getIp4Address(); - nic.getIp6Address(); - return true; - } - - @Override - public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { - vm.getHostName(); - nic.getIp4Address(); - nic.getIp6Address(); - // signal to the dns server that the vm is being shutdown and remove the mapping. - return true; - } - - @Override - public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException { - return true; - } - - @Override - public boolean destroy(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { - return true; - } - - @Override - public boolean isReady(PhysicalNetworkServiceProvider provider) { - return true; - } - - @Override - public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { - return true; - } - - @Override - public boolean canEnableIndividualServices() { - return true; - } - - @Override - public boolean verifyServicesCombination(Set services) { - return true; - } - -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package org.apache.cloudstack.network.element; + +import java.util.HashMap; +import java.util.Map; +import java.util.Set; + +import javax.ejb.Local; +import javax.naming.ConfigurationException; + +import com.cloud.deploy.DeployDestination; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.network.Network; +import com.cloud.network.Network.Capability; +import com.cloud.network.Network.Provider; +import com.cloud.network.Network.Service; +import com.cloud.network.PhysicalNetworkServiceProvider; +import com.cloud.network.element.NetworkElement; +import com.cloud.offering.NetworkOffering; +import com.cloud.utils.component.AdapterBase; +import com.cloud.vm.NicProfile; +import com.cloud.vm.ReservationContext; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachineProfile; + +/** + * @author ahuang + * + */ +@Local(NetworkElement.class) +public class DnsNotifier extends AdapterBase implements NetworkElement { + + public DnsNotifier() { + + } + + @Override + public Map> getCapabilities() { + Map> caps = new HashMap>(); + caps.put(Service.Dns, new HashMap()); + return caps; + } + + @Override + public Provider getProvider() { + return null; + } + + @Override + public boolean implement(Network network, NetworkOffering offering, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException, + InsufficientCapacityException { + return true; + } + + @Override + public boolean prepare(Network network, NicProfile nic, VirtualMachineProfile vm, DeployDestination dest, ReservationContext context) throws ConcurrentOperationException, + ResourceUnavailableException, InsufficientCapacityException { + // signal to the dns server that this vm is up and running and set the ip address to hostname mapping. + vm.getHostName(); + nic.getIp4Address(); + nic.getIp6Address(); + return true; + } + + @Override + public boolean release(Network network, NicProfile nic, VirtualMachineProfile vm, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + vm.getHostName(); + nic.getIp4Address(); + nic.getIp6Address(); + // signal to the dns server that the vm is being shutdown and remove the mapping. + return true; + } + + @Override + public boolean shutdown(Network network, ReservationContext context, boolean cleanup) throws ConcurrentOperationException, ResourceUnavailableException { + return true; + } + + @Override + public boolean destroy(Network network, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + return true; + } + + @Override + public boolean isReady(PhysicalNetworkServiceProvider provider) { + return true; + } + + @Override + public boolean shutdownProviderInstances(PhysicalNetworkServiceProvider provider, ReservationContext context) throws ConcurrentOperationException, ResourceUnavailableException { + return true; + } + + @Override + public boolean canEnableIndividualServices() { + return true; + } + + @Override + public boolean verifyServicesCombination(Set services) { + return true; + } + +} diff --git a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java index 77f6b60bfe8..e384e3cfd0d 100644 --- a/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java +++ b/plugins/network-elements/f5/src/com/cloud/network/element/F5ExternalLoadBalancerElement.java @@ -16,19 +16,6 @@ // under the License. package com.cloud.network.element; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.ejb.Local; -import javax.inject.Inject; - -import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; -import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; -import org.apache.log4j.Logger; - import com.cloud.agent.api.to.LoadBalancerTO; import com.cloud.api.ApiDBUtils; import com.cloud.api.commands.*; @@ -101,7 +88,7 @@ public class F5ExternalLoadBalancerElement extends ExternalLoadBalancerDeviceMan ConfigurationDao _configDao; private boolean canHandle(Network config) { - if (config.getGuestType() != Network.GuestType.Isolated || config.getTrafficType() != TrafficType.Guest) { + if ((config.getGuestType() != Network.GuestType.Isolated && config.getGuestType() != Network.GuestType.Shared) || config.getTrafficType() != TrafficType.Guest) { s_logger.trace("Not handling network with Type " + config.getGuestType() + " and traffic type " + config.getTrafficType()); return false; } diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java index af0912ad9f5..a429306a680 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/element/JuniperSRXExternalFirewallElement.java @@ -16,28 +16,8 @@ // under the License. package com.cloud.network.element; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.ejb.Local; -import javax.inject.Inject; - -import org.apache.cloudstack.api.response.ExternalFirewallResponse; -import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; -import org.apache.log4j.Logger; - import com.cloud.api.ApiDBUtils; -import com.cloud.api.commands.AddExternalFirewallCmd; -import com.cloud.api.commands.AddSrxFirewallCmd; -import com.cloud.api.commands.ConfigureSrxFirewallCmd; -import com.cloud.api.commands.DeleteExternalFirewallCmd; -import com.cloud.api.commands.DeleteSrxFirewallCmd; -import com.cloud.api.commands.ListExternalFirewallsCmd; -import com.cloud.api.commands.ListSrxFirewallNetworksCmd; -import com.cloud.api.commands.ListSrxFirewallsCmd; +import com.cloud.api.commands.*; import com.cloud.api.response.SrxFirewallResponse; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; @@ -47,35 +27,16 @@ import com.cloud.dc.DataCenter.NetworkType; import com.cloud.dc.DataCenterVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.deploy.DeployDestination; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InsufficientNetworkCapacityException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.ResourceUnavailableException; +import com.cloud.exception.*; import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.host.dao.HostDetailsDao; -import com.cloud.network.ExternalFirewallDeviceManagerImpl; -import com.cloud.network.Network; +import com.cloud.network.*; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.NetworkModel; -import com.cloud.network.PhysicalNetwork; -import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.PublicIpAddress; -import com.cloud.network.RemoteAccessVpn; -import com.cloud.network.VpnUser; -import com.cloud.network.dao.ExternalFirewallDeviceDao; -import com.cloud.network.dao.ExternalFirewallDeviceVO; -import com.cloud.network.dao.NetworkDao; -import com.cloud.network.dao.NetworkExternalFirewallDao; -import com.cloud.network.dao.NetworkExternalFirewallVO; -import com.cloud.network.dao.NetworkServiceMapDao; -import com.cloud.network.dao.NetworkVO; -import com.cloud.network.dao.PhysicalNetworkDao; -import com.cloud.network.dao.PhysicalNetworkVO; +import com.cloud.network.dao.*; import com.cloud.network.dao.ExternalFirewallDeviceVO.FirewallDeviceState; import com.cloud.network.resource.JuniperSrxResource; import com.cloud.network.rules.FirewallRule; @@ -89,6 +50,13 @@ import com.cloud.vm.NicProfile; import com.cloud.vm.ReservationContext; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineProfile; +import org.apache.cloudstack.api.response.ExternalFirewallResponse; +import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; +import org.apache.log4j.Logger; + +import javax.ejb.Local; +import javax.inject.Inject; +import java.util.*; @Local(value = {NetworkElement.class, FirewallServiceProvider.class, PortForwardingServiceProvider.class, IpDeployer.class, @@ -129,7 +97,9 @@ PortForwardingServiceProvider, RemoteAccessVPNServiceProvider, IpDeployer, Junip private boolean canHandle(Network network, Service service) { DataCenter zone = _configMgr.getZone(network.getDataCenterId()); - if ((zone.getNetworkType() == NetworkType.Advanced && network.getGuestType() != Network.GuestType.Isolated) || (zone.getNetworkType() == NetworkType.Basic && network.getGuestType() != Network.GuestType.Shared)) { + if ((zone.getNetworkType() == NetworkType.Advanced && !(network.getGuestType() == Network.GuestType.Isolated || + network.getGuestType() == Network.GuestType.Shared )) || + (zone.getNetworkType() == NetworkType.Basic && network.getGuestType() != Network.GuestType.Shared)) { s_logger.trace("Element " + getProvider().getName() + "is not handling network type = " + network.getGuestType()); return false; } @@ -274,7 +244,7 @@ PortForwardingServiceProvider, RemoteAccessVPNServiceProvider, IpDeployer, Junip firewallCapabilities.put(Capability.SupportedProtocols, "tcp,udp,icmp"); firewallCapabilities.put(Capability.MultipleIps, "true"); firewallCapabilities.put(Capability.TrafficStatistics, "per public ip"); - firewallCapabilities.put(Capability.SupportedTrafficDirection, "ingress"); + firewallCapabilities.put(Capability.SupportedTrafficDirection, "ingress, egress"); capabilities.put(Service.Firewall, firewallCapabilities); // Disabling VPN for Juniper in Acton as it 1) Was never tested 2) probably just doesn't work diff --git a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java index 84821680198..a0068c3784c 100644 --- a/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java +++ b/plugins/network-elements/juniper-srx/src/com/cloud/network/resource/JuniperSrxResource.java @@ -303,7 +303,7 @@ public class JuniperSrxResource implements ServerResource { } private enum Protocol { - tcp, udp, icmp, any; + tcp, udp, icmp, all, any; } private enum RuleMatchCondition { @@ -320,7 +320,8 @@ public class JuniperSrxResource implements ServerResource { private enum SecurityPolicyType { STATIC_NAT("staticnat"), DESTINATION_NAT("destnat"), - VPN("vpn"); + VPN("vpn"), + SECURITYPOLICY_EGRESS("egress"); private String identifier; @@ -776,6 +777,43 @@ public class JuniperSrxResource implements ServerResource { s_logger.debug(msg); } + private Map> getActiveFirewallEgressRules(FirewallRuleTO[] allRules) { + Map> activeRules = new HashMap>(); + + for (FirewallRuleTO rule : allRules) { + String guestVlan; + guestVlan = rule.getSrcVlanTag(); + + ArrayList activeRulesForNetwork = activeRules.get(guestVlan); + + if (activeRulesForNetwork == null) { + activeRulesForNetwork = new ArrayList(); + } + + if (!rule.revoked() || rule.isAlreadyAdded()) { + activeRulesForNetwork.add(rule); + } + + activeRules.put(guestVlan, activeRulesForNetwork); + } + + return activeRules; + } + + private List extractCidrs(List rules) throws ExecutionException { + List allCidrs = new ArrayList(); + List cidrs = new ArrayList(); + + for (FirewallRuleTO rule : rules) { + cidrs = (rule.getSourceCidrList()); + for (String cidr: cidrs) { + if (!allCidrs.contains(cidr)) { + allCidrs.add(cidr); + } + } + } + return allCidrs; + } /* security policies */ private synchronized Answer execute(SetFirewallRulesCommand cmd) { @@ -787,24 +825,39 @@ public class JuniperSrxResource implements ServerResource { FirewallRuleTO[] rules = cmd.getRules(); try { openConfiguration(); + if (rules[0].getTrafficType() == FirewallRule.TrafficType.Egress) { + Map> activeRules = getActiveFirewallEgressRules(rules); + Set guestVlans = activeRules.keySet(); + List cidrs = new ArrayList(); - for (FirewallRuleTO rule : rules) { - int startPort = 0, endPort = 0; - if (rule.getSrcPortRange() != null) { - startPort = rule.getSrcPortRange()[0]; - endPort = rule.getSrcPortRange()[1]; + for (String guestVlan : guestVlans) { + List activeRulesForGuestNw = activeRules.get(guestVlan); + + removeEgressSecurityPolicyAndApplications(SecurityPolicyType.SECURITYPOLICY_EGRESS, guestVlan, extractCidrs(activeRulesForGuestNw)); + if (activeRulesForGuestNw.size() > 0) { + addEgressSecurityPolicyAndApplications(SecurityPolicyType.SECURITYPOLICY_EGRESS, guestVlan, extractApplications(activeRulesForGuestNw), extractCidrs(activeRulesForGuestNw)); + } } - FirewallFilterTerm term = new FirewallFilterTerm(genIpIdentifier(rule.getSrcIp()) + "-" + String.valueOf(rule.getId()), rule.getSourceCidrList(), - rule.getSrcIp(), rule.getProtocol(), startPort, endPort, - rule.getIcmpType(), rule.getIcmpCode(), genIpIdentifier(rule.getSrcIp()) + _usageFilterIPInput.getCounterIdentifier()); - if (!rule.revoked()) { - manageFirewallFilter(SrxCommand.ADD, term, _publicZoneInputFilterName); - } else { - manageFirewallFilter(SrxCommand.DELETE, term, _publicZoneInputFilterName); + commitConfiguration(); + } else { + for (FirewallRuleTO rule : rules) { + int startPort = 0, endPort = 0; + if (rule.getSrcPortRange() != null) { + startPort = rule.getSrcPortRange()[0]; + endPort = rule.getSrcPortRange()[1]; + FirewallFilterTerm term = new FirewallFilterTerm(genIpIdentifier(rule.getSrcIp()) + "-" + String.valueOf(rule.getId()), rule.getSourceCidrList(), + rule.getSrcIp(), rule.getProtocol(), startPort, endPort, + rule.getIcmpType(), rule.getIcmpCode(), genIpIdentifier(rule.getSrcIp()) + _usageFilterIPInput.getCounterIdentifier()); + if (!rule.revoked()) { + manageFirewallFilter(SrxCommand.ADD, term, _publicZoneInputFilterName); + } else { + manageFirewallFilter(SrxCommand.DELETE, term, _publicZoneInputFilterName); + } + } + commitConfiguration(); } } - commitConfiguration(); return new Answer(cmd); } catch (ExecutionException e) { s_logger.error(e); @@ -992,7 +1045,7 @@ public class JuniperSrxResource implements ServerResource { // Delete all security policies for (String securityPolicyName : getVpnObjectNames(SrxXml.SECURITY_POLICY_GETALL, accountId)) { - manageSecurityPolicy(SecurityPolicyType.VPN, SrxCommand.DELETE, accountId, null, null, null, securityPolicyName); + manageSecurityPolicy(SecurityPolicyType.VPN, SrxCommand.DELETE, accountId, null, null, null, null, securityPolicyName); } // Delete all address book entries @@ -1064,7 +1117,7 @@ public class JuniperSrxResource implements ServerResource { manageAddressBookEntry(srxCmd, _privateZone , guestNetworkCidr, ipsecVpnName); // Security policy - manageSecurityPolicy(SecurityPolicyType.VPN, srxCmd, null, null, guestNetworkCidr, null, ipsecVpnName); + manageSecurityPolicy(SecurityPolicyType.VPN, srxCmd, null, null, guestNetworkCidr, null, null, ipsecVpnName); } commitConfiguration(); @@ -2455,38 +2508,44 @@ public class JuniperSrxResource implements ServerResource { * Applications */ - private String genApplicationName(Protocol protocol, int startPort, int endPort) { + private String genApplicationName(SecurityPolicyType type, Protocol protocol, int startPort, int endPort) { if (protocol.equals(Protocol.any)) { return Protocol.any.toString(); } else { - return genObjectName(protocol.toString(), String.valueOf(startPort), String.valueOf(endPort)); + if (type.equals(SecurityPolicyType.SECURITYPOLICY_EGRESS)) { + return genObjectName(type.getIdentifier(), protocol.toString(), String.valueOf(startPort), String.valueOf(endPort)); + } else { + return genObjectName(protocol.toString(), String.valueOf(startPort), String.valueOf(endPort)); + } } } - private Object[] parseApplicationName(String applicationName) throws ExecutionException { + private Object[] parseApplicationName(SecurityPolicyType type, String applicationName) throws ExecutionException { String errorMsg = "Invalid application: " + applicationName; String[] applicationComponents = applicationName.split("-"); Protocol protocol; Integer startPort; Integer endPort; + int offset = 0; try { - protocol = getProtocol(applicationComponents[0]); - startPort = Integer.parseInt(applicationComponents[1]); - endPort = Integer.parseInt(applicationComponents[2]); - } catch (Exception e) { + offset = type.equals(SecurityPolicyType.SECURITYPOLICY_EGRESS) ? 1 : 0; + protocol = getProtocol(applicationComponents[offset + 0]); + startPort = Integer.parseInt(applicationComponents[offset + 1]); + endPort = Integer.parseInt(applicationComponents[offset + 2]); + } catch (Exception e) { throw new ExecutionException(errorMsg); } return new Object[]{protocol, startPort, endPort}; } - private boolean manageApplication(SrxCommand command, Protocol protocol, int startPort, int endPort) throws ExecutionException { + private boolean manageApplication(SecurityPolicyType type, SrxCommand command, Protocol protocol, int startPort, int endPort) throws ExecutionException { if (protocol.equals(Protocol.any)) { return true; } - String applicationName = genApplicationName(protocol, startPort, endPort); + String applicationName = genApplicationName(type, protocol, startPort, endPort); String xml; switch (command) { @@ -2498,23 +2557,28 @@ public class JuniperSrxResource implements ServerResource { return sendRequestAndCheckResponse(command, xml, "name", applicationName); case ADD: - if (manageApplication(SrxCommand.CHECK_IF_EXISTS, protocol, startPort, endPort)) { + if (manageApplication(type, SrxCommand.CHECK_IF_EXISTS, protocol, startPort, endPort)) { return true; } - + String icmpOrDestPort; xml = SrxXml.APPLICATION_ADD.getXml(); xml = replaceXmlValue(xml, "name", applicationName); xml = replaceXmlValue(xml, "protocol", protocol.toString()); - - String destPort; - if (startPort == endPort) { - destPort = String.valueOf(startPort); + if (protocol.toString() == Protocol.icmp.toString()) { + icmpOrDestPort = "" + startPort + ""; + icmpOrDestPort += "" + endPort + ""; } else { - destPort = startPort + "-" + endPort; + String destPort; + + if (startPort == endPort) { + destPort = String.valueOf(startPort); + } else { + destPort = startPort + "-" + endPort; + } + icmpOrDestPort = "" + destPort + ""; } - xml = replaceXmlValue(xml, "dest-port", destPort); - + xml = replaceXmlValue(xml, "dest-port-icmp", icmpOrDestPort); if (!sendRequestAndCheckResponse(command, xml)) { throw new ExecutionException("Failed to add application " + applicationName); } else { @@ -2522,7 +2586,7 @@ public class JuniperSrxResource implements ServerResource { } case DELETE: - if (!manageApplication(SrxCommand.CHECK_IF_EXISTS, protocol, startPort, endPort)) { + if (!manageApplication(type, SrxCommand.CHECK_IF_EXISTS, protocol, startPort, endPort)) { return true; } @@ -2543,13 +2607,13 @@ public class JuniperSrxResource implements ServerResource { } - private List getUnusedApplications(List applications) throws ExecutionException { + private List getUnusedApplications(List applications, String fromZone, String toZone) throws ExecutionException { List unusedApplications = new ArrayList(); // Check if any of the applications are unused by existing security policies String xml = SrxXml.SECURITY_POLICY_GETALL.getXml(); - xml = replaceXmlValue(xml, "from-zone", _publicZone); - xml = replaceXmlValue(xml, "to-zone", _privateZone); + xml = replaceXmlValue(xml, "from-zone", fromZone); + xml = replaceXmlValue(xml, "to-zone", toZone); String allPolicies = sendRequest(xml); for (String application : applications) { @@ -2560,10 +2624,7 @@ public class JuniperSrxResource implements ServerResource { return unusedApplications; } - - private List getApplicationsForSecurityPolicy(SecurityPolicyType type, String privateIp) throws ExecutionException { - String fromZone = _publicZone; - String toZone = _privateZone; + private List getApplicationsForSecurityPolicy(SecurityPolicyType type, String privateIp, String fromZone, String toZone) throws ExecutionException { String policyName = genSecurityPolicyName(type, null, null, fromZone, toZone, privateIp); String xml = SrxXml.SECURITY_POLICY_GETONE.getXml(); xml = setDelete(xml, false); @@ -2591,8 +2652,31 @@ public class JuniperSrxResource implements ServerResource { for (FirewallRuleTO rule : rules) { Object[] application = new Object[3]; application[0] = getProtocol(rule.getProtocol()); - application[1] = rule.getSrcPortRange()[0]; - application[2] = rule.getSrcPortRange()[1]; + if (application[0] == Protocol.icmp) { + if (rule.getIcmpType() == -1) { + application[1] = 255; + } else { + application[1] = rule.getIcmpType(); + } + + if (rule.getIcmpCode() == -1) { + application[2] = 255; + } else { + application[2] = rule.getIcmpCode(); + } + } else if (application[0] == Protocol.tcp || application[0] == Protocol.udp) { + if (rule.getSrcPortRange() != null) { + application[1] = rule.getSrcPortRange()[0]; + application[2] = rule.getSrcPortRange()[1]; + } else { + application[1] = 0; + application[2] = 65535; + } + } else if (application[0] == Protocol.all) { + application[1] = 0; + application[2] = 65535; + } + applications.add(application); } @@ -2611,16 +2695,20 @@ public class JuniperSrxResource implements ServerResource { } } - private boolean manageSecurityPolicy(SecurityPolicyType type, SrxCommand command, Long accountId, String username, String privateIp, List applicationNames, String ipsecVpnName) throws ExecutionException { + private boolean manageSecurityPolicy(SecurityPolicyType type, SrxCommand command, Long accountId, String username, String privateIp, List applicationNames, List cidrs, String ipsecVpnName) throws ExecutionException { String fromZone = _publicZone; String toZone = _privateZone; String securityPolicyName; - String addressBookEntryName; - + String addressBookEntryName = null; + if (type.equals(SecurityPolicyType.VPN) && ipsecVpnName != null) { - securityPolicyName = ipsecVpnName; - addressBookEntryName = ipsecVpnName; + securityPolicyName = ipsecVpnName; + addressBookEntryName = ipsecVpnName; + } else if (type.equals(SecurityPolicyType.SECURITYPOLICY_EGRESS)) { + fromZone = _privateZone; + toZone = _publicZone; + securityPolicyName = genSecurityPolicyName(type, accountId, username, fromZone, toZone, privateIp); } else { securityPolicyName = genSecurityPolicyName(type, accountId, username, fromZone, toZone, privateIp); addressBookEntryName = genAddressBookEntryName(privateIp); @@ -2661,17 +2749,38 @@ public class JuniperSrxResource implements ServerResource { return false; case ADD: - if (!manageAddressBookEntry(SrxCommand.CHECK_IF_EXISTS, toZone, privateIp, ipsecVpnName)) { - throw new ExecutionException("No address book entry for policy: " + securityPolicyName); + if (!type.equals(SecurityPolicyType.SECURITYPOLICY_EGRESS)) { + if (!manageAddressBookEntry(SrxCommand.CHECK_IF_EXISTS, toZone, privateIp, addressBookEntryName)) { + throw new ExecutionException("No address book entry for policy: " + securityPolicyName); + } + } + + String srcAddrs = ""; + String dstAddrs = ""; + xml = SrxXml.SECURITY_POLICY_ADD.getXml(); + xml = replaceXmlValue(xml, "policy-name", securityPolicyName); + if (type.equals(SecurityPolicyType.SECURITYPOLICY_EGRESS)) { + xml = replaceXmlValue(xml, "from-zone", _privateZone); + xml = replaceXmlValue(xml, "to-zone", _publicZone); + if (cidrs == null) { + srcAddrs = "any"; + } else { + for (String cidr : cidrs) { + srcAddrs += "" + genAddressBookEntryName(cidr) + ""; + } + } + xml = replaceXmlValue(xml, "src-address", srcAddrs); + dstAddrs = "any"; + xml = replaceXmlValue(xml, "dst-address", dstAddrs); + } else { + xml = replaceXmlValue(xml, "from-zone", fromZone); + xml = replaceXmlValue(xml, "to-zone", toZone); + srcAddrs = "any"; + xml = replaceXmlValue(xml, "src-address", srcAddrs); + dstAddrs = "" + addressBookEntryName + ""; + xml = replaceXmlValue(xml, "dst-address", dstAddrs); } - xml = SrxXml.SECURITY_POLICY_ADD.getXml(); - xml = replaceXmlValue(xml, "from-zone", fromZone); - xml = replaceXmlValue(xml, "to-zone", toZone); - xml = replaceXmlValue(xml, "policy-name", securityPolicyName); - xml = replaceXmlValue(xml, "src-address", "any"); - xml = replaceXmlValue(xml, "dest-address", addressBookEntryName); - if (type.equals(SecurityPolicyType.VPN) && ipsecVpnName != null) { xml = replaceXmlValue(xml, "tunnel", "" + ipsecVpnName + ""); } else { @@ -2679,7 +2788,7 @@ public class JuniperSrxResource implements ServerResource { } String applications; - if (applicationNames == null) { + if (applicationNames == null || applicationNames.size() == 0) { applications = "any"; } else { applications = ""; @@ -2697,11 +2806,11 @@ public class JuniperSrxResource implements ServerResource { } case DELETE: - if (!manageSecurityPolicy(type, SrxCommand.CHECK_IF_EXISTS, null, null, privateIp, applicationNames, ipsecVpnName)) { + if (!manageSecurityPolicy(type, SrxCommand.CHECK_IF_EXISTS, null, null, privateIp, applicationNames, cidrs, ipsecVpnName)) { return true; } - if (manageSecurityPolicy(type, SrxCommand.CHECK_IF_IN_USE, null, null, privateIp, applicationNames, ipsecVpnName)) { + if (manageSecurityPolicy(type, SrxCommand.CHECK_IF_IN_USE, null, null, privateIp, applicationNames, cidrs, ipsecVpnName)) { return true; } @@ -2757,42 +2866,42 @@ public class JuniperSrxResource implements ServerResource { int startPort = application[1] != null ? ((Integer) application[1]) : -1; int endPort = application[2] != null ? ((Integer) application[2]) : -1; - String applicationName = genApplicationName(protocol, startPort, endPort); + String applicationName = genApplicationName(type, protocol, startPort, endPort); if (!applicationNames.contains(applicationName)) { applicationNames.add(applicationName); } - manageApplication(SrxCommand.ADD, protocol, startPort, endPort); + manageApplication(type, SrxCommand.ADD, protocol, startPort, endPort); } // Add a new security policy - manageSecurityPolicy(type, SrxCommand.ADD, null, null, privateIp, applicationNames, null); + manageSecurityPolicy(type, SrxCommand.ADD, null, null, privateIp, applicationNames, null, null); return true; } private boolean removeSecurityPolicyAndApplications(SecurityPolicyType type, String privateIp) throws ExecutionException { - if (!manageSecurityPolicy(type, SrxCommand.CHECK_IF_EXISTS, null, null, privateIp, null, null)) { + if (!manageSecurityPolicy(type, SrxCommand.CHECK_IF_EXISTS, null, null, privateIp, null,null, null)) { return true; } - if (manageSecurityPolicy(type, SrxCommand.CHECK_IF_IN_USE, null, null, privateIp, null, null)) { + if (manageSecurityPolicy(type, SrxCommand.CHECK_IF_IN_USE, null, null, privateIp, null, null, null)) { return true; } // Get a list of applications for this security policy - List applications = getApplicationsForSecurityPolicy(type, privateIp); + List applications = getApplicationsForSecurityPolicy(type, privateIp, _publicZone, _privateZone); - // Remove the security policy - manageSecurityPolicy(type, SrxCommand.DELETE, null, null, privateIp, null, null); + // Remove the security policy + manageSecurityPolicy(type, SrxCommand.DELETE, null, null, privateIp, null, null, null); // Remove any applications for the removed security policy that are no longer in use - List unusedApplications = getUnusedApplications(applications); + List unusedApplications = getUnusedApplications(applications, _publicZone, _privateZone); for (String application : unusedApplications) { Object[] applicationComponents; try { - applicationComponents = parseApplicationName(application); + applicationComponents = parseApplicationName(type, application); } catch (ExecutionException e) { s_logger.error("Found an invalid application: " + application + ". Not attempting to clean up."); continue; @@ -2800,13 +2909,78 @@ public class JuniperSrxResource implements ServerResource { Protocol protocol = (Protocol) applicationComponents[0]; Integer startPort = (Integer) applicationComponents[1]; - Integer endPort = (Integer) applicationComponents[2]; - manageApplication(SrxCommand.DELETE, protocol, startPort, endPort); + Integer endPort = (Integer) applicationComponents[2]; + manageApplication(type, SrxCommand.DELETE, protocol, startPort, endPort); } return true; } + + private boolean removeEgressSecurityPolicyAndApplications(SecurityPolicyType type, String guestVlan, List cidrs) throws ExecutionException { + if (!manageSecurityPolicy(type, SrxCommand.CHECK_IF_EXISTS, null, null, guestVlan, null, cidrs, null)) { + return true; + } + // Get a list of applications for this security policy + List applications; + applications = getApplicationsForSecurityPolicy(type, guestVlan, _privateZone, _publicZone); + + // Remove the security policy even if it is in use + manageSecurityPolicy(type, SrxCommand.DELETE, null, null, guestVlan, null, cidrs, null); + + // Remove any applications for the removed security policy that are no longer in use + List unusedApplications; + unusedApplications = getUnusedApplications(applications, _privateZone, _publicZone); + + for (String application : unusedApplications) { + Object[] applicationComponents; + + try { + applicationComponents = parseApplicationName(type, application); + } catch (ExecutionException e) { + s_logger.error("Found an invalid application: " + application + ". Not attempting to clean up."); + continue; + } + + Protocol protocol = (Protocol) applicationComponents[0]; + Integer startPort = (Integer) applicationComponents[1]; + Integer endPort = (Integer) applicationComponents[2]; + manageApplication(type, SrxCommand.DELETE, protocol, startPort, endPort); + } + for (String cidr: cidrs) { + manageAddressBookEntry(SrxCommand.DELETE, _publicZone, cidr, null); + } + + return true; + } + + private boolean addEgressSecurityPolicyAndApplications(SecurityPolicyType type, String guestVlan, List applications, List cidrs) throws ExecutionException { + // Add all necessary applications + List applicationNames = new ArrayList(); + for (Object[] application : applications) { + Protocol protocol = (Protocol) application[0]; + if (!protocol.equals(Protocol.all)) { + int startPort = application[1] != null ? ((Integer) application[1]) : 0; + int endPort = application[2] != null ? ((Integer) application[2]) : 65535; + + String applicationName = genApplicationName(type, protocol, startPort, endPort); + if (!applicationNames.contains(applicationName)) { + applicationNames.add(applicationName); + } + manageApplication(type, SrxCommand.ADD, protocol, startPort, endPort); + } + } + + for (String cidr: cidrs) { + manageAddressBookEntry(SrxCommand.ADD, _privateZone, cidr, null); + } + + // Add a new security policy + manageSecurityPolicy(type, SrxCommand.ADD, null, null, guestVlan, applicationNames, cidrs, null); + s_logger.debug("Added Egress firewall rule for guest network " + guestVlan); + return true; + } + /* * Filter terms */ diff --git a/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java b/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java index 4c0444571bf..a6b78d84129 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/element/SimpleFirewallRule.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.cloud.network.element; import com.cloud.agent.api.to.FirewallRuleTO; diff --git a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java index e6869d02606..7e93edbcd99 100644 --- a/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java +++ b/plugins/network-elements/midonet/src/com/cloud/network/guru/MidoNetPublicNetworkGuru.java @@ -1,3 +1,21 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you under the Apache License, Version 2.0 (the + * "License"); you may not use this file except in compliance + * with the License. You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, + * software distributed under the License is distributed on an + * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY + * KIND, either express or implied. See the License for the + * specific language governing permissions and limitations + * under the License. + */ package com.cloud.network.guru; import com.cloud.dc.DataCenter; diff --git a/plugins/network-elements/netscaler/pom.xml b/plugins/network-elements/netscaler/pom.xml index 1eb73a236dc..d5c7cdc5bcc 100644 --- a/plugins/network-elements/netscaler/pom.xml +++ b/plugins/network-elements/netscaler/pom.xml @@ -28,9 +28,9 @@ - com.cloud.com.citrix - netscaler - 1.0 + com.citrix.netscaler.nitro + nitro + 10.0.e com.cloud.com.citrix diff --git a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java index 17bb7cc1b6a..2bbdb0450be 100644 --- a/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java +++ b/plugins/network-elements/netscaler/src/com/cloud/network/element/NetscalerElement.java @@ -124,7 +124,8 @@ public class NetscalerElement extends ExternalLoadBalancerDeviceManagerImpl impl private boolean canHandle(Network config, Service service) { DataCenter zone = _dcDao.findById(config.getDataCenterId()); - boolean handleInAdvanceZone = (zone.getNetworkType() == NetworkType.Advanced && config.getGuestType() == Network.GuestType.Isolated && config.getTrafficType() == TrafficType.Guest); + boolean handleInAdvanceZone = (zone.getNetworkType() == NetworkType.Advanced && + (config.getGuestType() == Network.GuestType.Isolated || config.getGuestType() == Network.GuestType.Shared) && config.getTrafficType() == TrafficType.Guest); boolean handleInBasicZone = (zone.getNetworkType() == NetworkType.Basic && config.getGuestType() == Network.GuestType.Shared && config.getTrafficType() == TrafficType.Guest); if (!(handleInAdvanceZone || handleInBasicZone)) { diff --git a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java index 3ca34473cd7..c22f669796c 100644 --- a/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java +++ b/plugins/network-elements/nicira-nvp/src/com/cloud/network/element/NiciraNvpElement.java @@ -843,6 +843,11 @@ NiciraNvpElementService, ResourceStateAdapter, IpDeployer { List cidrs = new ArrayList(); for (PublicIpAddress ip : ipAddress) { + if (ip.getState() == IpAddress.State.Releasing) { + // If we are releasing we don't need to push this ip to + // the Logical Router + continue; + } cidrs.add(ip.getAddress().addr() + "/" + NetUtils.getCidrSize(ip.getNetmask())); } ConfigurePublicIpsOnLogicalRouterCommand cmd = new ConfigurePublicIpsOnLogicalRouterCommand(routermapping.getLogicalRouterUuid(), diff --git a/plugins/network-elements/nicira-nvp/test/com/cloud/network/element/NiciraNvpElementTest.java b/plugins/network-elements/nicira-nvp/test/com/cloud/network/element/NiciraNvpElementTest.java index 09d50a33a64..40685fa4236 100644 --- a/plugins/network-elements/nicira-nvp/test/com/cloud/network/element/NiciraNvpElementTest.java +++ b/plugins/network-elements/nicira-nvp/test/com/cloud/network/element/NiciraNvpElementTest.java @@ -16,107 +16,197 @@ // under the License. package com.cloud.network.element; +import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; +import java.util.List; +import java.util.Set; import javax.naming.ConfigurationException; import org.junit.Before; import org.junit.Test; +import org.mockito.ArgumentMatcher; +import com.cloud.agent.AgentManager; +import com.cloud.agent.api.Command; +import com.cloud.agent.api.ConfigurePublicIpsOnLogicalRouterAnswer; +import com.cloud.agent.api.ConfigurePublicIpsOnLogicalRouterCommand; import com.cloud.deploy.DeployDestination; import com.cloud.domain.Domain; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.ResourceUnavailableException; +import com.cloud.host.HostVO; +import com.cloud.host.dao.HostDao; import com.cloud.network.Network; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; +import com.cloud.network.IpAddress; import com.cloud.network.NetworkManager; import com.cloud.network.NetworkModel; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.TrafficType; +import com.cloud.network.NiciraNvpDeviceVO; +import com.cloud.network.NiciraNvpRouterMappingVO; +import com.cloud.network.PublicIpAddress; import com.cloud.network.dao.NetworkServiceMapDao; +import com.cloud.network.dao.NiciraNvpDao; +import com.cloud.network.dao.NiciraNvpRouterMappingDao; +import com.cloud.network.nicira.NatRule; import com.cloud.offering.NetworkOffering; import com.cloud.resource.ResourceManager; import com.cloud.user.Account; +import com.cloud.utils.net.Ip; import com.cloud.vm.ReservationContext; import static org.junit.Assert.*; +import static org.mockito.Matchers.argThat; +import static org.mockito.Matchers.eq; import static org.mockito.Mockito.*; public class NiciraNvpElementTest { - - NiciraNvpElement _element = new NiciraNvpElement(); - NetworkManager _networkManager = mock(NetworkManager.class); - NetworkModel _networkModel = mock(NetworkModel.class); - NetworkServiceMapDao _ntwkSrvcDao = mock (NetworkServiceMapDao.class); - - @Before - public void setUp() throws ConfigurationException { - _element._resourceMgr = mock(ResourceManager.class); - _element._networkManager = _networkManager; - _element._ntwkSrvcDao = _ntwkSrvcDao; - _element._networkModel = _networkModel; - - // Standard responses - when(_networkModel.isProviderForNetwork(Provider.NiciraNvp, 42L)).thenReturn(true); - - _element.configure("NiciraNvpTestElement", Collections. emptyMap()); - } - @Test - public void canHandleTest() { - Network net = mock(Network.class); - when(net.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Lswitch); - when(net.getId()).thenReturn(42L); - - when(_ntwkSrvcDao.canProviderSupportServiceInNetwork(42L, Service.Connectivity, Provider.NiciraNvp)).thenReturn(true); - // Golden path - assertTrue(_element.canHandle(net, Service.Connectivity)); - - when(net.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Vlan); - // Only broadcastdomaintype lswitch is supported - assertFalse(_element.canHandle(net, Service.Connectivity)); - - when(net.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Lswitch); - when(_ntwkSrvcDao.canProviderSupportServiceInNetwork(42L, Service.Connectivity, Provider.NiciraNvp)).thenReturn(false); - // No nvp provider in the network - assertFalse(_element.canHandle(net, Service.Connectivity)); - - when(_networkModel.isProviderForNetwork(Provider.NiciraNvp, 42L)).thenReturn(false); - when(_ntwkSrvcDao.canProviderSupportServiceInNetwork(42L, Service.Connectivity, Provider.NiciraNvp)).thenReturn(true); - // NVP provider does not provide Connectivity for this network - assertFalse(_element.canHandle(net, Service.Connectivity)); - - when(_networkModel.isProviderForNetwork(Provider.NiciraNvp, 42L)).thenReturn(true); - // Only service Connectivity is supported - assertFalse(_element.canHandle(net, Service.Dhcp)); - - } - - @Test - public void implementTest() throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { - Network network = mock(Network.class); - when(network.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Lswitch); - when(network.getId()).thenReturn(42L); - - NetworkOffering offering = mock(NetworkOffering.class); - when(offering.getId()).thenReturn(42L); - when(offering.getTrafficType()).thenReturn(TrafficType.Guest); - when(offering.getGuestType()).thenReturn(GuestType.Isolated); - - DeployDestination dest = mock(DeployDestination.class); - - Domain dom = mock(Domain.class); - when(dom.getName()).thenReturn("domain"); - Account acc = mock(Account.class); - when(acc.getAccountName()).thenReturn("accountname"); - ReservationContext context = mock(ReservationContext.class); - when(context.getDomain()).thenReturn(dom); - when(context.getAccount()).thenReturn(acc); - - //assertTrue(_element.implement(network, offering, dest, context)); - } + NiciraNvpElement _element = new NiciraNvpElement(); + NetworkManager _networkManager = mock(NetworkManager.class); + NetworkModel _networkModel = mock(NetworkModel.class); + NetworkServiceMapDao _ntwkSrvcDao = mock(NetworkServiceMapDao.class); + AgentManager _agentManager = mock(AgentManager.class); + HostDao _hostDao = mock(HostDao.class); + NiciraNvpDao _niciraNvpDao = mock(NiciraNvpDao.class); + NiciraNvpRouterMappingDao _niciraNvpRouterMappingDao = mock(NiciraNvpRouterMappingDao.class); -} + @Before + public void setUp() throws ConfigurationException { + _element._resourceMgr = mock(ResourceManager.class); + _element._networkManager = _networkManager; + _element._ntwkSrvcDao = _ntwkSrvcDao; + _element._networkModel = _networkModel; + _element._agentMgr = _agentManager; + _element._hostDao = _hostDao; + _element._niciraNvpDao = _niciraNvpDao; + _element._niciraNvpRouterMappingDao = _niciraNvpRouterMappingDao; + + // Standard responses + when(_networkModel.isProviderForNetwork(Provider.NiciraNvp, 42L)).thenReturn(true); + + _element.configure("NiciraNvpTestElement", Collections. emptyMap()); + } + + @Test + public void canHandleTest() { + Network net = mock(Network.class); + when(net.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Lswitch); + when(net.getId()).thenReturn(42L); + + when(_ntwkSrvcDao.canProviderSupportServiceInNetwork(42L, Service.Connectivity, Provider.NiciraNvp)).thenReturn(true); + // Golden path + assertTrue(_element.canHandle(net, Service.Connectivity)); + + when(net.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Vlan); + // Only broadcastdomaintype lswitch is supported + assertFalse(_element.canHandle(net, Service.Connectivity)); + + when(net.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Lswitch); + when(_ntwkSrvcDao.canProviderSupportServiceInNetwork(42L, Service.Connectivity, Provider.NiciraNvp)).thenReturn(false); + // No nvp provider in the network + assertFalse(_element.canHandle(net, Service.Connectivity)); + + when(_networkModel.isProviderForNetwork(Provider.NiciraNvp, 42L)).thenReturn(false); + when(_ntwkSrvcDao.canProviderSupportServiceInNetwork(42L, Service.Connectivity, Provider.NiciraNvp)).thenReturn(true); + // NVP provider does not provide Connectivity for this network + assertFalse(_element.canHandle(net, Service.Connectivity)); + + when(_networkModel.isProviderForNetwork(Provider.NiciraNvp, 42L)).thenReturn(true); + // Only service Connectivity is supported + assertFalse(_element.canHandle(net, Service.Dhcp)); + + } + + @Test + public void implementTest() throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { + Network network = mock(Network.class); + when(network.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Lswitch); + when(network.getId()).thenReturn(42L); + + NetworkOffering offering = mock(NetworkOffering.class); + when(offering.getId()).thenReturn(42L); + when(offering.getTrafficType()).thenReturn(TrafficType.Guest); + when(offering.getGuestType()).thenReturn(GuestType.Isolated); + + DeployDestination dest = mock(DeployDestination.class); + + Domain dom = mock(Domain.class); + when(dom.getName()).thenReturn("domain"); + Account acc = mock(Account.class); + when(acc.getAccountName()).thenReturn("accountname"); + ReservationContext context = mock(ReservationContext.class); + when(context.getDomain()).thenReturn(dom); + when(context.getAccount()).thenReturn(acc); + + // assertTrue(_element.implement(network, offering, dest, context)); + } + + @Test + public void applyIpTest() throws ResourceUnavailableException { + Network network = mock(Network.class); + when(network.getBroadcastDomainType()).thenReturn(BroadcastDomainType.Lswitch); + when(network.getId()).thenReturn(42L); + when(network.getPhysicalNetworkId()).thenReturn(42L); + + NetworkOffering offering = mock(NetworkOffering.class); + when(offering.getId()).thenReturn(42L); + when(offering.getTrafficType()).thenReturn(TrafficType.Guest); + when(offering.getGuestType()).thenReturn(GuestType.Isolated); + + List ipAddresses = new ArrayList(); + PublicIpAddress pipReleased = mock(PublicIpAddress.class); + PublicIpAddress pipAllocated = mock(PublicIpAddress.class); + Ip ipReleased = new Ip("42.10.10.10"); + Ip ipAllocated = new Ip("10.10.10.10"); + when(pipAllocated.getState()).thenReturn(IpAddress.State.Allocated); + when(pipAllocated.getAddress()).thenReturn(ipAllocated); + when(pipAllocated.getNetmask()).thenReturn("255.255.255.0"); + when(pipReleased.getState()).thenReturn(IpAddress.State.Releasing); + when(pipReleased.getAddress()).thenReturn(ipReleased); + when(pipReleased.getNetmask()).thenReturn("255.255.255.0"); + ipAddresses.add(pipAllocated); + ipAddresses.add(pipReleased); + + Set services = new HashSet(); + services.add(Service.SourceNat); + services.add(Service.StaticNat); + services.add(Service.PortForwarding); + + List deviceList = new ArrayList(); + NiciraNvpDeviceVO nndVO = mock(NiciraNvpDeviceVO.class); + NiciraNvpRouterMappingVO nnrmVO = mock(NiciraNvpRouterMappingVO.class); + when(_niciraNvpRouterMappingDao.findByNetworkId(42L)).thenReturn(nnrmVO); + when(nnrmVO.getLogicalRouterUuid()).thenReturn("abcde"); + when(nndVO.getHostId()).thenReturn(42L); + HostVO hvo = mock(HostVO.class); + when(hvo.getId()).thenReturn(42L); + when(hvo.getDetail("l3gatewayserviceuuid")).thenReturn("abcde"); + when(_hostDao.findById(42L)).thenReturn(hvo); + deviceList.add(nndVO); + when(_niciraNvpDao.listByPhysicalNetwork(42L)).thenReturn(deviceList); + + ConfigurePublicIpsOnLogicalRouterAnswer answer = mock(ConfigurePublicIpsOnLogicalRouterAnswer.class); + when(answer.getResult()).thenReturn(true); + when(_agentManager.easySend(eq(42L), any(ConfigurePublicIpsOnLogicalRouterCommand.class))).thenReturn(answer); + + assertTrue(_element.applyIps(network, ipAddresses, services)); + + verify(_agentManager, atLeast(1)).easySend(eq(42L), + argThat(new ArgumentMatcher() { + @Override + public boolean matches(Object argument) { + ConfigurePublicIpsOnLogicalRouterCommand command = (ConfigurePublicIpsOnLogicalRouterCommand) argument; + if (command.getPublicCidrs().size() == 1) + return true; + return false; + } + })); + } +} \ No newline at end of file diff --git a/plugins/pom.xml b/plugins/pom.xml index 607c50cff22..471253f0728 100755 --- a/plugins/pom.xml +++ b/plugins/pom.xml @@ -36,6 +36,7 @@ api/rate-limit api/discovery acl/static-role-based + affinity-group-processors/host-anti-affinity deployment-planners/user-concentrated-pod deployment-planners/user-dispersing host-allocators/random @@ -137,6 +138,7 @@ hypervisors/vmware + network-elements/cisco-vnmc diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java index b8b08598f69..a0c991b5ad6 100644 --- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java +++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/lifecycle/CloudStackPrimaryDataStoreLifeCycleImpl.java @@ -348,6 +348,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements new String(storageHost + hostPath).getBytes()).toString(); } + List spHandles = primaryDataStoreDao .findIfDuplicatePoolsExistByUUID(uuid); if ((spHandles != null) && (spHandles.size() > 0)) { @@ -358,6 +359,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements "Another active pool with the same uuid already exists"); } + String poolName = (String) dsInfos.get("name"); parameters.setUuid(uuid); @@ -530,8 +532,7 @@ public class CloudStackPrimaryDataStoreLifeCycleImpl implements throw new CloudRuntimeException("Failed to delete storage pool on host"); } - this.dataStoreHelper.deletePrimaryDataStore(store); - return false; + return this.dataStoreHelper.deletePrimaryDataStore(store); } @Override diff --git a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackPrimaryDataStoreProviderImpl.java b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackPrimaryDataStoreProviderImpl.java index 4d46d99fab3..826f07ae07e 100644 --- a/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackPrimaryDataStoreProviderImpl.java +++ b/plugins/storage/volume/default/src/org/apache/cloudstack/storage/datastore/provider/CloudStackPrimaryDataStoreProviderImpl.java @@ -37,7 +37,7 @@ public class CloudStackPrimaryDataStoreProviderImpl implements private final String providerName = "ancient primary data store provider"; protected PrimaryDataStoreDriver driver; protected HypervisorHostListener listener; - protected DataStoreLifeCycle lifecyle; + protected DataStoreLifeCycle lifecycle; CloudStackPrimaryDataStoreProviderImpl() { @@ -50,12 +50,12 @@ public class CloudStackPrimaryDataStoreProviderImpl implements @Override public DataStoreLifeCycle getDataStoreLifeCycle() { - return this.lifecyle; + return this.lifecycle; } @Override public boolean configure(Map params) { - lifecyle = ComponentContext.inject(CloudStackPrimaryDataStoreLifeCycleImpl.class); + lifecycle = ComponentContext.inject(CloudStackPrimaryDataStoreLifeCycleImpl.class); driver = ComponentContext.inject(CloudStackPrimaryDataStoreDriverImpl.class); listener = ComponentContext.inject(DefaultHostListener.class); return true; diff --git a/pom.xml b/pom.xml index 62081241445..7d5b4c3bdef 100644 --- a/pom.xml +++ b/pom.xml @@ -237,6 +237,22 @@ install + + org.apache.maven.plugins + maven-release-plugin + 2.2.1 + + + default + + perform + + + pom.xml + + + + @@ -317,6 +333,10 @@ deps/XenServerJava/Makefile dist/console-proxy/js/jquery.js scripts/vm/systemvm/id_rsa.cloud + services/console-proxy/server/conf/agent.properties + services/console-proxy/server/conf/environment.properties + services/secondary-storage/conf/agent.properties + services/secondary-storage/conf/environment.properties tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf tools/appliance/definitions/devcloud/* tools/appliance/definitions/systemvmtemplate/* diff --git a/scripts/network/juniper/application-add.xml b/scripts/network/juniper/application-add.xml index 66038507c44..177329a0359 100644 --- a/scripts/network/juniper/application-add.xml +++ b/scripts/network/juniper/application-add.xml @@ -23,7 +23,7 @@ under the License. %name% %protocol% -%dest-port% +%dest-port-icmp% diff --git a/scripts/network/juniper/security-policy-add.xml b/scripts/network/juniper/security-policy-add.xml index 632a17d6651..595e02680b8 100644 --- a/scripts/network/juniper/security-policy-add.xml +++ b/scripts/network/juniper/security-policy-add.xml @@ -27,8 +27,8 @@ under the License. %policy-name% -%src-address% -%dest-address% +%src-address% +%dst-address% %applications% diff --git a/scripts/vm/hypervisor/kvm/patchviasocket.pl b/scripts/vm/hypervisor/kvm/patchviasocket.pl index 443d6e4277b..7bcd245bc38 100644 --- a/scripts/vm/hypervisor/kvm/patchviasocket.pl +++ b/scripts/vm/hypervisor/kvm/patchviasocket.pl @@ -53,6 +53,6 @@ my $msg = "pubkey:" . $key . "\ncmdline:" . $cmdline; my $socket = IO::Socket::UNIX->new(Peer=>$sockfile,Type=>SOCK_STREAM) or die "ERROR: unable to connect to $sockfile - $^E\n"; -print $socket "$msg\r\n"; +print $socket "$msg\n"; close $socket; diff --git a/scripts/vm/network/security_group.py b/scripts/vm/network/security_group.py index 49d9be68ddd..6c12409b0cb 100755 --- a/scripts/vm/network/security_group.py +++ b/scripts/vm/network/security_group.py @@ -275,7 +275,7 @@ def remove_secip_log_for_vm(vmName): try: os.remove(logfilename) except: - util.SMlog("Failed to delete rule log file " + logfilename) + logging.debug("Failed to delete rule log file " + logfilename) result = False return result diff --git a/scripts/vm/systemvm/injectkeys.sh b/scripts/vm/systemvm/injectkeys.sh index e56eb85b356..c17a3c61935 100755 --- a/scripts/vm/systemvm/injectkeys.sh +++ b/scripts/vm/systemvm/injectkeys.sh @@ -22,6 +22,7 @@ # $2 = new private key #set -x +set -e TMP=/tmp MOUNTPATH=${HOME}/systemvm_mnt @@ -29,7 +30,7 @@ TMPDIR=${TMP}/cloud/systemvm clean_up() { - sudo umount $MOUNTPATH + $SUDO umount $MOUNTPATH } inject_into_iso() { @@ -39,23 +40,23 @@ inject_into_iso() { local tmpiso=${TMP}/$1 mkdir -p $MOUNTPATH [ ! -f $isofile ] && echo "$(basename $0): Could not find systemvm iso patch file $isofile" && return 1 - sudo mount -o loop $isofile $MOUNTPATH + $SUDO mount -o loop $isofile $MOUNTPATH [ $? -ne 0 ] && echo "$(basename $0): Failed to mount original iso $isofile" && clean_up && return 1 diff -q $MOUNTPATH/authorized_keys $newpubkey &> /dev/null && clean_up && return 0 - sudo cp -b $isofile $backup + $SUDO cp -b $isofile $backup [ $? -ne 0 ] && echo "$(basename $0): Failed to backup original iso $isofile" && clean_up && return 1 rm -rf $TMPDIR mkdir -p $TMPDIR [ ! -d $TMPDIR ] && echo "$(basename $0): Could not find/create temporary dir $TMPDIR" && clean_up && return 1 - sudo cp -fr $MOUNTPATH/* $TMPDIR/ + $SUDO cp -fr $MOUNTPATH/* $TMPDIR/ [ $? -ne 0 ] && echo "$(basename $0): Failed to copy from original iso $isofile" && clean_up && return 1 - sudo cp $newpubkey $TMPDIR/authorized_keys + $SUDO cp $newpubkey $TMPDIR/authorized_keys [ $? -ne 0 ] && echo "$(basename $0): Failed to copy key $newpubkey from original iso to new iso " && clean_up && return 1 mkisofs -quiet -r -o $tmpiso $TMPDIR [ $? -ne 0 ] && echo "$(basename $0): Failed to create new iso $tmpiso from $TMPDIR" && clean_up && return 1 - sudo umount $MOUNTPATH + $SUDO umount $MOUNTPATH [ $? -ne 0 ] && echo "$(basename $0): Failed to unmount old iso from $MOUNTPATH" && return 1 - sudo cp -f $tmpiso $isofile + $SUDO cp -f $tmpiso $isofile [ $? -ne 0 ] && echo "$(basename $0): Failed to overwrite old iso $isofile with $tmpiso" && return 1 rm -rf $TMPDIR } @@ -63,12 +64,17 @@ inject_into_iso() { copy_priv_key() { local newprivkey=$1 diff -q $newprivkey $(dirname $0)/id_rsa.cloud && return 0 - sudo cp -fb $newprivkey $(dirname $0)/id_rsa.cloud - sudo chmod 644 $(dirname $0)/id_rsa.cloud + $SUDO cp -fb $newprivkey $(dirname $0)/id_rsa.cloud + $SUDO chmod 644 $(dirname $0)/id_rsa.cloud return $? } -sudo mkdir -p $MOUNTPATH +if [[ "$EUID" -ne 0 ]] +then + SUDO="sudo " +fi + +$SUDO mkdir -p $MOUNTPATH [ $# -ne 3 ] && echo "Usage: $(basename $0) " && exit 3 newpubkey=$1 diff --git a/server/pom.xml b/server/pom.xml index a3971954475..8b64335d50f 100644 --- a/server/pom.xml +++ b/server/pom.xml @@ -153,13 +153,11 @@ com/cloud/snapshot/* com/cloud/storage/dao/* com/cloud/vm/dao/* - com/cloud/vpc/* com/cloud/api/ListPerfTest.java com/cloud/network/vpn/RemoteAccessVpnTest.java com/cloud/network/security/SecurityGroupManagerImpl2Test.java com/cloud/network/security/SecurityGroupManagerImpl2Test.java - - org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java + com/cloud/vpc/* diff --git a/server/src/com/cloud/agent/manager/AgentManagerImpl.java b/server/src/com/cloud/agent/manager/AgentManagerImpl.java index c1bbb588faf..6baeecf382a 100755 --- a/server/src/com/cloud/agent/manager/AgentManagerImpl.java +++ b/server/src/com/cloud/agent/manager/AgentManagerImpl.java @@ -668,7 +668,7 @@ public class AgentManagerImpl extends ManagerBase implements AgentManager, Handl public boolean start() { startDirectlyConnectedHosts(); if (_monitor != null) { - _monitor.startMonitoring(); + _monitor.startMonitoring(_pingTimeout); } if (_connection != null) { _connection.start(); diff --git a/server/src/com/cloud/agent/manager/AgentMonitor.java b/server/src/com/cloud/agent/manager/AgentMonitor.java index ae539fd9188..f3f6669dae6 100755 --- a/server/src/com/cloud/agent/manager/AgentMonitor.java +++ b/server/src/com/cloud/agent/manager/AgentMonitor.java @@ -35,6 +35,7 @@ import com.cloud.agent.api.Command; import com.cloud.agent.api.PingCommand; import com.cloud.agent.api.StartupCommand; import com.cloud.alert.AlertManager; +import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; import com.cloud.dc.dao.ClusterDao; @@ -60,7 +61,7 @@ import com.cloud.vm.dao.VMInstanceDao; public class AgentMonitor extends Thread implements AgentMonitorService { private static Logger s_logger = Logger.getLogger(AgentMonitor.class); private static Logger status_Logger = Logger.getLogger(Status.class); - private long _pingTimeout; + private long _pingTimeout = 120; // Default set to 120 seconds @Inject private HostDao _hostDao; private boolean _stop; @Inject private AgentManager _agentMgr; @@ -69,40 +70,16 @@ public class AgentMonitor extends Thread implements AgentMonitorService { @Inject private HostPodDao _podDao = null; @Inject private AlertManager _alertMgr; private long _msId; - private ConnectionConcierge _concierge; @Inject ClusterDao _clusterDao; @Inject ResourceManager _resourceMgr; - + // private ConnectionConcierge _concierge; private Map _pingMap; public AgentMonitor() { _pingMap = new ConcurrentHashMap(10007); } - - public AgentMonitor(long msId, HostDao hostDao, VMInstanceDao vmDao, DataCenterDao dcDao, HostPodDao podDao, AgentManagerImpl agentMgr, AlertManager alertMgr, long pingTimeout) { - super("AgentMonitor"); - _msId = msId; - _pingTimeout = pingTimeout; - _hostDao = hostDao; - _agentMgr = agentMgr; - _stop = false; - _vmDao = vmDao; - _dcDao = dcDao; - _podDao = podDao; - _alertMgr = alertMgr; - _pingMap = new ConcurrentHashMap(10007); - // try { - // Connection conn = Transaction.getStandaloneConnectionWithException(); - // conn.setAutoCommit(true); - // conn.setTransactionIsolation(Connection.TRANSACTION_READ_COMMITTED); - // _concierge = new ConnectionConcierge("AgentMonitor", conn, true); - // } catch (SQLException e) { - // throw new CloudRuntimeException("Unable to get a db connection", e); - // } - - } - + /** * Check if the agent is behind on ping * @@ -297,7 +274,9 @@ public class AgentMonitor extends Thread implements AgentMonitorService { return -1; } - public void startMonitoring() { + @Override + public void startMonitoring(long pingTimeout) { + _pingTimeout = pingTimeout; start(); } } diff --git a/server/src/com/cloud/agent/manager/AgentMonitorService.java b/server/src/com/cloud/agent/manager/AgentMonitorService.java index cdb0c1e2cbb..5759e5f6334 100644 --- a/server/src/com/cloud/agent/manager/AgentMonitorService.java +++ b/server/src/com/cloud/agent/manager/AgentMonitorService.java @@ -24,5 +24,5 @@ public interface AgentMonitorService extends Listener { public Long getAgentPingTime(long agentId); public void pingBy(long agentId); public void signalStop(); - public void startMonitoring(); + public void startMonitoring(long pingTimeout); } diff --git a/server/src/com/cloud/agent/manager/allocator/HostAllocator.java b/server/src/com/cloud/agent/manager/allocator/HostAllocator.java index 60027e7f9e3..6700f2227d9 100755 --- a/server/src/com/cloud/agent/manager/allocator/HostAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/HostAllocator.java @@ -21,6 +21,7 @@ import java.util.List; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.host.Host; +import com.cloud.host.HostVO; import com.cloud.host.Host.Type; import com.cloud.offering.ServiceOffering; import com.cloud.utils.component.Adapter; @@ -63,8 +64,22 @@ public interface HostAllocator extends Adapter { **/ public List allocateTo(VirtualMachineProfile vmProfile, DeploymentPlan plan, Type type, ExcludeList avoid, int returnUpTo, boolean considerReservedCapacity); - - - public static int RETURN_UPTO_ALL = -1; - + + /** + * Determines which physical hosts are suitable to + * allocate the guest virtual machines on + * + * @param VirtualMachineProfile vmProfile + * @param DeploymentPlan plan + * @param GuestType type + * @param ExcludeList avoid + * @param List hosts + * @param int returnUpTo (use -1 to return all possible hosts) + * @param boolean considerReservedCapacity (default should be true, set to false if host capacity calculation should not look at reserved capacity) + * @return List List of hosts that are suitable for VM allocation + **/ + public List allocateTo(VirtualMachineProfile vmProfile, DeploymentPlan plan, Type type, ExcludeList avoid, List hosts, int returnUpTo, boolean considerReservedCapacity); + + public static int RETURN_UPTO_ALL = -1; + } diff --git a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java index 0091e43cab8..b54b1c1f527 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/FirstFitAllocator.java @@ -172,6 +172,53 @@ public class FirstFitAllocator extends AdapterBase implements HostAllocator { return allocateTo(plan, offering, template, avoid, clusterHosts, returnUpTo, considerReservedCapacity, account); } + @Override + public List allocateTo(VirtualMachineProfile vmProfile, DeploymentPlan plan, + Type type, ExcludeList avoid, List hosts, int returnUpTo, boolean considerReservedCapacity) { + long dcId = plan.getDataCenterId(); + Long podId = plan.getPodId(); + Long clusterId = plan.getClusterId(); + ServiceOffering offering = vmProfile.getServiceOffering(); + VMTemplateVO template = (VMTemplateVO)vmProfile.getTemplate(); + Account account = vmProfile.getOwner(); + List suitableHosts = new ArrayList(); + + if (type == Host.Type.Storage) { + // FirstFitAllocator should be used for user VMs only since it won't care whether the host is capable of + // routing or not. + return suitableHosts; + } + + String hostTagOnOffering = offering.getHostTag(); + String hostTagOnTemplate = template.getTemplateTag(); + boolean hasSvcOfferingTag = hostTagOnOffering != null ? true : false; + boolean hasTemplateTag = hostTagOnTemplate != null ? true : false; + + String haVmTag = (String)vmProfile.getParameter(VirtualMachineProfile.Param.HaTag); + if (haVmTag != null) { + hosts.retainAll(_hostDao.listByHostTag(type, clusterId, podId, dcId, haVmTag)); + } else { + if (hostTagOnOffering == null && hostTagOnTemplate == null){ + hosts.retainAll(_resourceMgr.listAllUpAndEnabledNonHAHosts(type, clusterId, podId, dcId)); + } else { + if (hasSvcOfferingTag) { + hosts.retainAll(_hostDao.listByHostTag(type, clusterId, podId, dcId, hostTagOnOffering)); + } + + if (hasTemplateTag) { + hosts.retainAll(_hostDao.listByHostTag(type, clusterId, podId, dcId, hostTagOnTemplate)); + } + } + } + + if (!hosts.isEmpty()) { + suitableHosts = allocateTo(plan, offering, template, avoid, hosts, returnUpTo, considerReservedCapacity, + account); + } + + return suitableHosts; + } + protected List allocateTo(DeploymentPlan plan, ServiceOffering offering, VMTemplateVO template, ExcludeList avoid, List hosts, int returnUpTo, boolean considerReservedCapacity, Account account) { if (_allocationAlgorithm.equals("random") || _allocationAlgorithm.equals("userconcentratedpod_random")) { // Shuffle this so that we don't check the hosts in the same order. diff --git a/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java b/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java index 90bd95629bf..890c047de50 100755 --- a/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java +++ b/server/src/com/cloud/agent/manager/allocator/impl/TestingAllocator.java @@ -29,6 +29,7 @@ import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.host.Host; +import com.cloud.host.HostVO; import com.cloud.host.Host.Type; import com.cloud.host.dao.HostDao; import com.cloud.offering.ServiceOffering; @@ -50,6 +51,12 @@ public class TestingAllocator extends AdapterBase implements HostAllocator { return allocateTo(vmProfile, plan, type, avoid, returnUpTo, true); } + @Override + public List allocateTo(VirtualMachineProfile vmProfile, DeploymentPlan plan, Type type, + ExcludeList avoid, List hosts, int returnUpTo, boolean considerReservedCapacity) { + return allocateTo(vmProfile, plan, type, avoid, returnUpTo, considerReservedCapacity); + } + @Override public List allocateTo(VirtualMachineProfile vmProfile, DeploymentPlan plan, Type type, ExcludeList avoid, int returnUpTo, boolean considerReservedCapacity) { diff --git a/server/src/com/cloud/api/ApiDBUtils.java b/server/src/com/cloud/api/ApiDBUtils.java index 7b441901d5e..21ce63b8ae8 100755 --- a/server/src/com/cloud/api/ApiDBUtils.java +++ b/server/src/com/cloud/api/ApiDBUtils.java @@ -25,6 +25,11 @@ import java.util.Set; import javax.annotation.PostConstruct; import javax.inject.Inject; +import com.cloud.network.rules.LoadBalancer; +import com.cloud.region.ha.GlobalLoadBalancingRulesService; +import org.apache.cloudstack.affinity.AffinityGroup; +import org.apache.cloudstack.affinity.AffinityGroupResponse; +import org.apache.cloudstack.affinity.dao.AffinityGroupDao; import org.apache.cloudstack.api.ApiConstants.HostDetails; import org.apache.cloudstack.api.ApiConstants.VMDetails; import org.apache.cloudstack.api.response.AccountResponse; @@ -33,6 +38,7 @@ import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.EventResponse; import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostForMigrationResponse; import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.ProjectAccountResponse; import org.apache.cloudstack.api.response.ProjectInvitationResponse; @@ -40,6 +46,7 @@ import org.apache.cloudstack.api.response.ProjectResponse; import org.apache.cloudstack.api.response.ResourceTagResponse; import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; +import org.apache.cloudstack.api.response.StoragePoolForMigrationResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.api.response.UserVmResponse; @@ -50,6 +57,7 @@ import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.springframework.stereotype.Component; import com.cloud.api.query.dao.AccountJoinDao; +import com.cloud.api.query.dao.AffinityGroupJoinDao; import com.cloud.api.query.dao.AsyncJobJoinDao; import com.cloud.api.query.dao.DataCenterJoinDao; import com.cloud.api.query.dao.DiskOfferingJoinDao; @@ -67,6 +75,7 @@ import com.cloud.api.query.dao.UserAccountJoinDao; import com.cloud.api.query.dao.UserVmJoinDao; import com.cloud.api.query.dao.VolumeJoinDao; import com.cloud.api.query.vo.AccountJoinVO; +import com.cloud.api.query.vo.AffinityGroupJoinVO; import com.cloud.api.query.vo.AsyncJobJoinVO; import com.cloud.api.query.vo.DataCenterJoinVO; import com.cloud.api.query.vo.DiskOfferingJoinVO; @@ -284,7 +293,7 @@ public class ApiDBUtils { static NetworkModel _networkModel; static NetworkManager _networkMgr; static TemplateManager _templateMgr; - + static StatsCollector _statsCollector; static AccountDao _accountDao; @@ -379,6 +388,9 @@ public class ApiDBUtils { static ClusterDetailsDao _clusterDetailsDao; static NicSecondaryIpDao _nicSecondaryIpDao; static VpcProvisioningService _vpcProvSvc; + static AffinityGroupDao _affinityGroupDao; + static AffinityGroupJoinDao _affinityGroupJoinDao; + static GlobalLoadBalancingRulesService _gslbService; @Inject private ManagementServer ms; @Inject public AsyncJobManager asyncMgr; @@ -483,6 +495,10 @@ public class ApiDBUtils { @Inject private VMSnapshotDao vmSnapshotDao; @Inject private NicSecondaryIpDao nicSecondaryIpDao; @Inject private VpcProvisioningService vpcProvSvc; + @Inject private AffinityGroupDao affinityGroupDao; + @Inject private AffinityGroupJoinDao affinityGroupJoinDao; + @Inject private GlobalLoadBalancingRulesService gslbService; + @PostConstruct void init() { _ms = ms; @@ -585,6 +601,9 @@ public class ApiDBUtils { _vmSnapshotDao = vmSnapshotDao; _nicSecondaryIpDao = nicSecondaryIpDao; _vpcProvSvc = vpcProvSvc; + _affinityGroupDao = affinityGroupDao; + _affinityGroupJoinDao = affinityGroupJoinDao; + _gslbService = gslbService; // Note: stats collector should already have been initialized by this time, otherwise a null instance is returned _statsCollector = StatsCollector.getInstance(); } @@ -1506,6 +1525,14 @@ public class ApiDBUtils { return _hostJoinDao.setHostResponse(vrData, vr); } + public static HostForMigrationResponse newHostForMigrationResponse(HostJoinVO vr, EnumSet details) { + return _hostJoinDao.newHostForMigrationResponse(vr, details); + } + + public static HostForMigrationResponse fillHostForMigrationDetails(HostForMigrationResponse vrData, HostJoinVO vr) { + return _hostJoinDao.setHostForMigrationResponse(vrData, vr); + } + public static List newHostView(Host vr){ return _hostJoinDao.newHostView(vr); } @@ -1531,6 +1558,15 @@ public class ApiDBUtils { return _poolJoinDao.setStoragePoolResponse(vrData, vr); } + public static StoragePoolForMigrationResponse newStoragePoolForMigrationResponse(StoragePoolJoinVO vr) { + return _poolJoinDao.newStoragePoolForMigrationResponse(vr); + } + + public static StoragePoolForMigrationResponse fillStoragePoolForMigrationDetails(StoragePoolForMigrationResponse + vrData, StoragePoolJoinVO vr){ + return _poolJoinDao.setStoragePoolForMigrationResponse(vrData, vr); + } + public static List newStoragePoolView(StoragePool vr){ return _poolJoinDao.newStoragePoolView(vr); } @@ -1579,7 +1615,7 @@ public class ApiDBUtils { public static DataCenterJoinVO newDataCenterView(DataCenter dc){ return _dcJoinDao.newDataCenterView(dc); } - + public static Map findHostDetailsById(long hostId){ return _hostDetailsDao.findDetails(hostId); } @@ -1587,4 +1623,20 @@ public class ApiDBUtils { public static List findNicSecondaryIps(long nicId) { return _nicSecondaryIpDao.listByNicId(nicId); } + + public static AffinityGroup getAffinityGroup(String groupName, long accountId) { + return _affinityGroupDao.findByAccountAndName(accountId, groupName); + } + + public static AffinityGroupResponse newAffinityGroupResponse(AffinityGroupJoinVO group) { + return _affinityGroupJoinDao.newAffinityGroupResponse(group); + } + + public static AffinityGroupResponse fillAffinityGroupDetails(AffinityGroupResponse resp, AffinityGroupJoinVO group) { + return _affinityGroupJoinDao.setAffinityGroupResponse(resp, group); + } + + public static List listSiteLoadBalancers(long gslbRuleId) { + return _gslbService.listSiteLoadBalancers(gslbRuleId); + } } diff --git a/server/src/com/cloud/api/ApiDispatcher.java b/server/src/com/cloud/api/ApiDispatcher.java index 925d90a697d..b4437ce6193 100755 --- a/server/src/com/cloud/api/ApiDispatcher.java +++ b/server/src/com/cloud/api/ApiDispatcher.java @@ -27,7 +27,6 @@ import java.util.Date; import java.util.HashMap; import java.util.List; import java.util.Map; -import java.util.Set; import java.util.StringTokenizer; import java.util.regex.Matcher; @@ -56,21 +55,14 @@ import org.apache.cloudstack.api.command.user.event.ListEventsCmd; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.async.AsyncCommandQueued; import com.cloud.async.AsyncJobManager; import com.cloud.dao.EntityManager; -import com.cloud.exception.AccountLimitException; -import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.PermissionDeniedException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.UserContext; import com.cloud.utils.DateUtil; import com.cloud.utils.ReflectUtil; -import com.cloud.utils.component.ComponentContext; import com.cloud.utils.exception.CSExceptionErrorCode; import com.cloud.utils.exception.CloudRuntimeException; @@ -160,7 +152,6 @@ public class ApiDispatcher { } } } - cmd.execute(); } diff --git a/server/src/com/cloud/api/ApiResponseHelper.java b/server/src/com/cloud/api/ApiResponseHelper.java index 64be7f8758a..6090ff06d7c 100755 --- a/server/src/com/cloud/api/ApiResponseHelper.java +++ b/server/src/com/cloud/api/ApiResponseHelper.java @@ -34,6 +34,7 @@ import java.util.TimeZone; import javax.inject.Inject; +import com.cloud.vm.*; import org.apache.cloudstack.acl.ControlledEntity; import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.api.ApiConstants.HostDetails; @@ -65,6 +66,7 @@ import org.apache.cloudstack.api.response.FirewallRuleResponse; import org.apache.cloudstack.api.response.GlobalLoadBalancerResponse; import org.apache.cloudstack.api.response.GuestOSResponse; import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostForMigrationResponse; import org.apache.cloudstack.api.response.HypervisorCapabilitiesResponse; import org.apache.cloudstack.api.response.IPAddressResponse; import org.apache.cloudstack.api.response.InstanceGroupResponse; @@ -105,6 +107,7 @@ import org.apache.cloudstack.api.response.SnapshotResponse; import org.apache.cloudstack.api.response.SnapshotScheduleResponse; import org.apache.cloudstack.api.response.StaticRouteResponse; import org.apache.cloudstack.api.response.StorageNetworkIpRangeResponse; +import org.apache.cloudstack.api.response.StoragePoolForMigrationResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.cloudstack.api.response.SwiftResponse; import org.apache.cloudstack.api.response.SystemVmInstanceResponse; @@ -262,16 +265,38 @@ import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; import com.cloud.utils.StringUtils; import com.cloud.utils.net.NetUtils; -import com.cloud.vm.ConsoleProxyVO; -import com.cloud.vm.InstanceGroup; -import com.cloud.vm.Nic; -import com.cloud.vm.NicProfile; -import com.cloud.vm.NicVO; -import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.dao.NicSecondaryIpVO; import com.cloud.vm.snapshot.VMSnapshot; +import org.apache.cloudstack.acl.ControlledEntity; +import org.apache.cloudstack.acl.ControlledEntity.ACLType; +import org.apache.cloudstack.affinity.AffinityGroup; +import org.apache.cloudstack.affinity.AffinityGroupResponse; +import org.apache.cloudstack.api.ApiConstants.HostDetails; +import org.apache.cloudstack.api.ApiConstants.VMDetails; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.ResponseGenerator; +import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd; +import org.apache.cloudstack.api.response.*; +import org.apache.cloudstack.region.Region; +import org.apache.cloudstack.usage.Usage; +import org.apache.cloudstack.usage.UsageService; +import org.apache.cloudstack.usage.UsageTypes; +import com.cloud.vm.dao.UserVmData; +import com.cloud.vm.dao.UserVmData.NicData; +import com.cloud.vm.dao.UserVmData.SecurityGroupData; +import com.cloud.vm.snapshot.VMSnapshot; +import org.apache.cloudstack.api.ResponseGenerator; +import org.apache.cloudstack.api.response.VMSnapshotResponse; +import org.apache.log4j.Logger; + +import java.text.DecimalFormat; +import java.util.*; + +import javax.inject.Inject; + +import static java.util.Collections.emptyList; +import static java.util.Collections.singletonList; @Component public class ApiResponseHelper implements ResponseGenerator { @@ -349,7 +374,7 @@ public class ApiResponseHelper implements ResponseGenerator { populateDomain(resourceLimitResponse, accountTemp.getDomainId()); } resourceLimitResponse.setResourceType(Integer.valueOf(limit.getType().getOrdinal()).toString()); - if(limit.getType() == ResourceType.primary_storage || limit.getType() == ResourceType.secondary_storage) { + if((limit.getType() == ResourceType.primary_storage || limit.getType() == ResourceType.secondary_storage) && limit.getMax() >= 0) { resourceLimitResponse.setMax((long) Math.ceil(limit.getMax()/ResourceType.bytesToGiB)); } else { resourceLimitResponse.setMax(limit.getMax()); @@ -411,6 +436,12 @@ public class ApiResponseHelper implements ResponseGenerator { snapshotResponse.setVolumeId(volume.getUuid()); snapshotResponse.setVolumeName(volume.getName()); snapshotResponse.setVolumeType(volume.getVolumeType().name()); + + DataCenter zone = ApiDBUtils.findZoneById(volume.getDataCenterId()); + if (zone != null) { + snapshotResponse.setZoneName(zone.getName()); + snapshotResponse.setZoneType(zone.getNetworkType().toString()); + } } snapshotResponse.setCreated(snapshot.getCreated()); snapshotResponse.setName(snapshot.getName()); @@ -439,7 +470,7 @@ public class ApiResponseHelper implements ResponseGenerator { vmSnapshotResponse.setCreated(vmSnapshot.getCreated()); vmSnapshotResponse.setDescription(vmSnapshot.getDescription()); vmSnapshotResponse.setDisplayName(vmSnapshot.getDisplayName()); - UserVm vm = ApiDBUtils.findUserVmById(vmSnapshot.getVmId()); + UserVm vm = ApiDBUtils.findUserVmById(vmSnapshot.getVmId()); if(vm!=null) vmSnapshotResponse.setVirtualMachineid(vm.getUuid()); if(vmSnapshot.getParent() != null) @@ -449,7 +480,7 @@ public class ApiResponseHelper implements ResponseGenerator { vmSnapshotResponse.setObjectName("vmsnapshot"); return vmSnapshotResponse; } - + @Override public SnapshotPolicyResponse createSnapshotPolicyResponse(SnapshotPolicy policy) { SnapshotPolicyResponse policyResponse = new SnapshotPolicyResponse(); @@ -480,6 +511,20 @@ public class ApiResponseHelper implements ResponseGenerator { return listHosts.get(0); } + @Override + public HostForMigrationResponse createHostForMigrationResponse(Host host) { + return createHostForMigrationResponse(host, EnumSet.of(HostDetails.all)); + } + + @Override + public HostForMigrationResponse createHostForMigrationResponse(Host host, EnumSet details) { + List viewHosts = ApiDBUtils.newHostView(host); + List listHosts = ViewResponseHelper.createHostForMigrationResponse(details, + viewHosts.toArray(new HostJoinVO[viewHosts.size()])); + assert listHosts != null && listHosts.size() == 1 : "There should be one host returned"; + return listHosts.get(0); + } + @Override public SwiftResponse createSwiftResponse(Swift swift) { SwiftResponse swiftResponse = new SwiftResponse(); @@ -546,7 +591,7 @@ public class ApiResponseHelper implements ResponseGenerator { vlanResponse.setIp6Gateway(vlan.getIp6Gateway()); vlanResponse.setIp6Cidr(vlan.getIp6Cidr()); - + String ip6Range = vlan.getIp6Range(); if (ip6Range != null) { String[] range = ip6Range.split("-"); @@ -738,11 +783,22 @@ public class ApiResponseHelper implements ResponseGenerator { GlobalLoadBalancerResponse response = new GlobalLoadBalancerResponse(); response.setAlgorithm(globalLoadBalancerRule.getAlgorithm()); response.setStickyMethod(globalLoadBalancerRule.getPersistence()); + response.setServiceType(globalLoadBalancerRule.getServiceType()); response.setServiceDomainName(globalLoadBalancerRule.getGslbDomain()); response.setName(globalLoadBalancerRule.getName()); response.setDescription(globalLoadBalancerRule.getDescription()); response.setRegionIdId(globalLoadBalancerRule.getRegion()); response.setId(globalLoadBalancerRule.getUuid()); + populateOwner(response, globalLoadBalancerRule); + response.setObjectName("globalloadbalancer"); + + List siteLbResponses = new ArrayList(); + List siteLoadBalaners = ApiDBUtils.listSiteLoadBalancers(globalLoadBalancerRule.getId()); + for (LoadBalancer siteLb : siteLoadBalaners) { + LoadBalancerResponse siteLbResponse = createLoadBalancerResponse(siteLb); + siteLbResponses.add(siteLbResponse); + } + response.setSiteLoadBalancers(siteLbResponses); return response; } @@ -762,6 +818,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (zone != null) { podResponse.setZoneId(zone.getUuid()); podResponse.setZoneName(zone.getName()); + podResponse.setZoneType(zone.getNetworkType().toString()); } podResponse.setNetmask(NetUtils.getCidrNetmask(pod.getCidrSize())); podResponse.setStartIp(ipRange[0]); @@ -875,16 +932,21 @@ public class ApiResponseHelper implements ResponseGenerator { } - - @Override public StoragePoolResponse createStoragePoolResponse(StoragePool pool) { List viewPools = ApiDBUtils.newStoragePoolView(pool); List listPools = ViewResponseHelper.createStoragePoolResponse(viewPools.toArray(new StoragePoolJoinVO[viewPools.size()])); assert listPools != null && listPools.size() == 1 : "There should be one storage pool returned"; return listPools.get(0); + } - + @Override + public StoragePoolForMigrationResponse createStoragePoolForMigrationResponse(StoragePool pool) { + List viewPools = ApiDBUtils.newStoragePoolView(pool); + List listPools = ViewResponseHelper.createStoragePoolForMigrationResponse( + viewPools.toArray(new StoragePoolJoinVO[viewPools.size()])); + assert listPools != null && listPools.size() == 1 : "There should be one storage pool returned"; + return listPools.get(0); } @Override @@ -901,6 +963,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (dc != null) { clusterResponse.setZoneId(dc.getUuid()); clusterResponse.setZoneName(dc.getName()); + clusterResponse.setZoneType(dc.getNetworkType().toString()); } clusterResponse.setHypervisorType(cluster.getHypervisorType().toString()); clusterResponse.setClusterType(cluster.getClusterType().toString()); @@ -965,6 +1028,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setPublicIpAddress(ip.getAddress().addr()); if (ip != null && fwRule.getDestinationIpAddress() != null) { + response.setDestNatVmIp(fwRule.getDestinationIpAddress().toString()); UserVm vm = ApiDBUtils.findUserVmById(fwRule.getVirtualMachineId()); if (vm != null) { response.setVirtualMachineId(vm.getUuid()); @@ -1104,6 +1168,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (zone != null) { vmResponse.setZoneId(zone.getUuid()); vmResponse.setZoneName(zone.getName()); + vmResponse.setZoneType(zone.getNetworkType().toString()); vmResponse.setDns1(zone.getDns1()); vmResponse.setDns2(zone.getDns2()); } @@ -1394,6 +1459,7 @@ public class ApiResponseHelper implements ResponseGenerator { // Add the zone ID templateResponse.setZoneId(datacenter.getUuid()); templateResponse.setZoneName(datacenter.getName()); + templateResponse.setZoneType(datacenter.getNetworkType().toString()); } boolean isAdmin = false; @@ -1682,6 +1748,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (datacenter != null) { isoResponse.setZoneId(datacenter.getUuid()); isoResponse.setZoneName(datacenter.getName()); + isoResponse.setZoneType(datacenter.getNetworkType().toString()); } // If the user is an admin, add the template download status @@ -2249,7 +2316,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (((network.getCidr()) != null) && (network.getNetworkCidr() == null)) { response.setNetmask(NetUtils.cidr2Netmask(network.getCidr())); } - + response.setIp6Gateway(network.getIp6Gateway()); response.setIp6Cidr(network.getIp6Cidr()); @@ -2299,6 +2366,7 @@ public class ApiResponseHelper implements ResponseGenerator { if (zone != null) { response.setZoneId(zone.getUuid()); response.setZoneName(zone.getName()); + response.setZoneType(zone.getNetworkType().toString()); } if (network.getPhysicalNetworkId() != null) { PhysicalNetworkVO pnet = ApiDBUtils.findPhysicalNetworkById(network.getPhysicalNetworkId()); @@ -2444,7 +2512,7 @@ public class ApiResponseHelper implements ResponseGenerator { List cidrs = ApiDBUtils.findFirewallSourceCidrs(fwRule.getId()); response.setCidrList(StringUtils.join(cidrs, ",")); - + if (fwRule.getTrafficType() == FirewallRule.TrafficType.Ingress) { IpAddress ip = ApiDBUtils.findIpAddressById(fwRule.getSourceIpAddressId()); response.setPublicIpAddressId(ip.getId()); @@ -2634,7 +2702,7 @@ public class ApiResponseHelper implements ResponseGenerator { response.setZoneId(zone.getUuid()); } response.setNetworkSpeed(result.getSpeed()); - response.setVlan(result.getVnet()); + response.setVlan(result.getVnetString()); if (result.getDomainId() != null) { Domain domain = ApiDBUtils.findDomainById(result.getDomainId()); if (domain != null) { @@ -2684,8 +2752,8 @@ public class ApiResponseHelper implements ResponseGenerator { List serviceProviders = ApiDBUtils.getProvidersForService(service); List serviceProvidersResponses = new ArrayList(); for (Network.Provider serviceProvider : serviceProviders) { - // return only Virtual Router/JuniperSRX as a provider for the firewall - if (service == Service.Firewall && !(serviceProvider == Provider.VirtualRouter || serviceProvider == Provider.JuniperSRX)) { + // return only Virtual Router/JuniperSRX/CiscoVnmc as a provider for the firewall + if (service == Service.Firewall && !(serviceProvider == Provider.VirtualRouter || serviceProvider == Provider.JuniperSRX || serviceProvider == Provider.CiscoVnmc)) { continue; } @@ -3475,7 +3543,7 @@ public class ApiResponseHelper implements ResponseGenerator { return usageRecResponse; } - + public String getDateStringInternal(Date inputDate) { if (inputDate == null) return null; @@ -3559,7 +3627,7 @@ public class ApiResponseHelper implements ResponseGenerator { return sb.toString(); } - + @Override public TrafficMonitorResponse createTrafficMonitorResponse(Host trafficMonitor) { Map tmDetails = ApiDBUtils.findHostDetailsById(trafficMonitor.getId()); @@ -3571,11 +3639,12 @@ public class ApiResponseHelper implements ResponseGenerator { return response; } - public NicSecondaryIpResponse createSecondaryIPToNicResponse(String ipAddr, Long nicId, Long networkId) { + public NicSecondaryIpResponse createSecondaryIPToNicResponse(NicSecondaryIp result) { NicSecondaryIpResponse response = new NicSecondaryIpResponse(); - NicVO nic = _entityMgr.findById(NicVO.class, nicId); - NetworkVO network = _entityMgr.findById(NetworkVO.class, networkId); - response.setIpAddr(ipAddr); + NicVO nic = _entityMgr.findById(NicVO.class, result.getNicId()); + NetworkVO network = _entityMgr.findById(NetworkVO.class, result.getNetworkId()); + response.setId(result.getUuid()); + response.setIpAddr(result.getIp4Address()); response.setNicId(nic.getUuid()); response.setNwId(network.getUuid()); response.setObjectName("nicsecondaryip"); @@ -3584,7 +3653,10 @@ public class ApiResponseHelper implements ResponseGenerator { public NicResponse createNicResponse(Nic result) { NicResponse response = new NicResponse(); + NetworkVO network = _entityMgr.findById(NetworkVO.class, result.getNetworkId()); + response.setId(result.getUuid()); + response.setNetworkid(network.getUuid()); response.setIpaddress(result.getIp4Address()); if (result.getSecondaryIp()) { @@ -3601,22 +3673,45 @@ public class ApiResponseHelper implements ResponseGenerator { } } - response.setGateway(result.getGateway()); - response.setId(result.getUuid()); response.setGateway(result.getGateway()); response.setNetmask(result.getNetmask()); response.setMacAddress(result.getMacAddress()); - if (result.getBroadcastUri() != null) { - response.setBroadcastUri(result.getBroadcastUri().toString()); - } - if (result.getIsolationUri() != null) { - response.setIsolationUri(result.getIsolationUri().toString()); - } + if (result.getIp6Address() != null) { - response.setId(result.getIp6Address()); + response.setIp6Address(result.getIp6Address()); } response.setIsDefault(result.isDefaultNic()); return response; } + + @Override + public AffinityGroupResponse createAffinityGroupResponse(AffinityGroup group) { + + AffinityGroupResponse response = new AffinityGroupResponse(); + + Account account = ApiDBUtils.findAccountById(group.getAccountId()); + response.setAccountName(account.getAccountName()); + response.setName(group.getName()); + response.setType(group.getType()); + response.setDescription(group.getDescription()); + Domain domain = ApiDBUtils.findDomainById(account.getDomainId()); + if (domain != null) { + response.setDomainId(domain.getUuid()); + response.setDomainName(domain.getName()); + } + + response.setObjectName("affinitygroup"); + return response; + } + + @Override + public Long getAffinityGroupId(String groupName, long accountId) { + AffinityGroup ag = ApiDBUtils.getAffinityGroup(groupName, accountId); + if (ag == null) { + return null; + } else { + return ag.getId(); + } + } } diff --git a/server/src/com/cloud/api/ApiServer.java b/server/src/com/cloud/api/ApiServer.java index d842819ee48..dd5fd4d5657 100755 --- a/server/src/com/cloud/api/ApiServer.java +++ b/server/src/com/cloud/api/ApiServer.java @@ -16,30 +16,51 @@ // under the License. package com.cloud.api; -import com.cloud.api.response.ApiResponseSerializer; -import com.cloud.async.AsyncCommandQueued; -import com.cloud.async.AsyncJob; -import com.cloud.async.AsyncJobManager; -import com.cloud.async.AsyncJobVO; -import com.cloud.configuration.Config; -import com.cloud.configuration.ConfigurationVO; -import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.domain.Domain; -import com.cloud.domain.DomainVO; -import com.cloud.event.ActionEventUtils; -import com.cloud.exception.*; -import com.cloud.user.*; -import com.cloud.utils.NumbersUtil; -import com.cloud.utils.Pair; -import com.cloud.utils.StringUtils; -import com.cloud.utils.component.ComponentContext; -import com.cloud.utils.component.PluggableService; -import com.cloud.utils.concurrency.NamedThreadFactory; -import com.cloud.utils.db.SearchCriteria; -import com.cloud.utils.db.Transaction; -import com.cloud.utils.exception.CloudRuntimeException; +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.InterruptedIOException; +import java.net.InetAddress; +import java.net.ServerSocket; +import java.net.Socket; +import java.net.URI; +import java.net.URISyntaxException; +import java.net.URLEncoder; +import java.security.SecureRandom; +import java.text.DateFormat; +import java.text.ParseException; +import java.text.SimpleDateFormat; +import java.util.ArrayList; +import java.util.Collections; +import java.util.Date; +import java.util.HashMap; +import java.util.HashSet; +import java.util.Iterator; +import java.util.List; +import java.util.Map; +import java.util.Set; +import java.util.TimeZone; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.LinkedBlockingQueue; +import java.util.concurrent.ThreadPoolExecutor; +import java.util.concurrent.TimeUnit; + +import javax.annotation.PostConstruct; +import javax.crypto.Mac; +import javax.crypto.spec.SecretKeySpec; +import javax.inject.Inject; +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpServletResponse; +import javax.servlet.http.HttpSession; + import org.apache.cloudstack.acl.APIChecker; -import org.apache.cloudstack.api.*; +import org.apache.cloudstack.api.APICommand; +import org.apache.cloudstack.api.ApiErrorCode; +import org.apache.cloudstack.api.BaseAsyncCmd; +import org.apache.cloudstack.api.BaseAsyncCreateCmd; +import org.apache.cloudstack.api.BaseCmd; +import org.apache.cloudstack.api.BaseListCmd; +import org.apache.cloudstack.api.ResponseObject; +import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.command.admin.host.ListHostsCmd; import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd; import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd; @@ -61,7 +82,13 @@ import org.apache.cloudstack.api.response.ExceptionResponse; import org.apache.cloudstack.api.response.ListResponse; import org.apache.cloudstack.region.RegionManager; import org.apache.commons.codec.binary.Base64; -import org.apache.http.*; +import org.apache.http.ConnectionClosedException; +import org.apache.http.HttpException; +import org.apache.http.HttpRequest; +import org.apache.http.HttpResponse; +import org.apache.http.HttpServerConnection; +import org.apache.http.HttpStatus; +import org.apache.http.NameValuePair; import org.apache.http.client.utils.URLEncodedUtils; import org.apache.http.entity.BasicHttpEntity; import org.apache.http.impl.DefaultHttpResponseFactory; @@ -72,29 +99,54 @@ import org.apache.http.params.BasicHttpParams; import org.apache.http.params.CoreConnectionPNames; import org.apache.http.params.CoreProtocolPNames; import org.apache.http.params.HttpParams; -import org.apache.http.protocol.*; +import org.apache.http.protocol.BasicHttpContext; +import org.apache.http.protocol.BasicHttpProcessor; +import org.apache.http.protocol.HttpContext; +import org.apache.http.protocol.HttpRequestHandler; +import org.apache.http.protocol.HttpRequestHandlerRegistry; +import org.apache.http.protocol.HttpService; +import org.apache.http.protocol.ResponseConnControl; +import org.apache.http.protocol.ResponseContent; +import org.apache.http.protocol.ResponseDate; +import org.apache.http.protocol.ResponseServer; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import javax.annotation.PostConstruct; -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; -import javax.inject.Inject; -import javax.servlet.http.HttpServletResponse; -import javax.servlet.http.HttpSession; -import java.io.ByteArrayInputStream; -import java.io.IOException; -import java.io.InterruptedIOException; -import java.net.*; -import java.security.SecureRandom; -import java.text.DateFormat; -import java.text.ParseException; -import java.text.SimpleDateFormat; -import java.util.*; -import java.util.concurrent.ExecutorService; -import java.util.concurrent.LinkedBlockingQueue; -import java.util.concurrent.ThreadPoolExecutor; -import java.util.concurrent.TimeUnit; +import com.cloud.api.response.ApiResponseSerializer; +import com.cloud.async.AsyncCommandQueued; +import com.cloud.async.AsyncJob; +import com.cloud.async.AsyncJobManager; +import com.cloud.async.AsyncJobVO; +import com.cloud.configuration.Config; +import com.cloud.configuration.ConfigurationVO; +import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.domain.Domain; +import com.cloud.domain.DomainVO; +import com.cloud.event.ActionEventUtils; +import com.cloud.exception.AccountLimitException; +import com.cloud.exception.CloudAuthenticationException; +import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.PermissionDeniedException; +import com.cloud.exception.RequestLimitException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.user.Account; +import com.cloud.user.AccountManager; +import com.cloud.user.DomainManager; +import com.cloud.user.User; +import com.cloud.user.UserAccount; +import com.cloud.user.UserContext; +import com.cloud.user.UserVO; +import com.cloud.utils.NumbersUtil; +import com.cloud.utils.Pair; +import com.cloud.utils.StringUtils; +import com.cloud.utils.component.ComponentContext; +import com.cloud.utils.component.PluggableService; +import com.cloud.utils.concurrency.NamedThreadFactory; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.Transaction; +import com.cloud.utils.exception.CloudRuntimeException; @Component public class ApiServer implements HttpRequestHandler, ApiServerService { @@ -113,7 +165,7 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { @Inject List _pluggableServices; @Inject List _apiAccessCheckers; - @Inject private RegionManager _regionMgr = null; + @Inject private final RegionManager _regionMgr = null; private static int _workerCount = 0; private static ApiServer s_instance = null; @@ -227,6 +279,9 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { parameterMap.put(param.getName(), new String[] { param.getValue() }); } + // Get the type of http method being used. + parameterMap.put("httpmethod", new String[] { request.getRequestLine().getMethod() }); + // Check responseType, if not among valid types, fallback to JSON if (!(responseType.equals(BaseCmd.RESPONSE_TYPE_JSON) || responseType.equals(BaseCmd.RESPONSE_TYPE_XML))) responseType = BaseCmd.RESPONSE_TYPE_XML; @@ -254,10 +309,12 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { } } + @Override @SuppressWarnings("rawtypes") public String handleRequest(Map params, String responseType, StringBuffer auditTrailSb) throws ServerApiException { String response = null; String[] command = null; + try { command = (String[]) params.get("command"); if (command == null) { @@ -299,6 +356,7 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { cmdObj.configure(); cmdObj.setFullUrlParams(paramMap); cmdObj.setResponseType(responseType); + cmdObj.setHttpMethod(paramMap.get("httpmethod").toString()); // This is where the command is either serialized, or directly dispatched response = queueCommand(cmdObj, paramMap); @@ -530,6 +588,7 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { } } + @Override public boolean verifyRequest(Map requestParameters, Long userId) throws ServerApiException { try { String apiKey = null; @@ -692,10 +751,12 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { return false; } + @Override public Long fetchDomainId(String domainUUID) { return _domainMgr.getDomain(domainUUID).getId(); } + @Override public void loginUser(HttpSession session, String username, String password, Long domainId, String domainPath, String loginIpAddress ,Map requestParameters) throws CloudAuthenticationException { // We will always use domainId first. If that does not exist, we will use domain name. If THAT doesn't exist // we will default to ROOT @@ -770,11 +831,13 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { throw new CloudAuthenticationException("Failed to authenticate user " + username + " in domain " + domainId + "; please provide valid credentials"); } + @Override public void logoutUser(long userId) { _accountMgr.logoutUser(Long.valueOf(userId)); return; } + @Override public boolean verifyUser(Long userId) { User user = _accountMgr.getUserIncludingRemoved(userId); Account account = null; @@ -931,6 +994,7 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { } } + @Override public String getSerializedApiError(int errorCode, String errorText, Map apiCommandParams, String responseType) { String responseName = null; Class cmdClass = null; @@ -965,6 +1029,7 @@ public class ApiServer implements HttpRequestHandler, ApiServerService { return responseText; } + @Override public String getSerializedApiError(ServerApiException ex, Map apiCommandParams, String responseType) { String responseName = null; Class cmdClass = null; diff --git a/server/src/com/cloud/api/ApiServerService.java b/server/src/com/cloud/api/ApiServerService.java index 12d8b52fa83..dac81c665c4 100644 --- a/server/src/com/cloud/api/ApiServerService.java +++ b/server/src/com/cloud/api/ApiServerService.java @@ -21,6 +21,7 @@ import java.util.Map; import javax.servlet.http.HttpSession; import org.apache.cloudstack.api.ServerApiException; + import com.cloud.exception.CloudAuthenticationException; public interface ApiServerService { diff --git a/server/src/com/cloud/api/ApiServlet.java b/server/src/com/cloud/api/ApiServlet.java index 03bfb5f2d49..7525b61e84a 100755 --- a/server/src/com/cloud/api/ApiServlet.java +++ b/server/src/com/cloud/api/ApiServlet.java @@ -299,8 +299,10 @@ public class ApiServlet extends HttpServlet { auditTrailSb.insert(0, "(userId=" + UserContext.current().getCallerUserId() + " accountId=" + UserContext.current().getCaller().getId() + " sessionId=" + (session != null ? session.getId() : null) + ")"); - String response = _apiServer.handleRequest(params, responseType, auditTrailSb); - writeResponse(resp, response != null ? response : "", HttpServletResponse.SC_OK, responseType); + // Add the HTTP method (GET/POST/PUT/DELETE) as well into the params map. + params.put("httpmethod", new String[] { req.getMethod() }); + String response = _apiServer.handleRequest(params, responseType, auditTrailSb); + writeResponse(resp, response != null ? response : "", HttpServletResponse.SC_OK, responseType); } else { if (session != null) { try { diff --git a/server/src/com/cloud/api/query/QueryManagerImpl.java b/server/src/com/cloud/api/query/QueryManagerImpl.java index 951d09ed185..67af7e4b684 100644 --- a/server/src/com/cloud/api/query/QueryManagerImpl.java +++ b/server/src/com/cloud/api/query/QueryManagerImpl.java @@ -25,8 +25,10 @@ import java.util.Set; import javax.ejb.Local; import javax.inject.Inject; -import javax.naming.ConfigurationException; +import org.apache.cloudstack.affinity.AffinityGroupResponse; +import org.apache.cloudstack.affinity.AffinityGroupVMMapVO; +import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; import org.apache.cloudstack.api.command.admin.host.ListHostsCmd; import org.apache.cloudstack.api.command.admin.router.ListRoutersCmd; import org.apache.cloudstack.api.command.admin.storage.ListStoragePoolsCmd; @@ -69,6 +71,7 @@ import org.apache.log4j.Logger; import org.springframework.stereotype.Component; import com.cloud.api.query.dao.AccountJoinDao; +import com.cloud.api.query.dao.AffinityGroupJoinDao; import com.cloud.api.query.dao.AsyncJobJoinDao; import com.cloud.api.query.dao.DataCenterJoinDao; import com.cloud.api.query.dao.DiskOfferingJoinDao; @@ -86,6 +89,7 @@ import com.cloud.api.query.dao.UserAccountJoinDao; import com.cloud.api.query.dao.UserVmJoinDao; import com.cloud.api.query.dao.VolumeJoinDao; import com.cloud.api.query.vo.AccountJoinVO; +import com.cloud.api.query.vo.AffinityGroupJoinVO; import com.cloud.api.query.vo.AsyncJobJoinVO; import com.cloud.api.query.vo.DataCenterJoinVO; import com.cloud.api.query.vo.DiskOfferingJoinVO; @@ -104,7 +108,6 @@ import com.cloud.api.query.vo.UserAccountJoinVO; import com.cloud.api.query.vo.UserVmJoinVO; import com.cloud.api.query.vo.VolumeJoinVO; import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.dc.DataCenterVO; import com.cloud.domain.Domain; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; @@ -117,9 +120,9 @@ import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.security.SecurityGroupVMMapVO; import com.cloud.network.security.dao.SecurityGroupVMMapDao; import com.cloud.org.Grouping; -import com.cloud.projects.ProjectInvitation; -import com.cloud.projects.Project.ListProjectResourcesCriteria; import com.cloud.projects.Project; +import com.cloud.projects.Project.ListProjectResourcesCriteria; +import com.cloud.projects.ProjectInvitation; import com.cloud.projects.ProjectManager; import com.cloud.projects.dao.ProjectAccountDao; import com.cloud.projects.dao.ProjectDao; @@ -135,7 +138,6 @@ import com.cloud.user.dao.AccountDao; import com.cloud.utils.DateUtil; import com.cloud.utils.Pair; import com.cloud.utils.Ternary; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.Filter; import com.cloud.utils.db.SearchBuilder; @@ -246,6 +248,12 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { @Inject private HighAvailabilityManager _haMgr; + @Inject + AffinityGroupVMMapDao _affinityGroupVMMapDao; + + @Inject + private AffinityGroupJoinDao _affinityGroupJoinDao; + /* (non-Javadoc) * @see com.cloud.api.query.QueryService#searchForUsers(org.apache.cloudstack.api.command.admin.user.ListUsersCmd) */ @@ -624,12 +632,14 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { c.addCriteria(Criteria.NAME, cmd.getInstanceName()); c.addCriteria(Criteria.STATE, cmd.getState()); c.addCriteria(Criteria.DATACENTERID, cmd.getZoneId()); + c.addCriteria(Criteria.DATACENTERTYPE, cmd.getZoneType()); c.addCriteria(Criteria.GROUPID, cmd.getGroupId()); c.addCriteria(Criteria.FOR_VIRTUAL_NETWORK, cmd.getForVirtualNetwork()); c.addCriteria(Criteria.NETWORKID, cmd.getNetworkId()); c.addCriteria(Criteria.TEMPLATE_ID, cmd.getTemplateId()); c.addCriteria(Criteria.ISO_ID, cmd.getIsoId()); c.addCriteria(Criteria.VPC_ID, cmd.getVpcId()); + c.addCriteria(Criteria.AFFINITY_GROUP_ID, cmd.getAffinityGroupId()); if (domainId != null) { c.addCriteria(Criteria.DOMAINID, domainId); @@ -671,7 +681,8 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Object name = c.getCriteria(Criteria.NAME); Object state = c.getCriteria(Criteria.STATE); Object notState = c.getCriteria(Criteria.NOTSTATE); - Object zone = c.getCriteria(Criteria.DATACENTERID); + Object zoneId = c.getCriteria(Criteria.DATACENTERID); + Object zoneType = c.getCriteria(Criteria.DATACENTERTYPE); Object pod = c.getCriteria(Criteria.PODID); Object hostId = c.getCriteria(Criteria.HOSTID); Object hostName = c.getCriteria(Criteria.HOSTNAME); @@ -685,6 +696,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Object templateId = c.getCriteria(Criteria.TEMPLATE_ID); Object isoId = c.getCriteria(Criteria.ISO_ID); Object vpcId = c.getCriteria(Criteria.VPC_ID); + Object affinityGroupId = c.getCriteria(Criteria.AFFINITY_GROUP_ID); sb.and("displayName", sb.entity().getDisplayName(), SearchCriteria.Op.LIKE); sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); @@ -693,6 +705,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sb.and("stateNEQ", sb.entity().getState(), SearchCriteria.Op.NEQ); sb.and("stateNIN", sb.entity().getState(), SearchCriteria.Op.NIN); sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ); + sb.and("dataCenterType", sb.entity().getDataCenterType(), SearchCriteria.Op.EQ); sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ); sb.and("hypervisorType", sb.entity().getHypervisorType(), SearchCriteria.Op.EQ); sb.and("hostIdEQ", sb.entity().getHostId(), SearchCriteria.Op.EQ); @@ -725,6 +738,10 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sb.and("poolId", sb.entity().getPoolId(), SearchCriteria.Op.EQ); } + if (affinityGroupId != null) { + sb.and("affinityGroupId", sb.entity().getAffinityGroupId(), SearchCriteria.Op.EQ); + } + // populate the search criteria with the values passed in SearchCriteria sc = sb.create(); @@ -795,13 +812,18 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sc.setParameters("stateNIN", "Destroyed", "Expunging"); } - if (zone != null) { - sc.setParameters("dataCenterId", zone); + if (zoneId != null) { + sc.setParameters("dataCenterId", zoneId); if (state == null) { sc.setParameters("stateNEQ", "Destroyed"); } } + + if (zoneType != null) { + sc.setParameters("dataCenterType", zoneType); + } + if (pod != null) { sc.setParameters("podId", pod); @@ -822,6 +844,10 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sc.setParameters("poolId", storageId); } + if (affinityGroupId != null) { + sc.setParameters("affinityGroupId", affinityGroupId); + } + // search vm details by ids Pair, Integer> uniqueVmPair = _userVmJoinDao.searchAndCount(sc, searchFilter); Integer count = uniqueVmPair.second(); @@ -1374,6 +1400,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { public Pair, Integer> searchForServersInternal(ListHostsCmd cmd) { Long zoneId = _accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(), cmd.getZoneId()); + String zoneType = cmd.getZoneType(); Object name = cmd.getHostName(); Object type = cmd.getType(); Object state = cmd.getState(); @@ -1395,6 +1422,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sb.and("type", sb.entity().getType(), SearchCriteria.Op.LIKE); sb.and("status", sb.entity().getStatus(), SearchCriteria.Op.EQ); sb.and("dataCenterId", sb.entity().getZoneId(), SearchCriteria.Op.EQ); + sb.and("dataCenterType", sb.entity().getZoneType(), SearchCriteria.Op.EQ); sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ); sb.and("clusterId", sb.entity().getClusterId(), SearchCriteria.Op.EQ); sb.and("resourceState", sb.entity().getResourceState(), SearchCriteria.Op.EQ); @@ -1439,6 +1467,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { if (zoneId != null) { sc.setParameters("dataCenterId", zoneId); } + if (zoneType != null) { + sc.setParameters("dataCenterType", zoneType); + } if (pod != null) { sc.setParameters("podId", pod); } @@ -1496,6 +1527,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Map tags = cmd.getTags(); Long zoneId = cmd.getZoneId(); + String zoneType = cmd.getZoneType(); Long podId = null; if (_accountMgr.isAdmin(caller.getType())) { podId = cmd.getPodId(); @@ -1523,6 +1555,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sb.and("volumeType", sb.entity().getVolumeType(), SearchCriteria.Op.LIKE); sb.and("instanceId", sb.entity().getVmId(), SearchCriteria.Op.EQ); sb.and("dataCenterId", sb.entity().getDataCenterId(), SearchCriteria.Op.EQ); + sb.and("dataCenterType", sb.entity().getDataCenterType(), SearchCriteria.Op.EQ); sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ); // Only return volumes that are not destroyed sb.and("state", sb.entity().getState(), SearchCriteria.Op.NEQ); @@ -1582,6 +1615,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { if (zoneId != null) { sc.setParameters("dataCenterId", zoneId); } + if (zoneType != null) { + sc.setParameters("dataCenterType", zoneType); + } if (podId != null) { sc.setParameters("podId", podId); } @@ -1685,6 +1721,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sb.and("typeNEQ", sb.entity().getType(), SearchCriteria.Op.NEQ); sb.and("idNEQ", sb.entity().getId(), SearchCriteria.Op.NEQ); + if (listForDomain && isRecursive) { sb.and("path", sb.entity().getDomainPath(), SearchCriteria.Op.LIKE); } @@ -1827,6 +1864,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { private Pair, Integer> searchForStoragePoolsInternal(ListStoragePoolsCmd cmd) { Long zoneId = _accountMgr.checkAccessAndSpecifyAuthority(UserContext.current().getCaller(), cmd.getZoneId()); + String zoneType = cmd.getZoneType(); Object id = cmd.getId(); Object name = cmd.getStoragePoolName(); Object path = cmd.getPath(); @@ -1846,6 +1884,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE); sb.and("path", sb.entity().getPath(), SearchCriteria.Op.EQ); sb.and("dataCenterId", sb.entity().getZoneId(), SearchCriteria.Op.EQ); + sb.and("dataCenterType", sb.entity().getZoneType(), SearchCriteria.Op.EQ); sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ); sb.and("clusterId", sb.entity().getClusterId(), SearchCriteria.Op.EQ); sb.and("hostAddress", sb.entity().getHostAddress(), SearchCriteria.Op.EQ); @@ -1876,6 +1915,9 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { if (zoneId != null) { sc.setParameters("dataCenterId", zoneId); } + if (zoneType != null) { + sc.setParameters("dataCenterType", zoneType); + } if (pod != null) { sc.setParameters("podId", pod); } @@ -1927,7 +1969,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Boolean isAscending = Boolean.parseBoolean(_configDao.getValue("sortkey.algorithm")); isAscending = (isAscending == null ? true : isAscending); Filter searchFilter = new Filter(DiskOfferingJoinVO.class, "sortKey", isAscending, cmd.getStartIndex(), cmd.getPageSizeVal()); - SearchBuilder sb = _diskOfferingJoinDao.createSearchBuilder(); + SearchCriteria sc = _diskOfferingJoinDao.createSearchCriteria(); Account account = UserContext.current().getCaller(); @@ -1942,9 +1984,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { if (account.getType() == Account.ACCOUNT_TYPE_ADMIN || isPermissible(account.getDomainId(), domainId) ) { // check if the user's domain == do's domain || user's domain is // a child of so's domain for non-root users - sb.and("domainId", sb.entity().getDomainId(), SearchCriteria.Op.EQ); - SearchCriteria sc = sb.create(); - sc.setParameters("domainId", domainId); + sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId); return _diskOfferingJoinDao.searchAndCount(sc, searchFilter); } else { throw new PermissionDeniedException("The account:" + account.getAccountName() @@ -1952,11 +1992,7 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } } - sb.and("name", sb.entity().getName(), SearchCriteria.Op.LIKE); - sb.and("id", sb.entity().getId(), SearchCriteria.Op.EQ); - - boolean includePublicOfferings = false; List domainIds = null; // For non-root users, only return all offerings for the user's domain, and everything above till root if ((account.getType() == Account.ACCOUNT_TYPE_NORMAL || account.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) @@ -1973,16 +2009,17 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { domainRecord = _domainDao.findById(domainRecord.getParent()); domainIds.add(domainRecord.getId()); } - sb.and("domainIdIn", sb.entity().getDomainId(), SearchCriteria.Op.IN); - // include also public offering if no keyword, name and id specified - if ( keyword == null && name == null && id == null ){ - includePublicOfferings = true; - } + SearchCriteria spc = _diskOfferingJoinDao.createSearchCriteria(); + + spc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); + spc.addOr("domainId", SearchCriteria.Op.NULL); // include public offering as where + sc.addAnd("domainId", SearchCriteria.Op.SC, spc); + sc.addAnd("systemUse", SearchCriteria.Op.EQ, false); // non-root users should not see system offering at all + } - SearchCriteria sc = sb.create(); - if (keyword != null) { + if (keyword != null) { SearchCriteria ssc = _diskOfferingJoinDao.createSearchCriteria(); ssc.addOr("displayText", SearchCriteria.Op.LIKE, "%" + keyword + "%"); ssc.addOr("name", SearchCriteria.Op.LIKE, "%" + keyword + "%"); @@ -1990,24 +2027,12 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { sc.addAnd("name", SearchCriteria.Op.SC, ssc); } - if (name != null) { - sc.setParameters("name", "%" + name + "%"); - } - if (id != null) { - sc.setParameters("id", id); + sc.addAnd("id", SearchCriteria.Op.EQ, id); } - if (domainIds != null ){ - sc.setParameters("domainIdIn", domainIds.toArray()); - } - - if (includePublicOfferings){ - SearchCriteria spc = _diskOfferingJoinDao.createSearchCriteria(); - spc.addAnd("domainId", SearchCriteria.Op.NULL); - spc.addAnd("systemUse", SearchCriteria.Op.EQ, false); - - sc.addOr("systemUse", SearchCriteria.Op.SC, spc); + if (name != null) { + sc.addAnd("name", SearchCriteria.Op.EQ, name); } // FIXME: disk offerings should search back up the hierarchy for @@ -2086,10 +2111,10 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } } - boolean includePublicOfferings = false; + // boolean includePublicOfferings = false; if ((caller.getType() == Account.ACCOUNT_TYPE_NORMAL || caller.getType() == Account.ACCOUNT_TYPE_DOMAIN_ADMIN) || caller.getType() == Account.ACCOUNT_TYPE_RESOURCE_DOMAIN_ADMIN) { - // For non-root users + // For non-root users. if (isSystem) { throw new InvalidParameterValueException("Only root admins can access system's offering"); } @@ -2105,12 +2130,12 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { domainRecord = _domainDao.findById(domainRecord.getParent()); domainIds.add(domainRecord.getId()); } - sc.addAnd("domainId", SearchCriteria.Op.IN, domainIds.toArray()); + SearchCriteria spc = _srvOfferingJoinDao.createSearchCriteria(); + + spc.addOr("domainId", SearchCriteria.Op.IN, domainIds.toArray()); + spc.addOr("domainId", SearchCriteria.Op.NULL); // include public offering as where + sc.addAnd("domainId", SearchCriteria.Op.SC, spc); - // include also public offering if no keyword, name and id specified - if ( keyword == null && name == null && id == null ){ - includePublicOfferings = true; - } } else { // for root users @@ -2153,24 +2178,18 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { } if (isSystem != null) { + // note that for non-root users, isSystem is always false when control comes to here sc.addAnd("systemUse", SearchCriteria.Op.EQ, isSystem); } if (name != null) { - sc.addAnd("name", SearchCriteria.Op.LIKE, "%" + name + "%"); + sc.addAnd("name", SearchCriteria.Op.EQ, name); } if (vmTypeStr != null) { sc.addAnd("vm_type", SearchCriteria.Op.EQ, vmTypeStr); } - if (includePublicOfferings){ - SearchCriteria spc = _srvOfferingJoinDao.createSearchCriteria(); - spc.addAnd("domainId", SearchCriteria.Op.NULL); - spc.addAnd("systemUse", SearchCriteria.Op.EQ, false); - sc.addOr("systemUse", SearchCriteria.Op.SC, spc); - } - return _srvOfferingJoinDao.searchAndCount(sc, searchFilter); } @@ -2194,10 +2213,14 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { Long id = cmd.getId(); String keyword = cmd.getKeyword(); String name = cmd.getName(); + String networkType = cmd.getNetworkType(); Filter searchFilter = new Filter(DataCenterJoinVO.class, null, false, cmd.getStartIndex(), cmd.getPageSizeVal()); SearchCriteria sc = _dcJoinDao.createSearchCriteria(); + if(networkType != null) + sc.addAnd("networkType", SearchCriteria.Op.EQ, networkType); + if (id != null) { sc.addAnd("id", SearchCriteria.Op.EQ, id); } else if (name != null) { @@ -2328,5 +2351,99 @@ public class QueryManagerImpl extends ManagerBase implements QueryService { return false; } + @Override + public ListResponse listAffinityGroups(Long affinityGroupId, String affinityGroupName, + String affinityGroupType, Long vmId, Long startIndex, Long pageSize) { + Pair, Integer> result = listAffinityGroupsInternal(affinityGroupId, + affinityGroupName, affinityGroupType, vmId, startIndex, pageSize); + ListResponse response = new ListResponse(); + List agResponses = ViewResponseHelper.createAffinityGroupResponses(result.first()); + response.setResponses(agResponses, result.second()); + return response; + } + + + public Pair, Integer> listAffinityGroupsInternal(Long affinityGroupId, + String affinityGroupName, String affinityGroupType, Long vmId, Long startIndex, Long pageSize) { + + Account caller = UserContext.current().getCaller(); + + Long accountId = caller.getAccountId(); + Long domainId = caller.getDomainId(); + + if (vmId != null) { + UserVmVO userVM = _userVmDao.findById(vmId); + if (userVM == null){ + throw new InvalidParameterValueException("Unable to list affinity groups for virtual machine instance " + + vmId + "; instance not found."); + } + _accountMgr.checkAccess(caller, null, true, userVM); + return listAffinityGroupsByVM(vmId.longValue(), startIndex, pageSize); + } + + Filter searchFilter = new Filter(AffinityGroupJoinVO.class, "id", true, startIndex, pageSize); + SearchBuilder groupSearch = _affinityGroupJoinDao.createSearchBuilder(); + groupSearch.select(null, Func.DISTINCT, groupSearch.entity().getId()); // select + // distinct + + SearchCriteria sc = groupSearch.create(); + + if (accountId != null) { + sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId); + } + + if (domainId != null) { + sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId); + } + + if (affinityGroupId != null) { + sc.addAnd("id", SearchCriteria.Op.EQ, affinityGroupId); + } + + if (affinityGroupName != null) { + sc.addAnd("name", SearchCriteria.Op.EQ, affinityGroupName); + } + + if (affinityGroupType != null) { + sc.addAnd("type", SearchCriteria.Op.EQ, affinityGroupType); + } + + + Pair, Integer> uniqueGroupsPair = _affinityGroupJoinDao.searchAndCount(sc, + searchFilter); + // search group details by ids + Integer count = uniqueGroupsPair.second(); + if (count.intValue() == 0) { + // empty result + return uniqueGroupsPair; + } + List uniqueGroups = uniqueGroupsPair.first(); + Long[] vrIds = new Long[uniqueGroups.size()]; + int i = 0; + for (AffinityGroupJoinVO v : uniqueGroups) { + vrIds[i++] = v.getId(); + } + List vrs = _affinityGroupJoinDao.searchByIds(vrIds); + return new Pair, Integer>(vrs, count); + + } + + private Pair, Integer> listAffinityGroupsByVM(long vmId, long pageInd, long pageSize) { + Filter sf = new Filter(SecurityGroupVMMapVO.class, null, true, pageInd, pageSize); + Pair, Integer> agVmMappingPair = _affinityGroupVMMapDao.listByInstanceId(vmId, sf); + Integer count = agVmMappingPair.second(); + if (count.intValue() == 0) { + // handle empty result cases + return new Pair, Integer>(new ArrayList(), count); + } + List agVmMappings = agVmMappingPair.first(); + Long[] agIds = new Long[agVmMappings.size()]; + int i = 0; + for (AffinityGroupVMMapVO agVm : agVmMappings) { + agIds[i++] = agVm.getAffinityGroupId(); + } + List ags = _affinityGroupJoinDao.searchByIds(agIds); + return new Pair, Integer>(ags, count); + } } diff --git a/server/src/com/cloud/api/query/ViewResponseHelper.java b/server/src/com/cloud/api/query/ViewResponseHelper.java index 9e612b07d1b..827ae7b7a66 100644 --- a/server/src/com/cloud/api/query/ViewResponseHelper.java +++ b/server/src/com/cloud/api/query/ViewResponseHelper.java @@ -21,6 +21,7 @@ import java.util.EnumSet; import java.util.Hashtable; import java.util.List; +import org.apache.cloudstack.affinity.AffinityGroupResponse; import org.apache.cloudstack.api.ApiConstants.HostDetails; import org.apache.cloudstack.api.ApiConstants.VMDetails; import org.apache.cloudstack.api.response.AccountResponse; @@ -29,6 +30,7 @@ import org.apache.cloudstack.api.response.DiskOfferingResponse; import org.apache.cloudstack.api.response.DomainRouterResponse; import org.apache.cloudstack.api.response.EventResponse; import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostForMigrationResponse; import org.apache.cloudstack.api.response.InstanceGroupResponse; import org.apache.cloudstack.api.response.ProjectAccountResponse; import org.apache.cloudstack.api.response.ProjectInvitationResponse; @@ -37,6 +39,7 @@ import org.apache.cloudstack.api.response.ResourceTagResponse; import org.apache.cloudstack.api.response.SecurityGroupResponse; import org.apache.cloudstack.api.response.ServiceOfferingResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; +import org.apache.cloudstack.api.response.StoragePoolForMigrationResponse; import org.apache.cloudstack.api.response.UserResponse; import org.apache.cloudstack.api.response.UserVmResponse; import org.apache.cloudstack.api.response.VolumeResponse; @@ -45,6 +48,7 @@ import org.apache.log4j.Logger; import com.cloud.api.ApiDBUtils; import com.cloud.api.query.vo.AccountJoinVO; +import com.cloud.api.query.vo.AffinityGroupJoinVO; import com.cloud.api.query.vo.AsyncJobJoinVO; import com.cloud.api.query.vo.DataCenterJoinVO; import com.cloud.api.query.vo.DiskOfferingJoinVO; @@ -123,7 +127,7 @@ public class ViewResponseHelper { // first time encountering this vm userVmData = ApiDBUtils.newUserVmResponse(objectName, userVm, details, caller); } else{ - // update nics, securitygroups, tags for 1 to many mapping fields + // update nics, securitygroups, tags, affinitygroups for 1 to many mapping fields userVmData = ApiDBUtils.fillVmDetails(userVmData, userVm); } vmDataList.put(userVm.getId(), userVmData); @@ -228,6 +232,24 @@ public class ViewResponseHelper { return new ArrayList(vrDataList.values()); } + public static List createHostForMigrationResponse(EnumSet details, + HostJoinVO... hosts) { + Hashtable vrDataList = new Hashtable(); + // Initialise the vrdatalist with the input data + for (HostJoinVO vr : hosts) { + HostForMigrationResponse vrData = vrDataList.get(vr.getId()); + if ( vrData == null ) { + // first time encountering this vm + vrData = ApiDBUtils.newHostForMigrationResponse(vr, details); + } else { + // update tags + vrData = ApiDBUtils.fillHostForMigrationDetails(vrData, vr); + } + vrDataList.put(vr.getId(), vrData); + } + return new ArrayList(vrDataList.values()); + } + public static List createVolumeResponse(VolumeJoinVO... volumes) { Hashtable vrDataList = new Hashtable(); for (VolumeJoinVO vr : volumes) { @@ -263,6 +285,23 @@ public class ViewResponseHelper { return new ArrayList(vrDataList.values()); } + public static List createStoragePoolForMigrationResponse(StoragePoolJoinVO... pools) { + Hashtable vrDataList = new Hashtable(); + // Initialise the vrdatalist with the input data + for (StoragePoolJoinVO vr : pools) { + StoragePoolForMigrationResponse vrData = vrDataList.get(vr.getId()); + if ( vrData == null ) { + // first time encountering this vm + vrData = ApiDBUtils.newStoragePoolForMigrationResponse(vr); + } else { + // update tags + vrData = ApiDBUtils.fillStoragePoolForMigrationDetails(vrData, vr); + } + vrDataList.put(vr.getId(), vrData); + } + return new ArrayList(vrDataList.values()); + } + public static List createAccountResponse(AccountJoinVO... accounts) { List respList = new ArrayList(); @@ -303,4 +342,20 @@ public class ViewResponseHelper { } return respList; } + + public static List createAffinityGroupResponses(List groups) { + Hashtable vrDataList = new Hashtable(); + for (AffinityGroupJoinVO vr : groups) { + AffinityGroupResponse vrData = vrDataList.get(vr.getId()); + if (vrData == null) { + // first time encountering this AffinityGroup + vrData = ApiDBUtils.newAffinityGroupResponse(vr); + } else { + // update vms + vrData = ApiDBUtils.fillAffinityGroupDetails(vrData, vr); + } + vrDataList.put(vr.getId(), vrData); + } + return new ArrayList(vrDataList.values()); + } } diff --git a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java index 51ac5e61edb..796ae54d52f 100644 --- a/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/AccountJoinDaoImpl.java @@ -20,17 +20,16 @@ import java.util.List; import javax.ejb.Local; +import org.apache.cloudstack.api.response.AccountResponse; +import org.apache.cloudstack.api.response.UserResponse; import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; import com.cloud.api.ApiDBUtils; import com.cloud.api.query.ViewResponseHelper; import com.cloud.api.query.vo.AccountJoinVO; import com.cloud.api.query.vo.UserAccountJoinVO; import com.cloud.configuration.Resource.ResourceType; -import org.apache.cloudstack.api.response.AccountResponse; -import org.apache.cloudstack.api.response.UserResponse; -import org.springframework.stereotype.Component; - import com.cloud.user.Account; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; @@ -66,6 +65,7 @@ public class AccountJoinDaoImpl extends GenericDaoBase impl accountResponse.setState(account.getState().toString()); accountResponse.setNetworkDomain(account.getNetworkDomain()); accountResponse.setDefaultZone(account.getDataCenterUuid()); + accountResponse.setIsDefault(account.isDefault()); // get network stat accountResponse.setBytesReceived(account.getBytesReceived()); diff --git a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDao.java b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDao.java new file mode 100644 index 00000000000..c029b3fc4f8 --- /dev/null +++ b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDao.java @@ -0,0 +1,37 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.query.dao; + +import java.util.List; + +import org.apache.cloudstack.affinity.AffinityGroup; +import org.apache.cloudstack.affinity.AffinityGroupResponse; +import com.cloud.api.query.vo.AffinityGroupJoinVO; +import com.cloud.user.Account; +import com.cloud.utils.db.GenericDao; + +public interface AffinityGroupJoinDao extends GenericDao { + + AffinityGroupResponse newAffinityGroupResponse(AffinityGroupJoinVO vsg); + + AffinityGroupResponse setAffinityGroupResponse(AffinityGroupResponse vsgData, AffinityGroupJoinVO vsg); + + List newAffinityGroupView(AffinityGroup ag); + + List searchByIds(Long... ids); +} + diff --git a/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java new file mode 100644 index 00000000000..8743bcb2028 --- /dev/null +++ b/server/src/com/cloud/api/query/dao/AffinityGroupJoinDaoImpl.java @@ -0,0 +1,143 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.query.dao; + +import java.util.ArrayList; +import java.util.List; + +import javax.ejb.Local; +import javax.inject.Inject; + + +import org.apache.cloudstack.affinity.AffinityGroup; +import org.apache.cloudstack.affinity.AffinityGroupResponse; +import org.apache.log4j.Logger; +import com.cloud.api.ApiResponseHelper; +import com.cloud.api.query.vo.AffinityGroupJoinVO; +import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; + +@Local(value = { AffinityGroupJoinDao.class }) +public class AffinityGroupJoinDaoImpl extends GenericDaoBase implements AffinityGroupJoinDao { + public static final Logger s_logger = Logger.getLogger(AffinityGroupJoinDaoImpl.class); + + @Inject + private ConfigurationDao _configDao; + + private final SearchBuilder agSearch; + + private final SearchBuilder agIdSearch; + + protected AffinityGroupJoinDaoImpl() { + + agSearch = createSearchBuilder(); + agSearch.and("idIN", agSearch.entity().getId(), SearchCriteria.Op.IN); + agSearch.done(); + + agIdSearch = createSearchBuilder(); + agIdSearch.and("id", agIdSearch.entity().getId(), SearchCriteria.Op.EQ); + agIdSearch.done(); + + this._count = "select count(distinct id) from affinity_group_view WHERE "; + } + + @Override + public AffinityGroupResponse newAffinityGroupResponse(AffinityGroupJoinVO vag) { + AffinityGroupResponse agResponse = new AffinityGroupResponse(); + agResponse.setId(vag.getUuid()); + agResponse.setName(vag.getName()); + agResponse.setDescription(vag.getDescription()); + agResponse.setType(vag.getType()); + + ApiResponseHelper.populateOwner(agResponse, vag); + + // update vm information + long instanceId = vag.getVmId(); + if (instanceId > 0) { + List vmIdList = new ArrayList(); + vmIdList.add(vag.getVmUuid()); + agResponse.setVMIdList(vmIdList); + } + + agResponse.setObjectName("affinitygroup"); + return agResponse; + } + + @Override + public AffinityGroupResponse setAffinityGroupResponse(AffinityGroupResponse vagData, AffinityGroupJoinVO vag) { + // update vm information + long instanceId = vag.getVmId(); + if (instanceId > 0) { + vagData.addVMId(vag.getVmUuid()); + } + return vagData; + } + + @Override + public List newAffinityGroupView(AffinityGroup ag) { + + SearchCriteria sc = agIdSearch.create(); + sc.setParameters("id", ag.getId()); + return searchIncludingRemoved(sc, null, null, false); + } + + @Override + public List searchByIds(Long... agIds) { + // set detail batch query size + int DETAILS_BATCH_SIZE = 2000; + String batchCfg = _configDao.getValue("detail.batch.query.size"); + if ( batchCfg != null ){ + DETAILS_BATCH_SIZE = Integer.parseInt(batchCfg); + } + // query details by batches + List uvList = new ArrayList(); + // query details by batches + int curr_index = 0; + if (agIds.length > DETAILS_BATCH_SIZE) { + while ((curr_index + DETAILS_BATCH_SIZE) <= agIds.length) { + Long[] ids = new Long[DETAILS_BATCH_SIZE]; + for (int k = 0, j = curr_index; j < curr_index + DETAILS_BATCH_SIZE; j++, k++) { + ids[k] = agIds[j]; + } + SearchCriteria sc = agSearch.create(); + sc.setParameters("idIN", ids); + List vms = searchIncludingRemoved(sc, null, null, false); + if (vms != null) { + uvList.addAll(vms); + } + curr_index += DETAILS_BATCH_SIZE; + } + } + if (curr_index < agIds.length) { + int batch_size = (agIds.length - curr_index); + // set the ids value + Long[] ids = new Long[batch_size]; + for (int k = 0, j = curr_index; j < curr_index + batch_size; j++, k++) { + ids[k] = agIds[j]; + } + SearchCriteria sc = agSearch.create(); + sc.setParameters("idIN", ids); + List vms = searchIncludingRemoved(sc, null, null, false); + if (vms != null) { + uvList.addAll(vms); + } + } + return uvList; + } +} diff --git a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java index 488c4e494e1..25cd62faf7b 100644 --- a/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/DomainRouterJoinDaoImpl.java @@ -148,6 +148,7 @@ public class DomainRouterJoinDaoImpl extends GenericDaoBase { HostResponse setHostResponse(HostResponse response, HostJoinVO host); + HostForMigrationResponse newHostForMigrationResponse(HostJoinVO host, EnumSet details); + + HostForMigrationResponse setHostForMigrationResponse(HostForMigrationResponse response, HostJoinVO host); + List newHostView(Host group); List searchByIds(Long... ids); diff --git a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java index 1adff40d70f..c678f2f900f 100644 --- a/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/HostJoinDaoImpl.java @@ -29,6 +29,7 @@ import javax.inject.Inject; import org.apache.cloudstack.api.ApiConstants.HostDetails; import org.apache.cloudstack.api.response.HostResponse; +import org.apache.cloudstack.api.response.HostForMigrationResponse; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -92,6 +93,141 @@ public class HostJoinDaoImpl extends GenericDaoBase implements hostResponse.setVersion(host.getVersion()); hostResponse.setCreated(host.getCreated()); + if (details.contains(HostDetails.all) || details.contains(HostDetails.capacity) + || details.contains(HostDetails.stats) || details.contains(HostDetails.events)) { + + hostResponse.setOsCategoryId(host.getOsCategoryUuid()); + hostResponse.setOsCategoryName(host.getOsCategoryName()); + hostResponse.setZoneName(host.getZoneName()); + hostResponse.setZoneType(host.getZoneType().toString()); + hostResponse.setPodName(host.getPodName()); + if ( host.getClusterId() > 0) { + hostResponse.setClusterName(host.getClusterName()); + hostResponse.setClusterType(host.getClusterType().toString()); + } + } + + DecimalFormat decimalFormat = new DecimalFormat("#.##"); + if (host.getType() == Host.Type.Routing) { + if (details.contains(HostDetails.all) || details.contains(HostDetails.capacity)) { + // set allocated capacities + Long mem = host.getMemReservedCapacity() + host.getMemUsedCapacity(); + Long cpu = host.getCpuReservedCapacity() + host.getCpuReservedCapacity(); + + hostResponse.setMemoryAllocated(mem); + hostResponse.setMemoryTotal(host.getTotalMemory()); + + String hostTags = host.getTag(); + hostResponse.setHostTags(host.getTag()); + + String haTag = ApiDBUtils.getHaTag(); + if (haTag != null && !haTag.isEmpty() && hostTags != null && !hostTags.isEmpty()) { + if (haTag.equalsIgnoreCase(hostTags)) { + hostResponse.setHaHost(true); + } else { + hostResponse.setHaHost(false); + } + } else { + hostResponse.setHaHost(false); + } + + hostResponse.setHypervisorVersion(host.getHypervisorVersion()); + + String cpuAlloc = decimalFormat.format(((float) cpu / (float) (host.getCpus() * host.getSpeed())) * 100f) + "%"; + hostResponse.setCpuAllocated(cpuAlloc); + String cpuWithOverprovisioning = new Float(host.getCpus() * host.getSpeed() * ApiDBUtils.getCpuOverprovisioningFactor()).toString(); + hostResponse.setCpuWithOverprovisioning(cpuWithOverprovisioning); + } + + if (details.contains(HostDetails.all) || details.contains(HostDetails.stats)) { + // set CPU/RAM/Network stats + String cpuUsed = null; + HostStats hostStats = ApiDBUtils.getHostStatistics(host.getId()); + if (hostStats != null) { + float cpuUtil = (float) hostStats.getCpuUtilization(); + cpuUsed = decimalFormat.format(cpuUtil) + "%"; + hostResponse.setCpuUsed(cpuUsed); + hostResponse.setMemoryUsed((new Double(hostStats.getUsedMemory())).longValue()); + hostResponse.setNetworkKbsRead((new Double(hostStats.getNetworkReadKBs())).longValue()); + hostResponse.setNetworkKbsWrite((new Double(hostStats.getNetworkWriteKBs())).longValue()); + + } + } + + } else if (host.getType() == Host.Type.SecondaryStorage) { + StorageStats secStorageStats = ApiDBUtils.getSecondaryStorageStatistics(host.getId()); + if (secStorageStats != null) { + hostResponse.setDiskSizeTotal(secStorageStats.getCapacityBytes()); + hostResponse.setDiskSizeAllocated(secStorageStats.getByteUsed()); + } + } + + hostResponse.setLocalStorageActive(ApiDBUtils.isLocalStorageActiveOnHost(host.getId())); + + if (details.contains(HostDetails.all) || details.contains(HostDetails.events)) { + Set possibleEvents = host.getStatus().getPossibleEvents(); + if ((possibleEvents != null) && !possibleEvents.isEmpty()) { + String events = ""; + Iterator iter = possibleEvents.iterator(); + while (iter.hasNext()) { + com.cloud.host.Status.Event event = iter.next(); + events += event.toString(); + if (iter.hasNext()) { + events += "; "; + } + } + hostResponse.setEvents(events); + } + } + + hostResponse.setResourceState(host.getResourceState().toString()); + + // set async job + hostResponse.setJobId(host.getJobUuid()); + hostResponse.setJobStatus(host.getJobStatus()); + + hostResponse.setObjectName("host"); + + return hostResponse; + } + + + @Override + public HostResponse setHostResponse(HostResponse response, HostJoinVO host) { + String tag = host.getTag(); + if (tag != null) { + if ( response.getHostTags() != null && response.getHostTags().length() > 0){ + response.setHostTags(response.getHostTags() + "," + tag); + } + else{ + response.setHostTags(tag); + } + } + return response; + } + + @Override + public HostForMigrationResponse newHostForMigrationResponse(HostJoinVO host, EnumSet details) { + HostForMigrationResponse hostResponse = new HostForMigrationResponse(); + hostResponse.setId(host.getUuid()); + hostResponse.setCapabilities(host.getCapabilities()); + hostResponse.setClusterId(host.getClusterUuid()); + hostResponse.setCpuNumber(host.getCpus()); + hostResponse.setZoneId(host.getZoneUuid()); + hostResponse.setDisconnectedOn(host.getDisconnectedOn()); + hostResponse.setHypervisor(host.getHypervisorType()); + hostResponse.setHostType(host.getType()); + hostResponse.setLastPinged(new Date(host.getLastPinged())); + hostResponse.setManagementServerId(host.getManagementServerId()); + hostResponse.setName(host.getName()); + hostResponse.setPodId(host.getPodUuid()); + hostResponse.setRemoved(host.getRemoved()); + hostResponse.setCpuSpeed(host.getSpeed()); + hostResponse.setState(host.getStatus()); + hostResponse.setIpAddress(host.getPrivateIpAddress()); + hostResponse.setVersion(host.getVersion()); + hostResponse.setCreated(host.getCreated()); + if (details.contains(HostDetails.all) || details.contains(HostDetails.capacity) || details.contains(HostDetails.stats) || details.contains(HostDetails.events)) { @@ -189,27 +325,19 @@ public class HostJoinDaoImpl extends GenericDaoBase implements return hostResponse; } - - - - - @Override - public HostResponse setHostResponse(HostResponse response, HostJoinVO host) { + public HostForMigrationResponse setHostForMigrationResponse(HostForMigrationResponse response, HostJoinVO host) { String tag = host.getTag(); if (tag != null) { - if ( response.getHostTags() != null && response.getHostTags().length() > 0){ + if (response.getHostTags() != null && response.getHostTags().length() > 0) { response.setHostTags(response.getHostTags() + "," + tag); - } - else{ + } else { response.setHostTags(tag); } } return response; } - - @Override public List newHostView(Host host) { SearchCriteria sc = hostIdSearch.create(); diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDao.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDao.java index bbb02428981..b7e467fd6d3 100644 --- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDao.java +++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDao.java @@ -18,6 +18,7 @@ package com.cloud.api.query.dao; import java.util.List; +import org.apache.cloudstack.api.response.StoragePoolForMigrationResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import com.cloud.api.query.vo.StoragePoolJoinVO; @@ -30,6 +31,11 @@ public interface StoragePoolJoinDao extends GenericDao StoragePoolResponse setStoragePoolResponse(StoragePoolResponse response, StoragePoolJoinVO host); + StoragePoolForMigrationResponse newStoragePoolForMigrationResponse(StoragePoolJoinVO host); + + StoragePoolForMigrationResponse setStoragePoolForMigrationResponse(StoragePoolForMigrationResponse response, + StoragePoolJoinVO host); + List newStoragePoolView(StoragePool group); List searchByIds(Long... spIds); diff --git a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java index 66aecc212d8..260ff4d18e3 100644 --- a/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/StoragePoolJoinDaoImpl.java @@ -22,6 +22,7 @@ import java.util.List; import javax.ejb.Local; import javax.inject.Inject; +import org.apache.cloudstack.api.response.StoragePoolForMigrationResponse; import org.apache.cloudstack.api.response.StoragePoolResponse; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -76,12 +77,14 @@ public class StoragePoolJoinDaoImpl extends GenericDaoBase 0){ + response.setTags(response.getTags() + "," + tag); + } else { + response.setTags(tag); + } + } + return response; + } + @Override public List newStoragePoolView(StoragePool host) { SearchCriteria sc = spIdSearch.create(); diff --git a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java index 7072324080d..43b3a2d0a1f 100644 --- a/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/UserAccountJoinDaoImpl.java @@ -80,6 +80,7 @@ public class UserAccountJoinDaoImpl extends GenericDaoBase implem } userVmResponse.setZoneId(userVm.getDataCenterUuid()); userVmResponse.setZoneName(userVm.getDataCenterName()); + userVmResponse.setZoneType(userVm.getDataCenterType()); if ((caller == null) || (caller.getType() == Account.ACCOUNT_TYPE_ADMIN)) { userVmResponse.setInstanceName(userVm.getInstanceName()); userVmResponse.setHostId(userVm.getHostUuid()); @@ -216,6 +218,20 @@ public class UserVmJoinDaoImpl extends GenericDaoBase implem userVmResponse.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); } } + + if (details.contains(VMDetails.all) || details.contains(VMDetails.affgrp)) { + Long affinityGroupId = userVm.getAffinityGroupId(); + if (affinityGroupId != null && affinityGroupId.longValue() != 0) { + AffinityGroupResponse resp = new AffinityGroupResponse(); + resp.setId(userVm.getAffinityGroupUuid()); + resp.setName(userVm.getAffinityGroupName()); + resp.setDescription(userVm.getAffinityGroupDescription()); + resp.setObjectName("affinitygroup"); + resp.setAccountName(userVm.getAccountName()); + userVmResponse.addAffinityGroup(resp); + } + } + userVmResponse.setObjectName(objectName); return userVmResponse; @@ -276,6 +292,18 @@ public class UserVmJoinDaoImpl extends GenericDaoBase implem userVmData.addTag(ApiDBUtils.newResourceTagResponse(vtag, false)); } } + + Long affinityGroupId = uvo.getAffinityGroupId(); + if (affinityGroupId != null && affinityGroupId.longValue() != 0) { + AffinityGroupResponse resp = new AffinityGroupResponse(); + resp.setId(uvo.getAffinityGroupUuid()); + resp.setName(uvo.getAffinityGroupName()); + resp.setDescription(uvo.getAffinityGroupDescription()); + resp.setObjectName("affinitygroup"); + resp.setAccountName(uvo.getAccountName()); + userVmData.addAffinityGroup(resp); + } + return userVmData; } diff --git a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java index 495c0ebc18c..a7a0bf0b435 100644 --- a/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java +++ b/server/src/com/cloud/api/query/dao/VolumeJoinDaoImpl.java @@ -86,7 +86,8 @@ public class VolumeJoinDaoImpl extends GenericDaoBase implem volResponse.setZoneId(volume.getDataCenterUuid()); volResponse.setZoneName(volume.getDataCenterName()); - + volResponse.setZoneType(volume.getDataCenterType()); + volResponse.setVolumeType(volume.getVolumeType().toString()); volResponse.setDeviceId(volume.getDeviceId()); diff --git a/server/src/com/cloud/api/query/vo/AccountJoinVO.java b/server/src/com/cloud/api/query/vo/AccountJoinVO.java index 1cb17ef688b..800da7803fd 100644 --- a/server/src/com/cloud/api/query/vo/AccountJoinVO.java +++ b/server/src/com/cloud/api/query/vo/AccountJoinVO.java @@ -184,6 +184,9 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident @Column(name="job_status") private int jobStatus; + + @Column(name = "default") + boolean isDefault; public AccountJoinVO() { } @@ -672,6 +675,13 @@ public class AccountJoinVO extends BaseViewVO implements InternalIdentity, Ident } + public boolean isDefault() { + return isDefault; + } + public void setDefault(boolean isDefault) { + this.isDefault = isDefault; + } + } diff --git a/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java new file mode 100644 index 00000000000..1c0dc2ccde0 --- /dev/null +++ b/server/src/com/cloud/api/query/vo/AffinityGroupJoinVO.java @@ -0,0 +1,259 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.api.query.vo; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.EnumType; +import javax.persistence.Enumerated; +import javax.persistence.Id; +import javax.persistence.Table; + +import com.cloud.vm.VirtualMachine; + +@Entity +@Table(name = "affinity_group_view") +public class AffinityGroupJoinVO extends BaseViewVO implements ControlledViewEntity { + + @Id + @Column(name="id", updatable=false, nullable = false) + private long id; + + @Column(name="name") + private String name; + + @Column(name = "type") + private String type; + + @Column(name = "description") + private String description; + + @Column(name = "uuid") + private String uuid; + + @Column(name="account_id") + private long accountId; + + @Column(name="account_uuid") + private String accountUuid; + + @Column(name="account_name") + private String accountName = null; + + @Column(name="account_type") + private short accountType; + + @Column(name="domain_id") + private long domainId; + + @Column(name="domain_uuid") + private String domainUuid; + + @Column(name="domain_name") + private String domainName = null; + + @Column(name="domain_path") + private String domainPath = null; + + @Column(name = "vm_id") + private long vmId; + + @Column(name = "vm_uuid") + private String vmUuid; + + @Column(name = "vm_name") + private String vmName; + + @Column(name = "vm_display_name") + private String vmDisplayName; + + @Column(name = "vm_state") + @Enumerated(value = EnumType.STRING) + protected VirtualMachine.State vmState = null; + + + public AffinityGroupJoinVO() { + } + + @Override + public long getId() { + return id; + } + + @Override + public void setId(long id) { + this.id = id; + } + + @Override + public String getUuid() { + return uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } + + public String getType() { + return type; + } + + public void setType(String type) { + this.type = type; + } + + @Override + public long getAccountId() { + return accountId; + } + + public void setAccountId(long accountId) { + this.accountId = accountId; + } + + @Override + public String getAccountUuid() { + return accountUuid; + } + + public void setAccountUuid(String accountUuid) { + this.accountUuid = accountUuid; + } + + @Override + public String getAccountName() { + return accountName; + } + + public void setAccountName(String accountName) { + this.accountName = accountName; + } + + @Override + public short getAccountType() { + return accountType; + } + + public void setAccountType(short accountType) { + this.accountType = accountType; + } + + @Override + public long getDomainId() { + return domainId; + } + + public void setDomainId(long domainId) { + this.domainId = domainId; + } + + @Override + public String getDomainUuid() { + return domainUuid; + } + + public void setDomainUuid(String domainUuid) { + this.domainUuid = domainUuid; + } + + @Override + public String getDomainName() { + return domainName; + } + + public void setDomainName(String domainName) { + this.domainName = domainName; + } + + @Override + public String getDomainPath() { + return domainPath; + } + + public void setDomainPath(String domainPath) { + this.domainPath = domainPath; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public long getVmId() { + return vmId; + } + + public void setVmId(long vmId) { + this.vmId = vmId; + } + + public String getVmUuid() { + return vmUuid; + } + + public void setVmUuid(String vmUuid) { + this.vmUuid = vmUuid; + } + + public String getVmName() { + return vmName; + } + + public void setVmName(String vmName) { + this.vmName = vmName; + } + + public String getVmDisplayName() { + return vmDisplayName; + } + + public void setVmDisplayName(String vmDisplayName) { + this.vmDisplayName = vmDisplayName; + } + + public VirtualMachine.State getVmState() { + return vmState; + } + + public void setVmState(VirtualMachine.State vmState) { + this.vmState = vmState; + } + + @Override + public String getProjectUuid() { + // TODO Auto-generated method stub + return null; + } + + @Override + public String getProjectName() { + // TODO Auto-generated method stub + return null; + } +} diff --git a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java index b04120a71b2..5f2b500fa57 100644 --- a/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java +++ b/server/src/com/cloud/api/query/vo/DomainRouterJoinVO.java @@ -101,6 +101,9 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti @Column(name="data_center_name") private String dataCenterName = null; + @Column(name="data_center_type") + private String dataCenterType; + @Column(name="dns1") private String dns1 = null; @@ -447,6 +450,15 @@ public class DomainRouterJoinVO extends BaseViewVO implements ControlledViewEnti this.dataCenterName = zoneName; } + + public String getDataCenterType() { + return dataCenterType; + } + + public void setDataCenterType(String dataCenterType) { + this.dataCenterType = dataCenterType; + } + public Long getHostId() { return hostId; diff --git a/server/src/com/cloud/api/query/vo/HostJoinVO.java b/server/src/com/cloud/api/query/vo/HostJoinVO.java index 0b8f6721325..4aa45e5f593 100644 --- a/server/src/com/cloud/api/query/vo/HostJoinVO.java +++ b/server/src/com/cloud/api/query/vo/HostJoinVO.java @@ -130,6 +130,9 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity @Column(name="data_center_name") private String zoneName; + @Column(name="data_center_type") + private String zoneType; + @Column(name="pod_id") private long podId; @@ -231,7 +234,15 @@ public class HostJoinVO extends BaseViewVO implements InternalIdentity, Identity public void setZoneName(String zoneName) { this.zoneName = zoneName; } + + public String getZoneType() { + return zoneType; + } + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public String getName() { return name; } diff --git a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java b/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java index 89e79e5eea5..da06227ea66 100644 --- a/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java +++ b/server/src/com/cloud/api/query/vo/StoragePoolJoinVO.java @@ -31,6 +31,7 @@ import com.cloud.utils.db.GenericDao; import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; +import org.apache.cloudstack.engine.subsystem.api.storage.ScopeType; /** * Storage Pool DB view. @@ -96,6 +97,9 @@ public class StoragePoolJoinVO extends BaseViewVO implements InternalIdentity, I @Column(name="data_center_name") private String zoneName; + @Column(name="data_center_type") + private String zoneType; + @Column(name="pod_id") private long podId; @@ -124,6 +128,24 @@ public class StoragePoolJoinVO extends BaseViewVO implements InternalIdentity, I @Column(name="job_status") private int jobStatus; + + @Column(name = "scope") + @Enumerated(value = EnumType.STRING) + private ScopeType scope; + + /** + * @return the scope + */ + public ScopeType getScope() { + return scope; + } + + /** + * @param scope the scope to set + */ + public void setScope(ScopeType scope) { + this.scope = scope; + } @Override public long getId() { @@ -264,6 +286,14 @@ public class StoragePoolJoinVO extends BaseViewVO implements InternalIdentity, I this.zoneName = zoneName; } + public String getZoneType() { + return zoneType; + } + + public void setZoneType(String zoneType) { + this.zoneType = zoneType; + } + public long getPodId() { return podId; } diff --git a/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java b/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java index 44637db3400..d85392fb85a 100644 --- a/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java +++ b/server/src/com/cloud/api/query/vo/UserAccountJoinVO.java @@ -23,12 +23,12 @@ import javax.persistence.Entity; import javax.persistence.Id; import javax.persistence.Table; -import com.cloud.utils.db.Encrypt; -import com.cloud.utils.db.GenericDao; - import org.apache.cloudstack.api.Identity; import org.apache.cloudstack.api.InternalIdentity; +import com.cloud.utils.db.Encrypt; +import com.cloud.utils.db.GenericDao; + @Entity @Table(name="user_view") public class UserAccountJoinVO extends BaseViewVO implements InternalIdentity, Identity { @@ -116,6 +116,9 @@ public class UserAccountJoinVO extends BaseViewVO implements InternalIdentity, I @Column(name="job_status") private int jobStatus; + + @Column(name = "default") + boolean isDefault; public UserAccountJoinVO() { } @@ -345,6 +348,13 @@ public class UserAccountJoinVO extends BaseViewVO implements InternalIdentity, I this.jobStatus = jobStatus; } + public boolean isDefault() { + return isDefault; + } + public void setDefault(boolean isDefault) { + this.isDefault = isDefault; + } + } diff --git a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java index 33c49cdeae9..a50906d9e3d 100644 --- a/server/src/com/cloud/api/query/vo/UserVmJoinVO.java +++ b/server/src/com/cloud/api/query/vo/UserVmJoinVO.java @@ -153,6 +153,9 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity { @Column(name="data_center_name") private String dataCenterName = null; + @Column(name="data_center_type") + private String dataCenterType = null; + @Column(name="security_group_enabled") private boolean securityGroupEnabled; @@ -368,6 +371,18 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity { @Column(name="tag_customer") private String tagCustomer; + @Column(name = "affinity_group_id") + private long affinityGroupId; + + @Column(name = "affinity_group_uuid") + private String affinityGroupUuid; + + @Column(name = "affinity_group_name") + private String affinityGroupName; + + @Column(name = "affinity_group_description") + private String affinityGroupDescription; + transient String password; @Transient @@ -788,8 +803,18 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity { public void setDataCenterName(String zoneName) { this.dataCenterName = zoneName; } + + + public String getDataCenterType() { + return dataCenterType; + } + public void setDataCenterType(String zoneType) { + this.dataCenterType = zoneType; + } + + public boolean isSecurityGroupEnabled() { return securityGroupEnabled; } @@ -1671,4 +1696,29 @@ public class UserVmJoinVO extends BaseViewVO implements ControlledViewEntity { public void setIp6Cidr(String ip6Cidr) { this.ip6Cidr = ip6Cidr; } + + + public long getAffinityGroupId() { + return affinityGroupId; + } + + + + public String getAffinityGroupUuid() { + return affinityGroupUuid; + } + + + + public String getAffinityGroupName() { + return affinityGroupName; + } + + + + public String getAffinityGroupDescription() { + return affinityGroupDescription; + } + + } diff --git a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java index 4f6b35bab82..8a4bfe5c0fa 100644 --- a/server/src/com/cloud/api/query/vo/VolumeJoinVO.java +++ b/server/src/com/cloud/api/query/vo/VolumeJoinVO.java @@ -117,6 +117,9 @@ public class VolumeJoinVO extends BaseViewVO implements ControlledViewEntity { @Column(name="data_center_name") private String dataCenterName; + + @Column(name="data_center_type") + private String dataCenterType; @Column(name="vm_id") private long vmId; @@ -1004,8 +1007,20 @@ public class VolumeJoinVO extends BaseViewVO implements ControlledViewEntity { this.dataCenterName = dataCenterName; } + + + public String getDataCenterType() { + return dataCenterType; + } + + public void setDataCenterType(String dataCenterType) { + this.dataCenterType = dataCenterType; + } + + + public long getPodId() { return podId; } diff --git a/server/src/com/cloud/async/AsyncJobManagerImpl.java b/server/src/com/cloud/async/AsyncJobManagerImpl.java index 438877bf432..47d793fd0b0 100644 --- a/server/src/com/cloud/async/AsyncJobManagerImpl.java +++ b/server/src/com/cloud/async/AsyncJobManagerImpl.java @@ -15,8 +15,8 @@ // specific language governing permissions and limitations // under the License. -package com.cloud.async; - +package com.cloud.async; + import java.io.File; import java.io.FileInputStream; import java.lang.reflect.Type; @@ -75,182 +75,182 @@ import com.cloud.utils.mgmt.JmxUtil; import com.cloud.utils.net.MacAddress; import com.google.gson.Gson; import com.google.gson.reflect.TypeToken; - + @Component -@Local(value={AsyncJobManager.class}) -public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, ClusterManagerListener { - public static final Logger s_logger = Logger.getLogger(AsyncJobManagerImpl.class.getName()); +@Local(value={AsyncJobManager.class}) +public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, ClusterManagerListener { + public static final Logger s_logger = Logger.getLogger(AsyncJobManagerImpl.class.getName()); private static final int ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION = 3; // 3 seconds - - private static final int MAX_ONETIME_SCHEDULE_SIZE = 50; + + private static final int MAX_ONETIME_SCHEDULE_SIZE = 50; private static final int HEARTBEAT_INTERVAL = 2000; private static final int GC_INTERVAL = 10000; // 10 seconds - - @Inject private AsyncJobExecutorContext _context; - @Inject private SyncQueueManager _queueMgr; + + @Inject private AsyncJobExecutorContext _context; + @Inject private SyncQueueManager _queueMgr; @Inject private ClusterManager _clusterMgr; - @Inject private AccountManager _accountMgr; + @Inject private AccountManager _accountMgr; @Inject private AccountDao _accountDao; @Inject private AsyncJobDao _jobDao; @Inject private ConfigurationDao _configDao; private long _jobExpireSeconds = 86400; // 1 day private long _jobCancelThresholdSeconds = 3600; // 1 hour (for cancelling the jobs blocking other jobs) - @Inject private ApiDispatcher _dispatcher; - - private final ScheduledExecutorService _heartbeatScheduler = - Executors.newScheduledThreadPool(1, new NamedThreadFactory("AsyncJobMgr-Heartbeat")); - private ExecutorService _executor; - - @Override - public AsyncJobExecutorContext getExecutorContext() { - return _context; - } - - @Override - public AsyncJobVO getAsyncJob(long jobId) { - return _jobDao.findById(jobId); - } - - @Override - public AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId) { - return _jobDao.findInstancePendingAsyncJob(instanceType, instanceId); + @Inject private ApiDispatcher _dispatcher; + + private final ScheduledExecutorService _heartbeatScheduler = + Executors.newScheduledThreadPool(1, new NamedThreadFactory("AsyncJobMgr-Heartbeat")); + private ExecutorService _executor; + + @Override + public AsyncJobExecutorContext getExecutorContext() { + return _context; + } + + @Override + public AsyncJobVO getAsyncJob(long jobId) { + return _jobDao.findById(jobId); + } + + @Override + public AsyncJobVO findInstancePendingAsyncJob(String instanceType, long instanceId) { + return _jobDao.findInstancePendingAsyncJob(instanceType, instanceId); } @Override public List findInstancePendingAsyncJobs(AsyncJob.Type instanceType, Long accountId) { return _jobDao.findInstancePendingAsyncJobs(instanceType, accountId); - } - - @Override - public long submitAsyncJob(AsyncJobVO job) { - return submitAsyncJob(job, false); - } + } - @Override @DB + @Override + public long submitAsyncJob(AsyncJobVO job) { + return submitAsyncJob(job, false); + } + + @Override @DB public long submitAsyncJob(AsyncJobVO job, boolean scheduleJobExecutionInContext) { - Transaction txt = Transaction.currentTxn(); - try { - txt.start(); + Transaction txt = Transaction.currentTxn(); + try { + txt.start(); job.setInitMsid(getMsid()); - _jobDao.persist(job); - txt.commit(); + _jobDao.persist(job); + txt.commit(); // no sync source originally - job.setSyncSource(null); + job.setSyncSource(null); scheduleExecution(job, scheduleJobExecutionInContext); if(s_logger.isDebugEnabled()) { s_logger.debug("submit async job-" + job.getId() + ", details: " + job.toString()); } - return job.getId(); + return job.getId(); } catch(Exception e) { txt.rollback(); String errMsg = "Unable to schedule async job for command " + job.getCmd() + ", unexpected exception."; s_logger.warn(errMsg, e); throw new CloudRuntimeException(errMsg); - } - } - - @Override @DB - public void completeAsyncJob(long jobId, int jobStatus, int resultCode, Object resultObject) { + } + } + + @Override @DB + public void completeAsyncJob(long jobId, int jobStatus, int resultCode, Object resultObject) { if(s_logger.isDebugEnabled()) { - s_logger.debug("Complete async job-" + jobId + ", jobStatus: " + jobStatus + + s_logger.debug("Complete async job-" + jobId + ", jobStatus: " + jobStatus + ", resultCode: " + resultCode + ", result: " + resultObject); - } - - Transaction txt = Transaction.currentTxn(); - try { - txt.start(); - AsyncJobVO job = _jobDao.findById(jobId); - if(job == null) { + } + + Transaction txt = Transaction.currentTxn(); + try { + txt.start(); + AsyncJobVO job = _jobDao.findById(jobId); + if(job == null) { if(s_logger.isDebugEnabled()) { - s_logger.debug("job-" + jobId + " no longer exists, we just log completion info here. " + jobStatus + + s_logger.debug("job-" + jobId + " no longer exists, we just log completion info here. " + jobStatus + ", resultCode: " + resultCode + ", result: " + resultObject); - } - - txt.rollback(); - return; - } + } - job.setCompleteMsid(getMsid()); - job.setStatus(jobStatus); - job.setResultCode(resultCode); + txt.rollback(); + return; + } - // reset attached object - job.setInstanceType(null); - job.setInstanceId(null); + job.setCompleteMsid(getMsid()); + job.setStatus(jobStatus); + job.setResultCode(resultCode); + + // reset attached object + job.setInstanceType(null); + job.setInstanceId(null); if (resultObject != null) { job.setResult(ApiSerializerHelper.toSerializedStringOld(resultObject)); - } + } - job.setLastUpdated(DateUtil.currentGMTTime()); - _jobDao.update(jobId, job); - txt.commit(); - } catch(Exception e) { - s_logger.error("Unexpected exception while completing async job-" + jobId, e); - txt.rollback(); - } - } + job.setLastUpdated(DateUtil.currentGMTTime()); + _jobDao.update(jobId, job); + txt.commit(); + } catch(Exception e) { + s_logger.error("Unexpected exception while completing async job-" + jobId, e); + txt.rollback(); + } + } - @Override @DB - public void updateAsyncJobStatus(long jobId, int processStatus, Object resultObject) { + @Override @DB + public void updateAsyncJobStatus(long jobId, int processStatus, Object resultObject) { if(s_logger.isDebugEnabled()) { - s_logger.debug("Update async-job progress, job-" + jobId + ", processStatus: " + processStatus + + s_logger.debug("Update async-job progress, job-" + jobId + ", processStatus: " + processStatus + ", result: " + resultObject); - } - - Transaction txt = Transaction.currentTxn(); - try { - txt.start(); - AsyncJobVO job = _jobDao.findById(jobId); - if(job == null) { + } + + Transaction txt = Transaction.currentTxn(); + try { + txt.start(); + AsyncJobVO job = _jobDao.findById(jobId); + if(job == null) { if(s_logger.isDebugEnabled()) { s_logger.debug("job-" + jobId + " no longer exists, we just log progress info here. progress status: " + processStatus); - } - - txt.rollback(); - return; - } - - job.setProcessStatus(processStatus); + } + + txt.rollback(); + return; + } + + job.setProcessStatus(processStatus); if(resultObject != null) { job.setResult(ApiSerializerHelper.toSerializedStringOld(resultObject)); - } - job.setLastUpdated(DateUtil.currentGMTTime()); - _jobDao.update(jobId, job); - txt.commit(); - } catch(Exception e) { - s_logger.error("Unexpected exception while updating async job-" + jobId + " status: ", e); - txt.rollback(); - } - } + } + job.setLastUpdated(DateUtil.currentGMTTime()); + _jobDao.update(jobId, job); + txt.commit(); + } catch(Exception e) { + s_logger.error("Unexpected exception while updating async job-" + jobId + " status: ", e); + txt.rollback(); + } + } - @Override @DB - public void updateAsyncJobAttachment(long jobId, String instanceType, Long instanceId) { + @Override @DB + public void updateAsyncJobAttachment(long jobId, String instanceType, Long instanceId) { if(s_logger.isDebugEnabled()) { - s_logger.debug("Update async-job attachment, job-" + jobId + ", instanceType: " + instanceType + + s_logger.debug("Update async-job attachment, job-" + jobId + ", instanceType: " + instanceType + ", instanceId: " + instanceId); - } - - Transaction txt = Transaction.currentTxn(); - try { - txt.start(); + } - AsyncJobVO job = _jobDao.createForUpdate(); - //job.setInstanceType(instanceType); - job.setInstanceId(instanceId); - job.setLastUpdated(DateUtil.currentGMTTime()); - _jobDao.update(jobId, job); + Transaction txt = Transaction.currentTxn(); + try { + txt.start(); - txt.commit(); - } catch(Exception e) { - s_logger.error("Unexpected exception while updating async job-" + jobId + " attachment: ", e); - txt.rollback(); - } - } + AsyncJobVO job = _jobDao.createForUpdate(); + //job.setInstanceType(instanceType); + job.setInstanceId(instanceId); + job.setLastUpdated(DateUtil.currentGMTTime()); + _jobDao.update(jobId, job); - @Override + txt.commit(); + } catch(Exception e) { + s_logger.error("Unexpected exception while updating async job-" + jobId + " attachment: ", e); + txt.rollback(); + } + } + + @Override public void syncAsyncJobExecution(AsyncJob job, String syncObjType, long syncObjId, long queueSizeLimit) { // This method is re-entrant. If an API developer wants to synchronized on an object, e.g. the router, // when executing business logic, they will call this method (actually a method in BaseAsyncCmd that calls this). @@ -317,60 +317,60 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, return _jobDao.findById(cmd.getId()); } - @Override @DB - public AsyncJobResult queryAsyncJobResult(long jobId) { + @Override @DB + public AsyncJobResult queryAsyncJobResult(long jobId) { if(s_logger.isTraceEnabled()) { s_logger.trace("Query async-job status, job-" + jobId); - } - - Transaction txt = Transaction.currentTxn(); - AsyncJobResult jobResult = new AsyncJobResult(jobId); - - try { - txt.start(); - AsyncJobVO job = _jobDao.findById(jobId); - if(job != null) { - jobResult.setCmdOriginator(job.getCmdOriginator()); - jobResult.setJobStatus(job.getStatus()); - jobResult.setProcessStatus(job.getProcessStatus()); - jobResult.setResult(job.getResult()); + } + + Transaction txt = Transaction.currentTxn(); + AsyncJobResult jobResult = new AsyncJobResult(jobId); + + try { + txt.start(); + AsyncJobVO job = _jobDao.findById(jobId); + if(job != null) { + jobResult.setCmdOriginator(job.getCmdOriginator()); + jobResult.setJobStatus(job.getStatus()); + jobResult.setProcessStatus(job.getProcessStatus()); + jobResult.setResult(job.getResult()); jobResult.setResultCode(job.getResultCode()); - jobResult.setUuid(job.getUuid()); - - if(job.getStatus() == AsyncJobResult.STATUS_SUCCEEDED || - job.getStatus() == AsyncJobResult.STATUS_FAILED) { - + jobResult.setUuid(job.getUuid()); + + if(job.getStatus() == AsyncJobResult.STATUS_SUCCEEDED || + job.getStatus() == AsyncJobResult.STATUS_FAILED) { + if(s_logger.isDebugEnabled()) { s_logger.debug("Async job-" + jobId + " completed"); - } - } else { - job.setLastPolled(DateUtil.currentGMTTime()); - _jobDao.update(jobId, job); - } - } else { + } + } else { + job.setLastPolled(DateUtil.currentGMTTime()); + _jobDao.update(jobId, job); + } + } else { if(s_logger.isDebugEnabled()) { s_logger.debug("Async job-" + jobId + " does not exist, invalid job id?"); - } - - jobResult.setJobStatus(AsyncJobResult.STATUS_FAILED); - jobResult.setResult("job-" + jobId + " does not exist"); - } - txt.commit(); - } catch(Exception e) { - s_logger.error("Unexpected exception while querying async job-" + jobId + " status: ", e); - - jobResult.setJobStatus(AsyncJobResult.STATUS_FAILED); - jobResult.setResult("Exception: " + e.toString()); - txt.rollback(); - } - + } + + jobResult.setJobStatus(AsyncJobResult.STATUS_FAILED); + jobResult.setResult("job-" + jobId + " does not exist"); + } + txt.commit(); + } catch(Exception e) { + s_logger.error("Unexpected exception while querying async job-" + jobId + " status: ", e); + + jobResult.setJobStatus(AsyncJobResult.STATUS_FAILED); + jobResult.setResult("Exception: " + e.toString()); + txt.rollback(); + } + if(s_logger.isTraceEnabled()) { s_logger.trace("Job status: " + jobResult.toString()); - } - - return jobResult; + } + + return jobResult; } - + private void scheduleExecution(final AsyncJobVO job) { scheduleExecution(job, false); } @@ -509,7 +509,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, } }; } - + private void executeQueueItem(SyncQueueItemVO item, boolean fromPreviousSession) { AsyncJobVO job = _jobDao.findById(item.getContentId()); if (job != null) { @@ -539,59 +539,59 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, } } - @Override - public void releaseSyncSource(AsyncJobExecutor executor) { - if(executor.getSyncSource() != null) { + @Override + public void releaseSyncSource(AsyncJobExecutor executor) { + if(executor.getSyncSource() != null) { if(s_logger.isDebugEnabled()) { - s_logger.debug("Release sync source for job-" + executor.getJob().getId() + " sync source: " - + executor.getSyncSource().getContentType() + "-" + s_logger.debug("Release sync source for job-" + executor.getJob().getId() + " sync source: " + + executor.getSyncSource().getContentType() + "-" + executor.getSyncSource().getContentId()); - } - - _queueMgr.purgeItem(executor.getSyncSource().getId()); - checkQueue(executor.getSyncSource().getQueueId()); - } - } - - private void checkQueue(long queueId) { - while(true) { - try { - SyncQueueItemVO item = _queueMgr.dequeueFromOne(queueId, getMsid()); - if(item != null) { + } + + _queueMgr.purgeItem(executor.getSyncSource().getId()); + checkQueue(executor.getSyncSource().getQueueId()); + } + } + + private void checkQueue(long queueId) { + while(true) { + try { + SyncQueueItemVO item = _queueMgr.dequeueFromOne(queueId, getMsid()); + if(item != null) { if(s_logger.isDebugEnabled()) { s_logger.debug("Executing sync queue item: " + item.toString()); - } - - executeQueueItem(item, false); - } else { - break; - } - } catch(Throwable e) { - s_logger.error("Unexpected exception when kicking sync queue-" + queueId, e); - break; - } - } - } - - private Runnable getHeartbeatTask() { - return new Runnable() { + } + + executeQueueItem(item, false); + } else { + break; + } + } catch(Throwable e) { + s_logger.error("Unexpected exception when kicking sync queue-" + queueId, e); + break; + } + } + } + + private Runnable getHeartbeatTask() { + return new Runnable() { @Override - public void run() { + public void run() { try { - List l = _queueMgr.dequeueFromAny(getMsid(), MAX_ONETIME_SCHEDULE_SIZE); - if(l != null && l.size() > 0) { - for(SyncQueueItemVO item: l) { + List l = _queueMgr.dequeueFromAny(getMsid(), MAX_ONETIME_SCHEDULE_SIZE); + if(l != null && l.size() > 0) { + for(SyncQueueItemVO item: l) { if(s_logger.isDebugEnabled()) { s_logger.debug("Execute sync-queue item: " + item.toString()); } executeQueueItem(item, false); - } - } - } catch(Throwable e) { - s_logger.error("Unexpected exception when trying to execute queue item, ", e); - } - } - }; + } + } + } catch(Throwable e) { + s_logger.error("Unexpected exception when trying to execute queue item, ", e); + } + } + }; } @DB @@ -651,7 +651,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, }; } - + @DB protected void expungeAsyncJob(AsyncJobVO job) { Transaction txn = Transaction.currentTxn(); @@ -662,13 +662,13 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, txn.commit(); } - private long getMsid() { + private long getMsid() { if(_clusterMgr != null) { return _clusterMgr.getManagementNodeId(); - } - - return MacAddress.getMacAddress().toLong(); - } + } + + return MacAddress.getMacAddress().toLong(); + } private void cleanupPendingJobs(List l) { if(l != null && l.size() > 0) { @@ -688,10 +688,10 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, _queueMgr.purgeItem(item.getId()); } } - } - - @Override - public boolean configure(String name, Map params) throws ConfigurationException { + } + + @Override + public boolean configure(String name, Map params) throws ConfigurationException { int expireMinutes = NumbersUtil.parseInt( _configDao.getValue(Config.JobExpireMinutes.key()), 24*60); _jobExpireSeconds = (long)expireMinutes*60; @@ -715,7 +715,7 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, throw new ConfigurationException("Unable to load db.properties to configure AsyncJobManagerImpl"); } - return true; + return true; } @Override @@ -744,23 +744,23 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, @Override public void onManagementNodeIsolated() { } - - @Override + + @Override public boolean start() { - try { + try { List l = _queueMgr.getActiveQueueItems(getMsid(), false); cleanupPendingJobs(l); _jobDao.resetJobProcess(getMsid(), ApiErrorCode.INTERNAL_ERROR.getHttpCode(), getSerializedErrorMessage("job cancelled because of management server restart")); } catch(Throwable e) { s_logger.error("Unexpected exception " + e.getMessage(), e); } - - _heartbeatScheduler.scheduleAtFixedRate(getHeartbeatTask(), HEARTBEAT_INTERVAL, + + _heartbeatScheduler.scheduleAtFixedRate(getHeartbeatTask(), HEARTBEAT_INTERVAL, HEARTBEAT_INTERVAL, TimeUnit.MILLISECONDS); _heartbeatScheduler.scheduleAtFixedRate(getGCTask(), GC_INTERVAL, GC_INTERVAL, TimeUnit.MILLISECONDS); - - return true; + + return true; } private static ExceptionResponse getResetResultResponse(String errorMessage) { @@ -772,12 +772,12 @@ public class AsyncJobManagerImpl extends ManagerBase implements AsyncJobManager, private static String getSerializedErrorMessage(String errorMessage) { return ApiSerializerHelper.toSerializedStringOld(getResetResultResponse(errorMessage)); - } - - @Override - public boolean stop() { - _heartbeatScheduler.shutdown(); - _executor.shutdown(); - return true; - } -} + } + + @Override + public boolean stop() { + _heartbeatScheduler.shutdown(); + _executor.shutdown(); + return true; + } +} diff --git a/server/src/com/cloud/async/SyncQueueManager.java b/server/src/com/cloud/async/SyncQueueManager.java index a7032daaa47..2641a10ab89 100644 --- a/server/src/com/cloud/async/SyncQueueManager.java +++ b/server/src/com/cloud/async/SyncQueueManager.java @@ -20,16 +20,16 @@ import java.util.List; import com.cloud.utils.component.Manager; - -public interface SyncQueueManager extends Manager { - public SyncQueueVO queue(String syncObjType, long syncObjId, String itemType, long itemId, long queueSizeLimit); - public SyncQueueItemVO dequeueFromOne(long queueId, Long msid); - public List dequeueFromAny(Long msid, int maxItems); - public void purgeItem(long queueItemId); + +public interface SyncQueueManager extends Manager { + public SyncQueueVO queue(String syncObjType, long syncObjId, String itemType, long itemId, long queueSizeLimit); + public SyncQueueItemVO dequeueFromOne(long queueId, Long msid); + public List dequeueFromAny(Long msid, int maxItems); + public void purgeItem(long queueItemId); public void returnItem(long queueItemId); - + public List getActiveQueueItems(Long msid, boolean exclusive); public List getBlockedQueueItems(long thresholdMs, boolean exclusive); void purgeAsyncJobQueueItemId(long asyncJobId); -} +} diff --git a/server/src/com/cloud/async/SyncQueueManagerImpl.java b/server/src/com/cloud/async/SyncQueueManagerImpl.java index aaa4c9bfca2..14e24b1e75d 100644 --- a/server/src/com/cloud/async/SyncQueueManagerImpl.java +++ b/server/src/com/cloud/async/SyncQueueManagerImpl.java @@ -36,7 +36,7 @@ import com.cloud.utils.db.DB; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; -@Component +@Component @Local(value={SyncQueueManager.class}) public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManager { public static final Logger s_logger = Logger.getLogger(SyncQueueManagerImpl.class.getName()); @@ -46,7 +46,7 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage @Override @DB - public SyncQueueVO queue(String syncObjType, long syncObjId, String itemType, long itemId, long queueSizeLimit) { + public SyncQueueVO queue(String syncObjType, long syncObjId, String itemType, long itemId, long queueSizeLimit) { Transaction txn = Transaction.currentTxn(); try { txn.start(); @@ -57,7 +57,7 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage throw new CloudRuntimeException("Unable to queue item into DB, DB is full?"); queueVO.setQueueSizeLimit(queueSizeLimit); - _syncQueueDao.update(queueVO.getId(), queueVO); + _syncQueueDao.update(queueVO.getId(), queueVO); Date dt = DateUtil.currentGMTTime(); SyncQueueItemVO item = new SyncQueueItemVO(); @@ -91,7 +91,7 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage return null; } - if(queueReadyToProcess(queueVO)) { + if(queueReadyToProcess(queueVO)) { SyncQueueItemVO itemVO = _syncQueueItemDao.getNextQueueItem(queueVO.getId()); if(itemVO != null) { Long processNumber = queueVO.getLastProcessNumber(); @@ -102,12 +102,12 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage Date dt = DateUtil.currentGMTTime(); queueVO.setLastProcessNumber(processNumber); queueVO.setLastUpdated(dt); - queueVO.setQueueSize(queueVO.getQueueSize() + 1); + queueVO.setQueueSize(queueVO.getQueueSize() + 1); _syncQueueDao.update(queueVO.getId(), queueVO); itemVO.setLastProcessMsid(msid); itemVO.setLastProcessNumber(processNumber); - itemVO.setLastProcessTime(dt); + itemVO.setLastProcessTime(dt); _syncQueueItemDao.update(itemVO.getId(), itemVO); txt.commit(); @@ -143,7 +143,7 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage for(SyncQueueItemVO item : l) { SyncQueueVO queueVO = _syncQueueDao.lockRow(item.getQueueId(), true); SyncQueueItemVO itemVO = _syncQueueItemDao.lockRow(item.getId(), true); - if(queueReadyToProcess(queueVO) && itemVO.getLastProcessNumber() == null) { + if(queueReadyToProcess(queueVO) && itemVO.getLastProcessNumber() == null) { Long processNumber = queueVO.getLastProcessNumber(); if(processNumber == null) processNumber = new Long(1); @@ -153,12 +153,12 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage Date dt = DateUtil.currentGMTTime(); queueVO.setLastProcessNumber(processNumber); queueVO.setLastUpdated(dt); - queueVO.setQueueSize(queueVO.getQueueSize() + 1); + queueVO.setQueueSize(queueVO.getQueueSize() + 1); _syncQueueDao.update(queueVO.getId(), queueVO); itemVO.setLastProcessMsid(msid); itemVO.setLastProcessNumber(processNumber); - itemVO.setLastProcessTime(dt); + itemVO.setLastProcessTime(dt); _syncQueueItemDao.update(item.getId(), itemVO); resultList.add(item); @@ -195,7 +195,7 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage queueVO.setQueueSize(queueVO.getQueueSize() - 1); _syncQueueDao.update(queueVO.getId(), queueVO); } - } + } txt.commit(); } catch(Exception e) { s_logger.error("Unexpected exception: ", e); @@ -249,5 +249,5 @@ public class SyncQueueManagerImpl extends ManagerBase implements SyncQueueManage if (itemId != null) { purgeItem(itemId); } - } + } } diff --git a/server/src/com/cloud/async/dao/SyncQueueDao.java b/server/src/com/cloud/async/dao/SyncQueueDao.java index 816f9dd1c30..edd695c9fb8 100644 --- a/server/src/com/cloud/async/dao/SyncQueueDao.java +++ b/server/src/com/cloud/async/dao/SyncQueueDao.java @@ -22,4 +22,4 @@ import com.cloud.utils.db.GenericDao; public interface SyncQueueDao extends GenericDao{ public void ensureQueue(String syncObjType, long syncObjId); public SyncQueueVO find(String syncObjType, long syncObjId); -} +} diff --git a/server/src/com/cloud/async/dao/SyncQueueItemDao.java b/server/src/com/cloud/async/dao/SyncQueueItemDao.java index 6b9da8b63ea..b5a4eabdcc0 100644 --- a/server/src/com/cloud/async/dao/SyncQueueItemDao.java +++ b/server/src/com/cloud/async/dao/SyncQueueItemDao.java @@ -26,5 +26,5 @@ public interface SyncQueueItemDao extends GenericDao { public List getNextQueueItems(int maxItems); public List getActiveQueueItems(Long msid, boolean exclusive); public List getBlockedQueueItems(long thresholdMs, boolean exclusive); - public Long getQueueItemIdByContentIdAndType(long contentId, String contentType); -} + public Long getQueueItemIdByContentIdAndType(long contentId, String contentType); +} diff --git a/server/src/com/cloud/configuration/Config.java b/server/src/com/cloud/configuration/Config.java index 200943b35e6..dbcbc5332d0 100755 --- a/server/src/com/cloud/configuration/Config.java +++ b/server/src/com/cloud/configuration/Config.java @@ -19,6 +19,7 @@ package com.cloud.configuration; import java.util.ArrayList; import java.util.HashMap; import java.util.List; +import java.util.StringTokenizer; import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; @@ -28,6 +29,7 @@ import com.cloud.ha.HighAvailabilityManager; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.NetworkManager; import com.cloud.network.router.VpcVirtualNetworkApplianceManager; +import com.cloud.network.vpc.VpcManager; import com.cloud.server.ManagementServer; import com.cloud.storage.StorageManager; import com.cloud.storage.secondary.SecondaryStorageVmManager; @@ -36,10 +38,6 @@ import com.cloud.template.TemplateManager; import com.cloud.vm.UserVmManager; import com.cloud.vm.snapshot.VMSnapshotManager; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; - public enum Config { // Alert @@ -196,7 +194,7 @@ public enum Config { CPUOverprovisioningFactor("Advanced", ManagementServer.class, String.class, "cpu.overprovisioning.factor", "1", "Used for CPU overprovisioning calculation; available CPU will be (actualCpuCapacity * cpu.overprovisioning.factor)", null), MemOverprovisioningFactor("Advanced", ManagementServer.class, String.class, "mem.overprovisioning.factor", "1", "Used for memory overprovisioning calculation", null), LinkLocalIpNums("Advanced", ManagementServer.class, Integer.class, "linkLocalIp.nums", "10", "The number of link local ip that needed by domR(in power of 2)", null), - HypervisorList("Advanced", ManagementServer.class, String.class, "hypervisor.list", HypervisorType.KVM + "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.BareMetal + "," + HypervisorType.Ovm, "The list of hypervisors that this deployment will use.", "hypervisorList"), + HypervisorList("Advanced", ManagementServer.class, String.class, "hypervisor.list", HypervisorType.KVM + "," + HypervisorType.XenServer + "," + HypervisorType.VMware + "," + HypervisorType.BareMetal + "," + HypervisorType.Ovm + "," + HypervisorType.LXC, "The list of hypervisors that this deployment will use.", "hypervisorList"), ManagementHostIPAdr("Advanced", ManagementServer.class, String.class, "host", "localhost", "The ip address of management server", null), ManagementNetwork("Advanced", ManagementServer.class, String.class, "management.network.cidr", null, "The cidr of management server network", null), EventPurgeDelay("Advanced", ManagementServer.class, Integer.class, "event.purge.delay", "15", "Events older than specified number days will be purged. Set this value to 0 to never delete events", null), @@ -276,6 +274,7 @@ public enum Config { VmwareRootDiskControllerType("Advanced", ManagementServer.class, String.class, "vmware.root.disk.controller", "ide", "Specify the default disk controller for root volumes, valid values are scsi, ide", null), VmwareSystemVmNicDeviceType("Advanced", ManagementServer.class, String.class, "vmware.systemvm.nic.device.type", "E1000", "Specify the default network device type for system VMs, valid values are E1000, PCNet32, Vmxnet2, Vmxnet3", null), VmwareRecycleHungWorker("Advanced", ManagementServer.class, Boolean.class, "vmware.recycle.hung.wokervm", "false", "Specify whether or not to recycle hung worker VMs", null), + VmwareEnableNestedVirtualization("Advanced", ManagementServer.class, Boolean.class, "vmware.nested.virtualization", "false", "When set to true this will enable nested virtualization when this is supported by the hypervisor", null), // Midonet MidoNetAPIServerAddress("Network", ManagementServer.class, String.class, "midonet.apiserver.address", "http://localhost:8081", "Specify the address at which the Midonet API server can be contacted (if using Midonet)", null), @@ -304,6 +303,8 @@ public enum Config { SSOAuthTolerance("Advanced", ManagementServer.class, Long.class, "security.singlesignon.tolerance.millis", "300000", "The allowable clock difference in milliseconds between when an SSO login request is made and when it is received.", null), //NetworkType("Hidden", ManagementServer.class, String.class, "network.type", "vlan", "The type of network that this deployment will use.", "vlan,direct"), HashKey("Hidden", ManagementServer.class, String.class, "security.hash.key", null, "for generic key-ed hash", null), + EncryptionKey("Hidden", ManagementServer.class, String.class, "security.encryption.key", null, "base64 encoded key data", null), + EncryptionIV("Hidden", ManagementServer.class, String.class, "security.encryption.iv", null, "base64 encoded IV data", null), RouterRamSize("Hidden", NetworkManager.class, Integer.class, "router.ram.size", "128", "Default RAM for router VM (in MB).", null), VmOpWaitInterval("Advanced", ManagementServer.class, Integer.class, "vm.op.wait.interval", "120", "Time (in seconds) to wait before checking if a previous operation has succeeded", null), @@ -336,7 +337,7 @@ public enum Config { //disabling lb as cluster sync does not work with distributed cluster AgentLbEnable("Advanced", ManagementServer.class, Boolean.class, "agent.lb.enabled", "false", "If agent load balancing enabled in cluster setup", null), SubDomainNetworkAccess("Advanced", NetworkManager.class, Boolean.class, "allow.subdomain.network.access", "true", "Allow subdomains to use networks dedicated to their parent domain(s)", null), - UseExternalDnsServers("Advanced", NetworkManager.class, Boolean.class, "use.external.dns", "false", "Bypass internal dns, use external dns1 and dns2", null), + UseExternalDnsServers("Advanced", NetworkManager.class, Boolean.class, "use.external.dns", "false", "Bypass internal dns, use external dns1 and dns2", null, ConfigurationParameterScope.zone.toString()), EncodeApiResponse("Advanced", ManagementServer.class, Boolean.class, "encode.api.response", "false", "Do URL encoding for the api response, false by default", null), DnsBasicZoneUpdates("Advanced", NetworkManager.class, String.class, "network.dns.basiczone.updates", "all", "This parameter can take 2 values: all (default) and pod. It defines if DHCP/DNS requests have to be send to all dhcp servers in cloudstack, or only to the one in the same pod", "all,pod"), @@ -397,11 +398,12 @@ public enum Config { // VMSnapshots VMSnapshotMax("Advanced", VMSnapshotManager.class, Integer.class, "vmsnapshot.max", "10", "Maximum vm snapshots for a vm", null), - VMSnapshotCreateWait("Advanced", VMSnapshotManager.class, Integer.class, "vmsnapshot.create.wait", "600", "In second, timeout for create vm snapshot", null), - VMSnapshotExpungeInterval("Advanced", VMSnapshotManager.class, Integer.class, "vmsnapshot.expunge.interval", "60", "The interval (in seconds) to wait before running the expunge thread.", null), - VMSnapshotExpungeWorkers("Advanced", VMSnapshotManager.class, Integer.class, "vmsnapshot.expunge.workers", "1", "Number of workers performing expunge ", null), + VMSnapshotCreateWait("Advanced", VMSnapshotManager.class, Integer.class, "vmsnapshot.create.wait", "1800", "In second, timeout for create vm snapshot", null), - CloudDnsName("Advanced", ManagementServer.class, String.class, "cloud.dns.name", "default", " DNS name of the cloud", null); + CloudDnsName("Advanced", ManagementServer.class, String.class, "cloud.dns.name", "default", " DNS name of the cloud", null), + + BlacklistedRoutes("Advanced", VpcManager.class, String.class, "blacklisted.routes", null, "Routes that are blacklisted, can not be used for Static Routes creation for the VPC Private Gateway", + "routes", ConfigurationParameterScope.zone.toString()); private final String _category; @@ -411,6 +413,35 @@ public enum Config { private final String _defaultValue; private final String _description; private final String _range; + private final String _scope; // Parameter can be at different levels (Zone/cluster/pool/account), by default every parameter is at global + + public static enum ConfigurationParameterScope { + global, + zone, + cluster, + pool, + account + } + + private static final HashMap> _scopeLevelConfigsMap = new HashMap>(); + static { + _scopeLevelConfigsMap.put(ConfigurationParameterScope.zone.toString(), new ArrayList()); + _scopeLevelConfigsMap.put(ConfigurationParameterScope.cluster.toString(), new ArrayList()); + _scopeLevelConfigsMap.put(ConfigurationParameterScope.pool.toString(), new ArrayList()); + _scopeLevelConfigsMap.put(ConfigurationParameterScope.account.toString(), new ArrayList()); + _scopeLevelConfigsMap.put(ConfigurationParameterScope.global.toString(), new ArrayList()); + + for (Config c : Config.values()) { + //Creating group of parameters per each level (zone/cluster/pool/account) + StringTokenizer tokens = new StringTokenizer(c.getScope(), ","); + while (tokens.hasMoreTokens()) { + String scope = tokens.nextToken().trim(); + List currentConfigs = _scopeLevelConfigsMap.get(scope); + currentConfigs.add(c); + _scopeLevelConfigsMap.put(scope, currentConfigs); + } + } + } private static final HashMap> _configs = new HashMap>(); static { @@ -446,6 +477,17 @@ public enum Config { _defaultValue = defaultValue; _description = description; _range = range; + _scope = ConfigurationParameterScope.global.toString(); + } + private Config(String category, Class componentClass, Class type, String name, String defaultValue, String description, String range, String scope) { + _category = category; + _componentClass = componentClass; + _type = type; + _name = name; + _defaultValue = defaultValue; + _description = description; + _range = range; + _scope = scope; } public String getCategory() { @@ -472,6 +514,10 @@ public enum Config { return _componentClass; } + public String getScope() { + return _scope; + } + public String getComponent() { if (_componentClass == ManagementServer.class) { return "management-server"; @@ -489,6 +535,8 @@ public enum Config { return "StorageManager"; } else if (_componentClass == TemplateManager.class) { return "TemplateManager"; + } else if (_componentClass == VpcManager.class) { + return "VpcManager"; }else { return "none"; } @@ -529,4 +577,8 @@ public enum Config { } return categories; } + + public static List getConfigListByScope(String scope) { + return _scopeLevelConfigsMap.get(scope); + } } diff --git a/server/src/com/cloud/configuration/ConfigurationManager.java b/server/src/com/cloud/configuration/ConfigurationManager.java old mode 100644 new mode 100755 index 20e98845ac0..738c5bab35d --- a/server/src/com/cloud/configuration/ConfigurationManager.java +++ b/server/src/com/cloud/configuration/ConfigurationManager.java @@ -30,6 +30,7 @@ import com.cloud.dc.Vlan; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceAllocationException; import com.cloud.network.Network; import com.cloud.network.Network.Capability; import com.cloud.network.Network.Provider; @@ -59,7 +60,7 @@ public interface ConfigurationManager extends ConfigurationService, Manager { * @param name * @param value */ - void updateConfiguration(long userId, String name, String category, String value); + void updateConfiguration(long userId, String name, String category, String value, String scope, Long id); /** * Creates a new service offering @@ -149,6 +150,8 @@ public interface ConfigurationManager extends ConfigurationService, Manager { */ boolean deleteVlanAndPublicIpRange(long userId, long vlanDbId, Account caller); + boolean releasePublicIpRange(long userId, long vlanDbId, Account caller); + /** * Converts a comma separated list of tags to a List * @@ -210,7 +213,7 @@ public interface ConfigurationManager extends ConfigurationService, Manager { ClusterVO getCluster(long id); - boolean deleteAccountSpecificVirtualRanges(long accountId); + boolean releaseAccountSpecificVirtualRanges(long accountId); /** * Edits a pod in the database. Will not allow you to edit pods that are being used anywhere in the system. diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 8dbf08178d4..d5e405d5395 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -39,6 +39,7 @@ import javax.naming.NamingException; import javax.naming.directory.DirContext; import javax.naming.directory.InitialDirContext; +import com.cloud.dc.dao.*; import org.apache.cloudstack.acl.SecurityChecker; import org.apache.cloudstack.api.ApiConstants.LDAPParams; import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd; @@ -56,7 +57,9 @@ import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd; import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd; import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd; import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd; import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd; import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd; import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd; @@ -76,20 +79,13 @@ import com.cloud.dc.DataCenter.NetworkType; import com.cloud.dc.DataCenterIpAddressVO; import com.cloud.dc.DataCenterLinkLocalIpAddressVO; import com.cloud.dc.DataCenterVO; +import com.cloud.dc.DcDetailVO; import com.cloud.dc.HostPodVO; import com.cloud.dc.Pod; import com.cloud.dc.PodVlanMapVO; import com.cloud.dc.Vlan; import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.VlanVO; -import com.cloud.dc.dao.AccountVlanMapDao; -import com.cloud.dc.dao.ClusterDao; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.dc.dao.DataCenterIpAddressDao; -import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDao; -import com.cloud.dc.dao.HostPodDao; -import com.cloud.dc.dao.PodVlanMapDao; -import com.cloud.dc.dao.VlanDao; import com.cloud.deploy.DataCenterDeployment; import com.cloud.domain.Domain; import com.cloud.domain.DomainVO; @@ -186,6 +182,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati @Inject DataCenterDao _zoneDao; @Inject + DcDetailsDao _zoneDetailsDao; + @Inject DomainDao _domainDao; @Inject SwiftDao _swiftDao; @@ -325,15 +323,37 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati @Override @DB - public void updateConfiguration(long userId, String name, String category, String value) { + public void updateConfiguration(long userId, String name, String category, String value, String scope, Long resourceId) { - String validationMsg = validateConfigurationValue(name, value); + String validationMsg = validateConfigurationValue(name, value, scope); if (validationMsg != null) { s_logger.error("Invalid configuration option, name: " + name + ", value:" + value); throw new InvalidParameterValueException(validationMsg); } + // If scope of the parameter is given then it needs to be updated in the corresponding details table, + // if scope is mentioned as global or not mentioned then it is normal global parameter updation + if (scope != null && !scope.isEmpty() && !Config.ConfigurationParameterScope.global.toString().equalsIgnoreCase(scope)) { + if (Config.ConfigurationParameterScope.zone.toString().equalsIgnoreCase(scope)) { + DataCenterVO zone = _zoneDao.findById(resourceId); + if (zone == null) { + throw new InvalidParameterValueException("unable to find zone by id " + resourceId); + } + DcDetailVO dcDetailVO = _zoneDetailsDao.findDetail(resourceId, name.toLowerCase()); + if (dcDetailVO == null) { + dcDetailVO = new DcDetailVO(zone.getId(), name, value); + _zoneDetailsDao.persist(dcDetailVO); + } else { + dcDetailVO.setValue(value); + _zoneDetailsDao.update(resourceId, dcDetailVO); + } + } else { + s_logger.error("TO Do for the remaining levels (cluster/pool/account)"); + throw new InvalidParameterValueException("The scope "+ scope +" yet to be implemented"); + } + } + // Execute all updates in a single transaction Transaction txn = Transaction.currentTxn(); txn.start(); @@ -438,6 +458,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati Long userId = UserContext.current().getCallerUserId(); String name = cmd.getCfgName(); String value = cmd.getValue(); + String scope = cmd.getScope(); + Long id = cmd.getId(); UserContext.current().setEventDetails(" Name: " + name + " New Value: " + (((name.toLowerCase()).contains("password")) ? "*****" : (((value == null) ? "" : value)))); // check if config value exists @@ -454,7 +476,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati value = null; } - updateConfiguration(userId, name, config.getCategory(), value); + updateConfiguration(userId, name, config.getCategory(), value, scope, id); String updatedValue = _configDao.getValue(name); if ((value == null && updatedValue == null) || updatedValue.equalsIgnoreCase(value)) { return _configDao.findByName(name); @@ -464,13 +486,20 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } - private String validateConfigurationValue(String name, String value) { + private String validateConfigurationValue(String name, String value, String scope) { Config c = Config.getConfig(name); if (c == null) { s_logger.error("Missing configuration variable " + name + " in configuration table"); return "Invalid configuration variable."; } + String configScope = c.getScope(); + if (scope != null && !scope.isEmpty()) { + if (!configScope.contains(scope)) { + s_logger.error("Invalid scope " + scope + " for the parameter " + name); + return "Invalid scope for the parameter."; + } + } Class type = c.getType(); @@ -555,6 +584,17 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (!NetUtils.verifyInstanceName(value)) { return "Instance name can not contain hyphen, spaces and plus sign"; } + } else if (range.equals("routes")) { + String[] routes = value.split(","); + for (String route : routes) { + if (route != null) { + String routeToVerify = route.trim(); + if (!NetUtils.isValidCIDR(routeToVerify)) { + throw new InvalidParameterValueException("Invalid value for blacklisted route: " + route + ". Valid format is list" + + " of cidrs separated by coma. Example: 10.1.1.0/24,192.168.0.0/24"); + } + } + } } else { String[] options = range.split(","); for (String option : options) { @@ -2152,6 +2192,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati vlanOwner = _accountDao.findActiveAccount(accountName, domainId); if (vlanOwner == null) { throw new InvalidParameterValueException("Please specify a valid account."); + } else if (vlanOwner.getId() == Account.ACCOUNT_ID_SYSTEM) { + // by default vlan is dedicated to system account + vlanOwner = null; } } @@ -2306,9 +2349,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati throw new InvalidParameterValueException("Gateway, netmask and zoneId have to be passed in for virtual and direct untagged networks"); } - // if it's an account specific range, associate ip address list to the account - boolean associateIpRangeToAccount = false; - if (forVirtualNetwork) { if (vlanOwner != null) { @@ -2316,8 +2356,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati //check resource limits _resourceLimitMgr.checkResourceLimit(vlanOwner, ResourceType.public_ip, accountIpRange); - - associateIpRangeToAccount = true; } } @@ -2332,21 +2370,6 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati endIP, vlanGateway, vlanNetmask, vlanId, vlanOwner, startIPv6, endIPv6, ip6Gateway, ip6Cidr); txn.commit(); - if (associateIpRangeToAccount) { - _networkMgr.associateIpAddressListToAccount(userId, vlanOwner.getId(), zoneId, vlan.getId(), null); - } - - // Associate ips to the network - if (associateIpRangeToAccount) { - if (network.getState() == Network.State.Implemented) { - s_logger.debug("Applying ip associations for vlan id=" + vlanId + " in network " + network); - if (!_networkMgr.applyIpAssociations(network, false)) { - s_logger.warn("Failed to apply ip associations for vlan id=1 as a part of add vlan range for account id=" + vlanOwner.getId()); - } - } else { - s_logger.trace("Network id=" + network.getId() + " is not Implemented, no need to apply ipAssociations"); - } - } return vlan; } @@ -2648,7 +2671,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (vlan == null) { throw new CloudRuntimeException("Unable to acquire vlan configuration: " + vlanDbId); } - + if (s_logger.isDebugEnabled()) { s_logger.debug("lock vlan " + vlanDbId + " is acquired"); } @@ -2661,9 +2684,9 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati " as ip " + ip + " belonging to the range is used for static nat purposes. Cleanup the rules first"); } - if (ip.isSourceNat() && _networkModel.getNetwork(ip.getAssociatedWithNetworkId()) != null) { - throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + - " as ip " + ip + " belonging to the range is a source nat ip for the network id=" + ip.getSourceNetworkId() + + if (ip.isSourceNat()) { + throw new InvalidParameterValueException("Can't delete account specific vlan " + vlanDbId + + " as ip " + ip + " belonging to the range is a source nat ip for the network id=" + ip.getSourceNetworkId() + ". IP range with the source nat ip address can be removed either as a part of Network, or account removal"); } @@ -2698,6 +2721,150 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati } } + @Override + @DB + @ActionEvent(eventType = EventTypes.EVENT_VLAN_IP_RANGE_DEDICATE, eventDescription = "dedicating vlan ip range", async = false) + public Vlan dedicatePublicIpRange(DedicatePublicIpRangeCmd cmd) throws ResourceAllocationException { + Long vlanDbId = cmd.getId(); + String accountName = cmd.getAccountName(); + Long domainId = cmd.getDomainId(); + Long projectId = cmd.getProjectId(); + + // Check if account is valid + Account vlanOwner = null; + if (projectId != null) { + if (accountName != null) { + throw new InvalidParameterValueException("accountName and projectId are mutually exclusive"); + } + Project project = _projectMgr.getProject(projectId); + if (project == null) { + throw new InvalidParameterValueException("Unable to find project by id " + projectId); + } + vlanOwner = _accountMgr.getAccount(project.getProjectAccountId()); + } + + if ((accountName != null) && (domainId != null)) { + vlanOwner = _accountDao.findActiveAccount(accountName, domainId); + if (vlanOwner == null) { + throw new InvalidParameterValueException("Unable to find account by name " + accountName); + } else if (vlanOwner.getId() == Account.ACCOUNT_ID_SYSTEM) { + throw new InvalidParameterValueException("Please specify a valid account. Cannot dedicate IP range to system account"); + } + } + + // Check if range is valid + VlanVO vlan = _vlanDao.findById(vlanDbId); + if (vlan == null) { + throw new InvalidParameterValueException("Unable to find vlan by id " + vlanDbId); + } + + // Check if range has already been dedicated + List maps = _accountVlanMapDao.listAccountVlanMapsByVlan(vlanDbId); + if (maps != null && !maps.isEmpty()) { + throw new InvalidParameterValueException("Specified Public IP range has already been dedicated"); + } + + // Verify that zone exists and is advanced + Long zoneId = vlan.getDataCenterId(); + DataCenterVO zone = _zoneDao.findById(zoneId); + if (zone == null) { + throw new InvalidParameterValueException("Unable to find zone by id " + zoneId); + } + if (zone.getNetworkType() == NetworkType.Basic) { + throw new InvalidParameterValueException("Public IP range can be dedicated to an account only in the zone of type " + NetworkType.Advanced); + } + + // Check Public IP resource limits + int accountPublicIpRange = _publicIpAddressDao.countIPs(zoneId, vlanDbId, false); + _resourceLimitMgr.checkResourceLimit(vlanOwner, ResourceType.public_ip, accountPublicIpRange); + + // Check if any of the Public IP addresses is allocated to another account + List ips = _publicIpAddressDao.listByVlanId(vlanDbId); + for (IPAddressVO ip : ips) { + Long allocatedToAccountId = ip.getAllocatedToAccountId(); + if (allocatedToAccountId != null) { + Account accountAllocatedTo = _accountMgr.getActiveAccountById(allocatedToAccountId); + if (!accountAllocatedTo.getAccountName().equalsIgnoreCase(accountName)) + throw new InvalidParameterValueException(ip.getAddress() + " Public IP address in range is allocated to another account "); + } + } + + Transaction txn = Transaction.currentTxn(); + txn.start(); + + // Create an AccountVlanMapVO entry + AccountVlanMapVO accountVlanMapVO = new AccountVlanMapVO(vlanOwner.getId(), vlan.getId()); + _accountVlanMapDao.persist(accountVlanMapVO); + + txn.commit(); + + return vlan; + } + + @Override + @ActionEvent(eventType = EventTypes.EVENT_VLAN_IP_RANGE_RELEASE, eventDescription = "releasing a public ip range", async = false) + public boolean releasePublicIpRange(ReleasePublicIpRangeCmd cmd) { + Long vlanDbId = cmd.getId(); + + VlanVO vlan = _vlanDao.findById(vlanDbId); + if (vlan == null) { + throw new InvalidParameterValueException("Please specify a valid IP range id."); + } + + return releasePublicIpRange(vlanDbId, UserContext.current().getCallerUserId(), UserContext.current().getCaller()); + } + + @Override + @DB + public boolean releasePublicIpRange(long vlanDbId, long userId, Account caller) { + VlanVO vlan = _vlanDao.findById(vlanDbId); + + List acctVln = _accountVlanMapDao.listAccountVlanMapsByVlan(vlanDbId); + // Verify range is dedicated + if (acctVln == null || acctVln.isEmpty()) { + throw new InvalidParameterValueException("Can't release Public IP range " + vlanDbId + " as it not dedicated to any account"); + } + + // Check if range has any allocated public IPs + long allocIpCount = _publicIpAddressDao.countIPs(vlan.getDataCenterId(), vlanDbId, true); + boolean success = true; + if (allocIpCount > 0) { + try { + vlan = _vlanDao.acquireInLockTable(vlanDbId, 30); + if (vlan == null) { + throw new CloudRuntimeException("Unable to acquire vlan configuration: " + vlanDbId); + } + if (s_logger.isDebugEnabled()) { + s_logger.debug("lock vlan " + vlanDbId + " is acquired"); + } + List ips = _publicIpAddressDao.listByVlanId(vlanDbId); + for (IPAddressVO ip : ips) { + // Disassociate allocated IP's that are not in use + if ( !ip.isOneToOneNat() && !ip.isSourceNat() && !(_firewallDao.countRulesByIpId(ip.getId()) > 0) ) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Releasing Public IP addresses" + ip +" of vlan " + vlanDbId + " as part of Public IP" + + " range release to the system pool"); + } + success = success && _networkMgr.disassociatePublicIpAddress(ip.getId(), userId, caller); + } + } + if (!success) { + s_logger.warn("Some Public IP addresses that were not in use failed to be released as a part of" + + " vlan " + vlanDbId + "release to the system pool"); + } + } finally { + _vlanDao.releaseFromLockTable(vlanDbId); + } + } + + // A Public IP range can only be dedicated to one account at a time + if (_accountVlanMapDao.remove(acctVln.get(0).getId())) { + return true; + } else { + return false; + } + } + @Override public List csvTagsToList(String tags) { List tagsList = new ArrayList(); @@ -3177,8 +3344,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati throw new InvalidParameterValueException("Invalid service provider: " + prvNameStr); } - if (provider == Provider.JuniperSRX) { - firewallProvider = Provider.JuniperSRX; + if (provider == Provider.JuniperSRX || provider == Provider.CiscoVnmc) { + firewallProvider = provider; } if ((service == Service.PortForwarding || service == Service.StaticNat) && provider == Provider.VirtualRouter){ @@ -3308,20 +3475,34 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati void validateStaticNatServiceCapablities(Map staticNatServiceCapabilityMap) { if (staticNatServiceCapabilityMap != null && !staticNatServiceCapabilityMap.isEmpty()) { - if (staticNatServiceCapabilityMap.keySet().size() > 1) { - throw new InvalidParameterValueException("Only " + Capability.ElasticIp.getName() + " capability can be specified for static nat service"); + if (staticNatServiceCapabilityMap.keySet().size() > 2) { + throw new InvalidParameterValueException("Only " + Capability.ElasticIp.getName() + " and " + Capability.AssociatePublicIP.getName() + " capabilitiy can be sepcified for static nat service"); } + boolean eipEnabled = false; + boolean eipDisabled = false; + boolean associatePublicIP = true; for (Capability capability : staticNatServiceCapabilityMap.keySet()) { String value = staticNatServiceCapabilityMap.get(capability); if (capability == Capability.ElasticIp) { - boolean enabled = value.contains("true"); - boolean disabled = value.contains("false"); - if (!enabled && !disabled) { + eipEnabled = value.contains("true"); + eipDisabled = value.contains("false"); + if (!eipEnabled && !eipDisabled) { throw new InvalidParameterValueException("Unknown specified value for " + Capability.ElasticIp.getName()); } + } else if (capability == Capability.AssociatePublicIP) { + if (value.contains("true")) { + associatePublicIP = true; + } else if (value.contains("false")) { + associatePublicIP = false; + } else { + throw new InvalidParameterValueException("Unknown specified value for " + Capability.AssociatePublicIP.getName()); + } } else { - throw new InvalidParameterValueException("Only " + Capability.ElasticIp.getName() + " capability can be specified for static nat service"); + throw new InvalidParameterValueException("Only " + Capability.ElasticIp.getName() + " and " + Capability.AssociatePublicIP.getName() + " capabilitiy can be sepcified for static nat service"); + } + if (eipDisabled && associatePublicIP) { + throw new InvalidParameterValueException("Capability " + Capability.AssociatePublicIP.getName() + " can only be set when capability " + Capability.ElasticIp.getName() + " is true"); } } } @@ -3383,6 +3564,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati boolean sharedSourceNat = false; boolean redundantRouter = false; boolean elasticIp = false; + boolean associatePublicIp = false; boolean inline = false; if (serviceCapabilityMap != null && !serviceCapabilityMap.isEmpty()) { Map lbServiceCapabilityMap = serviceCapabilityMap.get(Service.Lb); @@ -3432,13 +3614,17 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati String param = staticNatServiceCapabilityMap.get(Capability.ElasticIp); if (param != null) { elasticIp = param.contains("true"); + String associatePublicIP = staticNatServiceCapabilityMap.get(Capability.AssociatePublicIP); + if (associatePublicIP != null) { + associatePublicIp = associatePublicIP.contains("true"); + } } } } NetworkOfferingVO offering = new NetworkOfferingVO(name, displayText, trafficType, systemOnly, specifyVlan, networkRate, multicastRate, isDefault, availability, tags, type, conserveMode, dedicatedLb, - sharedSourceNat, redundantRouter, elasticIp, elasticLb, specifyIpRanges, inline, isPersistent); + sharedSourceNat, redundantRouter, elasticIp, elasticLb, specifyIpRanges, inline, isPersistent, associatePublicIp); if (serviceOfferingId != null) { offering.setServiceOfferingId(serviceOfferingId); @@ -3957,14 +4143,14 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati @Override @DB - public boolean deleteAccountSpecificVirtualRanges(long accountId) { + public boolean releaseAccountSpecificVirtualRanges(long accountId) { List maps = _accountVlanMapDao.listAccountVlanMapsByAccount(accountId); boolean result = true; if (maps != null && !maps.isEmpty()) { Transaction txn = Transaction.currentTxn(); txn.start(); for (AccountVlanMapVO map : maps) { - if (!deleteVlanAndPublicIpRange(_accountMgr.getSystemUser().getId(), map.getVlanDbId(), + if (!releasePublicIpRange(map.getVlanDbId(), _accountMgr.getSystemUser().getId(), _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM))) { result = false; } @@ -3972,10 +4158,10 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (result) { txn.commit(); } else { - s_logger.error("Failed to delete account specific virtual ip ranges for account id=" + accountId); + s_logger.error("Failed to release account specific virtual ip ranges for account id=" + accountId); } } else { - s_logger.trace("Account id=" + accountId + " has no account specific virtual ip ranges, nothing to delete"); + s_logger.trace("Account id=" + accountId + " has no account specific virtual ip ranges, nothing to release"); } return result; } @@ -4001,7 +4187,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati DataCenterVO zone = ApiDBUtils.findZoneById(cluster.getDataCenterId()); return zone.getAllocationState(); } - } + } @Override public AllocationState findPodAllocationState(HostPodVO pod){ diff --git a/server/src/com/cloud/configuration/dao/ConfigurationDao.java b/server/src/com/cloud/configuration/dao/ConfigurationDao.java index c86c0243fae..2b099013430 100644 --- a/server/src/com/cloud/configuration/dao/ConfigurationDao.java +++ b/server/src/com/cloud/configuration/dao/ConfigurationDao.java @@ -17,6 +17,7 @@ package com.cloud.configuration.dao; import java.util.Map; +import java.util.List; import com.cloud.configuration.ConfigurationVO; import com.cloud.utils.db.GenericDao; diff --git a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java index d5f04acdf63..df53e0d7d81 100755 --- a/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/AgentBasedConsoleProxyManager.java @@ -23,48 +23,29 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; -import com.cloud.agent.api.AgentControlAnswer; -import com.cloud.agent.api.ConsoleAccessAuthenticationAnswer; -import com.cloud.agent.api.ConsoleAccessAuthenticationCommand; -import com.cloud.agent.api.ConsoleProxyLoadReportCommand; import com.cloud.agent.api.GetVncPortAnswer; import com.cloud.agent.api.GetVncPortCommand; -import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupProxyCommand; -import com.cloud.agent.api.StopAnswer; -import com.cloud.agent.api.to.NicTO; -import com.cloud.agent.api.to.VirtualMachineTO; -import com.cloud.agent.manager.Commands; import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.deploy.DeployDestination; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.ResourceUnavailableException; import com.cloud.host.HostVO; -import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.info.ConsoleProxyInfo; -import com.cloud.network.Network; +import com.cloud.keystore.KeystoreManager; +import com.cloud.server.ManagementServer; import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.ManagerBase; import com.cloud.vm.ConsoleProxyVO; -import com.cloud.vm.ReservationContext; import com.cloud.vm.UserVmVO; import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; -import com.cloud.vm.VirtualMachineGuru; import com.cloud.vm.VirtualMachineManager; -import com.cloud.vm.VirtualMachineName; -import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.dao.ConsoleProxyDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; @Local(value = { ConsoleProxyManager.class }) -public class AgentBasedConsoleProxyManager extends ManagerBase implements ConsoleProxyManager, VirtualMachineGuru, AgentHook { +public class AgentBasedConsoleProxyManager extends ManagerBase implements ConsoleProxyManager { private static final Logger s_logger = Logger.getLogger(AgentBasedConsoleProxyManager.class); @Inject @@ -85,8 +66,25 @@ public class AgentBasedConsoleProxyManager extends ManagerBase implements Consol VirtualMachineManager _itMgr; @Inject protected ConsoleProxyDao _cpDao; + @Inject + protected KeystoreManager _ksMgr; @Inject ConfigurationDao _configDao; + @Inject ManagementServer _ms; + + public class AgentBasedAgentHook extends AgentHookBase { + + public AgentBasedAgentHook(VMInstanceDao instanceDao, HostDao hostDao, ConfigurationDao cfgDao, + KeystoreManager ksMgr, AgentManager agentMgr, ManagementServer ms) { + super(instanceDao, hostDao, cfgDao, ksMgr, agentMgr, ms); + } + + @Override + protected HostVO findConsoleProxyHost(StartupProxyCommand cmd) { + return _hostDao.findByGuid(cmd.getGuid()); + } + + } public int getVncPort(VMInstanceVO vm) { if (vm.getHostId() == null) { @@ -123,11 +121,10 @@ public class AgentBasedConsoleProxyManager extends ManagerBase implements Consol _consoleProxyUrlDomain = configs.get("consoleproxy.url.domain"); - _listener = new ConsoleProxyListener(this); + _listener = + new ConsoleProxyListener(new AgentBasedAgentHook(_instanceDao, _hostDao, _configDao, _ksMgr, _agentMgr, _ms)); _agentMgr.registerForHostEvents(_listener, true, true, false); - _itMgr.registerGuru(VirtualMachine.Type.ConsoleProxy, this); - if (s_logger.isInfoEnabled()) { s_logger.info("AgentBasedConsoleProxyManager has been configured. SSL enabled: " + _sslEnabled); } @@ -177,64 +174,8 @@ public class AgentBasedConsoleProxyManager extends ManagerBase implements Consol return null; } - @Override - public void onLoadReport(ConsoleProxyLoadReportCommand cmd) { - } - @Override - public AgentControlAnswer onConsoleAccessAuthentication(ConsoleAccessAuthenticationCommand cmd) { - long vmId = 0; - if (cmd.getVmId() != null && cmd.getVmId().isEmpty()) { - if (s_logger.isTraceEnabled()) { - s_logger.trace("Invalid vm id sent from proxy(happens when proxy session has terminated)"); - } - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - try { - vmId = Long.parseLong(cmd.getVmId()); - } catch (NumberFormatException e) { - s_logger.error("Invalid vm id " + cmd.getVmId() + " sent from console access authentication", e); - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - // TODO authentication channel between console proxy VM and management - // server needs to be secured, - // the data is now being sent through private network, but this is - // apparently not enough - VMInstanceVO vm = _instanceDao.findById(vmId); - if (vm == null) { - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - if (vm.getHostId() == null) { - s_logger.warn("VM " + vmId + " lost host info, failed authentication request"); - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - HostVO host = _hostDao.findById(vm.getHostId()); - if (host == null) { - s_logger.warn("VM " + vmId + "'s host does not exist, fail authentication request"); - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - String sid = cmd.getSid(); - if (sid == null || !sid.equals(vm.getVncPassword())) { - s_logger.warn("sid " + sid + " in url does not match stored sid " + vm.getVncPassword()); - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - return new ConsoleAccessAuthenticationAnswer(cmd, true); - } - - @Override - public void onAgentConnect(HostVO host, StartupCommand cmd) { - } - - @Override - public void onAgentDisconnect(long agentId, Status state) { - } @Override public ConsoleProxyVO startProxy(long proxyVmId) { @@ -269,91 +210,8 @@ public class AgentBasedConsoleProxyManager extends ManagerBase implements Consol public void resumeLastManagementState() { } - @Override - public void startAgentHttpHandlerInVM(StartupProxyCommand startupCmd) { - } - @Override public String getName() { return _name; } - - @Override - public Long convertToId(String vmName) { - if (!VirtualMachineName.isValidConsoleProxyName(vmName, _instance)) { - return null; - } - return VirtualMachineName.getConsoleProxyId(vmName); - } - - @Override - public ConsoleProxyVO findByName(String name) { - // TODO Auto-generated method stub - return null; - } - - @Override - public ConsoleProxyVO findById(long id) { - // TODO Auto-generated method stub - return null; - } - - @Override - public ConsoleProxyVO persist(ConsoleProxyVO vm) { - // TODO Auto-generated method stub - return null; - } - - @Override - public boolean finalizeVirtualMachineProfile(VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean finalizeDeployment(Commands cmds, VirtualMachineProfile profile, DeployDestination dest, ReservationContext context) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean finalizeCommandsOnStart(Commands cmds, VirtualMachineProfile profile) { - // TODO Auto-generated method stub - return false; - } - - @Override - public boolean finalizeStart(VirtualMachineProfile profile, long hostId, Commands cmds, ReservationContext context) { - // TODO Auto-generated method stub - return false; - } - - @Override - public void finalizeStop(VirtualMachineProfile profile, StopAnswer answer) { - // TODO Auto-generated method stub - } - - @Override - public void finalizeExpunge(ConsoleProxyVO proxy) { - } - - @Override - public boolean plugNic(Network network, NicTO nic, VirtualMachineTO vm, - ReservationContext context, DeployDestination dest) throws ConcurrentOperationException, ResourceUnavailableException, - InsufficientCapacityException { - //not supported - throw new UnsupportedOperationException("Plug nic is not supported for vm of type " + vm.getType()); - } - - - @Override - public boolean unplugNic(Network network, NicTO nic, VirtualMachineTO vm, - ReservationContext context, DeployDestination dest) throws ConcurrentOperationException, ResourceUnavailableException { - //not supported - throw new UnsupportedOperationException("Unplug nic is not supported for vm of type " + vm.getType()); - } - - @Override - public void prepareStop(VirtualMachineProfile profile) { - } -} +} diff --git a/server/src/com/cloud/consoleproxy/AgentHookBase.java b/server/src/com/cloud/consoleproxy/AgentHookBase.java new file mode 100644 index 00000000000..2748a8cb68c --- /dev/null +++ b/server/src/com/cloud/consoleproxy/AgentHookBase.java @@ -0,0 +1,288 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package com.cloud.consoleproxy; + +import java.util.Date; +import java.util.Random; +import java.util.UUID; + +import org.apache.log4j.Logger; + +import com.cloud.agent.AgentManager; +import com.cloud.agent.api.AgentControlAnswer; +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.ConsoleAccessAuthenticationAnswer; +import com.cloud.agent.api.ConsoleAccessAuthenticationCommand; +import com.cloud.agent.api.ConsoleProxyLoadReportCommand; +import com.cloud.agent.api.GetVncPortAnswer; +import com.cloud.agent.api.GetVncPortCommand; +import com.cloud.agent.api.StartupCommand; +import com.cloud.agent.api.StartupProxyCommand; +import com.cloud.agent.api.proxy.StartConsoleProxyAgentHttpHandlerCommand; +import com.cloud.configuration.Config; +import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.OperationTimedoutException; +import com.cloud.host.HostVO; +import com.cloud.host.Status; +import com.cloud.host.dao.HostDao; +import com.cloud.keystore.KeystoreManager; +import com.cloud.server.ManagementServer; +import com.cloud.servlet.ConsoleProxyPasswordBasedEncryptor; +import com.cloud.servlet.ConsoleProxyServlet; +import com.cloud.utils.Ternary; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.dao.VMInstanceDao; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +/** + * Utility class to manage interactions with agent-based console access + * Extracted from ConsoleProxyManagerImpl so that other console proxy managers + * can reuse + */ +public abstract class AgentHookBase implements AgentHook { + private static final Logger s_logger = Logger.getLogger(AgentHookBase.class); + + VMInstanceDao _instanceDao; + HostDao _hostDao; + ConfigurationDao _configDao; + AgentManager _agentMgr; + KeystoreManager _ksMgr; + ManagementServer _ms; + final Random _random = new Random(System.currentTimeMillis()); + private String _hashKey; + + + public AgentHookBase(VMInstanceDao instanceDao, HostDao hostDao, ConfigurationDao cfgDao, KeystoreManager ksMgr, + AgentManager agentMgr, ManagementServer ms) { + this._instanceDao = instanceDao; + this._hostDao = hostDao; + this._agentMgr = agentMgr; + this._configDao = cfgDao; + this._ksMgr = ksMgr; + this._ms = ms; + } + + public AgentControlAnswer onConsoleAccessAuthentication(ConsoleAccessAuthenticationCommand cmd) { + Long vmId = null; + + String ticketInUrl = cmd.getTicket(); + if (ticketInUrl == null) { + s_logger.error("Access ticket could not be found, you could be running an old version of console proxy. vmId: " + + cmd.getVmId()); + return new ConsoleAccessAuthenticationAnswer(cmd, false); + } + + if (s_logger.isDebugEnabled()) { + s_logger.debug("Console authentication. Ticket in url for " + cmd.getHost() + ":" + cmd.getPort() + "-" + + cmd.getVmId() + " is " + ticketInUrl); + } + + if (!cmd.isReauthenticating()) { + String ticket = + ConsoleProxyServlet.genAccessTicket(cmd.getHost(), cmd.getPort(), cmd.getSid(), cmd.getVmId()); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Console authentication. Ticket in 1 minute boundary for " + cmd.getHost() + ":" + + cmd.getPort() + "-" + cmd.getVmId() + " is " + ticket); + } + + if (!ticket.equals(ticketInUrl)) { + Date now = new Date(); + // considering of minute round-up + String minuteEarlyTicket = + ConsoleProxyServlet.genAccessTicket(cmd.getHost(), cmd.getPort(), cmd.getSid(), cmd.getVmId(), + new Date(now.getTime() - 60 * 1000)); + + if (s_logger.isDebugEnabled()) { + s_logger.debug("Console authentication. Ticket in 2-minute boundary for " + cmd.getHost() + ":" + + cmd.getPort() + "-" + cmd.getVmId() + " is " + minuteEarlyTicket); + } + + if (!minuteEarlyTicket.equals(ticketInUrl)) { + s_logger.error("Access ticket expired or has been modified. vmId: " + cmd.getVmId() + + "ticket in URL: " + ticketInUrl + ", tickets to check against: " + ticket + "," + + minuteEarlyTicket); + return new ConsoleAccessAuthenticationAnswer(cmd, false); + } + } + } + + if (cmd.getVmId() != null && cmd.getVmId().isEmpty()) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Invalid vm id sent from proxy(happens when proxy session has terminated)"); + } + return new ConsoleAccessAuthenticationAnswer(cmd, false); + } + + VirtualMachine vm = _instanceDao.findByUuid(cmd.getVmId()); + if (vm == null) { + vm = _instanceDao.findById(Long.parseLong(cmd.getVmId())); + } + if (vm == null) { + s_logger.error("Invalid vm id " + cmd.getVmId() + " sent from console access authentication"); + return new ConsoleAccessAuthenticationAnswer(cmd, false); + } + + if (vm.getHostId() == null) { + s_logger.warn("VM " + vmId + " lost host info, failed authentication request"); + return new ConsoleAccessAuthenticationAnswer(cmd, false); + } + + HostVO host = _hostDao.findById(vm.getHostId()); + if (host == null) { + s_logger.warn("VM " + vmId + "'s host does not exist, fail authentication request"); + return new ConsoleAccessAuthenticationAnswer(cmd, false); + } + + String sid = cmd.getSid(); + if (sid == null || !sid.equals(vm.getVncPassword())) { + s_logger.warn("sid " + sid + " in url does not match stored sid " + vm.getVncPassword()); + return new ConsoleAccessAuthenticationAnswer(cmd, false); + } + + if (cmd.isReauthenticating()) { + ConsoleAccessAuthenticationAnswer authenticationAnswer = new ConsoleAccessAuthenticationAnswer(cmd, true); + authenticationAnswer.setReauthenticating(true); + + s_logger.info("Re-authentication request, ask host " + vm.getHostId() + " for new console info"); + GetVncPortAnswer answer = + (GetVncPortAnswer) _agentMgr.easySend(vm.getHostId(), + new GetVncPortCommand(vm.getId(), vm.getInstanceName())); + + if (answer != null && answer.getResult()) { + Ternary parsedHostInfo = ConsoleProxyServlet.parseHostInfo(answer.getAddress()); + + if (parsedHostInfo.second() != null && parsedHostInfo.third() != null) { + + s_logger.info("Re-authentication result. vm: " + vm.getId() + ", tunnel url: " + + parsedHostInfo.second() + ", tunnel session: " + parsedHostInfo.third()); + + authenticationAnswer.setTunnelUrl(parsedHostInfo.second()); + authenticationAnswer.setTunnelSession(parsedHostInfo.third()); + } else { + s_logger.info("Re-authentication result. vm: " + vm.getId() + ", host address: " + + parsedHostInfo.first() + ", port: " + answer.getPort()); + + authenticationAnswer.setHost(parsedHostInfo.first()); + authenticationAnswer.setPort(answer.getPort()); + } + } else { + s_logger.warn("Re-authentication request failed"); + + authenticationAnswer.setSuccess(false); + } + + return authenticationAnswer; + } + + return new ConsoleAccessAuthenticationAnswer(cmd, true); + } + + public void startAgentHttpHandlerInVM(StartupProxyCommand startupCmd) { + StartConsoleProxyAgentHttpHandlerCommand cmd = null; + if (_configDao.isPremium()) { + String storePassword = String.valueOf(_random.nextLong()); + byte[] ksBits = + _ksMgr.getKeystoreBits(ConsoleProxyManager.CERTIFICATE_NAME, ConsoleProxyManager.CERTIFICATE_NAME, + storePassword); + + assert (ksBits != null); + if (ksBits == null) { + s_logger.error("Could not find and construct a valid SSL certificate"); + } + cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword); + cmd.setEncryptorPassword(getEncryptorPassword()); + } else { + cmd = new StartConsoleProxyAgentHttpHandlerCommand(); + cmd.setEncryptorPassword(getEncryptorPassword()); + } + + try { + + HostVO consoleProxyHost = findConsoleProxyHost(startupCmd); + + assert (consoleProxyHost != null); + + Answer answer = _agentMgr.send(consoleProxyHost.getId(), cmd); + if (answer == null || !answer.getResult()) { + s_logger.error("Console proxy agent reported that it failed to execute http handling startup command"); + } else { + s_logger.info("Successfully sent out command to start HTTP handling in console proxy agent"); + } + } catch (AgentUnavailableException e) { + s_logger.error("Unable to send http handling startup command to the console proxy resource for proxy:" + + startupCmd.getProxyVmId(), e); + } catch (OperationTimedoutException e) { + s_logger.error( + "Unable to send http handling startup command(time out) to the console proxy resource for proxy:" + + startupCmd.getProxyVmId(), e); + } catch (OutOfMemoryError e) { + s_logger.error("Unrecoverable OutOfMemory Error, exit and let it be re-launched"); + System.exit(1); + } catch (Exception e) { + s_logger.error( + "Unexpected exception when sending http handling startup command(time out) to the console proxy resource for proxy:" + + startupCmd.getProxyVmId(), e); + } + } + + private String getEncryptorPassword() { + String key; + String iv; + ConsoleProxyPasswordBasedEncryptor.KeyIVPair keyIvPair = null; + + // if we failed after reset, something is definitely wrong + for(int i = 0; i < 2; i++) { + key = _ms.getEncryptionKey(); + iv = _ms.getEncryptionIV(); + + keyIvPair = new ConsoleProxyPasswordBasedEncryptor.KeyIVPair(key, iv); + + if(keyIvPair.getIvBytes() == null || keyIvPair.getIvBytes().length != 16 || + keyIvPair.getKeyBytes() == null || keyIvPair.getKeyBytes().length != 16) { + + s_logger.warn("Console access AES KeyIV sanity check failed, reset and regenerate"); + _ms.resetEncryptionKeyIV(); + } else { + break; + } + } + + Gson gson = new GsonBuilder().create(); + return gson.toJson(keyIvPair); + } + + + protected abstract HostVO findConsoleProxyHost(StartupProxyCommand cmd); + + @Override + public void onLoadReport(ConsoleProxyLoadReportCommand cmd) { + // no-op since we do not auto-scale + } + + @Override + public void onAgentConnect(HostVO host, StartupCommand cmd) { + // no-op + } + + @Override + public void onAgentDisconnect(long agentId, Status state) { + // no-op since we do not autoscale + } +} diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java index 6ebf3bc61f4..faec51307b5 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManager.java @@ -16,17 +16,9 @@ // under the License. package com.cloud.consoleproxy; -import com.cloud.agent.api.AgentControlAnswer; -import com.cloud.agent.api.ConsoleAccessAuthenticationCommand; -import com.cloud.agent.api.ConsoleProxyLoadReportCommand; -import com.cloud.agent.api.StartupCommand; -import com.cloud.host.HostVO; -import com.cloud.host.Status; -import com.cloud.host.Host.Type; -import com.cloud.info.ConsoleProxyInfo; import com.cloud.utils.component.Manager; import com.cloud.vm.ConsoleProxyVO; -public interface ConsoleProxyManager extends Manager { +public interface ConsoleProxyManager extends Manager, ConsoleProxyService { public static final int DEFAULT_PROXY_CAPACITY = 50; public static final int DEFAULT_STANDBY_CAPACITY = 10; @@ -45,16 +37,9 @@ public interface ConsoleProxyManager extends Manager { public ConsoleProxyManagementState getManagementState(); public void resumeLastManagementState(); - public ConsoleProxyInfo assignProxy(long dataCenterId, long userVmId); - public ConsoleProxyVO startProxy(long proxyVmId); public boolean stopProxy(long proxyVmId); public boolean rebootProxy(long proxyVmId); public boolean destroyProxy(long proxyVmId); - - public void onLoadReport(ConsoleProxyLoadReportCommand cmd); - public AgentControlAnswer onConsoleAccessAuthentication(ConsoleAccessAuthenticationCommand cmd); - public void onAgentConnect(HostVO host, StartupCommand cmd); - public void onAgentDisconnect(long agentId, Status state); } diff --git a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java index 1edd8692ec7..c4ad8170d6d 100755 --- a/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyManagerImpl.java @@ -23,26 +23,19 @@ import java.util.HashMap; import java.util.Iterator; import java.util.List; import java.util.Map; -import java.util.Random; import java.util.UUID; import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.log4j.Logger; import com.cloud.agent.AgentManager; -import com.cloud.agent.api.AgentControlAnswer; import com.cloud.agent.api.Answer; -import com.cloud.agent.api.ConsoleAccessAuthenticationAnswer; -import com.cloud.agent.api.ConsoleAccessAuthenticationCommand; import com.cloud.agent.api.ConsoleProxyLoadReportCommand; -import com.cloud.agent.api.GetVncPortAnswer; -import com.cloud.agent.api.GetVncPortCommand; import com.cloud.agent.api.RebootCommand; import com.cloud.agent.api.StartupCommand; import com.cloud.agent.api.StartupProxyCommand; @@ -50,11 +43,9 @@ import com.cloud.agent.api.StopAnswer; import com.cloud.agent.api.check.CheckSshAnswer; import com.cloud.agent.api.check.CheckSshCommand; import com.cloud.agent.api.proxy.ConsoleProxyLoadAnswer; -import com.cloud.agent.api.proxy.StartConsoleProxyAgentHttpHandlerCommand; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.manager.Commands; -import com.cloud.api.commands.DestroyConsoleProxyCmd; import com.cloud.certificate.dao.CertificateDao; import com.cloud.cluster.ClusterManager; import com.cloud.configuration.Config; @@ -68,11 +59,8 @@ import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.HostPodDao; import com.cloud.deploy.DataCenterDeployment; import com.cloud.deploy.DeployDestination; -import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.OperationTimedoutException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.StorageUnavailableException; import com.cloud.host.Host; @@ -107,14 +95,15 @@ import com.cloud.resource.ResourceManager; import com.cloud.resource.ResourceStateAdapter; import com.cloud.resource.ServerResource; import com.cloud.resource.UnableDeleteHostException; +import com.cloud.server.ManagementServer; import com.cloud.service.ServiceOfferingVO; import com.cloud.service.dao.ServiceOfferingDao; -import com.cloud.servlet.ConsoleProxyServlet; +import com.cloud.servlet.ConsoleProxyPasswordBasedEncryptor; import com.cloud.storage.StorageManager; import com.cloud.storage.StoragePoolStatus; import com.cloud.storage.VMTemplateHostVO; -import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; +import com.cloud.storage.VMTemplateVO; import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplateHostDao; @@ -126,8 +115,6 @@ import com.cloud.user.UserContext; import com.cloud.utils.DateUtil; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; -import com.cloud.utils.Ternary; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DB; import com.cloud.utils.db.GlobalLock; @@ -170,7 +157,8 @@ import com.google.gson.GsonBuilder; // because sooner or later, it will be driven into Running state // @Local(value = { ConsoleProxyManager.class, ConsoleProxyService.class }) -public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxyManager, ConsoleProxyService, AgentHook, VirtualMachineGuru, SystemVmLoadScanHandler, ResourceStateAdapter { +public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxyManager, + VirtualMachineGuru, SystemVmLoadScanHandler, ResourceStateAdapter { private static final Logger s_logger = Logger.getLogger(ConsoleProxyManagerImpl.class); private static final int DEFAULT_CAPACITY_SCAN_INTERVAL = 30000; // 30 seconds @@ -234,6 +222,8 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy TemplateManager templateMgr; @Inject IPAddressDao _ipAddressDao; + @Inject + ManagementServer _ms; private ConsoleProxyListener _listener; @@ -268,7 +258,6 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy private Map _zoneProxyCountMap; // map private Map _zoneVmCountMap; // map - private String _hashKey; private String _staticPublicIp; private int _staticPort; @@ -458,7 +447,131 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy private KeystoreDao _ksDao; @Inject private KeystoreManager _ksMgr; - private final Random _random = new Random(System.currentTimeMillis()); + + public class VmBasedAgentHook extends AgentHookBase { + + public VmBasedAgentHook(VMInstanceDao instanceDao, HostDao hostDao, ConfigurationDao cfgDao, + KeystoreManager ksMgr, AgentManager agentMgr, ManagementServer ms) { + super(instanceDao, hostDao, cfgDao, ksMgr, agentMgr, ms); + } + + @Override + public void onLoadReport(ConsoleProxyLoadReportCommand cmd) { + if (cmd.getLoadInfo() == null) { + return; + } + + ConsoleProxyStatus status = null; + try { + GsonBuilder gb = new GsonBuilder(); + gb.setVersion(1.3); + Gson gson = gb.create(); + status = gson.fromJson(cmd.getLoadInfo(), ConsoleProxyStatus.class); + } catch (Throwable e) { + s_logger.warn("Unable to parse load info from proxy, proxy vm id : " + cmd.getProxyVmId() + ", info : " + cmd.getLoadInfo()); + } + + if (status != null) { + int count = 0; + if (status.getConnections() != null) { + count = status.getConnections().length; + } + + byte[] details = null; + if (cmd.getLoadInfo() != null) { + details = cmd.getLoadInfo().getBytes(Charset.forName("US-ASCII")); + } + _consoleProxyDao.update(cmd.getProxyVmId(), count, DateUtil.currentGMTTime(), details); + } else { + if (s_logger.isTraceEnabled()) { + s_logger.trace("Unable to get console proxy load info, id : " + cmd.getProxyVmId()); + } + + _consoleProxyDao.update(cmd.getProxyVmId(), 0, DateUtil.currentGMTTime(), null); + } + } + + @Override + public void onAgentConnect(HostVO host, StartupCommand cmd) { + // no-op + } + + @Override + public void onAgentDisconnect(long agentId, com.cloud.host.Status state) { + + if (state == com.cloud.host.Status.Alert || state == com.cloud.host.Status.Disconnected) { + // be it either in alert or in disconnected state, the agent + // process + // may be gone in the VM, + // we will be reacting to stop the corresponding VM and let the + // scan + // process to + HostVO host = _hostDao.findById(agentId); + if (host.getType() == Type.ConsoleProxy) { + String name = host.getName(); + if (s_logger.isInfoEnabled()) { + s_logger.info("Console proxy agent disconnected, proxy: " + name); + } + if (name != null && name.startsWith("v-")) { + String[] tokens = name.split("-"); + long proxyVmId = 0; + try { + proxyVmId = Long.parseLong(tokens[1]); + } catch (NumberFormatException e) { + s_logger.error("Unexpected exception " + e.getMessage(), e); + return; + } + + final ConsoleProxyVO proxy = _consoleProxyDao.findById(proxyVmId); + if (proxy != null) { + + // Disable this feature for now, as it conflicts + // with + // the case of allowing user to reboot console proxy + // when rebooting happens, we will receive + // disconnect + // here and we can't enter into stopping process, + // as when the rebooted one comes up, it will kick + // off a + // newly started one and trigger the process + // continue on forever + + /* + * _capacityScanScheduler.execute(new Runnable() { + * public void run() { if(s_logger.isInfoEnabled()) + * s_logger.info("Stop console proxy " + + * proxy.getName() + + * " VM because of that the agent running inside it has disconnected" + * ); stopProxy(proxy.getId()); } }); + */ + } else { + if (s_logger.isInfoEnabled()) { + s_logger.info("Console proxy agent disconnected but corresponding console proxy VM no longer exists in DB, proxy: " + + name); + } + } + } else { + assert (false) : "Invalid console proxy name: " + name; + } + } + } + + } + + @Override + protected HostVO findConsoleProxyHost(StartupProxyCommand startupCmd) { + long proxyVmId = startupCmd.getProxyVmId(); + ConsoleProxyVO consoleProxy = _consoleProxyDao.findById(proxyVmId); + if (consoleProxy == null) { + s_logger.info("Proxy " + proxyVmId + " is no longer in DB, skip sending startup command"); + return null; + } + + assert (consoleProxy != null); + return findConsoleProxyHostByName(consoleProxy.getHostName()); + } + + } @Override public ConsoleProxyInfo assignProxy(final long dataCenterId, final long vmId) { @@ -850,181 +963,9 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy } } - @Override - public void onLoadReport(ConsoleProxyLoadReportCommand cmd) { - if (cmd.getLoadInfo() == null) { - return; - } - ConsoleProxyStatus status = null; - try { - GsonBuilder gb = new GsonBuilder(); - gb.setVersion(1.3); - Gson gson = gb.create(); - status = gson.fromJson(cmd.getLoadInfo(), ConsoleProxyStatus.class); - } catch (Throwable e) { - s_logger.warn("Unable to parse load info from proxy, proxy vm id : " + cmd.getProxyVmId() + ", info : " + cmd.getLoadInfo()); - } - if (status != null) { - int count = 0; - if (status.getConnections() != null) { - count = status.getConnections().length; - } - - byte[] details = null; - if (cmd.getLoadInfo() != null) { - details = cmd.getLoadInfo().getBytes(Charset.forName("US-ASCII")); - } - _consoleProxyDao.update(cmd.getProxyVmId(), count, DateUtil.currentGMTTime(), details); - } else { - if (s_logger.isTraceEnabled()) { - s_logger.trace("Unable to get console proxy load info, id : " + cmd.getProxyVmId()); - } - - _consoleProxyDao.update(cmd.getProxyVmId(), 0, DateUtil.currentGMTTime(), null); - } - } - - @Override - public AgentControlAnswer onConsoleAccessAuthentication(ConsoleAccessAuthenticationCommand cmd) { - Long vmId = null; - - String ticketInUrl = cmd.getTicket(); - if (ticketInUrl == null) { - s_logger.error("Access ticket could not be found, you could be running an old version of console proxy. vmId: " + cmd.getVmId()); - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Console authentication. Ticket in url for " + cmd.getHost() + ":" + cmd.getPort() + "-" + cmd.getVmId() + " is " + ticketInUrl); - } - - if(!cmd.isReauthenticating()) { - String ticket = ConsoleProxyServlet.genAccessTicket(cmd.getHost(), cmd.getPort(), cmd.getSid(), cmd.getVmId()); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Console authentication. Ticket in 1 minute boundary for " + cmd.getHost() + ":" + cmd.getPort() + "-" + cmd.getVmId() + " is " + ticket); - } - - if (!ticket.equals(ticketInUrl)) { - Date now = new Date(); - // considering of minute round-up - String minuteEarlyTicket = ConsoleProxyServlet.genAccessTicket(cmd.getHost(), cmd.getPort(), cmd.getSid(), cmd.getVmId(), new Date(now.getTime() - 60 * 1000)); - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Console authentication. Ticket in 2-minute boundary for " + cmd.getHost() + ":" + cmd.getPort() + "-" + cmd.getVmId() + " is " + minuteEarlyTicket); - } - - if (!minuteEarlyTicket.equals(ticketInUrl)) { - s_logger.error("Access ticket expired or has been modified. vmId: " + cmd.getVmId() + "ticket in URL: " + ticketInUrl + ", tickets to check against: " + ticket + "," - + minuteEarlyTicket); - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - } - } - - if (cmd.getVmId() != null && cmd.getVmId().isEmpty()) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Invalid vm id sent from proxy(happens when proxy session has terminated)"); - } - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - VirtualMachine vm = _instanceDao.findByUuid(cmd.getVmId()); - if (vm == null) { - vm = _instanceDao.findById(Long.parseLong(cmd.getVmId())); - } - if (vm == null) { - s_logger.error("Invalid vm id " + cmd.getVmId() + " sent from console access authentication"); - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - if (vm.getHostId() == null) { - s_logger.warn("VM " + vmId + " lost host info, failed authentication request"); - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - HostVO host = _hostDao.findById(vm.getHostId()); - if (host == null) { - s_logger.warn("VM " + vmId + "'s host does not exist, fail authentication request"); - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - String sid = cmd.getSid(); - if (sid == null || !sid.equals(vm.getVncPassword())) { - s_logger.warn("sid " + sid + " in url does not match stored sid " + vm.getVncPassword()); - return new ConsoleAccessAuthenticationAnswer(cmd, false); - } - - if(cmd.isReauthenticating()) { - ConsoleAccessAuthenticationAnswer authenticationAnswer = new ConsoleAccessAuthenticationAnswer(cmd, true); - authenticationAnswer.setReauthenticating(true); - - s_logger.info("Re-authentication request, ask host " + vm.getHostId() + " for new console info"); - GetVncPortAnswer answer = (GetVncPortAnswer) _agentMgr.easySend(vm.getHostId(), new - GetVncPortCommand(vm.getId(), vm.getInstanceName())); - - if (answer != null && answer.getResult()) { - Ternary parsedHostInfo = ConsoleProxyServlet.parseHostInfo(answer.getAddress()); - - if(parsedHostInfo.second() != null && parsedHostInfo.third() != null) { - - s_logger.info("Re-authentication result. vm: " + vm.getId() + ", tunnel url: " + parsedHostInfo.second() - + ", tunnel session: " + parsedHostInfo.third()); - - authenticationAnswer.setTunnelUrl(parsedHostInfo.second()); - authenticationAnswer.setTunnelSession(parsedHostInfo.third()); - } else { - s_logger.info("Re-authentication result. vm: " + vm.getId() + ", host address: " + parsedHostInfo.first() - + ", port: " + answer.getPort()); - - authenticationAnswer.setHost(parsedHostInfo.first()); - authenticationAnswer.setPort(answer.getPort()); - } - } else { - s_logger.warn("Re-authentication request failed"); - - authenticationAnswer.setSuccess(false); - } - - return authenticationAnswer; - } - - return new ConsoleAccessAuthenticationAnswer(cmd, true); - } - - @Override - public void onAgentConnect(HostVO host, StartupCommand cmd) { - // if (host.getType() == Type.ConsoleProxy) { - // // TODO we can use this event to mark the proxy is up and - // // functioning instead of - // // pinging the console proxy VM command port - // // - // // for now, just log a message - // if (s_logger.isInfoEnabled()) { - // s_logger.info("Console proxy agent is connected. proxy: " + host.getName()); - // } - // - // /* update public/private ip address */ - // if (_IpAllocator != null && _IpAllocator.exteralIpAddressAllocatorEnabled()) { - // try { - // ConsoleProxyVO console = findConsoleProxyByHost(host); - // if (console == null) { - // s_logger.debug("Can't find console proxy "); - // return; - // } - // console.setPrivateIpAddress(cmd.getPrivateIpAddress()); - // console.setPublicIpAddress(cmd.getPublicIpAddress()); - // console.setPublicNetmask(cmd.getPublicNetmask()); - // _consoleProxyDao.persist(console); - // } catch (NumberFormatException e) { - // } - // } - // } - } - - @Override - public void onAgentDisconnect(long agentId, com.cloud.host.Status state) { + public void handleAgentDisconnect(long agentId, com.cloud.host.Status state) { if (state == com.cloud.host.Status.Alert || state == com.cloud.host.Status.Disconnected) { // be it either in alert or in disconnected state, the agent process // may be gone in the VM, @@ -1499,7 +1440,9 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy value = agentMgrConfigs.get("port"); _mgmt_port = NumbersUtil.parseInt(value, 8250); - _listener = new ConsoleProxyListener(this); + _listener = + new ConsoleProxyListener(new VmBasedAgentHook(_instanceDao, _hostDao, _configDao, _ksMgr, + _agentMgr, _ms)); _agentMgr.registerForHostEvents(_listener, true, true, false); _itMgr.registerGuru(VirtualMachine.Type.ConsoleProxy, this); @@ -1549,18 +1492,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy return true; } - @Override - public boolean destroyConsoleProxy(DestroyConsoleProxyCmd cmd) throws ServerApiException { - Long proxyId = cmd.getId(); - // verify parameters - ConsoleProxyVO proxy = _consoleProxyDao.findById(proxyId); - if (proxy == null) { - throw new InvalidParameterValueException("unable to find a console proxy with id " + proxyId); - } - - return destroyProxy(proxyId); - } protected ConsoleProxyManagerImpl() { } @@ -1733,52 +1665,7 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy _consoleProxyDao.update(proxy.getId(), proxy); } - @Override - public void startAgentHttpHandlerInVM(StartupProxyCommand startupCmd) { - StartConsoleProxyAgentHttpHandlerCommand cmd = null; - if (_configDao.isPremium()) { - String storePassword = String.valueOf(_random.nextLong()); - byte[] ksBits = _ksMgr.getKeystoreBits(ConsoleProxyManager.CERTIFICATE_NAME, ConsoleProxyManager.CERTIFICATE_NAME, storePassword); - assert (ksBits != null); - if (ksBits == null) { - s_logger.error("Could not find and construct a valid SSL certificate"); - } - cmd = new StartConsoleProxyAgentHttpHandlerCommand(ksBits, storePassword); - cmd.setEncryptorPassword(getHashKey()); - } else { - cmd = new StartConsoleProxyAgentHttpHandlerCommand(); - cmd.setEncryptorPassword(getHashKey()); - } - - try { - long proxyVmId = startupCmd.getProxyVmId(); - ConsoleProxyVO consoleProxy = _consoleProxyDao.findById(proxyVmId); - if (consoleProxy == null) { - s_logger.info("Proxy " + proxyVmId + " is no longer in DB, skip sending startup command"); - return; - } - - assert (consoleProxy != null); - HostVO consoleProxyHost = findConsoleProxyHostByName(consoleProxy.getHostName()); - - Answer answer = _agentMgr.send(consoleProxyHost.getId(), cmd); - if (answer == null || !answer.getResult()) { - s_logger.error("Console proxy agent reported that it failed to execute http handling startup command"); - } else { - s_logger.info("Successfully sent out command to start HTTP handling in console proxy agent"); - } - } catch (AgentUnavailableException e) { - s_logger.error("Unable to send http handling startup command to the console proxy resource for proxy:" + startupCmd.getProxyVmId(), e); - } catch (OperationTimedoutException e) { - s_logger.error("Unable to send http handling startup command(time out) to the console proxy resource for proxy:" + startupCmd.getProxyVmId(), e); - } catch (OutOfMemoryError e) { - s_logger.error("Unrecoverable OutOfMemory Error, exit and let it be re-launched"); - System.exit(1); - } catch (Exception e) { - s_logger.error("Unexpected exception when sending http handling startup command(time out) to the console proxy resource for proxy:" + startupCmd.getProxyVmId(), e); - } - } @Override public ConsoleProxyVO persist(ConsoleProxyVO proxy) { @@ -2000,15 +1887,6 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy return sc.find(); } - public String getHashKey() { - // although we may have race conditioning here, database transaction serialization should - // give us the same key - if (_hashKey == null) { - _hashKey = _configDao.getValueAndInitIfNotExist(Config.HashKey.key(), Config.HashKey.getCategory(), UUID.randomUUID().toString()); - } - return _hashKey; - } - @Override public boolean plugNic(Network network, NicTO nic, VirtualMachineTO vm, ReservationContext context, DeployDestination dest) throws ConcurrentOperationException, ResourceUnavailableException, @@ -2028,4 +1906,5 @@ public class ConsoleProxyManagerImpl extends ManagerBase implements ConsoleProxy @Override public void prepareStop(VirtualMachineProfile profile) { } + } diff --git a/api/src/com/cloud/consoleproxy/ConsoleProxyService.java b/server/src/com/cloud/consoleproxy/ConsoleProxyService.java similarity index 87% rename from api/src/com/cloud/consoleproxy/ConsoleProxyService.java rename to server/src/com/cloud/consoleproxy/ConsoleProxyService.java index c347e0bf9fc..fd00f56333a 100644 --- a/api/src/com/cloud/consoleproxy/ConsoleProxyService.java +++ b/server/src/com/cloud/consoleproxy/ConsoleProxyService.java @@ -16,8 +16,10 @@ // under the License. package com.cloud.consoleproxy; -import com.cloud.api.commands.DestroyConsoleProxyCmd; +import com.cloud.info.ConsoleProxyInfo; public interface ConsoleProxyService { - boolean destroyConsoleProxy(DestroyConsoleProxyCmd cmd); -} + + public abstract ConsoleProxyInfo assignProxy(long dataCenterId, long userVmId); + +} \ No newline at end of file diff --git a/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java b/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java index 3ba98a94362..7b59a6bf45e 100755 --- a/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java +++ b/server/src/com/cloud/consoleproxy/StaticConsoleProxyManager.java @@ -16,29 +16,59 @@ // under the License. package com.cloud.consoleproxy; + import java.util.List; import java.util.Map; +import java.util.Random; import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import org.springframework.stereotype.Component; +import org.apache.log4j.Logger; +import com.cloud.agent.api.StartupCommand; +import com.cloud.agent.api.StartupProxyCommand; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.host.Host.Type; import com.cloud.host.HostVO; +import com.cloud.host.dao.HostDao; import com.cloud.info.ConsoleProxyInfo; +import com.cloud.keystore.KeystoreDao; +import com.cloud.keystore.KeystoreManager; import com.cloud.resource.ResourceManager; +import com.cloud.resource.ResourceStateAdapter; +import com.cloud.resource.ServerResource; +import com.cloud.resource.UnableDeleteHostException; +import com.cloud.utils.NumbersUtil; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.dao.ConsoleProxyDao; +import com.cloud.vm.dao.VMInstanceDao; @Local(value={ConsoleProxyManager.class}) -public class StaticConsoleProxyManager extends AgentBasedConsoleProxyManager implements ConsoleProxyManager { - String _ip = null; - @Inject ConsoleProxyDao _proxyDao; - @Inject ResourceManager _resourceMgr; - @Inject ConfigurationDao _configDao; +public class StaticConsoleProxyManager extends AgentBasedConsoleProxyManager implements ConsoleProxyManager, + ResourceStateAdapter { + private static final Logger s_logger = Logger.getLogger(StaticConsoleProxyManager.class); + + @Inject + ConsoleProxyDao _proxyDao; + @Inject + ResourceManager _resourceMgr; + @Inject + ConfigurationDao _configDao; + @Inject + private VMInstanceDao _instanceDao; + @Inject + KeystoreDao _ksDao; + @Inject + private KeystoreManager _ksMgr; + @Inject + private HostDao _hostDao; + private final Random _random = new Random(System.currentTimeMillis()); + private String _hashKey; + private String _ip = null; + + @Override protected HostVO findHost(VMInstanceVO vm) { @@ -50,20 +80,52 @@ public class StaticConsoleProxyManager extends AgentBasedConsoleProxyManager imp @Override public ConsoleProxyInfo assignProxy(long dataCenterId, long userVmId) { - return new ConsoleProxyInfo(false, _ip, _consoleProxyPort, _consoleProxyUrlPort, _consoleProxyUrlDomain); + return new ConsoleProxyInfo(_sslEnabled, _ip, _consoleProxyPort, _consoleProxyUrlPort, _consoleProxyUrlDomain); } @Override public boolean configure(String name, Map params) throws ConfigurationException { super.configure(name, params); - - Map dbParams = _configDao.getConfiguration("ManagementServer", params); - - _ip = dbParams.get("public.ip"); + _ip = _configDao.getValue("consoleproxy.static.publicIp"); if (_ip == null) { _ip = "127.0.0.1"; } + + String value = (String) params.get("consoleproxy.sslEnabled"); + if (value != null && value.equalsIgnoreCase("true")) { + _sslEnabled = true; + } + int defaultPort = 8088; + if (_sslEnabled) + defaultPort = 8443; + _consoleProxyUrlPort = NumbersUtil.parseInt(_configDao.getValue("consoleproxy.static.port"), defaultPort); + + _resourceMgr.registerResourceStateAdapter(this.getClass().getSimpleName(), this); + return true; } + + @Override + public HostVO createHostVOForConnectedAgent(HostVO host, StartupCommand[] cmd) { + if (!(cmd[0] instanceof StartupProxyCommand)) { + return null; + } + + host.setType(com.cloud.host.Host.Type.ConsoleProxy); + return host; + } + + @Override + public HostVO createHostVOForDirectConnectAgent(HostVO host, StartupCommand[] startup, ServerResource resource, + Map details, List hostTags) { + return null; + } + + @Override + public DeleteHostAnswer deleteHost(HostVO host, boolean isForced, boolean isForceDeleteStorage) + throws UnableDeleteHostException { + return null; + } + } diff --git a/server/src/com/cloud/dc/dao/DataCenterDao.java b/server/src/com/cloud/dc/dao/DataCenterDao.java index ee228f1ab5b..e54b9bbbe29 100755 --- a/server/src/com/cloud/dc/dao/DataCenterDao.java +++ b/server/src/com/cloud/dc/dao/DataCenterDao.java @@ -77,4 +77,6 @@ public interface DataCenterDao extends GenericDao { List findZonesByDomainId(Long domainId, String keyword); List findByKeyword(String keyword); + + List listAllZones(); } diff --git a/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java b/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java index 2a6c2ecb252..4afd640d314 100755 --- a/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DataCenterDaoImpl.java @@ -401,4 +401,12 @@ public class DataCenterDaoImpl extends GenericDaoBase implem txn.commit(); return result; } + + @Override + public List listAllZones(){ + SearchCriteria sc = NameSearch.create(); + List dcs = listBy(sc); + + return dcs; + } } diff --git a/server/src/com/cloud/dc/dao/DataCenterVnetDao.java b/server/src/com/cloud/dc/dao/DataCenterVnetDao.java index 79e91c4bca8..7fb68dcd7ac 100644 --- a/server/src/com/cloud/dc/dao/DataCenterVnetDao.java +++ b/server/src/com/cloud/dc/dao/DataCenterVnetDao.java @@ -20,9 +20,11 @@ import java.util.List; import com.cloud.dc.DataCenterVnetVO; import com.cloud.utils.db.GenericDao; +import com.cloud.utils.db.Transaction; public interface DataCenterVnetDao extends GenericDao { public List listAllocatedVnets(long physicalNetworkId); + public List listAllocatedVnetsInRange(long dcId, long physicalNetworkId, Integer start, Integer end); public List findVnet(long dcId, String vnet); public int countZoneVlans(long dcId, boolean onlyCountAllocated); public List findVnet(long dcId, long physicalNetworkId, String vnet); @@ -31,6 +33,10 @@ public interface DataCenterVnetDao extends GenericDao { public void delete(long physicalNetworkId); + public void deleteRange(Transaction txn, long dcId, long physicalNetworkId, int start, int end); + + public void lockRange(long dcId, long physicalNetworkId, Integer start, Integer end); + public DataCenterVnetVO take(long physicalNetworkId, long accountId, String reservationId); public void release(String vnet, long physicalNetworkId, long accountId, String reservationId); diff --git a/server/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java b/server/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java index 5ded0f4ecf5..2e044394ddc 100755 --- a/server/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java +++ b/server/src/com/cloud/dc/dao/DataCenterVnetDaoImpl.java @@ -21,6 +21,7 @@ import java.sql.SQLException; import java.util.Date; import java.util.List; +import com.cloud.exception.InvalidParameterValueException; import org.springframework.stereotype.Component; import com.cloud.dc.DataCenterVnetVO; @@ -46,8 +47,10 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase VnetDcSearch; private final SearchBuilder VnetDcSearchAllocated; private final SearchBuilder DcSearchAllocated; + private final SearchBuilder DcSearchAllocatedInRange; private final GenericSearchBuilder countZoneVlans; private final GenericSearchBuilder countAllocatedZoneVlans; + private final SearchBuilder SearchRange; public List listAllocatedVnets(long physicalNetworkId) { SearchCriteria sc = DcSearchAllocated.create(); @@ -55,6 +58,22 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase listAllocatedVnetsInRange(long dcId, long physicalNetworkId, Integer start, Integer end) { + SearchCriteria sc = DcSearchAllocatedInRange.create(); + sc.setParameters("dc",dcId); + sc.setParameters("physicalNetworkId", physicalNetworkId); + sc.setParameters("vnetRange", start.toString(), end.toString()); + return listBy(sc); + } + + public void lockRange(long dcId, long physicalNetworkId, Integer start, Integer end) { + SearchCriteria sc = SearchRange.create(); + sc.setParameters("dc",dcId); + sc.setParameters("physicalNetworkId", physicalNetworkId); + sc.setParameters("vnetRange", start.toString(), end.toString()); + lockRows(sc,null,true); + } + public List findVnet(long dcId, String vnet) { SearchCriteria sc = VnetDcSearch.create();; sc.setParameters("dc", dcId); @@ -93,11 +112,28 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase sc = VnetDcSearch.create(); sc.setParameters("physicalNetworkId", physicalNetworkId); @@ -149,6 +185,18 @@ public class DataCenterVnetDaoImpl extends GenericDaoBase { List listVlansByNetworkId(long networkId); List listVlansByPhysicalNetworkId(long physicalNetworkId); + + List listZoneWideNonDedicatedVlans(long zoneId); } diff --git a/server/src/com/cloud/dc/dao/VlanDaoImpl.java b/server/src/com/cloud/dc/dao/VlanDaoImpl.java old mode 100644 new mode 100755 index c5a635fd0c0..100295b4b5f --- a/server/src/com/cloud/dc/dao/VlanDaoImpl.java +++ b/server/src/com/cloud/dc/dao/VlanDaoImpl.java @@ -58,6 +58,9 @@ public class VlanDaoImpl extends GenericDaoBase implements VlanDao protected SearchBuilder ZoneVlanSearch; protected SearchBuilder NetworkVlanSearch; protected SearchBuilder PhysicalNetworkVlanSearch; + protected SearchBuilder ZoneWideNonDedicatedVlanSearch; + + protected SearchBuilder AccountVlanMapSearch; @Inject protected PodVlanMapDao _podVlanMapDao; @Inject protected AccountVlanMapDao _accountVlanMapDao; @@ -198,6 +201,14 @@ public class VlanDaoImpl extends GenericDaoBase implements VlanDao PodVlanSearch2.done(); ZoneTypePodSearch.done(); + ZoneWideNonDedicatedVlanSearch = createSearchBuilder(); + ZoneWideNonDedicatedVlanSearch.and("zoneId", ZoneWideNonDedicatedVlanSearch.entity().getDataCenterId(), SearchCriteria.Op.EQ); + AccountVlanMapSearch = _accountVlanMapDao.createSearchBuilder(); + AccountVlanMapSearch.and("accountId", AccountVlanMapSearch.entity().getAccountId(), SearchCriteria.Op.NULL); + ZoneWideNonDedicatedVlanSearch.join("AccountVlanMapSearch", AccountVlanMapSearch, ZoneWideNonDedicatedVlanSearch.entity().getId(), AccountVlanMapSearch.entity().getVlanDbId(), JoinBuilder.JoinType.LEFTOUTER); + ZoneWideNonDedicatedVlanSearch.done(); + AccountVlanMapSearch.done(); + return result; } @@ -312,4 +323,12 @@ public class VlanDaoImpl extends GenericDaoBase implements VlanDao sc.setParameters("physicalNetworkId", physicalNetworkId); return listBy(sc); } + + @Override + public List listZoneWideNonDedicatedVlans(long zoneId) { + SearchCriteria sc = ZoneWideNonDedicatedVlanSearch.create(); + sc.setParameters("ZoneWideNonDedicatedVlanSearch", "zoneId", zoneId); + return listBy(sc); + } + } diff --git a/server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java b/server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java index 03e87743851..7665687be60 100755 --- a/server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java +++ b/server/src/com/cloud/deploy/AbstractDeployPlannerSelector.java @@ -1,84 +1,84 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.deploy; - -import java.util.Map; - -import javax.inject.Inject; -import javax.naming.ConfigurationException; - -import com.cloud.configuration.Config; -import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.utils.component.AdapterBase; -import com.cloud.vm.UserVmVO; - -public abstract class AbstractDeployPlannerSelector extends AdapterBase implements DeployPlannerSelector { - protected Map params; - protected String name; - protected int runLevel; - - @Inject - protected ConfigurationDao _configDao; - protected String _allocationAlgorithm = "random"; - - @Override - public String getName() { - return name; - } - - @Override - public void setName(String name) { - this.name = name; - } - - @Override - public void setConfigParams(Map params) { - this.params = params; - } - - @Override - public Map getConfigParams() { - return params; - } - - @Override - public int getRunLevel() { - return runLevel; - } - - @Override - public void setRunLevel(int level) { - this.runLevel = level; - } - - @Override - public boolean configure(String name, Map params) throws ConfigurationException { - super.configure(name, params); - _allocationAlgorithm = _configDao.getValue(Config.VmAllocationAlgorithm.key()); - return true; - } - - @Override - public boolean start() { - return true; - } - - @Override - public boolean stop() { - return true; - } -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.deploy; + +import java.util.Map; + +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import com.cloud.configuration.Config; +import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.utils.component.AdapterBase; +import com.cloud.vm.UserVmVO; + +public abstract class AbstractDeployPlannerSelector extends AdapterBase implements DeployPlannerSelector { + protected Map params; + protected String name; + protected int runLevel; + + @Inject + protected ConfigurationDao _configDao; + protected String _allocationAlgorithm = "random"; + + @Override + public String getName() { + return name; + } + + @Override + public void setName(String name) { + this.name = name; + } + + @Override + public void setConfigParams(Map params) { + this.params = params; + } + + @Override + public Map getConfigParams() { + return params; + } + + @Override + public int getRunLevel() { + return runLevel; + } + + @Override + public void setRunLevel(int level) { + this.runLevel = level; + } + + @Override + public boolean configure(String name, Map params) throws ConfigurationException { + super.configure(name, params); + _allocationAlgorithm = _configDao.getValue(Config.VmAllocationAlgorithm.key()); + return true; + } + + @Override + public boolean start() { + return true; + } + + @Override + public boolean stop() { + return true; + } +} diff --git a/server/src/com/cloud/deploy/DeployPlannerSelector.java b/server/src/com/cloud/deploy/DeployPlannerSelector.java index 40eabb1646f..062b492d8fc 100755 --- a/server/src/com/cloud/deploy/DeployPlannerSelector.java +++ b/server/src/com/cloud/deploy/DeployPlannerSelector.java @@ -1,24 +1,24 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.deploy; - -import com.cloud.utils.component.Adapter; -import com.cloud.vm.UserVmVO; - -public interface DeployPlannerSelector extends Adapter { - String selectPlanner(UserVmVO vm); -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.deploy; + +import com.cloud.utils.component.Adapter; +import com.cloud.vm.UserVmVO; + +public interface DeployPlannerSelector extends Adapter { + String selectPlanner(UserVmVO vm); +} diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManager.java b/server/src/com/cloud/deploy/DeploymentPlanningManager.java new file mode 100644 index 00000000000..13f1c67d613 --- /dev/null +++ b/server/src/com/cloud/deploy/DeploymentPlanningManager.java @@ -0,0 +1,45 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.deploy; + +import com.cloud.deploy.DeploymentPlanner.ExcludeList; +import com.cloud.exception.AffinityConflictException; +import com.cloud.exception.InsufficientServerCapacityException; +import com.cloud.utils.component.Manager; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachineProfile; + +public interface DeploymentPlanningManager extends Manager { + + /** + * Manages vm deployment stages: First Process Affinity/Anti-affinity - Call + * the chain of AffinityGroupProcessor adapters to set deploymentplan scope + * and exclude list Secondly, Call DeploymentPlanner - to use heuristics to + * find the best spot to place the vm/volume. Planner will drill down to the + * write set of clusters to look for placement based on various heuristics. + * Lastly, Call Allocators - Given a cluster, allocators matches the + * requirements to capabilities of the physical resource (host, storage + * pool). + * + * @throws AffinityConflictException + * + * + * + */ + DeployDestination planDeployment(VirtualMachineProfile vmProfile, DeploymentPlan plan, + ExcludeList avoids) throws InsufficientServerCapacityException, AffinityConflictException; +} diff --git a/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java new file mode 100644 index 00000000000..c7162a2003f --- /dev/null +++ b/server/src/com/cloud/deploy/DeploymentPlanningManagerImpl.java @@ -0,0 +1,106 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.deploy; + +import java.util.List; + +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.cloudstack.affinity.AffinityGroupProcessor; +import org.apache.cloudstack.affinity.AffinityGroupVMMapVO; +import org.apache.cloudstack.affinity.dao.AffinityGroupDao; +import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; +import org.apache.log4j.Logger; + +import com.cloud.deploy.DeploymentPlanner.ExcludeList; +import com.cloud.exception.AffinityConflictException; +import com.cloud.exception.InsufficientServerCapacityException; +import com.cloud.utils.component.Manager; +import com.cloud.utils.component.ManagerBase; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachineProfile; +import com.cloud.vm.dao.UserVmDao; +import com.cloud.vm.dao.VMInstanceDao; + +@Local(value = { DeploymentPlanningManager.class }) +public class DeploymentPlanningManagerImpl extends ManagerBase implements DeploymentPlanningManager, Manager { + + private static final Logger s_logger = Logger.getLogger(DeploymentPlanningManagerImpl.class); + @Inject + protected UserVmDao _vmDao; + @Inject + protected VMInstanceDao _vmInstanceDao; + @Inject + protected AffinityGroupDao _affinityGroupDao; + @Inject + protected AffinityGroupVMMapDao _affinityGroupVMMapDao; + + protected List _planners; + public List getPlanners() { + return _planners; + } + public void setPlanners(List _planners) { + this._planners = _planners; + } + + protected List _affinityProcessors; + public List getAffinityGroupProcessors() { + return _affinityProcessors; + } + public void setAffinityGroupProcessors(List affinityProcessors) { + this._affinityProcessors = affinityProcessors; + } + + @Override + public DeployDestination planDeployment(VirtualMachineProfile vmProfile, + DeploymentPlan plan, ExcludeList avoids) throws InsufficientServerCapacityException, + AffinityConflictException { + + // call affinitygroup chain + VirtualMachine vm = vmProfile.getVirtualMachine(); + long vmGroupCount = _affinityGroupVMMapDao.countAffinityGroupsForVm(vm.getId()); + + if (vmGroupCount > 0) { + for (AffinityGroupProcessor processor : _affinityProcessors) { + processor.process(vmProfile, plan, avoids); + } + } + + if (s_logger.isDebugEnabled()) { + s_logger.debug("Deploy avoids pods: " + avoids.getPodsToAvoid() + ", clusters: " + + avoids.getClustersToAvoid() + ", hosts: " + avoids.getHostsToAvoid()); + } + + // call planners + DeployDestination dest = null; + for (DeploymentPlanner planner : _planners) { + if (planner.canHandle(vmProfile, plan, avoids)) { + dest = planner.plan(vmProfile, plan, avoids); + } else { + continue; + } + if (dest != null) { + avoids.addHost(dest.getHost().getId()); + break; + } + + } + return dest; + } + +} diff --git a/server/src/com/cloud/deploy/FirstFitPlanner.java b/server/src/com/cloud/deploy/FirstFitPlanner.java index 0cbf72f2d7a..1647cf7dba9 100755 --- a/server/src/com/cloud/deploy/FirstFitPlanner.java +++ b/server/src/com/cloud/deploy/FirstFitPlanner.java @@ -157,41 +157,48 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { if(plan.getHostId() != null && haVmTag == null){ Long hostIdSpecified = plan.getHostId(); if (s_logger.isDebugEnabled()){ - s_logger.debug("DeploymentPlan has host_id specified, making no checks on this host, looks like admin test: "+hostIdSpecified); + s_logger.debug("DeploymentPlan has host_id specified, choosing this host and making no checks on this host: " + + hostIdSpecified); } HostVO host = _hostDao.findById(hostIdSpecified); - if (s_logger.isDebugEnabled()) { - if(host == null){ - s_logger.debug("The specified host cannot be found"); - }else{ + if (host == null) { + s_logger.debug("The specified host cannot be found"); + } else if (avoid.shouldAvoid(host)) { + s_logger.debug("The specified host is in avoid set"); + } else { + if (s_logger.isDebugEnabled()) { s_logger.debug("Looking for suitable pools for this host under zone: "+host.getDataCenterId() +", pod: "+ host.getPodId()+", cluster: "+ host.getClusterId()); } - } - //search for storage under the zone, pod, cluster of the host. - DataCenterDeployment lastPlan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), host.getClusterId(), hostIdSpecified, plan.getPoolId(), null, plan.getReservationContext()); + // search for storage under the zone, pod, cluster of the host. + DataCenterDeployment lastPlan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), + host.getClusterId(), hostIdSpecified, plan.getPoolId(), null, plan.getReservationContext()); - Pair>, List> result = findSuitablePoolsForVolumes(vmProfile, lastPlan, avoid, HostAllocator.RETURN_UPTO_ALL); - Map> suitableVolumeStoragePools = result.first(); - List readyAndReusedVolumes = result.second(); + Pair>, List> result = findSuitablePoolsForVolumes(vmProfile, + lastPlan, avoid, HostAllocator.RETURN_UPTO_ALL); + Map> suitableVolumeStoragePools = result.first(); + List readyAndReusedVolumes = result.second(); - //choose the potential pool for this VM for this host - if(!suitableVolumeStoragePools.isEmpty()){ - List suitableHosts = new ArrayList(); - suitableHosts.add(host); + // choose the potential pool for this VM for this host + if (!suitableVolumeStoragePools.isEmpty()) { + List suitableHosts = new ArrayList(); + suitableHosts.add(host); - Pair> potentialResources = findPotentialDeploymentResources(suitableHosts, suitableVolumeStoragePools); - if(potentialResources != null){ - Pod pod = _podDao.findById(host.getPodId()); - Cluster cluster = _clusterDao.findById(host.getClusterId()); - Map storageVolMap = potentialResources.second(); - // remove the reused vol<->pool from destination, since we don't have to prepare this volume. - for(Volume vol : readyAndReusedVolumes){ - storageVolMap.remove(vol); + Pair> potentialResources = findPotentialDeploymentResources( + suitableHosts, suitableVolumeStoragePools); + if (potentialResources != null) { + Pod pod = _podDao.findById(host.getPodId()); + Cluster cluster = _clusterDao.findById(host.getClusterId()); + Map storageVolMap = potentialResources.second(); + // remove the reused vol<->pool from destination, since + // we don't have to prepare this volume. + for (Volume vol : readyAndReusedVolumes) { + storageVolMap.remove(vol); + } + DeployDestination dest = new DeployDestination(dc, pod, cluster, host, storageVolMap); + s_logger.debug("Returning Deployment Destination: " + dest); + return dest; } - DeployDestination dest = new DeployDestination(dc, pod, cluster, host, storageVolMap); - s_logger.debug("Returning Deployment Destination: "+ dest); - return dest; } } s_logger.debug("Cannnot deploy to specified host, returning."); @@ -407,9 +414,9 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { } /** - * This method should reorder the given list of Cluster Ids by applying any necessary heuristic + * This method should reorder the given list of Cluster Ids by applying any necessary heuristic * for this planner - * For FirstFitPlanner there is no specific heuristic to be applied + * For FirstFitPlanner there is no specific heuristic to be applied * other than the capacity based ordering which is done by default. * @return List ordered list of Cluster Ids */ @@ -419,9 +426,9 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { } /** - * This method should reorder the given list of Pod Ids by applying any necessary heuristic + * This method should reorder the given list of Pod Ids by applying any necessary heuristic * for this planner - * For FirstFitPlanner there is no specific heuristic to be applied + * For FirstFitPlanner there is no specific heuristic to be applied * other than the capacity based ordering which is done by default. * @return List ordered list of Pod Ids */ @@ -443,7 +450,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { private List listDisabledPods(long zoneId){ List disabledPods = _podDao.listDisabledPods(zoneId); return disabledPods; - } + } private Map getCapacityThresholdMap(){ // Lets build this real time so that the admin wont have to restart MS if he changes these values @@ -461,9 +468,9 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { } private List getCapacitiesForCheckingThreshold(){ - List capacityList = new ArrayList(); + List capacityList = new ArrayList(); capacityList.add(Capacity.CAPACITY_TYPE_CPU); - capacityList.add(Capacity.CAPACITY_TYPE_MEMORY); + capacityList.add(Capacity.CAPACITY_TYPE_MEMORY); return capacityList; } @@ -479,7 +486,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { // For each capacity get the cluster list crossing the threshold and remove it from the clusterList that will be used for vm allocation. for(short capacity : capacityList){ - + if (clusterListForVmAllocation == null || clusterListForVmAllocation.size() == 0){ return; } @@ -492,17 +499,17 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { capacityThresholdMap.get(capacity), ram_requested ); } - + if (clustersCrossingThreshold != null && clustersCrossingThreshold.size() != 0){ // addToAvoid Set avoid.addClusterList(clustersCrossingThreshold); // Remove clusters crossing disabled threshold clusterListForVmAllocation.removeAll(clustersCrossingThreshold); - + s_logger.debug("Cannot allocate cluster list " + clustersCrossingThreshold.toString() + " for vm creation since their allocated percentage" + " crosses the disable capacity threshold: " + capacityThresholdMap.get(capacity) + " for capacity Type : " + capacity + ", skipping these clusters"); } - + } } @@ -652,7 +659,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { public int compare(Volume v1, Volume v2) { if(v1.getSize() < v2.getSize()) return 1; - else + else return -1; } }); @@ -749,7 +756,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { }else{ pool = (StoragePool)this.dataStoreMgr.getPrimaryDataStore(plan.getPoolId()); } - + if(!pool.isInMaintenance()){ if(!avoid.shouldAvoid(pool)){ long exstPoolDcId = pool.getDataCenterId(); @@ -781,13 +788,13 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { if(!isRootAdmin(plan.getReservationContext())){ if(!isEnabledForAllocation(plan.getDataCenterId(), plan.getPodId(), plan.getClusterId())){ if(s_logger.isDebugEnabled()){ - s_logger.debug("Cannot allocate new storagepool for this volume in this cluster, allocation state is disabled"); + s_logger.debug("Cannot allocate new storagepool for this volume in this cluster, allocation state is disabled"); s_logger.debug("Cannot deploy to this specified plan, allocation state is disabled, returning."); } - //Cannot find suitable storage pools under this cluster for this volume since allocation_state is disabled. + //Cannot find suitable storage pools under this cluster for this volume since allocation_state is disabled. //- remove any suitable pools found for other volumes. //All volumes should get suitable pools under this cluster; else we cant use this cluster. - suitableVolumeStoragePools.clear(); + suitableVolumeStoragePools.clear(); break; } } @@ -877,7 +884,7 @@ public class FirstFitPlanner extends PlannerBase implements DeploymentPlanner { super.configure(name, params); _allocationAlgorithm = _configDao.getValue(Config.VmAllocationAlgorithm.key()); return true; - } + } private boolean isEnabledForAllocation(long zoneId, Long podId, Long clusterId){ // Check if the zone exists in the system diff --git a/server/src/com/cloud/deploy/HypervisorVmPlannerSelector.java b/server/src/com/cloud/deploy/HypervisorVmPlannerSelector.java index 0f454cdb582..ce494051376 100755 --- a/server/src/com/cloud/deploy/HypervisorVmPlannerSelector.java +++ b/server/src/com/cloud/deploy/HypervisorVmPlannerSelector.java @@ -1,54 +1,54 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.deploy; - -import javax.ejb.Local; - -import org.apache.log4j.Logger; - -import com.cloud.deploy.DeploymentPlanner.AllocationAlgorithm; -import com.cloud.hypervisor.Hypervisor.HypervisorType; -import com.cloud.vm.UserVmVO; - -@Local(value = {DeployPlannerSelector.class}) -public class HypervisorVmPlannerSelector extends AbstractDeployPlannerSelector { - private static final Logger s_logger = Logger.getLogger(HypervisorVmPlannerSelector.class); - - @Override - public String selectPlanner(UserVmVO vm) { - if (vm.getHypervisorType() != HypervisorType.BareMetal) { - //check the allocation strategy - if (_allocationAlgorithm != null) { - if (_allocationAlgorithm.equals(AllocationAlgorithm.random.toString()) - || _allocationAlgorithm.equals(AllocationAlgorithm.firstfit.toString())) { - return "FirstFitPlanner"; - } else if (_allocationAlgorithm.equals(AllocationAlgorithm.userdispersing.toString())) { - return "UserDispersingPlanner"; - } else if (_allocationAlgorithm.equals(AllocationAlgorithm.userconcentratedpod_random.toString()) - || _allocationAlgorithm.equals(AllocationAlgorithm.userconcentratedpod_firstfit.toString())) { - return "UserConcentratedPodPlanner"; - } - } else { - if (s_logger.isDebugEnabled()) { - s_logger.debug("The allocation algorithm is null, cannot select the planner"); - } - } - } - - return null; - } -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.deploy; + +import javax.ejb.Local; + +import org.apache.log4j.Logger; + +import com.cloud.deploy.DeploymentPlanner.AllocationAlgorithm; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.vm.UserVmVO; + +@Local(value = {DeployPlannerSelector.class}) +public class HypervisorVmPlannerSelector extends AbstractDeployPlannerSelector { + private static final Logger s_logger = Logger.getLogger(HypervisorVmPlannerSelector.class); + + @Override + public String selectPlanner(UserVmVO vm) { + if (vm.getHypervisorType() != HypervisorType.BareMetal) { + //check the allocation strategy + if (_allocationAlgorithm != null) { + if (_allocationAlgorithm.equals(AllocationAlgorithm.random.toString()) + || _allocationAlgorithm.equals(AllocationAlgorithm.firstfit.toString())) { + return "FirstFitPlanner"; + } else if (_allocationAlgorithm.equals(AllocationAlgorithm.userdispersing.toString())) { + return "UserDispersingPlanner"; + } else if (_allocationAlgorithm.equals(AllocationAlgorithm.userconcentratedpod_random.toString()) + || _allocationAlgorithm.equals(AllocationAlgorithm.userconcentratedpod_firstfit.toString())) { + return "UserConcentratedPodPlanner"; + } + } else { + if (s_logger.isDebugEnabled()) { + s_logger.debug("The allocation algorithm is null, cannot select the planner"); + } + } + } + + return null; + } +} diff --git a/server/src/com/cloud/domain/dao/DomainDaoImpl.java b/server/src/com/cloud/domain/dao/DomainDaoImpl.java index 79ef17ed2a6..c30ca5ef49a 100644 --- a/server/src/com/cloud/domain/dao/DomainDaoImpl.java +++ b/server/src/com/cloud/domain/dao/DomainDaoImpl.java @@ -262,11 +262,14 @@ public class DomainDaoImpl extends GenericDaoBase implements Dom public Set getDomainParentIds(long domainId) { Set parentDomains = new HashSet(); Domain domain = findById(domainId); - parentDomains.add(domain.getId()); - - while (domain.getParent() != null) { - domain = findById(domain.getParent()); + + if (domain != null) { parentDomains.add(domain.getId()); + + while (domain.getParent() != null) { + domain = findById(domain.getParent()); + parentDomains.add(domain.getId()); + } } return parentDomains; diff --git a/server/src/com/cloud/ha/UserVmDomRInvestigator.java b/server/src/com/cloud/ha/UserVmDomRInvestigator.java index f86932ab9fd..f785d183938 100644 --- a/server/src/com/cloud/ha/UserVmDomRInvestigator.java +++ b/server/src/com/cloud/ha/UserVmDomRInvestigator.java @@ -50,9 +50,9 @@ public class UserVmDomRInvestigator extends AbstractInvestigatorImpl { @Inject private final UserVmDao _userVmDao = null; @Inject private final AgentManager _agentMgr = null; @Inject private final NetworkModel _networkMgr = null; - @Inject private final VpcVirtualNetworkApplianceManager _vnaMgr = null; - - @Override + @Inject private final VpcVirtualNetworkApplianceManager _vnaMgr = null; + + @Override public Boolean isVmAlive(VMInstanceVO vm, HostVO host) { if (vm.getType() != VirtualMachine.Type.User) { if (s_logger.isDebugEnabled()) { diff --git a/server/src/com/cloud/host/dao/HostDao.java b/server/src/com/cloud/host/dao/HostDao.java index 4760035ec48..98bdcb470e1 100755 --- a/server/src/com/cloud/host/dao/HostDao.java +++ b/server/src/com/cloud/host/dao/HostDao.java @@ -79,5 +79,5 @@ public interface HostDao extends GenericDao, StateDao listAllUpAndEnabledNonHAHosts(Type type, Long clusterId, Long podId, long dcId, String haTag); -} + List listAllUpAndEnabledNonHAHosts(Type type, Long clusterId, Long podId, long dcId, String haTag); +} diff --git a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java index d77796da300..ca1644a4281 100644 --- a/server/src/com/cloud/hypervisor/HypervisorGuruBase.java +++ b/server/src/com/cloud/hypervisor/HypervisorGuruBase.java @@ -129,4 +129,9 @@ public abstract class HypervisorGuruBase extends AdapterBase implements Hypervis public long getCommandHostDelegation(long hostId, Command cmd) { return hostId; } + + @Override + public List finalizeExpunge(VirtualMachine vm) { + return null; + } } diff --git a/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDao.java b/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDao.java index 0fe0b535f78..1fdc03a74fe 100644 --- a/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDao.java +++ b/server/src/com/cloud/hypervisor/dao/HypervisorCapabilitiesDao.java @@ -33,4 +33,6 @@ public interface HypervisorCapabilitiesDao extends GenericDao nics = _nicDao.listByNetworkId(network.getId()); for (NicVO nic : nics) { - if (nic.getReservationStrategy().equals(ReservationStrategy.PlaceHolder) && nic.getIp4Address().equals(network.getGateway())) { + if (nic.getVmType() == null && nic.getReservationStrategy().equals(ReservationStrategy.PlaceHolder) && nic.getIp4Address().equals(network.getGateway())) { s_logger.debug("Removing placeholder nic " + nic + " for the network " + network); _nicDao.remove(nic.getId()); } @@ -541,8 +543,15 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl if (rule.getSourceCidrList() == null && (rule.getPurpose() == Purpose.Firewall || rule.getPurpose() == Purpose.NetworkACL)) { _fwRulesDao.loadSourceCidrs((FirewallRuleVO)rule); } - IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId()); - FirewallRuleTO ruleTO = new FirewallRuleTO(rule, null, sourceIp.getAddress().addr()); + FirewallRuleTO ruleTO; + if (rule.getPurpose() == Purpose.Firewall && rule.getTrafficType() == FirewallRule.TrafficType.Egress) { + String guestVlanTag = network.getBroadcastUri().getHost(); + String guestCidr = network.getCidr(); + ruleTO = new FirewallRuleTO(rule, guestVlanTag, rule.getTrafficType()); + } else { + IpAddress sourceIp = _networkModel.getIp(rule.getSourceIpAddressId()); + ruleTO = new FirewallRuleTO(rule, null, sourceIp.getAddress().addr()); + } rulesTO.add(ruleTO); } @@ -707,8 +716,17 @@ public abstract class ExternalFirewallDeviceManagerImpl extends AdapterBase impl if (pNetwork.getVnet() == null) { throw new CloudRuntimeException("Could not find vlan range for physical Network " + physicalNetworkId + "."); } - String vlanRange[] = pNetwork.getVnet().split("-"); - int lowestVlanTag = Integer.valueOf(vlanRange[0]); + Integer lowestVlanTag = null; + List> vnetList = pNetwork.getVnet(); + //finding the vlanrange in which the vlanTag lies. + for (Pair vnet : vnetList){ + if (vlanTag >= vnet.first() && vlanTag <= vnet.second()){ + lowestVlanTag = vnet.first(); + } + } + if (lowestVlanTag == null) { + throw new InvalidParameterValueException ("The vlan tag does not belong to any of the existing vlan ranges"); + } return vlanTag - lowestVlanTag; } diff --git a/server/src/com/cloud/network/ExteralIpAddressAllocator.java b/server/src/com/cloud/network/ExternalIpAddressAllocator.java similarity index 96% rename from server/src/com/cloud/network/ExteralIpAddressAllocator.java rename to server/src/com/cloud/network/ExternalIpAddressAllocator.java index 2b78712b86f..f24fa2d29b9 100644 --- a/server/src/com/cloud/network/ExteralIpAddressAllocator.java +++ b/server/src/com/cloud/network/ExternalIpAddressAllocator.java @@ -37,8 +37,8 @@ import com.cloud.utils.component.AdapterBase; import com.cloud.utils.exception.CloudRuntimeException; @Local(value=IpAddrAllocator.class) -public class ExteralIpAddressAllocator extends AdapterBase implements IpAddrAllocator{ - private static final Logger s_logger = Logger.getLogger(ExteralIpAddressAllocator.class); +public class ExternalIpAddressAllocator extends AdapterBase implements IpAddrAllocator{ + private static final Logger s_logger = Logger.getLogger(ExternalIpAddressAllocator.class); String _name; @Inject ConfigurationDao _configDao = null; @Inject IPAddressDao _ipAddressDao = null; @@ -135,7 +135,7 @@ public class ExteralIpAddressAllocator extends AdapterBase implements IpAddrAllo } @Override - public boolean exteralIpAddressAllocatorEnabled() { + public boolean externalIpAddressAllocatorEnabled() { return _isExternalIpAllocatorEnabled; } diff --git a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java index 4853256db72..b4662d13df3 100644 --- a/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java +++ b/server/src/com/cloud/network/ExternalLoadBalancerDeviceManagerImpl.java @@ -111,7 +111,6 @@ import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserStatisticsDao; import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.AdapterBase; -import com.cloud.utils.component.ComponentContext; import com.cloud.utils.db.DB; import com.cloud.utils.db.GlobalLock; import com.cloud.utils.db.Transaction; @@ -119,18 +118,10 @@ import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; import com.cloud.utils.net.UrlUtil; import com.cloud.vm.Nic; +import com.cloud.vm.Nic.ReservationStrategy; import com.cloud.vm.NicVO; import com.cloud.vm.dao.DomainRouterDao; import com.cloud.vm.dao.NicDao; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.response.ExternalLoadBalancerResponse; -import org.apache.cloudstack.network.ExternalNetworkDeviceManager.NetworkDevice; -import org.apache.log4j.Logger; - -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import java.net.URI; -import java.util.*; public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase implements ExternalLoadBalancerDeviceManager, ResourceStateAdapter { @@ -278,11 +269,11 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase txn.start(); lbDeviceVO = new ExternalLoadBalancerDeviceVO(host.getId(), pNetwork.getId(), ntwkDevice.getNetworkServiceProvder(), deviceName, capacity, dedicatedUse, gslbProvider); - _externalLoadBalancerDeviceDao.persist(lbDeviceVO); - if (!gslbProvider) { + if (gslbProvider) { lbDeviceVO.setGslbSitePrivateIP(gslbSitePublicIp); lbDeviceVO.setGslbSitePrivateIP(gslbSitePrivateIp); } + _externalLoadBalancerDeviceDao.persist(lbDeviceVO); DetailVO hostDetail = new DetailVO(host.getId(), ApiConstants.LOAD_BALANCER_DEVICE_ID, String.valueOf(lbDeviceVO.getId())); _hostDetailDao.persist(hostDetail); @@ -783,7 +774,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase // If a NIC doesn't exist for the load balancing IP address, create one loadBalancingIpNic = _nicDao.findByIp4AddressAndNetworkId(loadBalancingIpAddress, network.getId()); if (loadBalancingIpNic == null) { - loadBalancingIpNic = _networkMgr.savePlaceholderNic(network, loadBalancingIpAddress); + loadBalancingIpNic = _networkMgr.savePlaceholderNic(network, loadBalancingIpAddress, null); } // Save a mapping between the source IP address and the load balancing IP address NIC @@ -992,7 +983,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase if (add) { // on restart network, network could have already been implemented. If already implemented then return - Nic selfipNic = _networkModel.getPlaceholderNic(guestConfig, null); + Nic selfipNic = getPlaceholderNic(guestConfig); if (selfipNic != null) { return true; } @@ -1006,7 +997,7 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase } } else { // get the self-ip used by the load balancer - Nic selfipNic = _networkModel.getPlaceholderNic(guestConfig, null); + Nic selfipNic = getPlaceholderNic(guestConfig); if (selfipNic == null) { s_logger.warn("Network shutdwon requested on external load balancer element, which did not implement the network." + " Either network implement failed half way through or already network shutdown is completed. So just returning."); @@ -1034,10 +1025,10 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase if (add) { // Insert a new NIC for this guest network to reserve the self IP - _networkMgr.savePlaceholderNic(guestConfig, selfIp); + _networkMgr.savePlaceholderNic(guestConfig, selfIp, null); } else { // release the self-ip obtained from guest network - Nic selfipNic = _networkModel.getPlaceholderNic(guestConfig, null); + Nic selfipNic = getPlaceholderNic(guestConfig); _nicDao.remove(selfipNic.getId()); // release the load balancer allocated for the network @@ -1211,4 +1202,15 @@ public abstract class ExternalLoadBalancerDeviceManagerImpl extends AdapterBase return answer.getLoadBalancers(); } + private NicVO getPlaceholderNic(Network network) { + List guestIps = _nicDao.listByNetworkId(network.getId()); + for (NicVO guestIp : guestIps) { + // only external firewall and external load balancer will create NicVO with PlaceHolder reservation strategy + if (guestIp.getReservationStrategy().equals(ReservationStrategy.PlaceHolder) && guestIp.getVmType() == null + && guestIp.getReserver() == null && !guestIp.getIp4Address().equals(network.getGateway())) { + return guestIp; + } + } + return null; + } } diff --git a/server/src/com/cloud/network/IpAddrAllocator.java b/server/src/com/cloud/network/IpAddrAllocator.java index d79125b3741..6cdf5972080 100644 --- a/server/src/com/cloud/network/IpAddrAllocator.java +++ b/server/src/com/cloud/network/IpAddrAllocator.java @@ -52,5 +52,5 @@ public interface IpAddrAllocator extends Adapter { public IpAddr getPrivateIpAddress(String macAddr, long dcId, long podId); public boolean releasePublicIpAddress(String ip, long dcId, long podId); public boolean releasePrivateIpAddress(String ip, long dcId, long podId); - public boolean exteralIpAddressAllocatorEnabled(); + public boolean externalIpAddressAllocatorEnabled(); } diff --git a/server/src/com/cloud/network/NetworkManager.java b/server/src/com/cloud/network/NetworkManager.java index 851f7f54549..4af716ca12a 100755 --- a/server/src/com/cloud/network/NetworkManager.java +++ b/server/src/com/cloud/network/NetworkManager.java @@ -55,6 +55,7 @@ import com.cloud.vm.NicVO; import com.cloud.vm.ReservationContext; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.VirtualMachineProfile; /** @@ -345,6 +346,6 @@ public interface NetworkManager { String allocatePublicIpForGuestNic(Long networkId, DataCenter dc, Pod pod, Account caller, String requestedIp) throws InsufficientAddressCapacityException; boolean removeVmSecondaryIpsOfNic(long nicId); - NicVO savePlaceholderNic(Network network, String ip4Address); + NicVO savePlaceholderNic(Network network, String ip4Address, Type vmType); } diff --git a/server/src/com/cloud/network/NetworkManagerImpl.java b/server/src/com/cloud/network/NetworkManagerImpl.java index a16288ff606..72ccac0ec7d 100755 --- a/server/src/com/cloud/network/NetworkManagerImpl.java +++ b/server/src/com/cloud/network/NetworkManagerImpl.java @@ -16,42 +16,9 @@ // under the License. package com.cloud.network; -import java.net.URI; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.Collections; -import java.util.Comparator; -import java.util.Date; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Random; -import java.util.Set; -import java.util.UUID; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; - -import org.apache.cloudstack.acl.ControlledEntity.ACLType; -import org.apache.cloudstack.acl.SecurityChecker.AccessType; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; -import com.cloud.agent.api.AgentControlAnswer; -import com.cloud.agent.api.AgentControlCommand; -import com.cloud.agent.api.Answer; -import com.cloud.agent.api.CheckNetworkAnswer; -import com.cloud.agent.api.CheckNetworkCommand; -import com.cloud.agent.api.Command; -import com.cloud.agent.api.StartupCommand; -import com.cloud.agent.api.StartupRoutingCommand; +import com.cloud.agent.api.*; import com.cloud.agent.api.to.NicTO; import com.cloud.alert.AlertManager; import com.cloud.api.ApiDBUtils; @@ -59,15 +26,9 @@ import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.Resource.ResourceType; import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.dc.AccountVlanMapVO; -import com.cloud.dc.DataCenter; +import com.cloud.dc.*; import com.cloud.dc.DataCenter.NetworkType; -import com.cloud.dc.DataCenterVO; -import com.cloud.dc.Pod; -import com.cloud.dc.PodVlanMapVO; -import com.cloud.dc.Vlan; import com.cloud.dc.Vlan.VlanType; -import com.cloud.dc.VlanVO; import com.cloud.dc.dao.AccountVlanMapDao; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.PodVlanMapDao; @@ -80,66 +41,25 @@ import com.cloud.domain.dao.DomainDao; import com.cloud.event.EventTypes; import com.cloud.event.UsageEventUtils; import com.cloud.event.dao.UsageEventDao; -import com.cloud.exception.AccountLimitException; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.ConnectionException; -import com.cloud.exception.InsufficientAddressCapacityException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InsufficientVirtualNetworkCapcityException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.PermissionDeniedException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.exception.UnsupportedServiceException; +import com.cloud.exception.*; import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.Status; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.IpAddress.State; -import com.cloud.network.Network.Capability; -import com.cloud.network.Network.Event; -import com.cloud.network.Network.GuestType; -import com.cloud.network.Network.Provider; -import com.cloud.network.Network.Service; +import com.cloud.network.Network.*; import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.BroadcastDomainType; import com.cloud.network.Networks.IsolationType; import com.cloud.network.Networks.TrafficType; import com.cloud.network.addr.PublicIp; -import com.cloud.network.dao.FirewallRulesDao; -import com.cloud.network.dao.IPAddressDao; -import com.cloud.network.dao.IPAddressVO; -import com.cloud.network.dao.LoadBalancerDao; -import com.cloud.network.dao.NetworkDao; -import com.cloud.network.dao.NetworkDomainDao; -import com.cloud.network.dao.NetworkServiceMapDao; -import com.cloud.network.dao.NetworkServiceMapVO; -import com.cloud.network.dao.NetworkVO; -import com.cloud.network.dao.PhysicalNetworkDao; -import com.cloud.network.dao.PhysicalNetworkServiceProviderDao; -import com.cloud.network.dao.PhysicalNetworkTrafficTypeDao; -import com.cloud.network.dao.PhysicalNetworkTrafficTypeVO; -import com.cloud.network.dao.PhysicalNetworkVO; -import com.cloud.network.dao.UserIpv6AddressDao; -import com.cloud.network.element.DhcpServiceProvider; -import com.cloud.network.element.IpDeployer; -import com.cloud.network.element.IpDeployingRequester; -import com.cloud.network.element.LoadBalancingServiceProvider; -import com.cloud.network.element.NetworkElement; -import com.cloud.network.element.StaticNatServiceProvider; -import com.cloud.network.element.UserDataServiceProvider; +import com.cloud.network.dao.*; +import com.cloud.network.element.*; import com.cloud.network.guru.NetworkGuru; import com.cloud.network.lb.LoadBalancingRulesManager; -import com.cloud.network.rules.FirewallManager; -import com.cloud.network.rules.FirewallRule; +import com.cloud.network.rules.*; import com.cloud.network.rules.FirewallRule.Purpose; -import com.cloud.network.rules.FirewallRuleVO; -import com.cloud.network.rules.PortForwardingRuleVO; -import com.cloud.network.rules.RulesManager; -import com.cloud.network.rules.StaticNat; -import com.cloud.network.rules.StaticNatRule; -import com.cloud.network.rules.StaticNatRuleImpl; import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.network.vpc.NetworkACLManager; import com.cloud.network.vpc.VpcManager; @@ -152,49 +72,40 @@ import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.org.Grouping; -import com.cloud.user.Account; -import com.cloud.user.AccountManager; -import com.cloud.user.ResourceLimitService; -import com.cloud.user.User; -import com.cloud.user.UserContext; -import com.cloud.user.UserVO; +import com.cloud.user.*; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserDao; import com.cloud.utils.Journal; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.component.AdapterBase; -import com.cloud.utils.component.ComponentContext; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; -import com.cloud.utils.db.DB; -import com.cloud.utils.db.Filter; +import com.cloud.utils.db.*; import com.cloud.utils.db.JoinBuilder.JoinType; -import com.cloud.utils.db.SearchBuilder; -import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; -import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.fsm.NoTransitionException; import com.cloud.utils.fsm.StateMachine2; import com.cloud.utils.net.Ip; import com.cloud.utils.net.NetUtils; -import com.cloud.vm.Nic; +import com.cloud.vm.*; import com.cloud.vm.Nic.ReservationStrategy; -import com.cloud.vm.NicProfile; -import com.cloud.vm.NicVO; -import com.cloud.vm.ReservationContext; -import com.cloud.vm.ReservationContextImpl; -import com.cloud.vm.UserVmVO; -import com.cloud.vm.VMInstanceVO; -import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachine.Type; -import com.cloud.vm.VirtualMachineProfile; -import com.cloud.vm.dao.NicDao; -import com.cloud.vm.dao.NicSecondaryIpDao; -import com.cloud.vm.dao.NicSecondaryIpVO; -import com.cloud.vm.dao.UserVmDao; -import com.cloud.vm.dao.VMInstanceDao; +import com.cloud.vm.dao.*; +import org.apache.cloudstack.acl.ControlledEntity.ACLType; +import org.apache.cloudstack.acl.SecurityChecker.AccessType; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; +import java.net.URI; +import java.util.*; +import java.util.concurrent.Executors; +import java.util.concurrent.ScheduledExecutorService; +import java.util.concurrent.TimeUnit; /** * NetworkManagerImpl implements NetworkManager. @@ -348,7 +259,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L } @DB - public PublicIp fetchNewPublicIp(long dcId, Long podId, Long vlanDbId, Account owner, VlanType vlanUse, + public PublicIp fetchNewPublicIp(long dcId, Long podId, List vlanDbIds, Account owner, VlanType vlanUse, Long guestNetworkId, boolean sourceNat, boolean assign, String requestedIp, boolean isSystem, Long vpcId) throws InsufficientAddressCapacityException { StringBuilder errorMessage = new StringBuilder("Unable to get ip adress in "); @@ -364,9 +275,9 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L errorMessage.append(" zone id=" + dcId); } - if (vlanDbId != null) { - sc.addAnd("vlanId", SearchCriteria.Op.EQ, vlanDbId); - errorMessage.append(", vlanId id=" + vlanDbId); + if ( vlanDbIds != null && !vlanDbIds.isEmpty() ) { + sc.setParameters("vlanId", vlanDbIds.toArray()); + errorMessage.append(", vlanId id=" + vlanDbIds.toArray()); } sc.setParameters("dc", dcId); @@ -526,14 +437,14 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L } // If account has Account specific ip ranges, try to allocate ip from there - Long vlanId = null; + List vlanIds = new ArrayList(); List maps = _accountVlanMapDao.listAccountVlanMapsByAccount(ownerId); if (maps != null && !maps.isEmpty()) { - vlanId = maps.get(0).getVlanDbId(); + vlanIds.add(maps.get(0).getVlanDbId()); } - ip = fetchNewPublicIp(dcId, null, vlanId, owner, VlanType.VirtualNetwork, guestNtwkId, + ip = fetchNewPublicIp(dcId, null, vlanIds, owner, VlanType.VirtualNetwork, guestNtwkId, isSourceNat, false, null, false, vpcId); IPAddressVO publicIp = ip.ip(); @@ -663,12 +574,15 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L @DB @Override - public IpAddress allocateIp(Account ipOwner, boolean isSystem, Account caller, long callerUserId, DataCenter zone) + public IpAddress allocateIp(Account ipOwner, boolean isSystem, Account caller, long callerUserId, DataCenter zone) throws ConcurrentOperationException, ResourceAllocationException, InsufficientAddressCapacityException { VlanType vlanType = VlanType.VirtualNetwork; boolean assign = false; + boolean allocateFromDedicatedRange = false; + List dedicatedVlanDbIds = new ArrayList(); + List nonDedicatedVlanDbIds = new ArrayList(); if (Grouping.AllocationState.Disabled == zone.getAllocationState() && !_accountMgr.isRootAdmin(caller.getType())) { // zone is of type DataCenter. See DataCenterVO.java. @@ -702,11 +616,37 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L txn.start(); - ip = fetchNewPublicIp(zone.getId(), null, null, ipOwner, vlanType, null, - false, assign, null, isSystem, null); + // If account has dedicated Public IP ranges, allocate IP from the dedicated range + List maps = _accountVlanMapDao.listAccountVlanMapsByAccount(ipOwner.getId()); + for (AccountVlanMapVO map : maps) { + dedicatedVlanDbIds.add(map.getVlanDbId()); + } + if (dedicatedVlanDbIds != null && !dedicatedVlanDbIds.isEmpty()) { + allocateFromDedicatedRange = true; + } + + try { + if (allocateFromDedicatedRange) { + ip = fetchNewPublicIp(zone.getId(), null, dedicatedVlanDbIds, ipOwner, vlanType, null, + false, assign, null, isSystem, null); + } + } catch(InsufficientAddressCapacityException e) { + s_logger.warn("All IPs dedicated to account " + ipOwner.getId() + " has been acquired." + + " Now acquiring from the system pool"); + txn.close(); + allocateFromDedicatedRange = false; + } + + if (!allocateFromDedicatedRange) { + List nonDedicatedVlans = _vlanDao.listZoneWideNonDedicatedVlans(zone.getId()); + for (VlanVO nonDedicatedVlan : nonDedicatedVlans) { + nonDedicatedVlanDbIds.add(nonDedicatedVlan.getId()); + } + ip = fetchNewPublicIp(zone.getId(), null, nonDedicatedVlanDbIds, ipOwner, vlanType, null, false, assign, null, + isSystem, null); + } if (ip == null) { - InsufficientAddressCapacityException ex = new InsufficientAddressCapacityException ("Unable to find available public IP addresses", DataCenter.class, zone.getId()); ex.addProxyObject(ApiDBUtils.findZoneById(zone.getId()).getUuid()); @@ -763,7 +703,22 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L IPAddressVO ipToAssoc = _ipAddressDao.findById(ipId); if (ipToAssoc != null) { - _accountMgr.checkAccess(caller, null, true, ipToAssoc); + Network network = _networksDao.findById(networkId); + if (network == null) { + throw new InvalidParameterValueException("Invalid network id is given"); + } + + DataCenter zone = _configMgr.getZone(network.getDataCenterId()); + if (network.getGuestType() == Network.GuestType.Shared && zone.getNetworkType() == NetworkType.Advanced) { + if (isSharedNetworkOfferingWithServices(network.getNetworkOfferingId())) { + _accountMgr.checkAccess(UserContext.current().getCaller(), AccessType.UseNetwork, false, network); + } else { + throw new InvalidParameterValueException("IP can be associated with guest network of 'shared' type only if " + + "network services Source Nat, Static Nat, Port Forwarding, Load balancing, firewall are enabled in the network"); + } + } else { + _accountMgr.checkAccess(caller, null, true, ipToAssoc); + } owner = _accountMgr.getAccount(ipToAssoc.getAllocatedToAccountId()); } else { s_logger.debug("Unable to find ip address by id: " + ipId); @@ -790,16 +745,21 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L throw new InvalidParameterValueException("Ip address can be associated to the network with trafficType " + TrafficType.Guest); } - // Check that network belongs to IP owner - skip this check for Basic zone as there is just one guest network, - // and it belongs to the system - if (zone.getNetworkType() != NetworkType.Basic && network.getAccountId() != owner.getId()) { - throw new InvalidParameterValueException("The owner of the network is not the same as owner of the IP"); + // Check that network belongs to IP owner - skip this check + // - if zone is basic zone as there is just one guest network, + // - if shared network in Advanced zone + // - and it belongs to the system + if (network.getAccountId() != owner.getId()) { + if (zone.getNetworkType() != NetworkType.Basic && !(zone.getNetworkType() == NetworkType.Advanced && network.getGuestType() == Network.GuestType.Shared)) { + throw new InvalidParameterValueException("The owner of the network is not the same as owner of the IP"); + } } - // In Advance zone only allow to do IP assoc for Isolated networks with source nat service enabled + // In Advance zone only allow to do IP assoc + // - for Isolated networks with source nat service enabled + // - for shared networks with source nat service enabled if (zone.getNetworkType() == NetworkType.Advanced && - !(network.getGuestType() == GuestType.Isolated && _networkModel.areServicesSupportedInNetwork(network.getId(), - Service.SourceNat))) { + !(_networkModel.areServicesSupportedInNetwork(network.getId(), Service.SourceNat))) { throw new InvalidParameterValueException("In zone of type " + NetworkType.Advanced + " ip address can be associated only to the network of guest type " + GuestType.Isolated + " with the " + Service.SourceNat.getName() + " enabled"); @@ -968,9 +928,21 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L // diff between offering #1 and #2 - securityGroup is enabled for the first, and disabled for the third NetworkOfferingVO offering = null; + if (_networkOfferingDao.findByUniqueName(NetworkOffering.QuickCloudNoServices) == null) { + offering = + _configMgr.createNetworkOffering(NetworkOffering.QuickCloudNoServices, + "Offering for QuickCloud with no services", TrafficType.Guest, null, true, + Availability.Optional, null, new HashMap>(), true, + Network.GuestType.Shared, false, null, true, null, true, false); + offering.setState(NetworkOffering.State.Enabled); + _networkOfferingDao.update(offering.getId(), offering); + } if (_networkOfferingDao.findByUniqueName(NetworkOffering.DefaultSharedNetworkOfferingWithSGService) == null) { - offering = _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOfferingWithSGService, "Offering for Shared Security group enabled networks", TrafficType.Guest, null, - true, Availability.Optional, null, defaultSharedNetworkOfferingProviders, true, Network.GuestType.Shared, false, null, true, null, true, false); + offering = + _configMgr.createNetworkOffering(NetworkOffering.DefaultSharedNetworkOfferingWithSGService, + "Offering for Shared Security group enabled networks", TrafficType.Guest, null, true, + Availability.Optional, null, defaultSharedNetworkOfferingProviders, true, + Network.GuestType.Shared, false, null, true, null, true, false); offering.setState(NetworkOffering.State.Enabled); _networkOfferingDao.update(offering.getId(), offering); } @@ -1070,7 +1042,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L AssignIpAddressSearch = _ipAddressDao.createSearchBuilder(); AssignIpAddressSearch.and("dc", AssignIpAddressSearch.entity().getDataCenterId(), Op.EQ); AssignIpAddressSearch.and("allocated", AssignIpAddressSearch.entity().getAllocatedTime(), Op.NULL); - AssignIpAddressSearch.and("vlanId", AssignIpAddressSearch.entity().getVlanId(), Op.EQ); + AssignIpAddressSearch.and("vlanId", AssignIpAddressSearch.entity().getVlanId(), Op.IN); SearchBuilder vlanSearch = _vlanDao.createSearchBuilder(); vlanSearch.and("type", vlanSearch.entity().getVlanType(), Op.EQ); vlanSearch.and("networkId", vlanSearch.entity().getNetworkId(), Op.EQ); @@ -1459,12 +1431,21 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L try { NetworkGuru guru = AdapterBase.getAdapterByName(_networkGurus, network.getGuruName()); Network.State state = network.getState(); - if (state == Network.State.Implemented || state == Network.State.Setup || state == Network.State.Implementing) { + if (state == Network.State.Implemented || state == Network.State.Implementing) { s_logger.debug("Network id=" + networkId + " is already implemented"); implemented.set(guru, network); return implemented; } + if (state == Network.State.Setup) { + DataCenterVO zone = _dcDao.findById(network.getDataCenterId()); + if (!isSharedNetworkOfferingWithServices(network.getNetworkOfferingId()) || (zone.getNetworkType() == NetworkType.Basic)) { + s_logger.debug("Network id=" + networkId + " is already implemented"); + implemented.set(guru, network); + return implemented; + } + } + if (s_logger.isDebugEnabled()) { s_logger.debug("Asking " + guru.getName() + " to implement " + network); } @@ -1472,7 +1453,11 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L NetworkOfferingVO offering = _networkOfferingDao.findById(network.getNetworkOfferingId()); network.setReservationId(context.getReservationId()); - stateTransitTo(network, Event.ImplementNetwork); + if (isSharedNetworkWithServices(network)) { + network.setState(Network.State.Implementing); + } else { + stateTransitTo(network, Event.ImplementNetwork); + } Network result = guru.implement(network, offering, dest, context); network.setCidr(result.getCidr()); @@ -1485,7 +1470,11 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L // implement network elements and re-apply all the network rules implementNetworkElementsAndResources(dest, context, network, offering); - stateTransitTo(network,Event.OperationSucceeded); + if (isSharedNetworkWithServices(network)) { + network.setState(Network.State.Implemented); + } else { + stateTransitTo(network,Event.OperationSucceeded); + } network.setRestartRequired(false); _networksDao.update(network.getId(), network); @@ -1498,7 +1487,12 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L if (implemented.first() == null) { s_logger.debug("Cleaning up because we're unable to implement the network " + network); try { - stateTransitTo(network,Event.OperationFailed); + if (isSharedNetworkWithServices(network)) { + network.setState(Network.State.Shutdown); + _networksDao.update(networkId, network); + } else { + stateTransitTo(network,Event.OperationFailed); + } } catch (NoTransitionException e) { s_logger.error(e.getMessage()); } @@ -1523,14 +1517,17 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L NetworkVO network, NetworkOfferingVO offering) throws ConcurrentOperationException, InsufficientAddressCapacityException, ResourceUnavailableException, InsufficientCapacityException { - // If this is a 1) guest virtual network 2) network has sourceNat service 3) network offering does not support a - // Shared source NAT rule, - // associate a source NAT IP (if one isn't already associated with the network) + // Associate a source NAT IP (if one isn't already associated with the network) if this is a + // 1) 'Isolated' or 'Shared' guest virtual network in the advance zone + // 2) network has sourceNat service + // 3) network offering does not support a shared source NAT rule boolean sharedSourceNat = offering.getSharedSourceNat(); - if (network.getGuestType() == Network.GuestType.Isolated - && _networkModel.areServicesSupportedInNetwork(network.getId(), Service.SourceNat) - && !sharedSourceNat) { + DataCenter zone = _dcDao.findById(network.getDataCenterId()); + + if (!sharedSourceNat && _networkModel.areServicesSupportedInNetwork(network.getId(), Service.SourceNat) + && (network.getGuestType() == Network.GuestType.Isolated || + (network.getGuestType() == Network.GuestType.Shared && zone.getNetworkType() == NetworkType.Advanced))) { List ips = null; if (network.getVpcId() != null) { @@ -1994,10 +1991,12 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L throw new InvalidParameterValueException("Network with vlan " + vlanId + " already exists in zone " + zoneId); } } else { - //don't allow to create Shared network with Vlan that already exists in the zone for Isolated networks - if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0) { - throw new InvalidParameterValueException("Isolated network with vlan " + vlanId + " already exists " + - "in zone " + zoneId); + // don't allow to creating shared network with given Vlan ID, if there already exists a isolated network or + // shared network with same Vlan ID in the zone + if (_networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Isolated) > 0 || + _networksDao.countByZoneUriAndGuestType(zoneId, uri, GuestType.Shared) > 0) { + throw new InvalidParameterValueException("There is a isolated/shared network with vlan id: " + + vlanId + " already exists " + "in zone " + zoneId); } } } @@ -2129,6 +2128,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L @DB public boolean shutdownNetwork(long networkId, ReservationContext context, boolean cleanupElements) { boolean result = false; + Transaction txn = Transaction.currentTxn(); NetworkVO network = _networksDao.lockRow(networkId, true); if (network == null) { @@ -2139,16 +2139,23 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L s_logger.debug("Network is not implemented: " + network); return false; } - try { - stateTransitTo(network, Event.DestroyNetwork); - } catch (NoTransitionException e) { + + txn.start(); + if (isSharedNetworkWithServices(network)) { network.setState(Network.State.Shutdown); _networksDao.update(network.getId(), network); + } else { + try { + stateTransitTo(network, Event.DestroyNetwork); + } catch (NoTransitionException e) { + network.setState(Network.State.Shutdown); + _networksDao.update(network.getId(), network); + } } + txn.commit(); boolean success = shutdownNetworkElementsAndResources(context, cleanupElements, network); - Transaction txn = Transaction.currentTxn(); txn.start(); if (success) { if (s_logger.isDebugEnabled()) { @@ -2159,11 +2166,16 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L guru.shutdown(profile, _networkOfferingDao.findById(network.getNetworkOfferingId())); applyProfileToNetwork(network, profile); - try { - stateTransitTo(network, Event.OperationSucceeded); - } catch (NoTransitionException e) { - network.setState(Network.State.Allocated); - network.setRestartRequired(false); + DataCenterVO zone = _dcDao.findById(network.getDataCenterId()); + if (isSharedNetworkOfferingWithServices(network.getNetworkOfferingId()) && (zone.getNetworkType() == NetworkType.Advanced)) { + network.setState(Network.State.Setup); + } else { + try { + stateTransitTo(network, Event.OperationSucceeded); + } catch (NoTransitionException e) { + network.setState(Network.State.Allocated); + network.setRestartRequired(false); + } } _networksDao.update(network.getId(), network); _networksDao.clearCheckForGc(networkId); @@ -2779,6 +2791,17 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L return (UserDataServiceProvider)_networkModel.getElementImplementingProvider(SSHKeyProvider); } + protected boolean isSharedNetworkWithServices(Network network) { + assert(network != null); + DataCenter zone = _configMgr.getZone(network.getDataCenterId()); + if (network.getGuestType() == Network.GuestType.Shared && + zone.getNetworkType() == NetworkType.Advanced && + isSharedNetworkOfferingWithServices(network.getNetworkOfferingId())) { + return true; + } + return false; + } + protected boolean isSharedNetworkOfferingWithServices(long networkOfferingId) { NetworkOfferingVO networkOffering = _networkOfferingDao.findById(networkOfferingId); if ( (networkOffering.getGuestType() == Network.GuestType.Shared) && ( @@ -3488,6 +3511,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L public void allocateDirectIp(NicProfile nic, DataCenter dc, VirtualMachineProfile vm, Network network, String requestedIpv4, String requestedIpv6) throws InsufficientVirtualNetworkCapcityException, InsufficientAddressCapacityException { + //This method allocates direct ip for the Shared network in Advance zones boolean ipv4 = false, ipv6 = false; Transaction txn = Transaction.currentTxn(); @@ -3500,7 +3524,7 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L //Get ip address from the placeholder and don't allocate a new one if (requestedIpv4 != null && vm.getType() == VirtualMachine.Type.DomainRouter) { - Nic placeholderNic = _networkModel.getPlaceholderNic(network, null); + Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, null); if (placeholderNic != null) { IPAddressVO userIp = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), placeholderNic.getIp4Address()); ip = PublicIp.createFromAddrAndVlan(userIp, _vlanDao.findById(userIp.getVlanId())); @@ -3612,8 +3636,8 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L //2) prepare nic if (prepare) { - NetworkVO networkVO = _networksDao.findById(network.getId()); - nic = prepareNic(vmProfile, dest, context, nic.getId(), networkVO); + Pair implemented = implementNetwork(nic.getNetworkId(), dest, context); + nic = prepareNic(vmProfile, dest, context, nic.getId(), implemented.second()); s_logger.debug("Nic is prepared successfully for vm " + vm + " in network " + network); } @@ -3756,11 +3780,12 @@ public class NetworkManagerImpl extends ManagerBase implements NetworkManager, L } @Override - public NicVO savePlaceholderNic(Network network, String ip4Address) { + public NicVO savePlaceholderNic(Network network, String ip4Address, Type vmType) { NicVO nic = new NicVO(null, null, network.getId(), null); nic.setIp4Address(ip4Address); nic.setReservationStrategy(ReservationStrategy.PlaceHolder); nic.setState(Nic.State.Reserved); + nic.setVmType(vmType); return _nicDao.persist(nic); } diff --git a/server/src/com/cloud/network/NetworkModelImpl.java b/server/src/com/cloud/network/NetworkModelImpl.java old mode 100644 new mode 100755 index d967f3346bf..c5930d9315c --- a/server/src/com/cloud/network/NetworkModelImpl.java +++ b/server/src/com/cloud/network/NetworkModelImpl.java @@ -88,11 +88,12 @@ import com.cloud.offerings.NetworkOfferingServiceMapVO; import com.cloud.offerings.NetworkOfferingVO; import com.cloud.offerings.dao.NetworkOfferingDao; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; +import com.cloud.projects.dao.ProjectAccountDao; import com.cloud.user.Account; +import com.cloud.user.AccountVO; import com.cloud.user.DomainManager; import com.cloud.user.dao.AccountDao; import com.cloud.utils.component.AdapterBase; -import com.cloud.utils.component.ComponentContext; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.DB; import com.cloud.utils.db.JoinBuilder; @@ -179,7 +180,8 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { UserIpv6AddressDao _ipv6Dao; @Inject NicSecondaryIpDao _nicSecondaryIpDao;; - + @Inject + private ProjectAccountDao _projectAccountDao; private final HashMap _systemNetworks = new HashMap(5); static Long _privateOfferingId = null; @@ -1011,7 +1013,10 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { Set supportedProviders = new HashSet(); if (service != null) { - supportedProviders.addAll(s_serviceToImplementedProvidersMap.get(service)); + List providers = s_serviceToImplementedProvidersMap.get(service); + if (providers != null && !providers.isEmpty()) { + supportedProviders.addAll(providers); + } } else { for (List pList : s_serviceToImplementedProvidersMap.values()) { supportedProviders.addAll(pList); @@ -1473,10 +1478,20 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { public void checkNetworkPermissions(Account owner, Network network) { // Perform account permission check if (network.getGuestType() != Network.GuestType.Shared) { - List networkMap = _networksDao.listBy(owner.getId(), network.getId()); - if (networkMap == null || networkMap.isEmpty()) { - throw new PermissionDeniedException("Unable to use network with id= " + network.getUuid() + ", permission denied"); + AccountVO networkOwner = _accountDao.findById(network.getAccountId()); + if(networkOwner == null) + throw new PermissionDeniedException("Unable to use network with id= " + network.getId() + ", network does not have an owner"); + if(owner.getType() != Account.ACCOUNT_TYPE_PROJECT && networkOwner.getType() == Account.ACCOUNT_TYPE_PROJECT){ + if(!_projectAccountDao.canAccessProjectAccount(owner.getAccountId(), network.getAccountId())){ + throw new PermissionDeniedException("Unable to use network with id= " + network.getId() + ", permission denied"); + } + }else{ + List networkMap = _networksDao.listBy(owner.getId(), network.getId()); + if (networkMap == null || networkMap.isEmpty()) { + throw new PermissionDeniedException("Unable to use network with id= " + network.getId() + ", permission denied"); + } } + } else { if (!isNetworkAvailableInDomain(network.getId(), owner.getDomainId())) { throw new PermissionDeniedException("Shared network id=" + network.getUuid() + " is not available in domain id=" + owner.getDomainId()); @@ -2012,12 +2027,12 @@ public class NetworkModelImpl extends ManagerBase implements NetworkModel { } return startIpv6; } - + @Override - public NicVO getPlaceholderNic(Network network, Long podId) { - List nics = _nicDao.listPlaceholderNicsByNetworkId(network.getId()); + public NicVO getPlaceholderNicForRouter(Network network, Long podId) { + List nics = _nicDao.listPlaceholderNicsByNetworkIdAndVmType(network.getId(), VirtualMachine.Type.DomainRouter); for (NicVO nic : nics) { - if (nic.getVmType() == null && nic.getReserver() == null && nic.getIp4Address() != null && !nic.getIp4Address().equals(network.getGateway())) { + if (nic.getReserver() == null && nic.getIp4Address() != null) { if (podId == null) { return nic; } else { diff --git a/server/src/com/cloud/network/NetworkServiceImpl.java b/server/src/com/cloud/network/NetworkServiceImpl.java index 4eb620c4243..7bc2e5486ed 100755 --- a/server/src/com/cloud/network/NetworkServiceImpl.java +++ b/server/src/com/cloud/network/NetworkServiceImpl.java @@ -16,50 +16,13 @@ // under the License. package com.cloud.network; -import java.net.InetAddress; -import java.net.Inet6Address; -import java.net.UnknownHostException; -import java.security.InvalidParameterException; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Collection; -import java.util.HashMap; -import java.util.HashSet; -import java.util.List; -import java.util.Map; -import java.util.Set; -import java.util.TreeSet; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; - -import org.apache.cloudstack.acl.ControlledEntity.ACLType; -import org.apache.cloudstack.acl.SecurityChecker.AccessType; -import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd; -import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; -import org.apache.cloudstack.api.command.user.network.ListNetworksCmd; -import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; -import org.apache.cloudstack.api.command.user.vm.ListNicsCmd; -import org.bouncycastle.util.IPAddress; - import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.dc.DataCenter; -import com.cloud.dc.Pod; +import com.cloud.dc.*; import com.cloud.dc.DataCenter.NetworkType; -import com.cloud.dc.DataCenterVO; import com.cloud.dc.Vlan.VlanType; -import com.cloud.dc.VlanVO; -import com.cloud.dc.dao.AccountVlanMapDao; -import com.cloud.dc.dao.DataCenterDao; -import com.cloud.dc.dao.HostPodDao; -import com.cloud.dc.dao.VlanDao; +import com.cloud.dc.dao.*; import com.cloud.deploy.DeployDestination; import com.cloud.domain.Domain; import com.cloud.domain.DomainVO; @@ -70,10 +33,8 @@ import com.cloud.event.UsageEventUtils; import com.cloud.event.dao.EventDao; import com.cloud.event.dao.UsageEventDao; import com.cloud.exception.*; -import com.cloud.host.Host; import com.cloud.host.dao.HostDao; import com.cloud.network.IpAddress.State; -import com.cloud.vm.Nic; import com.cloud.network.Network.Capability; import com.cloud.network.Network.GuestType; import com.cloud.network.Network.Provider; @@ -89,10 +50,10 @@ import com.cloud.network.element.VirtualRouterElement; import com.cloud.network.element.VpcVirtualRouterElement; import com.cloud.network.guru.NetworkGuru; import com.cloud.network.rules.FirewallRule.Purpose; -import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.network.rules.FirewallRuleVO; import com.cloud.network.rules.PortForwardingRuleVO; import com.cloud.network.rules.RulesManager; +import com.cloud.network.rules.dao.PortForwardingRulesDao; import com.cloud.network.vpc.PrivateIpVO; import com.cloud.network.vpc.Vpc; import com.cloud.network.vpc.VpcManager; @@ -114,19 +75,34 @@ import com.cloud.utils.AnnotationHelper; import com.cloud.utils.Journal; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; -import com.cloud.utils.component.ComponentContext; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.db.*; import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; import com.cloud.vm.*; -import com.cloud.vm.dao.NicDao; -import com.cloud.vm.dao.NicSecondaryIpDao; -import com.cloud.vm.dao.NicSecondaryIpVO; -import com.cloud.vm.dao.UserVmDao; -import com.cloud.vm.dao.VMInstanceDao; +import com.cloud.vm.dao.*; +import org.apache.cloudstack.acl.ControlledEntity.ACLType; +import org.apache.cloudstack.acl.SecurityChecker; +import org.apache.cloudstack.acl.SecurityChecker.AccessType; +import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd; +import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworksCmd; +import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd; +import org.apache.cloudstack.api.command.user.vm.ListNicsCmd; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; +import java.net.Inet6Address; +import java.net.InetAddress; +import java.net.UnknownHostException; +import java.security.InvalidParameterException; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; import java.util.*; /** @@ -225,6 +201,8 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { HostDao _hostDao; @Inject HostPodDao _hostPodDao; + @Inject + DataCenterVnetDao _datacneter_vnet; int _cidrLimit; boolean _allowSubdomainNetworkAccess; @@ -433,7 +411,40 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { @Override @ActionEvent(eventType = EventTypes.EVENT_NET_IP_ASSIGN, eventDescription = "allocating Ip", create = true) - public IpAddress allocateIP(Account ipOwner, boolean isSystem, long zoneId) + public IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) + throws ResourceAllocationException, InsufficientAddressCapacityException, ConcurrentOperationException { + + if (networkId != null) { + Network network = _networksDao.findById(networkId); + if (network == null) { + throw new InvalidParameterValueException("Invalid network id is given"); + } + if (network.getGuestType() == Network.GuestType.Shared) { + DataCenter zone = _configMgr.getZone(zoneId); + if (zone == null) { + throw new InvalidParameterValueException("Invalid zone Id is given"); + } + + // if shared network in the advanced zone, then check the caller against the network for 'AccessType.UseNetwork' + if (isSharedNetworkOfferingWithServices(network.getNetworkOfferingId()) && zone.getNetworkType() == NetworkType.Advanced) { + Account caller = UserContext.current().getCaller(); + long callerUserId = UserContext.current().getCallerUserId(); + _accountMgr.checkAccess(caller, AccessType.UseNetwork, false, network); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Associate IP address called by the user " + callerUserId + " account " + ipOwner.getId()); + } + return _networkMgr.allocateIp(ipOwner, false, caller, callerUserId, zone); + } else { + throw new InvalidParameterValueException("Associate IP address can only be called on the shared networks in the advanced zone" + + " with Firewall/Source Nat/Static Nat/Port Forwarding/Load balancing services enabled"); + } + } + } + + return allocateIP(ipOwner, false, zoneId); + } + + public IpAddress allocateIP(Account ipOwner, boolean isSystem, long zoneId) throws ResourceAllocationException, InsufficientAddressCapacityException, ConcurrentOperationException { Account caller = UserContext.current().getCaller(); // check permissions @@ -472,7 +483,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } - public String allocateSecondaryGuestIP (Account ipOwner, long zoneId, Long nicId, Long networkId, String requestedIp) throws InsufficientAddressCapacityException { + public NicSecondaryIp allocateSecondaryGuestIP (Account ipOwner, long zoneId, Long nicId, Long networkId, String requestedIp) throws InsufficientAddressCapacityException { Long accountId = null; Long domainId = null; @@ -524,7 +535,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } else if (dc.getNetworkType() == NetworkType.Basic || ntwkOff.getGuestType() == Network.GuestType.Shared) { Account caller = UserContext.current().getCaller(); long callerUserId = UserContext.current().getCallerUserId(); - _accountMgr.checkAccess(caller, AccessType.UseNetwork, false, network); + _accountMgr.checkAccess(caller, SecurityChecker.AccessType.UseNetwork, false, network); //handle the basic networks here VirtualMachine vm = _userVmDao.findById(nicVO.getInstanceId()); if (vm == null) { @@ -554,6 +565,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { return null; } + NicSecondaryIpVO secondaryIpVO; if (ipaddr != null) { // we got the ip addr so up the nics table and secodary ip Transaction txn = Transaction.currentTxn(); @@ -569,11 +581,13 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { s_logger.debug("Setting nic_secondary_ip table ..."); vmId = nicVO.getInstanceId(); - NicSecondaryIpVO secondaryIpVO = new NicSecondaryIpVO(nicId, ipaddr, vmId, accountId, domainId, networkId); + secondaryIpVO = new NicSecondaryIpVO(nicId, ipaddr, vmId, accountId, domainId, networkId); _nicSecondaryIpDao.persist(secondaryIpVO); txn.commit(); + return getNicSecondaryIp(secondaryIpVO.getId()); + } else { + return null; } - return ipaddr; } @DB @@ -665,6 +679,14 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { return true; } + NicSecondaryIp getNicSecondaryIp (long id) { + NicSecondaryIp nicSecIp = _nicSecondaryIpDao.findById(id); + if (nicSecIp == null) { + return null; + } + return nicSecIp; + } + @Override @DB @ActionEvent(eventType = EventTypes.EVENT_NET_IP_RELEASE, eventDescription = "disassociating Ip", async = true) @@ -697,15 +719,6 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { throw new IllegalArgumentException("only ip addresses that belong to a virtual network may be disassociated."); } - // Check for account wide pool. It will have an entry for account_vlan_map. - if (_accountVlanMapDao.findAccountVlanMap(ipVO.getAllocatedToAccountId(), ipVO.getVlanId()) != null) { - //see IPaddressVO.java - InvalidParameterValueException ex = new InvalidParameterValueException("Sepcified IP address uuid belongs to" + - " Account wide IP pool and cannot be disassociated"); - ex.addProxyObject("user_ip_address", ipAddressId, "ipAddressId"); - throw ex; - } - // don't allow releasing system ip address if (ipVO.getSystem()) { InvalidParameterValueException ex = new InvalidParameterValueException("Can't release system IP address with specified id"); @@ -753,18 +766,20 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // in the zone when using external networking PhysicalNetworkVO pNetwork = _physicalNetworkDao.findById(physicalNetworkId); if (pNetwork.getVnet() != null) { - String vlanRange[] = pNetwork.getVnet().split("-"); - int lowestVlanTag = Integer.valueOf(vlanRange[0]); - int highestVlanTag = Integer.valueOf(vlanRange[1]); - for (int vlan=lowestVlanTag; vlan <= highestVlanTag; ++vlan) { - int offset = vlan - lowestVlanTag; - String globalVlanBits = _configDao.getValue(Config.GuestVlanBits.key()); - int cidrSize = 8 + Integer.parseInt(globalVlanBits); - String guestNetworkCidr = zone.getGuestNetworkCidr(); - String[] cidrTuple = guestNetworkCidr.split("\\/"); - long newCidrAddress = (NetUtils.ip2Long(cidrTuple[0]) & 0xff000000) | (offset << (32 - cidrSize)); - if (NetUtils.isNetworksOverlap(NetUtils.long2Ip(newCidrAddress), cidr)) { - throw new InvalidParameterValueException("Specified CIDR for shared network conflict with CIDR that is reserved for zone vlan " + vlan); + List > vlanList = pNetwork.getVnet(); + for (Pair vlanRange : vlanList){ + Integer lowestVlanTag = vlanRange.first(); + Integer highestVlanTag = vlanRange.second(); + for (int vlan=lowestVlanTag; vlan <= highestVlanTag; ++vlan) { + int offset = vlan - lowestVlanTag; + String globalVlanBits = _configDao.getValue(Config.GuestVlanBits.key()); + int cidrSize = 8 + Integer.parseInt(globalVlanBits); + String guestNetworkCidr = zone.getGuestNetworkCidr(); + String[] cidrTuple = guestNetworkCidr.split("\\/"); + long newCidrAddress = (NetUtils.ip2Long(cidrTuple[0]) & 0xff000000) | (offset << (32 - cidrSize)); + if (NetUtils.isNetworksOverlap(NetUtils.long2Ip(newCidrAddress), cidr)) { + throw new InvalidParameterValueException("Specified CIDR for shared network conflict with CIDR that is reserved for zone vlan " + vlan); + } } } } @@ -1864,11 +1879,13 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { // If networkCidr is null it implies that there was no prior IP reservation, so the network cidr is network.getCidr() // But in case networkCidr is a non null value (IP reservation already exists), it implies network cidr is networkCidr - if (networkCidr != null && ! NetUtils.isNetworkAWithinNetworkB(guestVmCidr, networkCidr)) { + if (networkCidr != null) { + if(! NetUtils.isNetworkAWithinNetworkB(guestVmCidr, networkCidr)) { throw new InvalidParameterValueException ("Invalid value of Guest VM CIDR. For IP Reservation, Guest VM CIDR should be a subset of network CIDR : " + networkCidr); + } } else { if (! NetUtils.isNetworkAWithinNetworkB(guestVmCidr, network.getCidr())) { - throw new InvalidParameterValueException ("Invalid value of Guest VM CIDR. For IP Reservation, Guest VM CIDR should be a subset of network CIDR : " + network.getCidr()); + throw new InvalidParameterValueException ("Invalid value of Guest VM CIDR. For IP Reservation, Guest VM CIDR should be a subset of network CIDR : " + network.getCidr()); } } @@ -1982,8 +1999,11 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { continue; } long isDefault = (nic.isDefaultNic()) ? 1 : 0; - UsageEventUtils.saveUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), null, oldNetworkOfferingId, null, 0L); - UsageEventUtils.saveUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, vm.getAccountId(), vm.getDataCenterId(), vm.getId(), vm.getHostName(), networkOfferingId, null, isDefault); + String nicIdString = Long.toString(nic.getId()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vm.getAccountId(), vm.getDataCenterId(), + vm.getId(), nicIdString, oldNetworkOfferingId, null, isDefault, VirtualMachine.class.getName(), vm.getUuid()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, vm.getAccountId(), vm.getDataCenterId(), + vm.getId(), nicIdString, networkOfferingId, null, isDefault, VirtualMachine.class.getName(), vm.getUuid()); } txn.commit(); } else { @@ -2193,7 +2213,6 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } catch (NumberFormatException e) { throw new InvalidParameterValueException("Please specify valid integers for the vlan range."); } - if ((vnetStart > vnetEnd) || (vnetStart < 0) || (vnetEnd > 4096)) { s_logger.warn("Invalid vnet range: start range:" + vnetStart + " end range:" + vnetEnd); throw new InvalidParameterValueException("Vnet range should be between 0-4096 and start range should be lesser than or equal to end range"); @@ -2284,7 +2303,7 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { @Override @DB @ActionEvent(eventType = EventTypes.EVENT_PHYSICAL_NETWORK_UPDATE, eventDescription = "updating physical network", async = true) - public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List tags, String newVnetRangeString, String state) { + public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List tags, String newVnetRangeString, String state, String removeVlan) { // verify input parameters PhysicalNetworkVO network = _physicalNetworkDao.findById(id); @@ -2309,6 +2328,12 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } } + if (removeVlan != null){ + List tokens = processVlanRange(network,removeVlan); + boolean result = removeVlanRange(network, tokens.get(0), tokens.get(1)); + + } + if (tags != null && tags.size() > 1) { throw new InvalidParameterException("Unable to support more than one tag on network yet"); } @@ -2335,90 +2360,209 @@ public class NetworkServiceImpl extends ManagerBase implements NetworkService { } // Vnet range can be extended only - boolean replaceVnet = false; - ArrayList> vnetsToAdd = new ArrayList>(2); + boolean AddVnet = true; + List> vnetsToAdd = new ArrayList>(); if (newVnetRangeString != null) { Integer newStartVnet = 0; Integer newEndVnet = 0; - String[] newVnetRange = newVnetRangeString.split("-"); - int maxVnet = 4096; - // for GRE phynets allow up to 32bits - // TODO: Not happy about this test. - // What about guru-like objects for physical networs? - s_logger.debug("ISOLATION METHODS:" + network.getIsolationMethods()); - // Java does not have unsigned types... - if (network.getIsolationMethods().contains("GRE")) { - maxVnet = (int)(Math.pow(2, 32)-1); - } - String rangeMessage = " between 0 and " + maxVnet; - if (newVnetRange.length < 2) { - throw new InvalidParameterValueException("Please provide valid vnet range" + rangeMessage); - } + List tokens = processVlanRange(network, newVnetRangeString); + newStartVnet = tokens.get(0); + newEndVnet = tokens.get(1); + Integer j=0; + List > existingRanges = network.getVnet(); + if (!existingRanges.isEmpty()) { + for (; j < existingRanges.size(); j++){ + int existingStartVnet = existingRanges.get(j).first(); + int existingEndVnet = existingRanges.get(j).second(); - if (newVnetRange[0] == null || newVnetRange[1] == null) { - throw new InvalidParameterValueException("Please provide valid vnet range" + rangeMessage); - } + // check if vnet is being extended + if (newStartVnet.intValue() >= existingStartVnet & newEndVnet.intValue() <= existingEndVnet) { + throw new InvalidParameterValueException("The vlan range you trying to add already exists."); + } - try { - newStartVnet = Integer.parseInt(newVnetRange[0]); - newEndVnet = Integer.parseInt(newVnetRange[1]); - } catch (NumberFormatException e) { - s_logger.warn("Unable to parse vnet range:", e); - throw new InvalidParameterValueException("Please provide valid vnet range" + rangeMessage); - } - if (newStartVnet < 0 || newEndVnet > maxVnet) { - throw new InvalidParameterValueException("Vnet range has to be" + rangeMessage); - } + if (newStartVnet < existingStartVnet & newEndVnet+1 >= existingStartVnet & newEndVnet <= existingEndVnet) { + vnetsToAdd.add(new Pair(newStartVnet, existingStartVnet - 1)); + existingRanges.get(j).first(newStartVnet); + AddVnet = false; + break; + } - if (newStartVnet > newEndVnet) { - throw new InvalidParameterValueException("Vnet range has to be" + rangeMessage + " and start range should be lesser than or equal to stop range"); - } - - if (physicalNetworkHasAllocatedVnets(network.getDataCenterId(), network.getId())) { - String[] existingRange = network.getVnet().split("-"); - int existingStartVnet = Integer.parseInt(existingRange[0]); - int existingEndVnet = Integer.parseInt(existingRange[1]); + else if (newStartVnet > existingStartVnet & newStartVnet-1 <= existingEndVnet & newEndVnet >= existingEndVnet) { + vnetsToAdd.add(new Pair(existingEndVnet + 1, newEndVnet)); + existingRanges.get(j).second(newEndVnet); + AddVnet = false; + break; + } - // check if vnet is being extended - if (newStartVnet.intValue() > existingStartVnet || newEndVnet.intValue() < existingEndVnet) { - throw new InvalidParameterValueException("Can't shrink existing vnet range as it the range has vnets allocated. Only extending existing vnet is supported"); + else if (newStartVnet< existingStartVnet & newEndVnet > existingEndVnet){ + vnetsToAdd.add(new Pair(newStartVnet,existingStartVnet-1)); + vnetsToAdd.add(new Pair(existingEndVnet+1,newEndVnet)); + existingRanges.get(j).first(newStartVnet); + existingRanges.get(j).second(newEndVnet); + break; + } } - if (newStartVnet < existingStartVnet) { - vnetsToAdd.add(new Pair(newStartVnet, existingStartVnet - 1)); - } - - if (newEndVnet > existingEndVnet) { - vnetsToAdd.add(new Pair(existingEndVnet + 1, newEndVnet)); - } - - } else { - vnetsToAdd.add(new Pair(newStartVnet, newEndVnet)); - replaceVnet = true; } - } + if (AddVnet){ + vnetsToAdd.add(new Pair(newStartVnet, newEndVnet)); + existingRanges.add(new Pair(newStartVnet,newEndVnet)); + } - if (newVnetRangeString != null) { - network.setVnet(newVnetRangeString); + Map vnetMap = new HashMap(existingRanges.size()); + Map IndexMap = new HashMap(existingRanges.size()); + for (int i=0; i< existingRanges.size(); i++){ + vnetMap.put(existingRanges.get(i).first(),existingRanges.get(i).second()); + IndexMap.put(existingRanges.get(i).first(),i); + } + + Integer value; + Integer index; + String vnetString = ""; + for (int i=0; i < existingRanges.size(); i++){ + value = vnetMap.get((existingRanges.get(i).second()+1)); + if (value != null) { + vnetMap.remove((existingRanges.get(i).second()+1)); + vnetMap.remove(existingRanges.get(i).first()); + vnetMap.put(existingRanges.get(i).first(),value); + existingRanges.add(new Pair(existingRanges.get(i).first(),value)); + index = IndexMap.get(existingRanges.get(i).second()+1); + existingRanges.get(index).first(-1); + existingRanges.get(index).second(-1); + existingRanges.get(i).first(-1); + existingRanges.get(i).second(-1); + } + value = vnetMap.get((existingRanges.get(i).second())); + if (value != null) { + vnetMap.remove((existingRanges.get(i).second())); + vnetMap.remove(existingRanges.get(i).first()); + vnetMap.put(existingRanges.get(i).first(),value); + existingRanges.add(new Pair(existingRanges.get(i).first(),value)); + index = IndexMap.get(existingRanges.get(i).second()); + existingRanges.get(index).first(-1); + existingRanges.get(index).second(-1); + existingRanges.get(i).first(-1); + existingRanges.get(i).second(-1); + } + } + + + + if (newVnetRangeString != null) { + for (Pair vnetRange : existingRanges ){ + value=vnetMap.get(vnetRange.first()); + if (value != null){ + vnetString = vnetString+vnetRange.first().toString()+"-"+value.toString()+";"; + } + } + vnetString = vnetString+"*"; + vnetString = vnetString.replace(";*",""); + network.setVnet(vnetString); + } + + for (Pair vnetToAdd : vnetsToAdd) { + s_logger.debug("Adding vnet range " + vnetToAdd.first() + "-" + vnetToAdd.second() + " for the physicalNetwork id= " + id + " and zone id=" + network.getDataCenterId() + + " as a part of updatePhysicalNetwork call"); + _dcDao.addVnet(network.getDataCenterId(), network.getId(), vnetToAdd.first(), vnetToAdd.second()); + } } _physicalNetworkDao.update(id, network); - if (replaceVnet) { - s_logger.debug("Deleting existing vnet range for the physicalNetwork id= " + id + " and zone id=" + network.getDataCenterId() + " as a part of updatePhysicalNetwork call"); - _dcDao.deleteVnet(network.getId()); - } - - for (Pair vnetToAdd : vnetsToAdd) { - s_logger.debug("Adding vnet range " + vnetToAdd.first() + "-" + vnetToAdd.second() + " for the physicalNetwork id= " + id + " and zone id=" + network.getDataCenterId() - + " as a part of updatePhysicalNetwork call"); - _dcDao.addVnet(network.getDataCenterId(), network.getId(), vnetToAdd.first(), vnetToAdd.second()); - } - return network; } + private List processVlanRange(PhysicalNetworkVO network, String removeVlan) { + Integer StartVnet; + Integer EndVnet; + String[] VnetRange = removeVlan.split("-"); + int maxVnet = 4096; + // for GRE phynets allow up to 32bits + // TODO: Not happy about this test. + // What about guru-like objects for physical networs? + s_logger.debug("ISOLATION METHODS:" + network.getIsolationMethods()); + // Java does not have unsigned types... + if (network.getIsolationMethods().contains("GRE")) { + maxVnet = (int)(Math.pow(2, 32)-1); + } + String rangeMessage = " between 0 and " + maxVnet; + if (VnetRange.length < 2) { + throw new InvalidParameterValueException("Please provide valid vnet range" + rangeMessage); + } + + if (VnetRange[0] == null || VnetRange[1] == null) { + throw new InvalidParameterValueException("Please provide valid vnet range" + rangeMessage); + } + + try { + StartVnet = Integer.parseInt(VnetRange[0]); + EndVnet = Integer.parseInt(VnetRange[1]); + } catch (NumberFormatException e) { + s_logger.warn("Unable to parse vnet range:", e); + throw new InvalidParameterValueException("Please provide valid vnet range" + rangeMessage); + } + if (StartVnet < 0 || EndVnet > maxVnet) { + throw new InvalidParameterValueException("Vnet range has to be" + rangeMessage); + } + + if (StartVnet > EndVnet) { + throw new InvalidParameterValueException("Vnet range has to be" + rangeMessage + " and start range should be lesser than or equal to stop range"); + } + List tokens = new ArrayList(); + tokens.add(StartVnet); + tokens.add(EndVnet); + return tokens; + + } + + + private boolean removeVlanRange( PhysicalNetworkVO network, Integer start, Integer end) { + Integer temp=0; + int i; + List > existingRanges = network.getVnet(); + Transaction txn = Transaction.currentTxn(); + txn.start(); + _physicalNetworkDao.acquireInLockTable(network.getId(),10); + _datacneter_vnet.lockRange(network.getDataCenterId(), network.getId(), start, end); + List result = _datacneter_vnet.listAllocatedVnetsInRange(network.getDataCenterId(), network.getId(), start, end); + if (!result.isEmpty()){ + txn.close(); + throw new InvalidParameterValueException("Some of the vnets from this range are allocated, can only remove a range which has no allocated vnets"); + } + for (i=0; i= end){ + temp = existingRanges.get(i).second(); + existingRanges.get(i).second(start - 1); + existingRanges.add(new Pair((end+1),temp)); + break; + } + } + + if (temp == 0){ + throw new InvalidParameterValueException("The vlan range you are trying to delete does not exist."); + } + if(existingRanges.get(i).first() > existingRanges.get(i).second()){ + existingRanges.remove(i); + } + if(existingRanges.get(existingRanges.size()-1).first() > existingRanges.get(existingRanges.size()-1).second()){ + existingRanges.remove(existingRanges.size()-1); + } + _datacneter_vnet.deleteRange(txn, network.getDataCenterId(), network.getId(), start, end); + + String vnetString=""; + for (Pair vnetRange : existingRanges ){ + vnetString=vnetString+vnetRange.first().toString()+"-"+vnetRange.second().toString()+";"; + } + vnetString = vnetString+"*"; + vnetString = vnetString.replace(";*",""); + network.setVnet(vnetString); + _physicalNetworkDao.update(network.getId(), network); + txn.commit(); + _physicalNetworkDao.releaseFromLockTable(network.getId()); + return true; + } + private boolean physicalNetworkHasAllocatedVnets(long zoneId, long physicalNetworkId) { return !_dcDao.listAllocatedVnets(physicalNetworkId).isEmpty(); } diff --git a/server/src/com/cloud/network/addr/PublicIp.java b/server/src/com/cloud/network/addr/PublicIp.java index 8217e4e47b9..25e9d308b14 100644 --- a/server/src/com/cloud/network/addr/PublicIp.java +++ b/server/src/com/cloud/network/addr/PublicIp.java @@ -194,23 +194,12 @@ public class PublicIp implements PublicIpAddress { public boolean getSystem() { return _addr.getSystem(); } - - /* (non-Javadoc) - * @see com.cloud.network.IpAddress#getVpcId() - */ + @Override public Long getVpcId() { return _addr.getVpcId(); } - /* (non-Javadoc) - * @see com.cloud.network.IpAddress#setVpcId(java.lang.Long) - */ - @Override - public void setVpcId(Long vpcId) { - _addr.setVpcId(vpcId); - } - @Override public String getIp6Gateway() { return _vlan.getIp6Gateway(); @@ -230,9 +219,4 @@ public class PublicIp implements PublicIpAddress { public String getVmIp() { return _addr.getVmIp(); } - - @Override - public void setVmIp(String vmIp) { - _addr.setVmIp(vmIp); - } } diff --git a/server/src/com/cloud/network/as/AutoScaleManager.java b/server/src/com/cloud/network/as/AutoScaleManager.java index ac822dca945..5b84b30d744 100644 --- a/server/src/com/cloud/network/as/AutoScaleManager.java +++ b/server/src/com/cloud/network/as/AutoScaleManager.java @@ -1,19 +1,19 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.network.as; public interface AutoScaleManager extends AutoScaleService { diff --git a/server/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java b/server/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java index 88755bb3378..30251984807 100644 --- a/server/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java +++ b/server/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDao.java @@ -1,19 +1,19 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.network.as.dao; import java.util.List; diff --git a/server/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java b/server/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java index cacebf05f5f..00fee3db6c7 100644 --- a/server/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java +++ b/server/src/com/cloud/network/as/dao/AutoScalePolicyConditionMapDaoImpl.java @@ -1,31 +1,31 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.network.as.dao; import java.util.List; import javax.ejb.Local; - -import org.springframework.stereotype.Component; + +import org.springframework.stereotype.Component; import com.cloud.network.as.AutoScalePolicyConditionMapVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; - + @Component @Local(value={AutoScalePolicyConditionMapDao.class}) public class AutoScalePolicyConditionMapDaoImpl extends GenericDaoBase implements AutoScalePolicyConditionMapDao { diff --git a/server/src/com/cloud/network/as/dao/AutoScalePolicyDao.java b/server/src/com/cloud/network/as/dao/AutoScalePolicyDao.java index 51b2a943de6..0cc2d270f7f 100644 --- a/server/src/com/cloud/network/as/dao/AutoScalePolicyDao.java +++ b/server/src/com/cloud/network/as/dao/AutoScalePolicyDao.java @@ -1,19 +1,19 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.network.as.dao; import com.cloud.network.as.AutoScalePolicyVO; diff --git a/server/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java b/server/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java index 05dbf310418..796a9c3fe66 100644 --- a/server/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java +++ b/server/src/com/cloud/network/as/dao/AutoScalePolicyDaoImpl.java @@ -1,29 +1,29 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.network.as.dao; import javax.ejb.Local; - -import org.springframework.stereotype.Component; + +import org.springframework.stereotype.Component; import com.cloud.network.as.AutoScalePolicyVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; - + @Component @Local(value = { AutoScalePolicyDao.class }) public class AutoScalePolicyDaoImpl extends GenericDaoBase implements AutoScalePolicyDao { diff --git a/server/src/com/cloud/network/as/dao/AutoScaleVmGroupDao.java b/server/src/com/cloud/network/as/dao/AutoScaleVmGroupDao.java index a11bedda873..3fc8a5b6069 100644 --- a/server/src/com/cloud/network/as/dao/AutoScaleVmGroupDao.java +++ b/server/src/com/cloud/network/as/dao/AutoScaleVmGroupDao.java @@ -1,19 +1,19 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.network.as.dao; import java.util.List; diff --git a/server/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java b/server/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java index ae4ab2c7db9..4ddd57251f2 100644 --- a/server/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java +++ b/server/src/com/cloud/network/as/dao/AutoScaleVmGroupDaoImpl.java @@ -1,33 +1,33 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.network.as.dao; import java.util.List; import javax.ejb.Local; - -import org.springframework.stereotype.Component; + +import org.springframework.stereotype.Component; import com.cloud.network.as.AutoScaleVmGroupVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.GenericSearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Func; - + @Component @Local(value = { AutoScaleVmGroupDao.class }) public class AutoScaleVmGroupDaoImpl extends GenericDaoBase implements AutoScaleVmGroupDao { diff --git a/server/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java b/server/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java index b0d064e1d20..ffb3dbc38b0 100644 --- a/server/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java +++ b/server/src/com/cloud/network/as/dao/AutoScaleVmGroupPolicyMapDaoImpl.java @@ -1,33 +1,33 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.network.as.dao; import java.util.List; import javax.ejb.Local; - -import org.springframework.stereotype.Component; + +import org.springframework.stereotype.Component; import com.cloud.network.as.AutoScaleVmGroupPolicyMapVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.SearchCriteria.Op; - + @Component @Local(value={AutoScaleVmGroupPolicyMapDao.class}) public class AutoScaleVmGroupPolicyMapDaoImpl extends GenericDaoBase implements AutoScaleVmGroupPolicyMapDao { diff --git a/server/src/com/cloud/network/as/dao/AutoScaleVmProfileDao.java b/server/src/com/cloud/network/as/dao/AutoScaleVmProfileDao.java index d97e848a081..0855bf76add 100644 --- a/server/src/com/cloud/network/as/dao/AutoScaleVmProfileDao.java +++ b/server/src/com/cloud/network/as/dao/AutoScaleVmProfileDao.java @@ -1,19 +1,19 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.network.as.dao; import com.cloud.network.as.AutoScaleVmProfileVO; diff --git a/server/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java b/server/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java index 99c3cc2b70a..5d08491f84e 100644 --- a/server/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java +++ b/server/src/com/cloud/network/as/dao/AutoScaleVmProfileDaoImpl.java @@ -1,29 +1,29 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. package com.cloud.network.as.dao; import javax.ejb.Local; - -import org.springframework.stereotype.Component; + +import org.springframework.stereotype.Component; import com.cloud.network.as.AutoScaleVmProfileVO; import com.cloud.utils.db.GenericDaoBase; import com.cloud.utils.db.SearchCriteria; - + @Component @Local(value = { AutoScaleVmProfileDao.class }) public class AutoScaleVmProfileDaoImpl extends GenericDaoBase implements AutoScaleVmProfileDao { diff --git a/server/src/com/cloud/network/dao/IPAddressVO.java b/server/src/com/cloud/network/dao/IPAddressVO.java index 8ce8d3382b2..c5c78e557ae 100644 --- a/server/src/com/cloud/network/dao/IPAddressVO.java +++ b/server/src/com/cloud/network/dao/IPAddressVO.java @@ -292,7 +292,6 @@ public class IPAddressVO implements IpAddress { return vpcId; } - @Override public void setVpcId(Long vpcId) { this.vpcId = vpcId; } @@ -302,7 +301,6 @@ public class IPAddressVO implements IpAddress { return vmIp; } - @Override public void setVmIp(String vmIp) { this.vmIp = vmIp; } diff --git a/server/src/com/cloud/network/dao/PhysicalNetworkVO.java b/server/src/com/cloud/network/dao/PhysicalNetworkVO.java index e5ffcfb7c0d..f68eee1de5c 100644 --- a/server/src/com/cloud/network/dao/PhysicalNetworkVO.java +++ b/server/src/com/cloud/network/dao/PhysicalNetworkVO.java @@ -34,11 +34,9 @@ import javax.persistence.Table; import javax.persistence.TableGenerator; import com.cloud.network.PhysicalNetwork; -import com.cloud.network.PhysicalNetwork.BroadcastDomainRange; -import com.cloud.network.PhysicalNetwork.State; import com.cloud.utils.NumbersUtil; +import com.cloud.utils.Pair; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; /** * NetworkConfigurationVO contains information about a specific physical network. @@ -205,7 +203,21 @@ public class PhysicalNetworkVO implements PhysicalNetwork { } @Override - public String getVnet() { + public List> getVnet() { + List > vnetList = new ArrayList>(); + if (vnet != null) { + String [] Temp = vnet.split(";"); + String [] vnetSplit = null; + for (String vnetRange : Temp){ + vnetSplit = vnetRange.split("-"); + vnetList.add(new Pair(Integer.parseInt(vnetSplit[0]),Integer.parseInt(vnetSplit[1]))); + } + } + return vnetList; + } + + @Override + public String getVnetString() { return vnet; } diff --git a/server/src/com/cloud/network/element/VirtualRouterElement.java b/server/src/com/cloud/network/element/VirtualRouterElement.java index 169db3283e3..f601f4fa2e4 100755 --- a/server/src/com/cloud/network/element/VirtualRouterElement.java +++ b/server/src/com/cloud/network/element/VirtualRouterElement.java @@ -876,8 +876,8 @@ public class VirtualRouterElement extends AdapterBase implements VirtualRouterEl if (publicNetwork) { routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER); } else { - Long podId = dest.getPod().getId(); if (isPodBased) { + Long podId = dest.getPod().getId(); routers = _routerDao.listByNetworkAndPodAndRole(network.getId(), podId, Role.VIRTUAL_ROUTER); } else { routers = _routerDao.listByNetworkAndRole(network.getId(), Role.VIRTUAL_ROUTER); diff --git a/server/src/com/cloud/network/guru/DirectNetworkGuru.java b/server/src/com/cloud/network/guru/DirectNetworkGuru.java index 2c8acbb25e9..84008c0f050 100755 --- a/server/src/com/cloud/network/guru/DirectNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectNetworkGuru.java @@ -227,10 +227,10 @@ public class DirectNetworkGuru extends AdapterBase implements NetworkGuru { _networkMgr.allocateDirectIp(nic, dc, vm, network, requestedIp4Addr, requestedIp6Addr); //save the placeholder nic if the vm is the Virtual router if (vm.getType() == VirtualMachine.Type.DomainRouter) { - Nic placeholderNic = _networkModel.getPlaceholderNic(network, null); + Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, null); if (placeholderNic == null) { s_logger.debug("Saving placeholder nic with ip4 address " + nic.getIp4Address() + " and ipv6 address " + requestedIp6Addr + " for the network " + network); - _networkMgr.savePlaceholderNic(network, nic.getIp4Address()); + _networkMgr.savePlaceholderNic(network, nic.getIp4Address(), VirtualMachine.Type.DomainRouter); } } txn.commit(); @@ -259,7 +259,7 @@ public class DirectNetworkGuru extends AdapterBase implements NetworkGuru { txn.start(); // if the ip address a part of placeholder, don't release it - Nic placeholderNic = _networkModel.getPlaceholderNic(network, null); + Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, null); if (placeholderNic != null && placeholderNic.getIp4Address().equalsIgnoreCase(ip.getAddress().addr())) { s_logger.debug("Not releasing direct ip " + ip.getId() +" yet as its ip is saved in the placeholder"); } else { diff --git a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java index d74cd064488..cf27986a69d 100755 --- a/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java +++ b/server/src/com/cloud/network/guru/DirectPodBasedNetworkGuru.java @@ -1,3 +1,4 @@ + // Licensed to the Apache Software Foundation (ASF) under one // or more contributor license agreements. See the NOTICE file // distributed with this work for additional information @@ -173,7 +174,7 @@ public class DirectPodBasedNetworkGuru extends DirectNetworkGuru { } //Get ip address from the placeholder and don't allocate a new one if (vm.getType() == VirtualMachine.Type.DomainRouter) { - Nic placeholderNic = _networkModel.getPlaceholderNic(network, null); + Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, pod.getId()); if (placeholderNic != null) { IPAddressVO userIp = _ipAddressDao.findByIpAndSourceNetworkId(network.getId(), placeholderNic.getIp4Address()); ip = PublicIp.createFromAddrAndVlan(userIp, _vlanDao.findById(userIp.getVlanId())); @@ -199,10 +200,10 @@ public class DirectPodBasedNetworkGuru extends DirectNetworkGuru { //save the placeholder nic if the vm is the Virtual router if (vm.getType() == VirtualMachine.Type.DomainRouter) { - Nic placeholderNic = _networkModel.getPlaceholderNic(network, null); + Nic placeholderNic = _networkModel.getPlaceholderNicForRouter(network, pod.getId()); if (placeholderNic == null) { - s_logger.debug("Saving placeholder nic with ip4 address " + nic.getIp4Address() + " for the network " + network + " with the gateway " + podRangeGateway); - _networkMgr.savePlaceholderNic(network, nic.getIp4Address()); + s_logger.debug("Saving placeholder nic with ip4 address " + nic.getIp4Address() + " for the network " + network); + _networkMgr.savePlaceholderNic(network, nic.getIp4Address(), VirtualMachine.Type.DomainRouter); } } txn.commit(); diff --git a/server/src/com/cloud/network/guru/GuestNetworkGuru.java b/server/src/com/cloud/network/guru/GuestNetworkGuru.java index 9c0205a89b2..291e3ccbc77 100755 --- a/server/src/com/cloud/network/guru/GuestNetworkGuru.java +++ b/server/src/com/cloud/network/guru/GuestNetworkGuru.java @@ -26,6 +26,7 @@ import javax.ejb.Local; import javax.inject.Inject; import com.cloud.event.ActionEventUtils; +import com.cloud.utils.Pair; import org.apache.log4j.Logger; import com.cloud.configuration.Config; @@ -274,8 +275,17 @@ public abstract class GuestNetworkGuru extends AdapterBase implements NetworkGur if (pNetwork.getVnet() == null) { throw new CloudRuntimeException("Could not find vlan range for physical Network " + physicalNetworkId + "."); } - String vlanRange[] = pNetwork.getVnet().split("-"); - int lowestVlanTag = Integer.valueOf(vlanRange[0]); + Integer lowestVlanTag = null; + List> vnetList = pNetwork.getVnet(); + //finding the vlanrange in which the vlanTag lies. + for (Pair vnet : vnetList){ + if (vlanTag >= vnet.first() && vlanTag <= vnet.second()){ + lowestVlanTag = vnet.first(); + } + } + if (lowestVlanTag == null) { + throw new InvalidParameterValueException ("The vlan tag does not belong to any of the existing vlan ranges"); + } return vlanTag - lowestVlanTag; } diff --git a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java index afdbbca1a96..4c7bc75b2d3 100755 --- a/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java +++ b/server/src/com/cloud/network/router/VirtualNetworkApplianceManagerImpl.java @@ -40,6 +40,7 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; +import com.cloud.server.ConfigurationServer; import org.apache.cloudstack.api.command.admin.router.UpgradeRouterCmd; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; @@ -286,6 +287,8 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V @Inject ConfigurationManager _configMgr; @Inject + ConfigurationServer _configServer; + @Inject ServiceOfferingDao _serviceOfferingDao = null; @Inject UserVmDao _userVmDao; @@ -1708,15 +1711,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V String defaultNetworkStartIp = null, defaultNetworkStartIpv6 = null; if (!setupPublicNetwork) { if (guestNetwork.getCidr() != null) { - //Check the placeholder nic, and if it's ip address is not empty, allocate it from there - String requestedGateway = null; - if (guestNetwork.getGateway() != null) { - requestedGateway = guestNetwork.getGateway(); - } else if (plan != null && plan.getPodId() != null) { - Pod pod = _configMgr.getPod(plan.getPodId()); - requestedGateway = pod.getGateway(); - } - Nic placeholder = _networkModel.getPlaceholderNic(guestNetwork, null); + Nic placeholder = _networkModel.getPlaceholderNicForRouter(guestNetwork, plan.getPodId()); if (placeholder != null) { s_logger.debug("Requesting ip address " + placeholder.getIp4Address() + " stored in placeholder nic for the network " + guestNetwork); defaultNetworkStartIp = placeholder.getIp4Address(); @@ -2102,7 +2097,7 @@ public class VirtualNetworkApplianceManagerImpl extends ManagerBase implements V boolean useExtDns = !dnsProvided; /* For backward compatibility */ - String use_external_dns = _configDao.getValue(Config.UseExternalDnsServers.key()); + String use_external_dns = _configServer.getConfigValue(Config.UseExternalDnsServers.key(), Config.ConfigurationParameterScope.zone.toString(), dc.getId()); if (use_external_dns != null && use_external_dns.equals("true")) { useExtDns = true; } diff --git a/server/src/com/cloud/network/rules/RulesManagerImpl.java b/server/src/com/cloud/network/rules/RulesManagerImpl.java index 29ed5f36d5e..8636d8503a3 100755 --- a/server/src/com/cloud/network/rules/RulesManagerImpl.java +++ b/server/src/com/cloud/network/rules/RulesManagerImpl.java @@ -1215,11 +1215,13 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules Network guestNetwork = _networkModel.getNetwork(ipAddress.getAssociatedWithNetworkId()); NetworkOffering offering = _configMgr.getNetworkOffering(guestNetwork.getNetworkOfferingId()); if (offering.getElasticIp()) { - getSystemIpAndEnableStaticNatForVm(_vmDao.findById(vmId), true); - return true; - } else { - return disableStaticNat(ipId, caller, ctx.getCallerUserId(), false); + if (offering.getAssociatePublicIP()) { + getSystemIpAndEnableStaticNatForVm(_vmDao.findById(vmId), true); + return true; + } } + + return disableStaticNat(ipId, caller, ctx.getCallerUserId(), false); } @Override @@ -1410,6 +1412,11 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules Network guestNetwork = _networkModel.getNetwork(nic.getNetworkId()); NetworkOffering offering = _configMgr.getNetworkOffering(guestNetwork.getNetworkOfferingId()); if (offering.getElasticIp()) { + boolean isSystemVM = (vm.getType() == Type.ConsoleProxy || vm.getType() == Type.SecondaryStorageVm); + // for user VM's associate public IP only if offering is marked to associate a public IP by default on start of VM + if (!isSystemVM && !offering.getAssociatePublicIP()) { + continue; + } // check if there is already static nat enabled if (_ipAddressDao.findByAssociatedVmId(vm.getId()) != null && !getNewIp) { s_logger.debug("Vm " + vm + " already has ip associated with it in guest network " + guestNetwork); @@ -1424,7 +1431,6 @@ public class RulesManagerImpl extends ManagerBase implements RulesManager, Rules s_logger.debug("Allocated system ip " + ip + ", now enabling static nat on it for vm " + vm); - boolean isSystemVM = (vm.getType() == Type.ConsoleProxy || vm.getType() == Type.SecondaryStorageVm); try { success = enableStaticNat(ip.getId(), vm.getId(), guestNetwork.getId(), isSystemVM, null); } catch (NetworkRuleConflictException ex) { diff --git a/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java b/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java index dfa6a2e53ad..d82cc4a79b5 100644 --- a/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java +++ b/server/src/com/cloud/network/security/dao/SecurityGroupDaoImpl.java @@ -34,20 +34,20 @@ import com.cloud.utils.db.SearchBuilder; import com.cloud.utils.db.SearchCriteria; import com.cloud.utils.db.Transaction; -@Component -@Local(value={SecurityGroupDao.class}) -public class SecurityGroupDaoImpl extends GenericDaoBase implements SecurityGroupDao { +@Component +@Local(value={SecurityGroupDao.class}) +public class SecurityGroupDaoImpl extends GenericDaoBase implements SecurityGroupDao { private SearchBuilder AccountIdSearch; private SearchBuilder AccountIdNameSearch; private SearchBuilder AccountIdNamesSearch; @Inject ResourceTagDao _tagsDao; - - - protected SecurityGroupDaoImpl() { - AccountIdSearch = createSearchBuilder(); - AccountIdSearch.and("accountId", AccountIdSearch.entity().getAccountId(), SearchCriteria.Op.EQ); + + + protected SecurityGroupDaoImpl() { + AccountIdSearch = createSearchBuilder(); + AccountIdSearch.and("accountId", AccountIdSearch.entity().getAccountId(), SearchCriteria.Op.EQ); AccountIdSearch.done(); - + AccountIdNameSearch = createSearchBuilder(); AccountIdNameSearch.and("accountId", AccountIdNameSearch.entity().getAccountId(), SearchCriteria.Op.EQ); AccountIdNameSearch.and("name", AccountIdNameSearch.entity().getName(), SearchCriteria.Op.EQ); @@ -132,5 +132,5 @@ public class SecurityGroupDaoImpl extends GenericDaoBase boolean result = super.expunge(id); txn.commit(); return result; - } -} + } +} diff --git a/server/src/com/cloud/network/vpc/VpcManagerImpl.java b/server/src/com/cloud/network/vpc/VpcManagerImpl.java index 3948f2ecf73..224a6800326 100644 --- a/server/src/com/cloud/network/vpc/VpcManagerImpl.java +++ b/server/src/com/cloud/network/vpc/VpcManagerImpl.java @@ -44,6 +44,7 @@ import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.dc.DataCenter; import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.VlanVO; +import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.VlanDao; import com.cloud.deploy.DeployDestination; import com.cloud.event.ActionEvent; @@ -92,6 +93,7 @@ import com.cloud.offerings.NetworkOfferingServiceMapVO; import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.org.Grouping; import com.cloud.projects.Project.ListProjectResourcesCriteria; +import com.cloud.server.ConfigurationServer; import com.cloud.server.ResourceTag.TaggedResourceType; import com.cloud.tags.ResourceTagVO; import com.cloud.tags.dao.ResourceTagDao; @@ -115,7 +117,6 @@ import com.cloud.utils.db.SearchCriteria.Op; import com.cloud.utils.db.Transaction; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; -import com.cloud.vm.DomainRouterVO; import com.cloud.vm.ReservationContext; import com.cloud.vm.ReservationContextImpl; import com.cloud.vm.dao.DomainRouterDao; @@ -175,11 +176,16 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis ResourceLimitService _resourceLimitMgr; @Inject VpcServiceMapDao _vpcSrvcDao; + @Inject + DataCenterDao _dcDao; + @Inject + ConfigurationServer _configServer; private final ScheduledExecutorService _executor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("VpcChecker")); private List vpcElements = null; private final List nonSupportedServices = Arrays.asList(Service.SecurityGroup, Service.Firewall); - + private final List supportedProviders = Arrays.asList(Provider.VPCVirtualRouter, Provider.NiciraNvp); + int _cleanupInterval; int _maxNetworks; SearchBuilder IpAddressSearch; @@ -1054,9 +1060,9 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis //1) in current release, only vpc provider is supported by Vpc offering List providers = _ntwkModel.getNtwkOffDistinctProviders(guestNtwkOff.getId()); for (Provider provider : providers) { - if (provider != Provider.VPCVirtualRouter) { - throw new InvalidParameterValueException("Only provider of type " + Provider.VPCVirtualRouter.getName() - + " is supported for network offering that can be used in VPC"); + if (!supportedProviders.contains(provider) ) { + throw new InvalidParameterValueException("Provider of type " + provider.getName() + + " is not supported for network offerings that can be used in VPC"); } } @@ -1652,6 +1658,11 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis if (NetUtils.isNetworksOverlap(vpc.getCidr(), NetUtils.getLinkLocalCIDR())) { throw new InvalidParameterValueException("CIDR should be outside of link local cidr " + NetUtils.getLinkLocalCIDR()); } + + //3) Verify against blacklisted routes + if (isCidrBlacklisted(cidr, vpc.getZoneId())) { + throw new InvalidParameterValueException("The static gateway cidr overlaps with one of the blacklisted routes of the zone the VPC belongs to"); + } Transaction txn = Transaction.currentTxn(); txn.start(); @@ -1672,6 +1683,23 @@ public class VpcManagerImpl extends ManagerBase implements VpcManager, VpcProvis return newRoute; } + protected boolean isCidrBlacklisted(String cidr, long zoneId) { + String routesStr = _configServer.getConfigValue(Config.BlacklistedRoutes.key(), Config.ConfigurationParameterScope.zone.toString(), zoneId); + if (routesStr != null && !routesStr.isEmpty()) { + String[] cidrBlackList = routesStr.split(","); + + if (cidrBlackList != null && cidrBlackList.length > 0) { + for (String blackListedRoute : cidrBlackList) { + if (NetUtils.isNetworksOverlap(blackListedRoute, cidr)) { + return true; + } + } + } + } + + return false; + } + @Override public Pair, Integer> listStaticRoutes(ListStaticRoutesCmd cmd) { Long id = cmd.getId(); diff --git a/server/src/com/cloud/offerings/NetworkOfferingVO.java b/server/src/com/cloud/offerings/NetworkOfferingVO.java index 5de76a526b5..c015989c5c5 100755 --- a/server/src/com/cloud/offerings/NetworkOfferingVO.java +++ b/server/src/com/cloud/offerings/NetworkOfferingVO.java @@ -110,6 +110,9 @@ public class NetworkOfferingVO implements NetworkOffering { @Column(name = "elastic_ip_service") boolean elasticIp; + @Column(name = "eip_associate_public_ip") + boolean eipAssociatePublicIp; + @Column(name = "elastic_lb_service") boolean elasticLb; @@ -278,6 +281,7 @@ public class NetworkOfferingVO implements NetworkOffering { this.sharedSourceNat = false; this.redundantRouter = false; this.elasticIp = false; + this.eipAssociatePublicIp = true; this.elasticLb = false; this.inline = false; this.specifyIpRanges = specifyIpRanges; @@ -286,7 +290,7 @@ public class NetworkOfferingVO implements NetworkOffering { public NetworkOfferingVO(String name, String displayText, TrafficType trafficType, boolean systemOnly, boolean specifyVlan, Integer rateMbps, Integer multicastRateMbps, boolean isDefault, Availability availability, String tags, Network.GuestType guestType, boolean conserveMode, boolean dedicatedLb, boolean sharedSourceNat, boolean redundantRouter, boolean elasticIp, boolean elasticLb, - boolean specifyIpRanges, boolean inline, boolean isPersistent) { + boolean specifyIpRanges, boolean inline, boolean isPersistent, boolean associatePublicIP) { this(name, displayText, trafficType, systemOnly, specifyVlan, rateMbps, multicastRateMbps, isDefault, availability, tags, guestType, conserveMode, specifyIpRanges, isPersistent); this.dedicatedLB = dedicatedLb; this.sharedSourceNat = sharedSourceNat; @@ -294,6 +298,7 @@ public class NetworkOfferingVO implements NetworkOffering { this.elasticIp = elasticIp; this.elasticLb = elasticLb; this.inline = inline; + this.eipAssociatePublicIp = associatePublicIP; } public NetworkOfferingVO() { @@ -355,6 +360,11 @@ public class NetworkOfferingVO implements NetworkOffering { return elasticIp; } + @Override + public boolean getAssociatePublicIP() { + return eipAssociatePublicIp; + } + @Override public boolean getElasticLb() { return elasticLb; diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java b/server/src/com/cloud/resource/ResourceManagerImpl.java index 82bca5194bf..c9c3f9c3722 100755 --- a/server/src/com/cloud/resource/ResourceManagerImpl.java +++ b/server/src/com/cloud/resource/ResourceManagerImpl.java @@ -1181,29 +1181,17 @@ public class ResourceManagerImpl extends ManagerBase implements ResourceManager, } } - ClusterDetailsVO memory_detail = _clusterDetailsDao.findDetail(cluster.getId(),"memoryOvercommitRatio"); - if( memory_detail == null){ - if (memoryovercommitratio.compareTo(1f) > 0){ - memory_detail = new ClusterDetailsVO(cluster.getId(),"memoryOvercommitRatio",Float.toString(memoryovercommitratio)); - _clusterDetailsDao.persist(memory_detail); - } - } - else { + if (memoryovercommitratio != null) { + ClusterDetailsVO memory_detail = _clusterDetailsDao.findDetail(cluster.getId(),"memoryOvercommitRatio"); memory_detail.setValue(Float.toString(memoryovercommitratio)); _clusterDetailsDao.update(memory_detail.getId(),memory_detail); } - ClusterDetailsVO cpu_detail = _clusterDetailsDao.findDetail(cluster.getId(),"cpuOvercommitRatio"); - if( cpu_detail == null){ - if (cpuovercommitratio.compareTo(1f) > 0){ - cpu_detail = new ClusterDetailsVO(cluster.getId(),"cpuOvercommitRatio",Float.toString(cpuovercommitratio)); - _clusterDetailsDao.persist(cpu_detail); - } - } - else { + if (cpuovercommitratio != null) { + ClusterDetailsVO cpu_detail = _clusterDetailsDao.findDetail(cluster.getId(),"cpuOvercommitRatio"); cpu_detail.setValue(Float.toString(cpuovercommitratio)); _clusterDetailsDao.update(cpu_detail.getId(),cpu_detail); - } + } if (doUpdate) { diff --git a/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java b/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java index 73015c11464..8658113d0f6 100755 --- a/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/secstorage/PremiumSecondaryStorageManagerImpl.java @@ -25,8 +25,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; import com.cloud.agent.api.Command; import com.cloud.configuration.Config; @@ -90,6 +88,10 @@ public class PremiumSecondaryStorageManagerImpl extends SecondaryStorageManagerI @Override public Pair scanPool(Long pool) { long dataCenterId = pool.longValue(); + if (!isSecondaryStorageVmRequired(dataCenterId)) { + return new Pair(AfterScanAction.nop, null); + } + Date cutTime = new Date(DateUtil.currentGMTTime().getTime() - _maxExecutionTimeMs); _cmdExecLogDao.expungeExpiredRecords(cutTime); diff --git a/server/src/com/cloud/server/ConfigurationServer.java b/server/src/com/cloud/server/ConfigurationServer.java index f441b1f5de6..c1306d5ec82 100644 --- a/server/src/com/cloud/server/ConfigurationServer.java +++ b/server/src/com/cloud/server/ConfigurationServer.java @@ -16,6 +16,9 @@ // under the License. package com.cloud.server; +import java.util.List; + +import com.cloud.configuration.ConfigurationVO; import com.cloud.exception.InternalErrorException; /** @@ -30,4 +33,6 @@ public interface ConfigurationServer { */ public void persistDefaultValues() throws InternalErrorException; public void updateKeyPairs(); + public String getConfigValue(String name, String scope, Long resourceId); + public List getConfigListByScope(String scope, Long resourceId); } diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java b/server/src/com/cloud/server/ConfigurationServerImpl.java index 53df3b970a8..cd890ce8582 100755 --- a/server/src/com/cloud/server/ConfigurationServerImpl.java +++ b/server/src/com/cloud/server/ConfigurationServerImpl.java @@ -36,28 +36,29 @@ import java.util.Map; import java.util.Properties; import java.util.UUID; import java.util.regex.Pattern; +import java.util.StringTokenizer; import javax.crypto.KeyGenerator; import javax.crypto.SecretKey; import javax.inject.Inject; import javax.naming.ConfigurationException; +import com.cloud.configuration.*; +import com.cloud.dc.*; +import com.cloud.dc.dao.DcDetailsDao; +import com.cloud.user.*; +import com.cloud.utils.db.GenericDao; +import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailVO; +import org.apache.cloudstack.storage.datastore.db.StoragePoolDetailsDao; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; import org.springframework.stereotype.Component; -import com.cloud.configuration.Config; -import com.cloud.configuration.ConfigurationVO; -import com.cloud.configuration.Resource; import com.cloud.configuration.Resource.ResourceOwnerType; import com.cloud.configuration.Resource.ResourceType; -import com.cloud.configuration.ResourceCountVO; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.configuration.dao.ResourceCountDao; import com.cloud.dc.DataCenter.NetworkType; -import com.cloud.dc.DataCenterVO; -import com.cloud.dc.HostPodVO; -import com.cloud.dc.VlanVO; import com.cloud.dc.dao.DataCenterDao; import com.cloud.dc.dao.HostPodDao; import com.cloud.dc.dao.VlanDao; @@ -91,9 +92,6 @@ import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.test.IPRangeConfig; -import com.cloud.user.Account; -import com.cloud.user.AccountVO; -import com.cloud.user.User; import com.cloud.user.dao.AccountDao; import com.cloud.utils.PasswordGenerator; import com.cloud.utils.PropertiesUtil; @@ -127,6 +125,11 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio @Inject private ResourceCountDao _resourceCountDao; @Inject private NetworkOfferingServiceMapDao _ntwkOfferingServiceMapDao; @Inject private IdentityDao _identityDao; + @Inject private DcDetailsDao _dcDetailsDao; + @Inject private ClusterDetailsDao _clusterDetailsDao; + @Inject private StoragePoolDetailsDao _storagePoolDetailsDao; + @Inject private AccountDetailsDao _accountDetailsDao; + public ConfigurationServerImpl() { setRunLevel(ComponentLifecycle.RUN_LEVEL_FRAMEWORK_BOOTSTRAP); @@ -148,8 +151,6 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio @DB public void persistDefaultValues() throws InternalErrorException { - fixupScriptFileAttribute(); - // Create system user and admin user saveUser(); @@ -335,7 +336,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio @DB protected void saveUser() { // insert system account - String insertSql = "INSERT INTO `cloud`.`account` (id, uuid, account_name, type, domain_id) VALUES (1, UUID(), 'system', '1', '1')"; + String insertSql = "INSERT INTO `cloud`.`account` (id, uuid, account_name, type, domain_id, account.default) VALUES (1, UUID(), 'system', '1', '1', 1)"; Transaction txn = Transaction.currentTxn(); try { PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); @@ -343,8 +344,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } catch (SQLException ex) { } // insert system user - insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created)" + - " VALUES (1, UUID(), 'system', RAND(), 1, 'system', 'cloud', now())"; + insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created, user.default)" + + " VALUES (1, UUID(), 'system', RAND(), 1, 'system', 'cloud', now(), 1)"; txn = Transaction.currentTxn(); try { PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); @@ -360,7 +361,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio String lastname = "cloud"; // create an account for the admin user first - insertSql = "INSERT INTO `cloud`.`account` (id, uuid, account_name, type, domain_id) VALUES (" + id + ", UUID(), '" + username + "', '1', '1')"; + insertSql = "INSERT INTO `cloud`.`account` (id, uuid, account_name, type, domain_id, account.default) VALUES (" + id + ", UUID(), '" + username + "', '1', '1', 1)"; txn = Transaction.currentTxn(); try { PreparedStatement stmt = txn.prepareAutoCloseStatement(insertSql); @@ -369,8 +370,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } // now insert the user - insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created, state) " + - "VALUES (" + id + ", UUID(), '" + username + "', RAND(), 2, '" + firstname + "','" + lastname + "',now(), 'disabled')"; + insertSql = "INSERT INTO `cloud`.`user` (id, uuid, username, password, account_id, firstname, lastname, created, state, user.default) " + + "VALUES (" + id + ", UUID(), '" + username + "', RAND(), 2, '" + firstname + "','" + lastname + "',now(), 'disabled', 1)"; txn = Transaction.currentTxn(); try { @@ -674,6 +675,76 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } } + @Override + public String getConfigValue(String name, String scope, Long resourceId) { + // If either of scope or resourceId is null then return global config value otherwise return value at the scope + Config c = Config.getConfig(name); + if (c == null) { + throw new CloudRuntimeException("Missing configuration variable " + name + " in configuration table"); + } + String configScope = c.getScope(); + if (scope != null && !scope.isEmpty()) { + if (!configScope.contains(scope)) { + throw new CloudRuntimeException("Invalid scope " + scope + " for the parameter " + name ); + } + if (resourceId != null) { + switch (Config.ConfigurationParameterScope.valueOf(scope)) { + case zone: DataCenterVO zone = _zoneDao.findById(resourceId); + if (zone == null) { + throw new InvalidParameterValueException("unable to find zone by id " + resourceId); + } + DcDetailVO dcDetailVO = _dcDetailsDao.findDetail(resourceId, name); + if (dcDetailVO != null && dcDetailVO.getValue() != null) { + return dcDetailVO.getValue(); + } break; + + case cluster: ClusterDetailsVO cluster = _clusterDetailsDao.findById(resourceId); + if (cluster == null) { + throw new InvalidParameterValueException("unable to find cluster by id " + resourceId); + } + ClusterDetailsVO clusterDetailsVO = _clusterDetailsDao.findDetail(resourceId, name); + if (clusterDetailsVO != null && clusterDetailsVO.getValue() != null) { + return clusterDetailsVO.getValue(); + } break; + + case pool: StoragePoolDetailVO pool = _storagePoolDetailsDao.findById(resourceId); + if (pool == null) { + throw new InvalidParameterValueException("unable to find storage pool by id " + resourceId); + } + StoragePoolDetailVO storagePoolDetailVO = _storagePoolDetailsDao.findDetail(resourceId, name); + if (storagePoolDetailVO != null && storagePoolDetailVO.getValue() != null) { + return storagePoolDetailVO.getValue(); + } break; + + case account: AccountDetailVO account = _accountDetailsDao.findById(resourceId); + if (account == null) { + throw new InvalidParameterValueException("unable to find account by id " + resourceId); + } + AccountDetailVO accountDetailVO = _accountDetailsDao.findDetail(resourceId, name); + if (accountDetailVO != null && accountDetailVO.getValue() != null) { + return accountDetailVO.getValue(); + } break; + default: + } + } + } + return _configDao.getValue(name); + } + + @Override + public List getConfigListByScope(String scope, Long resourceId) { + + // Getting the list of parameters defined at the scope + List configList = Config.getConfigListByScope(scope); + List configVOList = new ArrayList(); + for (Config param:configList){ + ConfigurationVO configVo = _configDao.findByName(param.toString()); + configVo.setValue(getConfigValue(param.toString(), scope, resourceId)); + configVOList.add(configVo); + } + return configVOList; + } + private void writeKeyToDisk(String key, String keyPath) { File keyfile = new File(keyPath); if (!keyfile.exists()) { @@ -701,24 +772,6 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio } - private void fixupScriptFileAttribute() { - // TODO : this is a hacking fix to workaround that executable bit is not preserved in WAR package - String scriptPath = Script.findScript("", "scripts/vm/systemvm/injectkeys.sh"); - if(scriptPath != null) { - File file = new File(scriptPath); - if(!file.canExecute()) { - s_logger.info("Some of the shell script files may not have executable bit set. Fixup..."); - - String cmd = "sudo chmod ugo+x " + scriptPath; - s_logger.info("Executing " + cmd); - String result = Script.runSimpleBashScript(cmd); - if (result != null) { - s_logger.warn("Failed to fixup shell script executable bits " + result); - } - } - } - } - private void updateKeyPairsOnDisk(String homeDir) { File keyDir = new File(homeDir + "/.ssh"); Boolean devel = Boolean.valueOf(_configDao.getValue("developer")); @@ -749,7 +802,8 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio if (systemVmIsoPath == null) { throw new CloudRuntimeException("Unable to find systemvm iso vms/systemvm.iso"); } - final Script command = new Script(scriptPath, s_logger); + final Script command = new Script("/bin/bash", s_logger); + command.add(scriptPath); command.add(publicKeyPath); command.add(privKeyPath); command.add(systemVmIsoPath); @@ -1027,7 +1081,7 @@ public class ConfigurationServerImpl extends ManagerBase implements Configuratio "Offering for Shared networks with Elastic IP and Elastic LB capabilities", TrafficType.Guest, false, true, null, null, true, Availability.Optional, - null, Network.GuestType.Shared, true, false, false, false, true, true, true, false, false); + null, Network.GuestType.Shared, true, false, false, false, true, true, true, false, false, true); defaultNetscalerNetworkOffering.setState(NetworkOffering.State.Enabled); defaultNetscalerNetworkOffering = _networkOfferingDao.persistDefaultNetworkOffering(defaultNetscalerNetworkOffering); diff --git a/server/src/com/cloud/server/Criteria.java b/server/src/com/cloud/server/Criteria.java index 35186f89711..cbe022a3508 100755 --- a/server/src/com/cloud/server/Criteria.java +++ b/server/src/com/cloud/server/Criteria.java @@ -19,7 +19,7 @@ package com.cloud.server; import java.util.HashMap; public class Criteria { - + private Long offset; private Long limit; private String orderBy; @@ -32,6 +32,7 @@ public class Criteria { public static final String NOTSTATE = "notState"; public static final String STATE = "state"; public static final String DATACENTERID = "dataCenterId"; + public static final String DATACENTERTYPE = "dataCenterType"; public static final String DESCRIPTION = "description"; public static final String PODID = "podId"; public static final String CLUSTERID = "clusterId"; @@ -82,6 +83,7 @@ public class Criteria { public static final String TEMPLATE_ID = "templateid"; public static final String ISO_ID = "isoid"; public static final String VPC_ID = "vpcId"; + public static final String AFFINITY_GROUP_ID = "affinitygroupid"; public Criteria(String orderBy, Boolean ascending, Long offset, Long limit) { this.offset = offset; @@ -90,7 +92,7 @@ public class Criteria { this.ascending = ascending; criteria = new HashMap(); } - + public Criteria() { criteria = new HashMap(); this.ascending = false; @@ -99,11 +101,11 @@ public class Criteria { public Long getOffset() { return offset; } - + public void addCriteria(String name, Object val) { criteria.put(name, val); } - + public Object getCriteria(String name) { return criteria.get(name); } @@ -135,5 +137,5 @@ public class Criteria { public void setAscending(Boolean ascending) { this.ascending = ascending; } - + } diff --git a/server/src/com/cloud/server/ManagementServer.java b/server/src/com/cloud/server/ManagementServer.java index 6773725f361..240464e4938 100755 --- a/server/src/com/cloud/server/ManagementServer.java +++ b/server/src/com/cloud/server/ManagementServer.java @@ -95,6 +95,9 @@ public interface ManagementServer extends ManagementService, PluggableService { Pair, Integer> searchForStoragePools(Criteria c); String getHashKey(); + String getEncryptionKey(); + String getEncryptionIV(); + void resetEncryptionKeyIV(); public void enableAdminUser(String password); } diff --git a/server/src/com/cloud/server/ManagementServerImpl.java b/server/src/com/cloud/server/ManagementServerImpl.java index af77ba5645f..16127a22d95 100755 --- a/server/src/com/cloud/server/ManagementServerImpl.java +++ b/server/src/com/cloud/server/ManagementServerImpl.java @@ -22,6 +22,8 @@ import java.net.InetAddress; import java.net.URI; import java.net.URISyntaxException; import java.net.UnknownHostException; +import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; import java.util.ArrayList; import java.util.Calendar; import java.util.Comparator; @@ -37,16 +39,12 @@ import java.util.concurrent.Executors; import java.util.concurrent.ScheduledExecutorService; import java.util.concurrent.TimeUnit; -import javax.annotation.PostConstruct; import javax.crypto.Mac; import javax.crypto.spec.SecretKeySpec; import javax.inject.Inject; -import javax.management.InstanceAlreadyExistsException; -import javax.management.MBeanRegistrationException; -import javax.management.MalformedObjectNameException; -import javax.management.NotCompliantMBeanException; import javax.naming.ConfigurationException; +import com.cloud.configuration.*; import com.cloud.storage.dao.*; import org.apache.cloudstack.acl.SecurityChecker.AccessType; import org.apache.cloudstack.api.ApiConstants; @@ -54,60 +52,44 @@ import org.apache.cloudstack.api.ApiConstants; import com.cloud.event.ActionEventUtils; import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd; import org.apache.cloudstack.api.command.admin.account.*; -import org.apache.cloudstack.api.command.admin.autoscale.*; -import org.apache.cloudstack.api.command.admin.cluster.*; -import org.apache.cloudstack.api.command.admin.config.*; import org.apache.cloudstack.api.command.admin.domain.*; import org.apache.cloudstack.api.command.admin.host.*; -import org.apache.cloudstack.api.command.admin.ldap.*; import org.apache.cloudstack.api.command.admin.network.*; import org.apache.cloudstack.api.command.admin.offering.*; -import org.apache.cloudstack.api.command.admin.pod.*; -import org.apache.cloudstack.api.command.admin.region.*; import org.apache.cloudstack.api.command.admin.resource.*; import org.apache.cloudstack.api.command.admin.router.*; import org.apache.cloudstack.api.command.admin.storage.*; -import org.apache.cloudstack.api.command.admin.swift.*; import org.apache.cloudstack.api.command.admin.systemvm.*; -import org.apache.cloudstack.api.command.admin.template.*; import org.apache.cloudstack.api.command.admin.usage.*; import org.apache.cloudstack.api.command.admin.user.*; import org.apache.cloudstack.api.command.admin.vlan.*; -import org.apache.cloudstack.api.command.admin.vm.*; import org.apache.cloudstack.api.command.admin.vpc.*; -import org.apache.cloudstack.api.command.admin.zone.*; -import org.apache.cloudstack.api.command.user.account.*; -import org.apache.cloudstack.api.command.user.address.*; import org.apache.cloudstack.api.command.user.autoscale.*; -import org.apache.cloudstack.api.command.user.config.*; -import org.apache.cloudstack.api.command.user.event.*; import org.apache.cloudstack.api.command.user.firewall.*; -import org.apache.cloudstack.api.command.user.guest.*; import org.apache.cloudstack.api.command.user.iso.*; -import org.apache.cloudstack.api.command.user.job.*; import org.apache.cloudstack.api.command.user.loadbalancer.*; import org.apache.cloudstack.api.command.user.nat.*; import org.apache.cloudstack.api.command.user.network.*; -import org.apache.cloudstack.api.command.user.offering.*; import org.apache.cloudstack.api.command.user.project.*; -import org.apache.cloudstack.api.command.user.region.*; import org.apache.cloudstack.api.command.user.resource.*; import org.apache.cloudstack.api.command.user.securitygroup.*; import org.apache.cloudstack.api.command.user.snapshot.*; -import org.apache.cloudstack.api.command.user.ssh.*; -import org.apache.cloudstack.api.command.user.tag.*; import org.apache.cloudstack.api.command.user.template.*; import org.apache.cloudstack.api.command.user.vm.*; -import org.apache.cloudstack.api.command.user.vmgroup.*; import org.apache.cloudstack.api.command.user.volume.*; import org.apache.cloudstack.api.command.user.vpc.*; import org.apache.cloudstack.api.command.user.vpn.*; -import org.apache.cloudstack.api.command.user.zone.*; import org.apache.cloudstack.api.response.ExtractResponse; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; +import org.apache.cloudstack.affinity.AffinityGroupProcessor; +import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; +import org.apache.cloudstack.api.command.user.affinitygroup.CreateAffinityGroupCmd; +import org.apache.cloudstack.api.command.user.affinitygroup.DeleteAffinityGroupCmd; +import org.apache.cloudstack.api.command.user.affinitygroup.ListAffinityGroupTypesCmd; +import org.apache.cloudstack.api.command.user.affinitygroup.ListAffinityGroupsCmd; +import org.apache.cloudstack.api.command.user.affinitygroup.UpdateVMAffinityGroupCmd; import com.cloud.agent.AgentManager; import com.cloud.agent.api.GetVncPortAnswer; import com.cloud.agent.api.GetVncPortCommand; @@ -125,10 +107,6 @@ import com.cloud.capacity.CapacityVO; import com.cloud.capacity.dao.CapacityDao; import com.cloud.capacity.dao.CapacityDaoImpl.SummedCapacity; import com.cloud.cluster.ClusterManager; -import com.cloud.configuration.Config; -import com.cloud.configuration.Configuration; -import com.cloud.configuration.ConfigurationManager; -import com.cloud.configuration.ConfigurationVO; import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.consoleproxy.ConsoleProxyManagementState; import com.cloud.consoleproxy.ConsoleProxyManager; @@ -136,11 +114,11 @@ import com.cloud.dc.*; import com.cloud.dc.Vlan.VlanType; import com.cloud.dc.dao.*; import com.cloud.deploy.DataCenterDeployment; +import com.cloud.deploy.DeploymentPlanner; import com.cloud.deploy.DeploymentPlanner.ExcludeList; import com.cloud.domain.DomainVO; import com.cloud.domain.dao.DomainDao; import com.cloud.event.ActionEvent; -import com.cloud.event.ActionEventUtils; import com.cloud.event.EventTypes; import com.cloud.event.EventVO; import com.cloud.event.dao.EventDao; @@ -175,7 +153,6 @@ import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.*; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Upload.Mode; -import com.cloud.storage.dao.*; import com.cloud.storage.s3.S3Manager; import com.cloud.storage.secondary.SecondaryStorageVmManager; import com.cloud.storage.snapshot.SnapshotManager; @@ -193,11 +170,7 @@ import com.cloud.utils.EnumUtils; import com.cloud.utils.NumbersUtil; import com.cloud.utils.Pair; import com.cloud.utils.PasswordGenerator; -import com.cloud.utils.ReflectUtil; import com.cloud.utils.Ternary; -import com.cloud.utils.component.Adapter; -import com.cloud.utils.component.AdapterBase; -import com.cloud.utils.component.ComponentContext; import com.cloud.utils.component.ComponentLifecycle; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.concurrency.NamedThreadFactory; @@ -214,10 +187,6 @@ import com.cloud.vm.dao.*; import edu.emory.mathcs.backport.java.util.Arrays; import edu.emory.mathcs.backport.java.util.Collections; import org.apache.cloudstack.acl.ControlledEntity; -import org.apache.cloudstack.acl.SecurityChecker.AccessType; -import org.apache.cloudstack.api.ApiConstants; -import org.apache.cloudstack.api.BaseUpdateTemplateOrIsoCmd; -import org.apache.cloudstack.api.command.admin.account.*; import org.apache.cloudstack.api.command.admin.autoscale.CreateCounterCmd; import org.apache.cloudstack.api.command.admin.autoscale.DeleteCounterCmd; import org.apache.cloudstack.api.command.admin.cluster.AddClusterCmd; @@ -228,12 +197,8 @@ import org.apache.cloudstack.api.command.admin.config.ListCfgsByCmd; import org.apache.cloudstack.api.command.admin.config.ListHypervisorCapabilitiesCmd; import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd; import org.apache.cloudstack.api.command.admin.config.UpdateHypervisorCapabilitiesCmd; -import org.apache.cloudstack.api.command.admin.domain.*; -import org.apache.cloudstack.api.command.admin.host.*; import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd; import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd; -import org.apache.cloudstack.api.command.admin.network.*; -import org.apache.cloudstack.api.command.admin.offering.*; import org.apache.cloudstack.api.command.admin.pod.CreatePodCmd; import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd; import org.apache.cloudstack.api.command.admin.pod.ListPodsByCmd; @@ -241,22 +206,16 @@ import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd; import org.apache.cloudstack.api.command.admin.region.AddRegionCmd; import org.apache.cloudstack.api.command.admin.region.RemoveRegionCmd; import org.apache.cloudstack.api.command.admin.region.UpdateRegionCmd; -import org.apache.cloudstack.api.command.admin.resource.*; -import org.apache.cloudstack.api.command.admin.router.*; -import org.apache.cloudstack.api.command.admin.storage.*; import org.apache.cloudstack.api.command.admin.swift.AddSwiftCmd; import org.apache.cloudstack.api.command.admin.swift.ListSwiftsCmd; -import org.apache.cloudstack.api.command.admin.systemvm.*; import org.apache.cloudstack.api.command.admin.template.PrepareTemplateCmd; -import org.apache.cloudstack.api.command.admin.usage.*; -import org.apache.cloudstack.api.command.admin.user.*; import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd; import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd; import org.apache.cloudstack.api.command.admin.vlan.ListVlanIpRangesCmd; import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd; import org.apache.cloudstack.api.command.admin.vm.MigrateVMCmd; +import org.apache.cloudstack.api.command.admin.vm.MigrateVirtualMachineWithVolumeCmd; import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd; -import org.apache.cloudstack.api.command.admin.vpc.*; import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd; import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd; import org.apache.cloudstack.api.command.admin.zone.MarkDefaultZoneForAccountCmd; @@ -268,29 +227,19 @@ import org.apache.cloudstack.api.command.user.account.ListProjectAccountsCmd; import org.apache.cloudstack.api.command.user.address.AssociateIPAddrCmd; import org.apache.cloudstack.api.command.user.address.DisassociateIPAddrCmd; import org.apache.cloudstack.api.command.user.address.ListPublicIpAddressesCmd; -import org.apache.cloudstack.api.command.user.autoscale.*; import org.apache.cloudstack.api.command.user.config.ListCapabilitiesCmd; import org.apache.cloudstack.api.command.user.event.ArchiveEventsCmd; import org.apache.cloudstack.api.command.user.event.DeleteEventsCmd; import org.apache.cloudstack.api.command.user.event.ListEventTypesCmd; import org.apache.cloudstack.api.command.user.event.ListEventsCmd; -import org.apache.cloudstack.api.command.user.firewall.*; import org.apache.cloudstack.api.command.user.guest.ListGuestOsCategoriesCmd; import org.apache.cloudstack.api.command.user.guest.ListGuestOsCmd; -import org.apache.cloudstack.api.command.user.iso.*; import org.apache.cloudstack.api.command.user.job.ListAsyncJobsCmd; import org.apache.cloudstack.api.command.user.job.QueryAsyncJobResultCmd; -import org.apache.cloudstack.api.command.user.loadbalancer.*; -import org.apache.cloudstack.api.command.user.nat.*; -import org.apache.cloudstack.api.command.user.network.*; import org.apache.cloudstack.api.command.user.offering.ListDiskOfferingsCmd; import org.apache.cloudstack.api.command.user.offering.ListServiceOfferingsCmd; -import org.apache.cloudstack.api.command.user.project.*; import org.apache.cloudstack.api.command.user.region.ListRegionsCmd; import org.apache.cloudstack.api.command.user.region.ha.gslb.*; -import org.apache.cloudstack.api.command.user.resource.*; -import org.apache.cloudstack.api.command.user.securitygroup.*; -import org.apache.cloudstack.api.command.user.snapshot.*; import org.apache.cloudstack.api.command.user.ssh.CreateSSHKeyPairCmd; import org.apache.cloudstack.api.command.user.ssh.DeleteSSHKeyPairCmd; import org.apache.cloudstack.api.command.user.ssh.ListSSHKeyPairsCmd; @@ -298,8 +247,6 @@ import org.apache.cloudstack.api.command.user.ssh.RegisterSSHKeyPairCmd; import org.apache.cloudstack.api.command.user.tag.CreateTagsCmd; import org.apache.cloudstack.api.command.user.tag.DeleteTagsCmd; import org.apache.cloudstack.api.command.user.tag.ListTagsCmd; -import org.apache.cloudstack.api.command.user.template.*; -import org.apache.cloudstack.api.command.user.vm.*; import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd; import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd; import org.apache.cloudstack.api.command.user.vmgroup.ListVMGroupsCmd; @@ -308,27 +255,11 @@ import org.apache.cloudstack.api.command.user.vmsnapshot.CreateVMSnapshotCmd; import org.apache.cloudstack.api.command.user.vmsnapshot.DeleteVMSnapshotCmd; import org.apache.cloudstack.api.command.user.vmsnapshot.ListVMSnapshotCmd; import org.apache.cloudstack.api.command.user.vmsnapshot.RevertToSnapshotCmd; -import org.apache.cloudstack.api.command.user.volume.*; -import org.apache.cloudstack.api.command.user.vpc.*; -import org.apache.cloudstack.api.command.user.vpn.*; import org.apache.cloudstack.api.command.user.zone.ListZonesByCmd; -import org.apache.cloudstack.api.response.ExtractResponse; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; +import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; -import org.apache.commons.codec.binary.Base64; -import org.apache.log4j.Logger; - -import javax.crypto.Mac; -import javax.crypto.spec.SecretKeySpec; -import javax.inject.Inject; -import javax.naming.ConfigurationException; -import java.lang.reflect.Field; -import java.net.*; -import java.util.*; -import java.util.concurrent.Executors; -import java.util.concurrent.ScheduledExecutorService; -import java.util.concurrent.TimeUnit; public class ManagementServerImpl extends ManagerBase implements ManagementServer { public static final Logger s_logger = Logger.getLogger(ManagementServerImpl.class.getName()); @@ -400,6 +331,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe @Inject private StorageManager _storageMgr; @Inject + private VolumeManager _volumeMgr; + @Inject private VirtualMachineManager _itMgr; @Inject private HostPodDao _hostPodDao; @@ -423,10 +356,10 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe private LoadBalancerDao _loadbalancerDao; @Inject private HypervisorCapabilitiesDao _hypervisorCapabilitiesDao; - private List _hostAllocators; - - @Inject + @Inject + private List _storagePoolAllocators; + @Inject private ConfigurationManager _configMgr; @Inject private ResourceTagDao _resourceTagDao; @@ -449,6 +382,9 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe @Inject S3Manager _s3Mgr; + @Inject + ConfigurationServer _configServer; + private final ScheduledExecutorService _eventExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("EventChecker")); private final ScheduledExecutorService _alertExecutor = Executors.newScheduledThreadPool(1, new NamedThreadFactory("AlertChecker")); private KeystoreManager _ksMgr; @@ -462,15 +398,28 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe @Inject ClusterManager _clusterMgr; private String _hashKey = null; + private String _encryptionKey = null; + private String _encryptionIV = null; + + @Inject + protected AffinityGroupVMMapDao _affinityGroupVMMapDao; + + protected List _affinityProcessors; + public List getAffinityGroupProcessors() { + return _affinityProcessors; + } + public void setAffinityGroupProcessors(List affinityProcessors) { + this._affinityProcessors = affinityProcessors; + } public ManagementServerImpl() { setRunLevel(ComponentLifecycle.RUN_LEVEL_APPLICATION_MAINLOOP); } - + public List getUserAuthenticators() { return _userAuthenticators; } - + public void setUserAuthenticators(List authenticators) { _userAuthenticators = authenticators; } @@ -734,12 +683,14 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe Object resourceState = cmd.getResourceState(); Object haHosts = cmd.getHaHost(); - Pair, Integer> result = searchForServers(cmd.getStartIndex(), cmd.getPageSizeVal(), name, type, state, zoneId, pod, cluster, id, keyword, resourceState, haHosts); + Pair, Integer> result = searchForServers(cmd.getStartIndex(), cmd.getPageSizeVal(), name, type, + state, zoneId, pod, cluster, id, keyword, resourceState, haHosts, null, null); return new Pair, Integer>(result.first(), result.second()); } @Override - public Pair, Integer>, List> listHostsForMigrationOfVM(Long vmId, Long startIndex, Long pageSize) { + public Ternary, Integer>, List, Map> + listHostsForMigrationOfVM(Long vmId, Long startIndex, Long pageSize) { // access check - only root admin can migrate VM Account caller = UserContext.current().getCaller(); if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) { @@ -755,12 +706,13 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe ex.addProxyObject(vm, vmId, "vmId"); throw ex; } - // business logic + if (vm.getState() != State.Running) { if (s_logger.isDebugEnabled()) { s_logger.debug("VM is not Running, unable to migrate the vm" + vm); } - InvalidParameterValueException ex = new InvalidParameterValueException("VM is not Running, unable to migrate the vm with specified id"); + InvalidParameterValueException ex = new InvalidParameterValueException("VM is not Running, unable to" + + " migrate the vm with specified id"); ex.addProxyObject(vm, vmId, "vmId"); throw ex; } @@ -770,17 +722,11 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe if (s_logger.isDebugEnabled()) { s_logger.debug(vm + " is not XenServer/VMware/KVM/OVM, cannot migrate this VM."); } - throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support XenServer/VMware/KVM only"); - } - ServiceOfferingVO svcOffering = _offeringsDao.findById(vm.getServiceOfferingId()); - if (svcOffering.getUseLocalStorage()) { - if (s_logger.isDebugEnabled()) { - s_logger.debug(vm + " is using Local Storage, cannot migrate this VM."); - } - throw new InvalidParameterValueException("Unsupported operation, VM uses Local storage, cannot migrate"); + throw new InvalidParameterValueException("Unsupported Hypervisor Type for VM migration, we support " + + "XenServer/VMware/KVM/Ovm only"); } + long srcHostId = vm.getHostId(); - // why is this not HostVO? Host srcHost = _hostDao.findById(srcHostId); if (srcHost == null) { if (s_logger.isDebugEnabled()) { @@ -792,55 +738,254 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe ex.addProxyObject(vm, vmId, "vmId"); throw ex; } - Long cluster = srcHost.getClusterId(); - Type hostType = srcHost.getType(); - if (s_logger.isDebugEnabled()) { - s_logger.debug("Searching for all hosts in cluster: " + cluster + " for migrating VM " + vm); + + // Check if the vm can be migrated with storage. + boolean canMigrateWithStorage = false; + HypervisorCapabilitiesVO capabilities = _hypervisorCapabilitiesDao.findByHypervisorTypeAndVersion( + srcHost.getHypervisorType(), srcHost.getHypervisorVersion()); + if (capabilities != null) { + canMigrateWithStorage = capabilities.isStorageMotionSupported(); } - Pair, Integer> allHostsInClusterPair = searchForServers(startIndex, pageSize, null, hostType, null, null, null, cluster, null, null, null, null); - - // filter out the current host - List allHostsInCluster = allHostsInClusterPair.first(); - allHostsInCluster.remove(srcHost); - Pair, Integer> otherHostsInCluster = new Pair, Integer>(allHostsInCluster, new Integer(allHostsInClusterPair.second().intValue()-1)); - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Other Hosts in this cluster: " + allHostsInCluster); - } - - if (s_logger.isDebugEnabled()) { - s_logger.debug("Calling HostAllocators to search for hosts in cluster: " + cluster + " having enough capacity and suitable for migration"); - } - - List suitableHosts = new ArrayList(); - + // Check if the vm is using any disks on local storage. VirtualMachineProfile vmProfile = new VirtualMachineProfileImpl(vm); + List volumes = _volumeDao.findCreatedByInstance(vmProfile.getId()); + boolean usesLocal = false; + for (VolumeVO volume : volumes) { + DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId()); + DiskProfile diskProfile = new DiskProfile(volume, diskOffering, vmProfile.getHypervisorType()); + if (diskProfile.useLocalStorage()) { + usesLocal = true; + break; + } + } - DataCenterDeployment plan = new DataCenterDeployment(srcHost.getDataCenterId(), srcHost.getPodId(), srcHost.getClusterId(), null, null, null); + if (!canMigrateWithStorage && usesLocal) { + throw new InvalidParameterValueException("Unsupported operation, VM uses Local storage, cannot migrate"); + } + + Type hostType = srcHost.getType(); + Pair, Integer> allHostsPair = null; + List allHosts = null; + Map requiresStorageMotion = new HashMap(); + DataCenterDeployment plan = null; + if (canMigrateWithStorage) { + allHostsPair = searchForServers(startIndex, pageSize, null, hostType, null, srcHost.getDataCenterId(), null, + null, null, null, null, null, srcHost.getHypervisorType(), srcHost.getHypervisorVersion()); + allHosts = allHostsPair.first(); + allHosts.remove(srcHost); + + // Check if the host has storage pools for all the volumes of the vm to be migrated. + for (Host host : allHosts) { + Map> volumePools = findSuitablePoolsForVolumes(vmProfile, host); + if (volumePools.isEmpty()) { + allHosts.remove(host); + } else { + if (host.getClusterId() != srcHost.getClusterId() || usesLocal) { + requiresStorageMotion.put(host, true); + } + } + } + + plan = new DataCenterDeployment(srcHost.getDataCenterId(), null, null, null, null, null); + } else { + Long cluster = srcHost.getClusterId(); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Searching for all hosts in cluster " + cluster + " for migrating VM " + vm); + } + allHostsPair = searchForServers(startIndex, pageSize, null, hostType, null, null, null, cluster, null, null, + null, null, null, null); + // Filter out the current host. + allHosts = allHostsPair.first(); + allHosts.remove(srcHost); + plan = new DataCenterDeployment(srcHost.getDataCenterId(), srcHost.getPodId(), srcHost.getClusterId(), + null, null, null); + } + + Pair, Integer> otherHosts = new Pair, Integer>(allHosts, + new Integer(allHosts.size())); + List suitableHosts = new ArrayList(); ExcludeList excludes = new ExcludeList(); excludes.addHost(srcHostId); + // call affinitygroup chain + long vmGroupCount = _affinityGroupVMMapDao.countAffinityGroupsForVm(vm.getId()); + + if (vmGroupCount > 0) { + for (AffinityGroupProcessor processor : _affinityProcessors) { + processor.process(vmProfile, plan, excludes); + } + } + for (HostAllocator allocator : _hostAllocators) { - suitableHosts = allocator.allocateTo(vmProfile, plan, Host.Type.Routing, excludes, HostAllocator.RETURN_UPTO_ALL, false); + if (canMigrateWithStorage) { + suitableHosts = allocator.allocateTo(vmProfile, plan, Host.Type.Routing, excludes, allHosts, + HostAllocator.RETURN_UPTO_ALL, false); + } else { + suitableHosts = allocator.allocateTo(vmProfile, plan, Host.Type.Routing, excludes, + HostAllocator.RETURN_UPTO_ALL, false); + } + if (suitableHosts != null && !suitableHosts.isEmpty()) { break; } } - if (suitableHosts.isEmpty()) { - s_logger.debug("No suitable hosts found"); - } else { - if (s_logger.isDebugEnabled()) { + if (s_logger.isDebugEnabled()) { + if (suitableHosts.isEmpty()) { + s_logger.debug("No suitable hosts found"); + } else { s_logger.debug("Hosts having capacity and suitable for migration: " + suitableHosts); } } - return new Pair, Integer>, List>(otherHostsInCluster, suitableHosts); + return new Ternary, Integer>, List, Map> (otherHosts, + suitableHosts, requiresStorageMotion); + } + + private Map> findSuitablePoolsForVolumes(VirtualMachineProfile vmProfile, + Host host) { + List volumes = _volumeDao.findCreatedByInstance(vmProfile.getId()); + Map> suitableVolumeStoragePools = new HashMap>(); + + // For each volume find list of suitable storage pools by calling the allocators + for (VolumeVO volume : volumes) { + DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId()); + DiskProfile diskProfile = new DiskProfile(volume, diskOffering, vmProfile.getHypervisorType()); + DataCenterDeployment plan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), + host.getClusterId(), host.getId(), null, null); + ExcludeList avoid = new ExcludeList(); + + boolean foundPools = false; + for (StoragePoolAllocator allocator : _storagePoolAllocators) { + List poolList = allocator.allocateToPool(diskProfile, vmProfile, plan, avoid, + StoragePoolAllocator.RETURN_UPTO_ALL); + if (poolList != null && !poolList.isEmpty()) { + suitableVolumeStoragePools.put(volume, poolList); + foundPools = true; + break; + } + } + + if (!foundPools) { + suitableVolumeStoragePools.clear(); + break; + } + } + + return suitableVolumeStoragePools; + } + + @Override + public Pair, List> listStoragePoolsForMigrationOfVolume(Long volumeId) { + // Access check - only root administrator can migrate volumes. + Account caller = UserContext.current().getCaller(); + if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Caller is not a root admin, permission denied to migrate the volume"); + } + throw new PermissionDeniedException("No permission to migrate volume, only root admin can migrate a volume"); + } + + VolumeVO volume = _volumeDao.findById(volumeId); + if (volume == null) { + InvalidParameterValueException ex = new InvalidParameterValueException("Unable to find volume with" + + " specified id."); + ex.addProxyObject(volume, volumeId, "volumeId"); + throw ex; + } + + // Volume must be attached to an instance for live migration. + List allPools = new ArrayList(); + List suitablePools = new ArrayList(); + Long instanceId = volume.getInstanceId(); + VMInstanceVO vm = null; + if (instanceId != null) { + vm = _vmInstanceDao.findById(instanceId); + } + + // Check that the VM is in correct state. + if (vm == null || vm.getState() != State.Running) { + s_logger.info("Volume " + volume + " isn't attached to any running vm. Only volumes attached to a running" + + " VM can be migrated."); + return new Pair, List>(allPools, suitablePools); + } + + // Volume must be in Ready state to be migrated. + if (!Volume.State.Ready.equals(volume.getState())) { + s_logger.info("Volume " + volume + " must be in ready state for migration."); + return new Pair, List>(allPools, suitablePools); + } + + if (!_volumeMgr.volumeOnSharedStoragePool(volume)) { + s_logger.info("Volume " + volume + " is on local storage. It cannot be migrated to another pool."); + return new Pair, List>(allPools, suitablePools); + } + + // Check if the underlying hypervisor supports storage motion. + boolean storageMotionSupported = false; + Long hostId = vm.getHostId(); + if (hostId != null) { + HostVO host = _hostDao.findById(hostId); + HypervisorCapabilitiesVO capabilities = null; + if (host != null) { + capabilities = _hypervisorCapabilitiesDao.findByHypervisorTypeAndVersion(host.getHypervisorType(), + host.getHypervisorVersion()); + } else { + s_logger.error("Details of the host on which the vm " + vm + ", to which volume "+ volume + " is " + + "attached, couldn't be retrieved."); + } + + if (capabilities != null) { + storageMotionSupported = capabilities.isStorageMotionSupported(); + } else { + s_logger.error("Capabilities for host " + host + " couldn't be retrieved."); + } + } + + if (storageMotionSupported) { + // Source pool of the volume. + StoragePoolVO srcVolumePool = _poolDao.findById(volume.getPoolId()); + + // Get all the pools available. Only shared pools are considered because only a volume on a shared pools + // can be live migrated while the virtual machine stays on the same host. + List storagePools = _poolDao.findPoolsByTags(volume.getDataCenterId(), + volume.getPodId(), srcVolumePool.getClusterId(), null); + storagePools.remove(srcVolumePool); + for (StoragePoolVO pool : storagePools) { + if (pool.isShared()) { + allPools.add((StoragePool)this.dataStoreMgr.getPrimaryDataStore(pool.getId())); + } + } + + // Get all the suitable pools. + // Exclude the current pool from the list of pools to which the volume can be migrated. + ExcludeList avoid = new ExcludeList(); + avoid.addPool(srcVolumePool.getId()); + + // Volume stays in the same cluster after migration. + DataCenterDeployment plan = new DataCenterDeployment(volume.getDataCenterId(), volume.getPodId(), + srcVolumePool.getClusterId(), null, null, null); + VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm); + + DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId()); + DiskProfile diskProfile = new DiskProfile(volume, diskOffering, profile.getHypervisorType()); + + // Call the storage pool allocator to find the list of storage pools. + for (StoragePoolAllocator allocator : _storagePoolAllocators) { + List pools = allocator.allocateToPool(diskProfile, profile, plan, avoid, + StoragePoolAllocator.RETURN_UPTO_ALL); + if (pools != null && !pools.isEmpty()) { + suitablePools.addAll(pools); + break; + } + } + } + return new Pair, List>(allPools, suitablePools); } private Pair, Integer> searchForServers(Long startIndex, Long pageSize, Object name, Object type, Object state, Object zone, Object pod, Object cluster, Object id, Object keyword, - Object resourceState, Object haHosts) { + Object resourceState, Object haHosts, Object hypervisorType, Object hypervisorVersion) { Filter searchFilter = new Filter(HostVO.class, "id", Boolean.TRUE, startIndex, pageSize); SearchBuilder sb = _hostDao.createSearchBuilder(); @@ -852,6 +997,8 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe sb.and("podId", sb.entity().getPodId(), SearchCriteria.Op.EQ); sb.and("clusterId", sb.entity().getClusterId(), SearchCriteria.Op.EQ); sb.and("resourceState", sb.entity().getResourceState(), SearchCriteria.Op.EQ); + sb.and("hypervisorType", sb.entity().getHypervisorType(), SearchCriteria.Op.EQ); + sb.and("hypervisorVersion", sb.entity().getHypervisorVersion(), SearchCriteria.Op.EQ); String haTag = _haMgr.getHaTag(); SearchBuilder hostTagSearch = null; @@ -901,6 +1048,12 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe if (cluster != null) { sc.setParameters("clusterId", cluster); } + if (hypervisorType != null) { + sc.setParameters("hypervisorType", hypervisorType); + } + if (hypervisorVersion != null) { + sc.setParameters("hypervisorVersion", hypervisorVersion); + } if (resourceState != null) { sc.setParameters("resourceState", resourceState); @@ -1084,6 +1237,22 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe Object name = cmd.getConfigName(); Object category = cmd.getCategory(); Object keyword = cmd.getKeyword(); + Long id = cmd.getId(); + String scope = cmd.getScope(); + + if (scope!= null && !scope.isEmpty()) { + // getting the list of parameters at requested scope + try { + Config.ConfigurationParameterScope.valueOf(scope.toLowerCase()); + } catch (Exception e ) { + throw new InvalidParameterValueException("Invalid scope " + scope + " while listing configuration parameters"); + } + if (id == null) { + throw new InvalidParameterValueException("Invalid id null, id is needed corresponding to the scope"); + } + List configList = _configServer.getConfigListByScope(scope, id); + return new Pair, Integer>(configList, configList.size()); + } if (keyword != null) { SearchCriteria ssc = _configDao.createSearchCriteria(); @@ -1999,6 +2168,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe cmdList.add(CancelMaintenanceCmd.class); cmdList.add(DeleteHostCmd.class); cmdList.add(ListHostsCmd.class); + cmdList.add(FindHostsForMigrationCmd.class); cmdList.add(PrepareForMaintenanceCmd.class); cmdList.add(ReconnectHostCmd.class); cmdList.add(UpdateHostCmd.class); @@ -2055,6 +2225,7 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe cmdList.add(DeletePoolCmd.class); cmdList.add(ListS3sCmd.class); cmdList.add(ListStoragePoolsCmd.class); + cmdList.add(FindStoragePoolsForMigrationCmd.class); cmdList.add(PreparePrimaryStorageForMaintenanceCmd.class); cmdList.add(UpdateStoragePoolCmd.class); cmdList.add(AddSwiftCmd.class); @@ -2090,8 +2261,11 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe cmdList.add(CreateVlanIpRangeCmd.class); cmdList.add(DeleteVlanIpRangeCmd.class); cmdList.add(ListVlanIpRangesCmd.class); + cmdList.add(DedicatePublicIpRangeCmd.class); + cmdList.add(ReleasePublicIpRangeCmd.class); cmdList.add(AssignVMCmd.class); cmdList.add(MigrateVMCmd.class); + cmdList.add(MigrateVirtualMachineWithVolumeCmd.class); cmdList.add(RecoverVMCmd.class); cmdList.add(CreatePrivateGatewayCmd.class); cmdList.add(CreateVPCOfferingCmd.class); @@ -2301,6 +2475,12 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe cmdList.add(AssignToGlobalLoadBalancerRuleCmd.class); cmdList.add(RemoveFromGlobalLoadBalancerRuleCmd.class); cmdList.add(ListStorageProvidersCmd.class); + cmdList.add(CreateAffinityGroupCmd.class); + cmdList.add(DeleteAffinityGroupCmd.class); + cmdList.add(ListAffinityGroupsCmd.class); + cmdList.add(UpdateVMAffinityGroupCmd.class); + cmdList.add(ListAffinityGroupTypesCmd.class); + return cmdList; } @@ -3034,15 +3214,66 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe @Override public String getHashKey() { - // although we may have race conditioning here, database transaction - // serialization should + // although we may have race conditioning here, database transaction serialization should // give us the same key if (_hashKey == null) { - _hashKey = _configDao.getValueAndInitIfNotExist(Config.HashKey.key(), Config.HashKey.getCategory(), UUID.randomUUID().toString()); + _hashKey = _configDao.getValueAndInitIfNotExist(Config.HashKey.key(), Config.HashKey.getCategory(), + getBase64EncodedRandomKey(128)); } return _hashKey; } + @Override + public String getEncryptionKey() { + if (_encryptionKey == null) { + _encryptionKey = _configDao.getValueAndInitIfNotExist(Config.EncryptionKey.key(), + Config.EncryptionKey.getCategory(), + getBase64EncodedRandomKey(128)); + } + return _encryptionKey; + } + + @Override + public String getEncryptionIV() { + if (_encryptionIV == null) { + _encryptionIV = _configDao.getValueAndInitIfNotExist(Config.EncryptionIV.key(), + Config.EncryptionIV.getCategory(), + getBase64EncodedRandomKey(128)); + } + return _encryptionIV; + } + + @Override + @DB + public void resetEncryptionKeyIV() { + + SearchBuilder sb = _configDao.createSearchBuilder(); + sb.and("name1", sb.entity().getName(), SearchCriteria.Op.EQ); + sb.or("name2", sb.entity().getName(), SearchCriteria.Op.EQ); + sb.done(); + + SearchCriteria sc = sb.create(); + sc.setParameters("name1", Config.EncryptionKey.key()); + sc.setParameters("name2", Config.EncryptionIV.key()); + + _configDao.expunge(sc); + _encryptionKey = null; + _encryptionIV = null; + } + + private static String getBase64EncodedRandomKey(int nBits) { + SecureRandom random; + try { + random = SecureRandom.getInstance("SHA1PRNG"); + byte[] keyBytes = new byte[nBits/8]; + random.nextBytes(keyBytes); + return Base64.encodeBase64URLSafeString(keyBytes); + } catch (NoSuchAlgorithmException e) { + s_logger.error("Unhandled exception: ", e); + } + return null; + } + @Override public SSHKeyPair createSSHKeyPair(CreateSSHKeyPairCmd cmd) { Account caller = UserContext.current().getCaller(); @@ -3365,5 +3596,4 @@ public class ManagementServerImpl extends ManagerBase implements ManagementServe } } - } diff --git a/server/src/com/cloud/service/ServiceOfferingVO.java b/server/src/com/cloud/service/ServiceOfferingVO.java index 7be939c3a15..94a73515e6a 100755 --- a/server/src/com/cloud/service/ServiceOfferingVO.java +++ b/server/src/com/cloud/service/ServiceOfferingVO.java @@ -34,25 +34,25 @@ import com.cloud.vm.VirtualMachine; public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering { @Column(name="cpu") private int cpu; - + @Column(name="speed") private int speed; - + @Column(name="ram_size") private int ramSize; - + @Column(name="nw_rate") private Integer rateMbps; - + @Column(name="mc_rate") private Integer multicastRateMbps; - + @Column(name="ha_enabled") private boolean offerHA; @Column(name="limit_cpu_use") - private boolean limitCpuUse; - + private boolean limitCpuUse; + @Column(name="is_volatile") private boolean volatileVm; @@ -64,10 +64,10 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering @Column(name="vm_type") private String vm_type; - + @Column(name="sort_key") int sortKey; - + protected ServiceOfferingVO() { super(); } @@ -80,7 +80,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering this.rateMbps = rateMbps; this.multicastRateMbps = multicastRateMbps; this.offerHA = offerHA; - this.limitCpuUse = false; + this.limitCpuUse = false; this.volatileVm = false; this.default_use = defaultUse; this.vm_type = vm_type == null ? null : vm_type.toString().toLowerCase(); @@ -94,7 +94,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering this.rateMbps = rateMbps; this.multicastRateMbps = multicastRateMbps; this.offerHA = offerHA; - this.limitCpuUse = limitCpuUse; + this.limitCpuUse = limitCpuUse; this.volatileVm = volatileVm; this.vm_type = vm_type == null ? null : vm_type.toString().toLowerCase(); } @@ -102,31 +102,31 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering public ServiceOfferingVO(String name, int cpu, int ramSize, int speed, Integer rateMbps, Integer multicastRateMbps, boolean offerHA, boolean limitResourceUse, boolean volatileVm, String displayText, boolean useLocalStorage, boolean recreatable, String tags, boolean systemUse, VirtualMachine.Type vm_type, Long domainId, String hostTag) { this(name, cpu, ramSize, speed, rateMbps, multicastRateMbps, offerHA, limitResourceUse, volatileVm, displayText, useLocalStorage, recreatable, tags, systemUse, vm_type, domainId); this.hostTag = hostTag; - } + } @Override public boolean getOfferHA() { return offerHA; } - + public void setOfferHA(boolean offerHA) { this.offerHA = offerHA; } - @Override + @Override public boolean getLimitCpuUse() { return limitCpuUse; } - + public void setLimitResourceUse(boolean limitCpuUse) { this.limitCpuUse = limitCpuUse; } - - @Override + + @Override public boolean getDefaultUse() { return default_use; } - + @Override @Transient public String[] getTagsArray() { @@ -134,15 +134,15 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering if (tags == null || tags.length() == 0) { return new String[0]; } - + return tags.split(","); } - + @Override public int getCpu() { return cpu; } - + public void setCpu(int cpu) { this.cpu = cpu; } @@ -154,17 +154,17 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering public void setRamSize(int ramSize) { this.ramSize = ramSize; } - + @Override public int getSpeed() { return speed; } - + @Override public int getRamSize() { return ramSize; } - + public void setRateMbps(Integer rateMbps) { this.rateMbps = rateMbps; } @@ -177,7 +177,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering public void setMulticastRateMbps(Integer multicastRateMbps) { this.multicastRateMbps = multicastRateMbps; } - + @Override public Integer getMulticastRateMbps() { return multicastRateMbps; @@ -185,12 +185,12 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering public void setHostTag(String hostTag) { this.hostTag = hostTag; - } - + } + public String getHostTag() { return hostTag; } - + public String getSystemVmType(){ return vm_type; } @@ -202,7 +202,7 @@ public class ServiceOfferingVO extends DiskOfferingVO implements ServiceOffering public int getSortKey() { return sortKey; } - + @Override public boolean getVolatileVm() { return volatileVm; diff --git a/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java b/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java index 2638c8b31b9..7463ec097f3 100644 --- a/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java +++ b/server/src/com/cloud/servlet/ConsoleProxyPasswordBasedEncryptor.java @@ -16,13 +16,16 @@ // under the License. package com.cloud.servlet; +import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; +import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import org.apache.commons.codec.binary.Base64; @@ -35,26 +38,26 @@ import com.google.gson.GsonBuilder; public class ConsoleProxyPasswordBasedEncryptor { private static final Logger s_logger = Logger.getLogger(ConsoleProxyPasswordBasedEncryptor.class); - private String password; private Gson gson; + // key/IV will be set in 128 bit strength + private KeyIVPair keyIvPair; + public ConsoleProxyPasswordBasedEncryptor(String password) { - this.password = password; gson = new GsonBuilder().create(); + keyIvPair = gson.fromJson(password, KeyIVPair.class); } public String encryptText(String text) { if(text == null || text.isEmpty()) return text; - assert(password != null); - assert(!password.isEmpty()); - try { - Cipher cipher = Cipher.getInstance("DES"); - int maxKeySize = 8; - SecretKeySpec keySpec = new SecretKeySpec(normalizeKey(password.getBytes(), maxKeySize), "DES"); - cipher.init(Cipher.ENCRYPT_MODE, keySpec); + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + SecretKeySpec keySpec = new SecretKeySpec(keyIvPair.getKeyBytes(), "AES"); + + cipher.init(Cipher.ENCRYPT_MODE, keySpec, new IvParameterSpec(keyIvPair.getIvBytes())); + byte[] encryptedBytes = cipher.doFinal(text.getBytes()); return Base64.encodeBase64URLSafeString(encryptedBytes); } catch (NoSuchAlgorithmException e) { @@ -72,6 +75,9 @@ public class ConsoleProxyPasswordBasedEncryptor { } catch (InvalidKeyException e) { s_logger.error("Unexpected exception ", e); return null; + } catch (InvalidAlgorithmParameterException e) { + s_logger.error("Unexpected exception ", e); + return null; } } @@ -79,14 +85,10 @@ public class ConsoleProxyPasswordBasedEncryptor { if(encryptedText == null || encryptedText.isEmpty()) return encryptedText; - assert(password != null); - assert(!password.isEmpty()); - try { - Cipher cipher = Cipher.getInstance("DES"); - int maxKeySize = 8; - SecretKeySpec keySpec = new SecretKeySpec(normalizeKey(password.getBytes(), maxKeySize), "DES"); - cipher.init(Cipher.DECRYPT_MODE, keySpec); + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + SecretKeySpec keySpec = new SecretKeySpec(keyIvPair.getKeyBytes(), "AES"); + cipher.init(Cipher.DECRYPT_MODE, keySpec, new IvParameterSpec(keyIvPair.getIvBytes())); byte[] encryptedBytes = Base64.decodeBase64(encryptedText); return new String(cipher.doFinal(encryptedBytes)); @@ -105,6 +107,9 @@ public class ConsoleProxyPasswordBasedEncryptor { } catch (InvalidKeyException e) { s_logger.error("Unexpected exception ", e); return null; + } catch (InvalidAlgorithmParameterException e) { + s_logger.error("Unexpected exception ", e); + return null; } } @@ -125,13 +130,63 @@ public class ConsoleProxyPasswordBasedEncryptor { return (T)gson.fromJson(json, clz); } - private static byte[] normalizeKey(byte[] keyBytes, int keySize) { - assert(keySize > 0); - byte[] key = new byte[keySize]; + public static class KeyIVPair { + String base64EncodedKeyBytes; + String base64EncodedIvBytes; - for(int i = 0; i < keyBytes.length; i++) - key[i%keySize] ^= keyBytes[i]; + public KeyIVPair() { + } - return key; + public KeyIVPair(String base64EncodedKeyBytes, String base64EncodedIvBytes) { + this.base64EncodedKeyBytes = base64EncodedKeyBytes; + this.base64EncodedIvBytes = base64EncodedIvBytes; + } + + public byte[] getKeyBytes() { + return Base64.decodeBase64(base64EncodedKeyBytes); + } + + public void setKeyBytes(byte[] keyBytes) { + base64EncodedKeyBytes = Base64.encodeBase64URLSafeString(keyBytes); + } + + public byte[] getIvBytes() { + return Base64.decodeBase64(base64EncodedIvBytes); + } + + public void setIvBytes(byte[] ivBytes) { + base64EncodedIvBytes = Base64.encodeBase64URLSafeString(ivBytes); + } } + + public static void main(String[] args) { + SecureRandom random; + try { + random = SecureRandom.getInstance("SHA1PRNG"); + byte[] keyBytes = new byte[16]; + random.nextBytes(keyBytes); + + byte[] ivBytes = new byte[16]; + random.nextBytes(ivBytes); + + KeyIVPair keyIvPair = new KeyIVPair("8x/xUBgX0Up+3UEo39dSeG277JhVj31+ElHkN5+EC0Q=", "Y2SUiIN6JXTdKNK/ZMDyVtLB7gAM9MCCiyrP1xd3bSQ="); + //keyIvPair.setKeyBytes(keyBytes); + //keyIvPair.setIvBytes(ivBytes); + + Gson gson = new GsonBuilder().create(); + ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(gson.toJson(keyIvPair)); + + String encrypted = encryptor.encryptText("Hello, world"); + + System.out.println("Encrypted result: " + encrypted); + + String decrypted = encryptor.decryptText(encrypted); + + System.out.println("Decrypted result: " + decrypted); + + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + } } + diff --git a/server/src/com/cloud/servlet/ConsoleProxyServlet.java b/server/src/com/cloud/servlet/ConsoleProxyServlet.java index c4b93349080..ebb91746268 100644 --- a/server/src/com/cloud/servlet/ConsoleProxyServlet.java +++ b/server/src/com/cloud/servlet/ConsoleProxyServlet.java @@ -55,6 +55,8 @@ import com.cloud.utils.db.Transaction; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; import com.cloud.vm.VirtualMachineManager; +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; /** * Thumbnail access : /console?cmd=thumbnail&vm=xxx&w=xxx&h=xxx @@ -75,6 +77,8 @@ public class ConsoleProxyServlet extends HttpServlet { static ManagementServer s_ms; + private Gson _gson = new GsonBuilder().create(); + public ConsoleProxyServlet() { } @@ -327,6 +331,14 @@ public class ConsoleProxyServlet extends HttpServlet { return new Ternary(host, tunnelUrl, tunnelSession); } + private String getEncryptorPassword() { + String key = _ms.getEncryptionKey(); + String iv = _ms.getEncryptionIV(); + + ConsoleProxyPasswordBasedEncryptor.KeyIVPair keyIvPair = new ConsoleProxyPasswordBasedEncryptor.KeyIVPair(key, iv); + return _gson.toJson(keyIvPair); + } + private String composeThumbnailUrl(String rootUrl, VMInstanceVO vm, HostVO hostVo, int w, int h) { StringBuffer sb = new StringBuffer(rootUrl); @@ -340,7 +352,7 @@ public class ConsoleProxyServlet extends HttpServlet { tag = _identityService.getIdentityUuid("vm_instance", tag); String ticket = genAccessTicket(host, String.valueOf(portInfo.second()), sid, tag); - ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(_ms.getHashKey()); + ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(getEncryptorPassword()); ConsoleProxyClientParam param = new ConsoleProxyClientParam(); param.setClientHostAddress(parsedHostInfo.first()); param.setClientHostPort(portInfo.second()); @@ -376,7 +388,7 @@ public class ConsoleProxyServlet extends HttpServlet { String tag = String.valueOf(vm.getId()); tag = _identityService.getIdentityUuid("vm_instance", tag); String ticket = genAccessTicket(host, String.valueOf(portInfo.second()), sid, tag); - ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(_ms.getHashKey()); + ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(getEncryptorPassword()); ConsoleProxyClientParam param = new ConsoleProxyClientParam(); param.setClientHostAddress(parsedHostInfo.first()); param.setClientHostPort(portInfo.second()); diff --git a/server/src/com/cloud/storage/StorageManager.java b/server/src/com/cloud/storage/StorageManager.java index 9213b4bf486..6026cd9c0fc 100755 --- a/server/src/com/cloud/storage/StorageManager.java +++ b/server/src/com/cloud/storage/StorageManager.java @@ -120,4 +120,4 @@ public interface StorageManager extends StorageService { DataStore createLocalStorage(Host host, StoragePoolInfo poolInfo) throws ConnectionException; -} +} diff --git a/server/src/com/cloud/storage/StorageManagerImpl.java b/server/src/com/cloud/storage/StorageManagerImpl.java index a33d524d8ea..a182e39dd86 100755 --- a/server/src/com/cloud/storage/StorageManagerImpl.java +++ b/server/src/com/cloud/storage/StorageManagerImpl.java @@ -51,7 +51,6 @@ import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProvider; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreRole; -import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreStatus; import org.apache.cloudstack.engine.subsystem.api.storage.HostScope; import org.apache.cloudstack.engine.subsystem.api.storage.HypervisorHostListener; import org.apache.cloudstack.engine.subsystem.api.storage.ImageDataFactory; @@ -381,7 +380,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C if (pools == null || pools.size() == 0 || (pools.size() == 1 && pools.get(0).getStatus() - .equals(DataStoreStatus.Maintenance))) { + .equals(StoragePoolStatus.Maintenance))) { return false; } else { return true; @@ -964,9 +963,7 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C DataStoreLifeCycle lifeCycle = storeProvider.getDataStoreLifeCycle(); DataStore store = dataStoreMgr.getDataStore( sPool.getId(), DataStoreRole.Primary); - lifeCycle.deleteDataStore(store); - - return false; + return lifeCycle.deleteDataStore(store); } @Override @@ -1000,8 +997,16 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C if (capacities.size() == 0) { CapacityVO capacity = new CapacityVO(storagePool.getId(), storagePool.getDataCenterId(), storagePool.getPodId(), storagePool.getClusterId(), allocated, totalOverProvCapacity, capacityType); - CapacityState capacityState = _configMgr.findClusterAllocationState(ApiDBUtils.findClusterById(storagePool.getClusterId())) == AllocationState.Disabled ? + AllocationState allocationState = null; + if (storagePool.getScope() == ScopeType.ZONE) { + DataCenterVO dc = ApiDBUtils.findZoneById(storagePool.getDataCenterId()); + allocationState = dc.getAllocationState(); + } else { + allocationState = _configMgr.findClusterAllocationState(ApiDBUtils.findClusterById(storagePool.getClusterId())); + } + CapacityState capacityState = (allocationState == AllocationState.Disabled) ? CapacityState.Disabled : CapacityState.Enabled; + capacity.setCapacityState(capacityState); _capacityDao.persist(capacity); } else { @@ -1419,9 +1424,9 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C } } - if (!primaryStorage.getStatus().equals(DataStoreStatus.Up) + if (!primaryStorage.getStatus().equals(StoragePoolStatus.Up) && !primaryStorage.getStatus().equals( - DataStoreStatus.ErrorInMaintenance)) { + StoragePoolStatus.ErrorInMaintenance)) { throw new InvalidParameterValueException("Primary storage with id " + primaryStorageId + " is not ready for migration, as the status is:" @@ -1458,9 +1463,9 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C throw new InvalidParameterValueException(msg); } - if (primaryStorage.getStatus().equals(DataStoreStatus.Up) + if (primaryStorage.getStatus().equals(StoragePoolStatus.Up) || primaryStorage.getStatus().equals( - DataStoreStatus.PrepareForMaintenance)) { + StoragePoolStatus.PrepareForMaintenance)) { throw new StorageUnavailableException("Primary storage with id " + primaryStorageId + " is not ready to complete migration, as the status is:" @@ -1519,11 +1524,11 @@ public class StorageManagerImpl extends ManagerBase implements StorageManager, C // check if pool is in an inconsistent state if (pool != null && (pool.getStatus().equals( - DataStoreStatus.ErrorInMaintenance) + StoragePoolStatus.ErrorInMaintenance) || pool.getStatus() - .equals(DataStoreStatus.PrepareForMaintenance) || pool + .equals(StoragePoolStatus.PrepareForMaintenance) || pool .getStatus() - .equals(DataStoreStatus.CancelMaintenance))) { + .equals(StoragePoolStatus.CancelMaintenance))) { _storagePoolWorkDao.removePendingJobsOnMsRestart( vo.getMsid(), poolId); pool.setStatus(StoragePoolStatus.ErrorInMaintenance); diff --git a/server/src/com/cloud/storage/VolumeManager.java b/server/src/com/cloud/storage/VolumeManager.java index 2101038f8f3..d198e5dd7df 100644 --- a/server/src/com/cloud/storage/VolumeManager.java +++ b/server/src/com/cloud/storage/VolumeManager.java @@ -18,6 +18,8 @@ */ package com.cloud.storage; +import java.util.Map; + import org.apache.cloudstack.api.command.user.volume.AttachVolumeCmd; import org.apache.cloudstack.api.command.user.volume.CreateVolumeCmd; import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd; @@ -25,12 +27,15 @@ import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd; import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd; import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd; import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; +import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientStorageCapacityException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.StorageUnavailableException; +import com.cloud.host.Host; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.storage.Volume.Type; import com.cloud.user.Account; @@ -80,6 +85,9 @@ public interface VolumeManager extends VolumeApiService { Volume migrateVolume(MigrateVolumeCmd cmd); + void migrateVolumes(T vm, VirtualMachineTO vmTo, Host srcHost, Host destHost, + Map volumeToPool); + boolean storageMigration( VirtualMachineProfile vm, StoragePool destPool); diff --git a/server/src/com/cloud/storage/VolumeManagerImpl.java b/server/src/com/cloud/storage/VolumeManagerImpl.java index 1e8edafe4e2..e57d393eb2d 100644 --- a/server/src/com/cloud/storage/VolumeManagerImpl.java +++ b/server/src/com/cloud/storage/VolumeManagerImpl.java @@ -28,6 +28,7 @@ import java.util.Date; import java.util.HashSet; import java.util.List; import java.util.Map; +import java.util.HashMap; import java.util.Set; import java.util.UUID; import java.util.concurrent.ExecutionException; @@ -42,6 +43,7 @@ import org.apache.cloudstack.api.command.user.volume.DetachVolumeCmd; import org.apache.cloudstack.api.command.user.volume.MigrateVolumeCmd; import org.apache.cloudstack.api.command.user.volume.ResizeVolumeCmd; import org.apache.cloudstack.api.command.user.volume.UploadVolumeCmd; +import org.apache.cloudstack.engine.subsystem.api.storage.CommandResult; import org.apache.cloudstack.engine.subsystem.api.storage.DataStore; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreProviderManager; @@ -68,6 +70,7 @@ import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; import com.cloud.agent.api.AttachVolumeAnswer; import com.cloud.agent.api.AttachVolumeCommand; +import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.api.to.VolumeTO; import com.cloud.alert.AlertManager; import com.cloud.api.ApiDBUtils; @@ -102,11 +105,13 @@ import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.StorageUnavailableException; +import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.hypervisor.HypervisorGuruManager; import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao; +import com.cloud.hypervisor.HypervisorCapabilitiesVO; import com.cloud.network.NetworkModel; import com.cloud.org.Grouping; import com.cloud.resource.ResourceManager; @@ -2003,7 +2008,7 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { public Volume migrateVolume(MigrateVolumeCmd cmd) { Long volumeId = cmd.getVolumeId(); Long storagePoolId = cmd.getStoragePoolId(); - + VolumeVO vol = _volsDao.findById(volumeId); if (vol == null) { throw new InvalidParameterValueException( @@ -2015,9 +2020,39 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { "Volume must be in ready state"); } - if (vol.getInstanceId() != null) { - throw new InvalidParameterValueException( - "Volume needs to be dettached from VM"); + boolean liveMigrateVolume = false; + Long instanceId = vol.getInstanceId(); + VMInstanceVO vm = null; + if (instanceId != null) { + vm = _vmInstanceDao.findById(instanceId); + } + + if (vm != null && vm.getState() == State.Running) { + // Check if the underlying hypervisor supports storage motion. + Long hostId = vm.getHostId(); + if (hostId != null) { + HostVO host = _hostDao.findById(hostId); + HypervisorCapabilitiesVO capabilities = null; + if (host != null) { + capabilities = _hypervisorCapabilitiesDao.findByHypervisorTypeAndVersion(host.getHypervisorType(), + host.getHypervisorVersion()); + } + + if (capabilities != null) { + liveMigrateVolume = capabilities.isStorageMotionSupported(); + } + } + } + + // If the disk is not attached to any VM then it can be moved. Otherwise, it needs to be attached to a vm + // running on a hypervisor that supports storage motion so that it be be migrated. + if (instanceId != null && !liveMigrateVolume) { + throw new InvalidParameterValueException("Volume needs to be detached from VM"); + } + + if (liveMigrateVolume && !cmd.isLiveMigrate()) { + throw new InvalidParameterValueException("The volume " + vol + "is attached to a vm and for migrating it " + + "the parameter livemigrate should be specified"); } StoragePool destPool = (StoragePool)this.dataStoreMgr.getDataStore(storagePoolId, DataStoreRole.Primary); @@ -2032,12 +2067,15 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { "Migration of volume from local storage pool is not supported"); } - Volume newVol = migrateVolume(vol, destPool); + Volume newVol = null; + if (liveMigrateVolume) { + newVol = liveMigrateVolume(vol, destPool); + } else { + newVol = migrateVolume(vol, destPool); + } return newVol; } - - @DB protected Volume migrateVolume(Volume volume, StoragePool destPool) { VolumeInfo vol = this.volFactory.getVolume(volume.getId()); @@ -2058,6 +2096,66 @@ public class VolumeManagerImpl extends ManagerBase implements VolumeManager { } } + @DB + protected Volume liveMigrateVolume(Volume volume, StoragePool destPool) { + VolumeInfo vol = this.volFactory.getVolume(volume.getId()); + AsyncCallFuture future = this.volService.migrateVolume(vol, (DataStore)destPool); + try { + VolumeApiResult result = future.get(); + if (result.isFailed()) { + s_logger.debug("migrate volume failed:" + result.getResult()); + return null; + } + return result.getVolume(); + } catch (InterruptedException e) { + s_logger.debug("migrate volume failed", e); + return null; + } catch (ExecutionException e) { + s_logger.debug("migrate volume failed", e); + return null; + } + } + + @Override + public void migrateVolumes(T vm, VirtualMachineTO vmTo, Host srcHost, Host destHost, + Map volumeToPool) { + // Check if all the vms being migrated belong to the vm. + // Check if the storage pool is of the right type. + // Create a VolumeInfo to DataStore map too. + Map volumeMap = new HashMap(); + for (Map.Entry entry : volumeToPool.entrySet()) { + VolumeVO volume = entry.getKey(); + StoragePoolVO storagePool = entry.getValue(); + StoragePool destPool = (StoragePool)this.dataStoreMgr.getDataStore(storagePool.getId(), + DataStoreRole.Primary); + + if (volume.getInstanceId() != vm.getId()) { + throw new CloudRuntimeException("Volume " + volume + " that has to be migrated doesn't belong to the" + + " instance " + vm); + } + + if (destPool == null) { + throw new CloudRuntimeException("Failed to find the destination storage pool " + storagePool.getId()); + } + + volumeMap.put(this.volFactory.getVolume(volume.getId()), (DataStore)destPool); + } + + AsyncCallFuture future = this.volService.migrateVolumes(volumeMap, vmTo, srcHost, destHost); + try { + CommandResult result = future.get(); + if (result.isFailed()) { + s_logger.debug("Failed to migrated vm " + vm + " along with its volumes. " + result.getResult()); + throw new CloudRuntimeException("Failed to migrated vm " + vm + " along with its volumes. " + + result.getResult()); + } + } catch (InterruptedException e) { + s_logger.debug("Failed to migrated vm " + vm + " along with its volumes.", e); + } catch (ExecutionException e) { + s_logger.debug("Failed to migrated vm " + vm + " along with its volumes.", e); + } + } + @Override public boolean storageMigration( VirtualMachineProfile vm, diff --git a/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java b/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java index 0d797ed3545..a0d5d0e6e97 100644 --- a/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java +++ b/server/src/com/cloud/storage/dao/StoragePoolDetailsDaoImpl.java @@ -72,4 +72,13 @@ public class StoragePoolDetailsDaoImpl extends GenericDaoBase sc = PoolSearch.create(); + sc.setParameters("pool", poolId); + sc.setParameters("name", name); + + return findOneIncludingRemovedBy(sc); + } } diff --git a/server/src/com/cloud/storage/dao/VMTemplateDao.java b/server/src/com/cloud/storage/dao/VMTemplateDao.java index c39626f54dd..726337129a3 100755 --- a/server/src/com/cloud/storage/dao/VMTemplateDao.java +++ b/server/src/com/cloud/storage/dao/VMTemplateDao.java @@ -48,11 +48,11 @@ public interface VMTemplateDao extends GenericDao, StateDao< public List listAllSystemVMTemplates(); - public List listDefaultBuiltinTemplates(); - public String getRoutingTemplateUniqueName(); - public List findIsosByIdAndPath(Long domainId, Long accountId, String path); - public List listReadyTemplates(); - public List listByAccountId(long accountId); + public List listDefaultBuiltinTemplates(); + public String getRoutingTemplateUniqueName(); + public List findIsosByIdAndPath(Long domainId, Long accountId, String path); + public List listReadyTemplates(); + public List listByAccountId(long accountId); public Set> searchTemplates(String name, String keyword, TemplateFilter templateFilter, boolean isIso, List hypers, Boolean bootable, DomainVO domain, Long pageSize, Long startIndex, Long zoneId, HypervisorType hyperType, boolean onlyReady, boolean showDomr, List permittedAccounts, Account caller, diff --git a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java index b51b216717b..d9a26d3ca66 100755 --- a/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java +++ b/server/src/com/cloud/storage/dao/VMTemplateDaoImpl.java @@ -129,16 +129,16 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem @Inject ResourceTagDao _tagsDao; - - private String routerTmpltName; - private String consoleProxyTmpltName; - - public VMTemplateDaoImpl() { - } - + + private String routerTmpltName; + private String consoleProxyTmpltName; + + public VMTemplateDaoImpl() { + } + @Override public List listByPublic() { - SearchCriteria sc = PublicSearch.create(); + SearchCriteria sc = PublicSearch.create(); sc.setParameters("public", 1); return listBy(sc); } @@ -515,8 +515,8 @@ public class VMTemplateDaoImpl extends GenericDaoBase implem return templateZonePairList; } - - @Override + + @Override public Set> searchTemplates(String name, String keyword, TemplateFilter templateFilter, boolean isIso, List hypers, Boolean bootable, DomainVO domain, Long pageSize, Long startIndex, Long zoneId, HypervisorType hyperType, boolean onlyReady, boolean showDomr,List permittedAccounts, diff --git a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java index 7ed6f3f27d6..5d7a2106e6a 100755 --- a/server/src/com/cloud/storage/download/DownloadMonitorImpl.java +++ b/server/src/com/cloud/storage/download/DownloadMonitorImpl.java @@ -37,21 +37,17 @@ import com.cloud.agent.AgentManager; import com.cloud.agent.Listener; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; - import com.cloud.agent.api.storage.DeleteTemplateCommand; import com.cloud.agent.api.storage.DeleteVolumeCommand; import com.cloud.agent.api.storage.DownloadCommand; - import com.cloud.agent.api.storage.DownloadCommand.Proxy; import com.cloud.agent.api.storage.DownloadCommand.ResourceType; -import com.cloud.agent.api.storage.DownloadProgressCommand.RequestType; - import com.cloud.agent.api.storage.DownloadProgressCommand; +import com.cloud.agent.api.storage.DownloadProgressCommand.RequestType; import com.cloud.agent.api.storage.ListTemplateAnswer; import com.cloud.agent.api.storage.ListTemplateCommand; import com.cloud.agent.api.storage.ListVolumeAnswer; import com.cloud.agent.api.storage.ListVolumeCommand; - import com.cloud.agent.manager.Commands; import com.cloud.alert.AlertManager; import com.cloud.configuration.Config; @@ -72,13 +68,12 @@ import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.resource.ResourceManager; import com.cloud.storage.Storage.ImageFormat; - import com.cloud.storage.StorageManager; import com.cloud.storage.SwiftVO; import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc; -import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; +import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VMTemplateZoneVO; import com.cloud.storage.VolumeHostVO; import com.cloud.storage.VolumeVO; @@ -91,7 +86,6 @@ import com.cloud.storage.dao.VMTemplateSwiftDao; import com.cloud.storage.dao.VMTemplateZoneDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.storage.dao.VolumeHostDao; - import com.cloud.storage.secondary.SecondaryStorageVmManager; import com.cloud.storage.swift.SwiftManager; import com.cloud.storage.template.TemplateConstants; @@ -284,10 +278,10 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor String sourceChecksum = this.templateMgr.getChecksum(srcTmpltHost.getHostId(), srcTmpltHost.getInstallPath()); DownloadCommand dcmd = new DownloadCommand(destServer.getStorageUrl(), url, template, TemplateConstants.DEFAULT_HTTP_AUTH_USER, _copyAuthPasswd, maxTemplateSizeInBytes); - dcmd.setProxy(getHttpProxy()); if (downloadJobExists) { dcmd = new DownloadProgressCommand(dcmd, destTmpltHost.getJobId(), RequestType.GET_OR_RESTART); } + dcmd.setProxy(getHttpProxy()); dcmd.setChecksum(sourceChecksum); // We need to set the checksum as the source template might be a compressed url and have cksum for compressed image. Bug #10775 HostVO ssAhost = _ssvmMgr.pickSsvmHost(destServer); if( ssAhost == null ) { @@ -369,10 +363,10 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor start(); DownloadCommand dcmd = new DownloadCommand(secUrl, template, maxTemplateSizeInBytes); - dcmd.setProxy(getHttpProxy()); if (downloadJobExists) { dcmd = new DownloadProgressCommand(dcmd, vmTemplateHost.getJobId(), RequestType.GET_OR_RESTART); } + dcmd.setProxy(getHttpProxy()); if (vmTemplateHost.isCopy()) { dcmd.setCreds(TemplateConstants.DEFAULT_HTTP_AUTH_USER, _copyAuthPasswd); } @@ -458,12 +452,11 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor if(volumeHost != null) { start(); DownloadCommand dcmd = new DownloadCommand(secUrl, volume, maxVolumeSizeInBytes, checkSum, url, format); - dcmd.setProxy(getHttpProxy()); if (downloadJobExists) { dcmd = new DownloadProgressCommand(dcmd, volumeHost.getJobId(), RequestType.GET_OR_RESTART); dcmd.setResourceType(ResourceType.VOLUME); } - + dcmd.setProxy(getHttpProxy()); HostVO ssvm = _ssvmMgr.pickSsvmHost(sserver); if( ssvm == null ) { s_logger.warn("There is no secondary storage VM for secondary storage host " + sserver.getName()); @@ -858,7 +851,7 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor TemplateInfo tmpltInfo = templateInfos.remove(uniqueName); toBeDownloaded.remove(tmplt); if (tmpltHost != null) { - s_logger.info("Template Sync found " + uniqueName + " already in the template host table"); + s_logger.info("Template Sync found " + tmplt.getName() + " already in the template host table"); if (tmpltHost.getDownloadState() != Status.DOWNLOADED) { tmpltHost.setErrorString(""); } @@ -918,10 +911,12 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor continue; } if (tmpltHost != null && tmpltHost.getDownloadState() != Status.DOWNLOADED) { - s_logger.info("Template Sync did not find " + uniqueName + " ready on server " + sserverId + ", will request download to start/resume shortly"); + s_logger.info("Template Sync did not find " + tmplt.getName() + " ready on server " + sserverId + + ", will request download to start/resume shortly"); } else if (tmpltHost == null) { - s_logger.info("Template Sync did not find " + uniqueName + " on the server " + sserverId + ", will request download shortly"); + s_logger.info("Template Sync did not find " + tmplt.getName() + " on the server " + sserverId + + ", will request download shortly"); VMTemplateHostVO templtHost = new VMTemplateHostVO(sserverId, tmplt.getId(), new Date(), 0, Status.NOT_DOWNLOADED, null, null, null, null, tmplt.getUrl()); _vmTemplateHostDao.persist(templtHost); VMTemplateZoneVO tmpltZoneVO = _vmTemplateZoneDao.findByZoneTemplate(zoneId, tmplt.getId()); @@ -971,6 +966,9 @@ public class DownloadMonitorImpl extends ManagerBase implements DownloadMonitor } s_logger.debug("Template " + tmplt.getName() + " needs to be downloaded to " + ssHost.getName()); downloadTemplateToStorage(tmplt, ssHost); + } else { + s_logger.info("Skipping download of template " + tmplt.getName() + " since we don't have any " + + tmplt.getHypervisorType() + " hypervisors"); } } } diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java index 9a4d6b047e7..3cf9a7ef5a3 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java +++ b/server/src/com/cloud/storage/secondary/SecondaryStorageManagerImpl.java @@ -30,8 +30,6 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import org.apache.log4j.Logger; -import org.springframework.context.annotation.Primary; -import org.springframework.stereotype.Component; import com.cloud.agent.AgentManager; import com.cloud.agent.api.Answer; @@ -98,8 +96,8 @@ import com.cloud.service.dao.ServiceOfferingDao; import com.cloud.storage.SnapshotVO; import com.cloud.storage.Storage; import com.cloud.storage.VMTemplateHostVO; -import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VMTemplateStorageResourceAssoc.Status; +import com.cloud.storage.VMTemplateVO; import com.cloud.storage.dao.SnapshotDao; import com.cloud.storage.dao.StoragePoolHostDao; import com.cloud.storage.dao.VMTemplateDao; @@ -474,7 +472,7 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar } - private boolean isSecondaryStorageVmRequired(long dcId) { + protected boolean isSecondaryStorageVmRequired(long dcId) { DataCenterVO dc = _dcDao.findById(dcId); _dcDao.loadDetails(dc); String ssvmReq = dc.getDetail(ZoneConfig.EnableSecStorageVm.key()); @@ -742,7 +740,8 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar return true; } else { if (s_logger.isDebugEnabled()) { - s_logger.debug("Primary storage is not ready, wait until it is ready to launch secondary storage vm"); + s_logger.debug("Primary storage is not ready, wait until it is ready to launch secondary storage vm. dcId: " + dataCenterId + " system.vm.use.local.storage: " + _useLocalStorage + + "If you want to use local storage to start ssvm, need to set system.vm.use.local.storage to true"); } } } else { @@ -1065,10 +1064,10 @@ public class SecondaryStorageManagerImpl extends ManagerBase implements Secondar buf.append(" resource=com.cloud.storage.resource.PremiumSecondaryStorageResource"); } else { s_logger.debug("Telling the ssvm to load the NfsSecondaryStorageResource"); - buf.append(" resource=com.cloud.storage.resource.NfsSecondaryStorageResource"); + buf.append(" resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource"); } } else { - buf.append(" resource=com.cloud.storage.resource.NfsSecondaryStorageResource"); + buf.append(" resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource"); } buf.append(" instance=SecStorage"); buf.append(" sslcopy=").append(Boolean.toString(_useSSlCopy)); diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java index 3a453d50a72..490948ba5ae 100755 --- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java +++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java @@ -181,9 +181,8 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, private ResourceTagDao _resourceTagDao; @Inject private ConfigurationDao _configDao; - - @Inject - private VMSnapshotDao _vmSnapshotDao; + @Inject + private PrimaryDataStoreDao _primaryDataStoreDao; String _name; @Inject TemplateManager templateMgr; @@ -694,11 +693,11 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, S3TO s3 = _s3Mgr.getS3TO(); checkObjectStorageConfiguration(swift, s3); - + StoragePoolVO pool = _primaryDataStoreDao.findById(volume.getPoolId()); if (swift == null && s3 == null) { for (HostVO ssHost : ssHosts) { DeleteSnapshotBackupCommand cmd = new DeleteSnapshotBackupCommand( - null, null, ssHost.getStorageUrl(), dcId, + pool,null, null, ssHost.getStorageUrl(), dcId, accountId, volumeId, "", true); Answer answer = null; try { @@ -717,7 +716,7 @@ public class SnapshotManagerImpl extends ManagerBase implements SnapshotManager, } } else { DeleteSnapshotBackupCommand cmd = new DeleteSnapshotBackupCommand( - swift, s3, "", dcId, accountId, volumeId, "", true); + pool,swift, s3, "", dcId, accountId, volumeId, "", true); Answer answer = null; try { answer = _agentMgr.sendToSSVM(dcId, cmd); diff --git a/server/src/com/cloud/template/TemplateManagerImpl.java b/server/src/com/cloud/template/TemplateManagerImpl.java index 2892e0081c2..c7eaa64335e 100755 --- a/server/src/com/cloud/template/TemplateManagerImpl.java +++ b/server/src/com/cloud/template/TemplateManagerImpl.java @@ -273,7 +273,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, if (type == HypervisorType.BareMetal) { adapter = AdapterBase.getAdapterByName(_adapters, TemplateAdapterType.BareMetal.getName()); } else { - // see HyervisorTemplateAdapter + // see HypervisorTemplateAdapter adapter = AdapterBase.getAdapterByName(_adapters, TemplateAdapterType.Hypervisor.getName()); } @@ -1716,8 +1716,17 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, try { TemplateInfo tmplInfo = this.tmplFactory.getTemplate(templateId); - snapshot = _snapshotDao.findById(snapshotId); - ZoneScope scope = new ZoneScope(snapshot.getDataCenterId()); + ZoneScope scope = null; + Long zoneId = null; + if (snapshotId != null) { + snapshot = _snapshotDao.findById(snapshotId); + zoneId = snapshot.getDataCenterId(); + + } else if (volumeId != null) { + volume = _volumeDao.findById(volumeId); + zoneId = volume.getDataCenterId(); + } + scope = new ZoneScope(zoneId); List store = this.dataStoreMgr.getImageStores(scope); if (store.size() > 1) { throw new CloudRuntimeException("muliple image data store, don't know which one to use"); @@ -1727,7 +1736,6 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, SnapshotInfo snapInfo = this.snapshotFactory.getSnapshot(snapshotId); future = this.imageSvr.createTemplateFromSnapshotAsync(snapInfo, tmplInfo, store.get(0)); } else if (volumeId != null) { - volume = _volumeDao.findById(volumeId); VolumeInfo volInfo = this.volFactory.getVolume(volumeId); future = this.imageSvr.createTemplateFromVolumeAsync(volInfo, tmplInfo, store.get(0)); } else { @@ -1748,7 +1756,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, UsageEventVO usageEvent = new UsageEventVO( EventTypes.EVENT_TEMPLATE_CREATE, privateTemplate.getAccountId(), - snapshot.getDataCenterId(), + zoneId, privateTemplate.getId(), privateTemplate.getName(), null, privateTemplate.getSourceTemplateId(), privateTemplate.getSize()); @@ -1971,6 +1979,7 @@ public class TemplateManagerImpl extends ManagerBase implements TemplateManager, } } privateTemplate.setSourceTemplateId(sourceTemplateId); + privateTemplate.setImageDataStoreId(1); VMTemplateVO template = this._tmpltDao.persist(privateTemplate); // Increment the number of templates diff --git a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java index 14a81439670..bad32536955 100755 --- a/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java +++ b/server/src/com/cloud/upgrade/PremiumDatabaseUpgradeChecker.java @@ -40,6 +40,7 @@ import com.cloud.upgrade.dao.Upgrade229to2210; import com.cloud.upgrade.dao.Upgrade301to302; import com.cloud.upgrade.dao.Upgrade302to40; import com.cloud.upgrade.dao.Upgrade30to301; +import com.cloud.upgrade.dao.Upgrade40to41; import com.cloud.upgrade.dao.UpgradeSnapshot217to224; import com.cloud.upgrade.dao.UpgradeSnapshot223to224; import com.cloud.upgrade.dao.VersionDaoImpl; @@ -53,87 +54,95 @@ public class PremiumDatabaseUpgradeChecker extends DatabaseUpgradeChecker { new Upgrade221to222Premium(), new UpgradeSnapshot217to224(), new Upgrade222to224Premium(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.1.8", new DbUpgrade[] { new Upgrade218to22Premium(), new Upgrade221to222Premium(), new UpgradeSnapshot217to224(), new Upgrade222to224Premium(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), - new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213() - , new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40() }); + new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), + new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.1.9", new DbUpgrade[] { new Upgrade218to22Premium(), new Upgrade221to222Premium(), new UpgradeSnapshot217to224(), new Upgrade222to224Premium(), new Upgrade218to224DomainVlans(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), + new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.1", new DbUpgrade[] { new Upgrade221to222Premium(), new Upgrade222to224Premium(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.2", new DbUpgrade[] { new Upgrade222to224Premium(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), + new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.3", new DbUpgrade[] { new Upgrade222to224Premium(), new UpgradeSnapshot223to224(), new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), + new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.4", new DbUpgrade[] { new Upgrade224to225(), new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.5", new DbUpgrade[] { new Upgrade225to226(), new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), - new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.6", new DbUpgrade[] { new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), + new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.7", new DbUpgrade[] { new Upgrade227to228Premium(), new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), - new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), + new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.8", new DbUpgrade[] { new Upgrade228to229(), new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), - new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.9", new DbUpgrade[] { new Upgrade229to2210(), new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), - new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.10", new DbUpgrade[] { new Upgrade2210to2211(), new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.11", new DbUpgrade[] { new Upgrade2211to2212Premium(), new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40() }); + new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.12", new DbUpgrade[] { new Upgrade2212to2213(), new Upgrade2213to2214(), new Upgrade2214to30(), - new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40() }); + new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); - _upgradeMap.put("2.2.13", new DbUpgrade[] { new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), - new Upgrade301to302(), new Upgrade302to40() }); + _upgradeMap.put("2.2.13", new DbUpgrade[] { new Upgrade2213to2214(), new Upgrade2214to30(), new Upgrade30to301(), + new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); _upgradeMap.put("2.2.14", new DbUpgrade[] { new Upgrade2214to30(), new Upgrade30to301(), new Upgrade301to302(), - new Upgrade302to40() }); + new Upgrade302to40(), new Upgrade40to41() }); - _upgradeMap.put("3.0.0", new DbUpgrade[] { new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40() }); - - _upgradeMap.put("3.0.1", new DbUpgrade[] { new Upgrade301to302(), new Upgrade302to40() }); - - _upgradeMap.put("3.0.2", new DbUpgrade[] { new Upgrade302to40() }); - } + _upgradeMap.put("3.0.0", new DbUpgrade[] { new Upgrade30to301(), new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); + + _upgradeMap.put("3.0.1", new DbUpgrade[] { new Upgrade301to302(), new Upgrade302to40(), new Upgrade40to41() }); + + _upgradeMap.put("3.0.2", new DbUpgrade[] { new Upgrade302to40(), new Upgrade40to41() }); + + _upgradeMap.put("4.0.0", new DbUpgrade[] { new Upgrade40to41() }); + + _upgradeMap.put("4.0.1", new DbUpgrade[] { new Upgrade40to41() }); + + _upgradeMap.put("4.0.2", new DbUpgrade[] { new Upgrade40to41() }); } } diff --git a/server/src/com/cloud/upgrade/dao/Upgrade30xBase.java b/server/src/com/cloud/upgrade/dao/Upgrade30xBase.java index 36ae3c548b7..723089e9a84 100644 --- a/server/src/com/cloud/upgrade/dao/Upgrade30xBase.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade30xBase.java @@ -1,311 +1,311 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package com.cloud.upgrade.dao; - -import java.sql.Connection; -import java.sql.PreparedStatement; -import java.sql.ResultSet; -import java.sql.SQLException; -import java.util.UUID; - -import org.apache.log4j.Logger; - -import com.cloud.utils.exception.CloudRuntimeException; - -public abstract class Upgrade30xBase implements DbUpgrade{ - - final static Logger s_logger = Logger.getLogger(Upgrade30xBase.class); - - protected String getNetworkLabelFromConfig(Connection conn, String name){ - String sql = "SELECT value FROM `cloud`.`configuration` where name = '"+name+"'"; - String networkLabel = null; - PreparedStatement pstmt = null; - ResultSet rs = null; - try{ - pstmt = conn.prepareStatement(sql); - rs = pstmt.executeQuery(); - if (rs.next()) { - networkLabel = rs.getString(1); - } - }catch (SQLException e) { - throw new CloudRuntimeException("Unable to fetch network label from configuration", e); - }finally{ - if (rs != null) { - try { - rs.close(); - } catch (SQLException e) { - } - } - if (pstmt != null) { - try { - pstmt.close(); - } catch (SQLException e) { - } - } - } - return networkLabel; - } - - - protected long addPhysicalNetworkToZone(Connection conn, long zoneId, String zoneName, String networkType, String vnet, Long domainId){ - - String getNextNetworkSequenceSql = "SELECT value from `cloud`.`sequence` where name='physical_networks_seq'"; - String advanceNetworkSequenceSql = "UPDATE `cloud`.`sequence` set value=value+1 where name='physical_networks_seq'"; - PreparedStatement pstmtUpdate = null, pstmt2 = null; - // add p.network - try{ - pstmt2 = conn.prepareStatement(getNextNetworkSequenceSql); - - ResultSet rsSeq = pstmt2.executeQuery(); - rsSeq.next(); - - long physicalNetworkId = rsSeq.getLong(1); - rsSeq.close(); - pstmt2.close(); - pstmt2 = conn.prepareStatement(advanceNetworkSequenceSql); - pstmt2.executeUpdate(); - pstmt2.close(); - - String uuid = UUID.randomUUID().toString(); - String broadcastDomainRange = "POD"; - if ("Advanced".equals(networkType)) { - broadcastDomainRange = "ZONE"; - } - - s_logger.debug("Adding PhysicalNetwork " + physicalNetworkId + " for Zone id " + zoneId); - String sql = "INSERT INTO `cloud`.`physical_network` (id, uuid, data_center_id, vnet, broadcast_domain_range, state, name) VALUES (?,?,?,?,?,?,?)"; - - pstmtUpdate = conn.prepareStatement(sql); - pstmtUpdate.setLong(1, physicalNetworkId); - pstmtUpdate.setString(2, uuid); - pstmtUpdate.setLong(3, zoneId); - pstmtUpdate.setString(4, vnet); - pstmtUpdate.setString(5, broadcastDomainRange); - pstmtUpdate.setString(6, "Enabled"); - zoneName = zoneName + "-pNtwk" +physicalNetworkId; - pstmtUpdate.setString(7, zoneName); - s_logger.warn("Statement is " + pstmtUpdate.toString()); - pstmtUpdate.executeUpdate(); - pstmtUpdate.close(); - - if (domainId != null && domainId.longValue() != 0) { - s_logger.debug("Updating domain_id for physical network id=" + physicalNetworkId); - sql = "UPDATE `cloud`.`physical_network` set domain_id=? where id=?"; - pstmtUpdate = conn.prepareStatement(sql); - pstmtUpdate.setLong(1, domainId); - pstmtUpdate.setLong(2, physicalNetworkId); - pstmtUpdate.executeUpdate(); - pstmtUpdate.close(); - } - - return physicalNetworkId; - } catch (SQLException e) { - throw new CloudRuntimeException("Exception while adding PhysicalNetworks", e); - } finally { - if (pstmtUpdate != null) { - try { - pstmtUpdate.close(); - } catch (SQLException e) { - } - } - if (pstmt2 != null) { - try { - pstmt2.close(); - } catch (SQLException e) { - } - } - - } - } - - protected void addTrafficType(Connection conn, long physicalNetworkId, String trafficType, String xenPublicLabel, String kvmPublicLabel, String vmwarePublicLabel){ - // add traffic types - PreparedStatement pstmtUpdate = null; - try{ - s_logger.debug("Adding PhysicalNetwork traffic types"); - String insertTraficType = "INSERT INTO `cloud`.`physical_network_traffic_types` (physical_network_id, traffic_type, xen_network_label, kvm_network_label, vmware_network_label, uuid) VALUES ( ?, ?, ?, ?, ?, ?)"; - pstmtUpdate = conn.prepareStatement(insertTraficType); - pstmtUpdate.setLong(1, physicalNetworkId); - pstmtUpdate.setString(2, trafficType); - pstmtUpdate.setString(3, xenPublicLabel); - pstmtUpdate.setString(4, kvmPublicLabel); - pstmtUpdate.setString(5, vmwarePublicLabel); - pstmtUpdate.setString(6, UUID.randomUUID().toString()); - pstmtUpdate.executeUpdate(); - pstmtUpdate.close(); - }catch (SQLException e) { - throw new CloudRuntimeException("Exception while adding PhysicalNetworks", e); - } finally { - if (pstmtUpdate != null) { - try { - pstmtUpdate.close(); - } catch (SQLException e) { - } - } - } - } - - - protected void addDefaultSGProvider(Connection conn, long physicalNetworkId, long zoneId, String networkType, boolean is304){ - PreparedStatement pstmtUpdate = null, pstmt2 = null; - try{ - //add security group service provider (if security group service is enabled for at least one guest network) - boolean isSGServiceEnabled = false; - String selectSG = ""; - - if(is304){ - selectSG = "SELECT nm.* FROM `cloud`.`ntwk_service_map` nm JOIN `cloud`.`networks` n ON nm.network_id = n.id where n.data_center_id = ? and nm.service='SecurityGroup'"; - }else{ - selectSG = "SELECT * from `cloud`.`networks` where is_security_group_enabled=1 and data_center_id=?"; - } - - pstmt2 = conn.prepareStatement(selectSG); - pstmt2.setLong(1, zoneId); - ResultSet sgDcSet = pstmt2.executeQuery(); - if (sgDcSet.next()) { - isSGServiceEnabled = true; - } - sgDcSet.close(); - pstmt2.close(); - - if(isSGServiceEnabled){ - s_logger.debug("Adding PhysicalNetworkServiceProvider SecurityGroupProvider to the physical network id=" + physicalNetworkId); - String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + - "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + - "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + - "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,0,0,0,0,0,0,0,1)"; - pstmtUpdate = conn.prepareStatement(insertPNSP); - pstmtUpdate.setString(1, UUID.randomUUID().toString()); - pstmtUpdate.setLong(2, physicalNetworkId); - pstmtUpdate.setString(3, "SecurityGroupProvider"); - pstmtUpdate.setString(4, "Enabled"); - - pstmtUpdate.executeUpdate(); - pstmtUpdate.close(); - } - - }catch (SQLException e) { - throw new CloudRuntimeException("Exception while adding default Security Group Provider", e); - } finally { - if (pstmtUpdate != null) { - try { - pstmtUpdate.close(); - } catch (SQLException e) { - } - } - if (pstmt2 != null) { - try { - pstmt2.close(); - } catch (SQLException e) { - } - } - } - } - - protected void addDefaultVRProvider(Connection conn, long physicalNetworkId, long zoneId){ - PreparedStatement pstmtUpdate = null, pstmt2 = null; - try{ - // add physical network service provider - VirtualRouter - s_logger.debug("Adding PhysicalNetworkServiceProvider VirtualRouter"); - String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + - "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + - "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + - "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,1,1,1,1,1,1,1,1,1,1,0)"; - - String routerUUID = UUID.randomUUID().toString(); - pstmtUpdate = conn.prepareStatement(insertPNSP); - pstmtUpdate.setString(1, routerUUID ); - pstmtUpdate.setLong(2, physicalNetworkId); - pstmtUpdate.setString(3, "VirtualRouter"); - pstmtUpdate.setString(4, "Enabled"); - pstmtUpdate.executeUpdate(); - pstmtUpdate.close(); - - // add virtual_router_element - String fetchNSPid = "SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId + " AND provider_name = 'VirtualRouter' AND uuid = ?"; - pstmt2 = conn.prepareStatement(fetchNSPid); - pstmt2.setString(1, routerUUID); - ResultSet rsNSPid = pstmt2.executeQuery(); - rsNSPid.next(); - long nspId = rsNSPid.getLong(1); - pstmt2.close(); - - String insertRouter = "INSERT INTO `cloud`.`virtual_router_providers` (`nsp_id`, `uuid` , `type` , `enabled`) " + - "VALUES (?,?,?,?)"; - pstmtUpdate = conn.prepareStatement(insertRouter); - pstmtUpdate.setLong(1, nspId); - pstmtUpdate.setString(2, UUID.randomUUID().toString()); - pstmtUpdate.setString(3, "VirtualRouter"); - pstmtUpdate.setInt(4, 1); - pstmtUpdate.executeUpdate(); - pstmtUpdate.close(); - }catch (SQLException e) { - throw new CloudRuntimeException("Exception while adding PhysicalNetworks", e); - } finally { - if (pstmtUpdate != null) { - try { - pstmtUpdate.close(); - } catch (SQLException e) { - } - } - if (pstmt2 != null) { - try { - pstmt2.close(); - } catch (SQLException e) { - } - } - } - } - - protected void addPhysicalNtwk_To_Ntwk_IP_Vlan(Connection conn, long physicalNetworkId, long networkId){ - PreparedStatement pstmtUpdate = null; - try{ - // add physicalNetworkId to vlan for this zone - String updateVLAN = "UPDATE `cloud`.`vlan` SET physical_network_id = " + physicalNetworkId + " WHERE network_id = " + networkId; - pstmtUpdate = conn.prepareStatement(updateVLAN); - pstmtUpdate.executeUpdate(); - pstmtUpdate.close(); - - // add physicalNetworkId to user_ip_address for this zone - String updateUsrIp = "UPDATE `cloud`.`user_ip_address` SET physical_network_id = " + physicalNetworkId + " WHERE source_network_id = " + networkId; - pstmtUpdate = conn.prepareStatement(updateUsrIp); - pstmtUpdate.executeUpdate(); - pstmtUpdate.close(); - - // add physicalNetworkId to guest networks for this zone - String updateNet = "UPDATE `cloud`.`networks` SET physical_network_id = " + physicalNetworkId + " WHERE id = " + networkId + " AND traffic_type = 'Guest'"; - pstmtUpdate = conn.prepareStatement(updateNet); - pstmtUpdate.executeUpdate(); - pstmtUpdate.close(); - }catch (SQLException e) { - throw new CloudRuntimeException("Exception while adding PhysicalNetworks", e); - } finally { - if (pstmtUpdate != null) { - try { - pstmtUpdate.close(); - } catch (SQLException e) { - } - } - } - - } - - - - -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package com.cloud.upgrade.dao; + +import java.sql.Connection; +import java.sql.PreparedStatement; +import java.sql.ResultSet; +import java.sql.SQLException; +import java.util.UUID; + +import org.apache.log4j.Logger; + +import com.cloud.utils.exception.CloudRuntimeException; + +public abstract class Upgrade30xBase implements DbUpgrade{ + + final static Logger s_logger = Logger.getLogger(Upgrade30xBase.class); + + protected String getNetworkLabelFromConfig(Connection conn, String name){ + String sql = "SELECT value FROM `cloud`.`configuration` where name = '"+name+"'"; + String networkLabel = null; + PreparedStatement pstmt = null; + ResultSet rs = null; + try{ + pstmt = conn.prepareStatement(sql); + rs = pstmt.executeQuery(); + if (rs.next()) { + networkLabel = rs.getString(1); + } + }catch (SQLException e) { + throw new CloudRuntimeException("Unable to fetch network label from configuration", e); + }finally{ + if (rs != null) { + try { + rs.close(); + } catch (SQLException e) { + } + } + if (pstmt != null) { + try { + pstmt.close(); + } catch (SQLException e) { + } + } + } + return networkLabel; + } + + + protected long addPhysicalNetworkToZone(Connection conn, long zoneId, String zoneName, String networkType, String vnet, Long domainId){ + + String getNextNetworkSequenceSql = "SELECT value from `cloud`.`sequence` where name='physical_networks_seq'"; + String advanceNetworkSequenceSql = "UPDATE `cloud`.`sequence` set value=value+1 where name='physical_networks_seq'"; + PreparedStatement pstmtUpdate = null, pstmt2 = null; + // add p.network + try{ + pstmt2 = conn.prepareStatement(getNextNetworkSequenceSql); + + ResultSet rsSeq = pstmt2.executeQuery(); + rsSeq.next(); + + long physicalNetworkId = rsSeq.getLong(1); + rsSeq.close(); + pstmt2.close(); + pstmt2 = conn.prepareStatement(advanceNetworkSequenceSql); + pstmt2.executeUpdate(); + pstmt2.close(); + + String uuid = UUID.randomUUID().toString(); + String broadcastDomainRange = "POD"; + if ("Advanced".equals(networkType)) { + broadcastDomainRange = "ZONE"; + } + + s_logger.debug("Adding PhysicalNetwork " + physicalNetworkId + " for Zone id " + zoneId); + String sql = "INSERT INTO `cloud`.`physical_network` (id, uuid, data_center_id, vnet, broadcast_domain_range, state, name) VALUES (?,?,?,?,?,?,?)"; + + pstmtUpdate = conn.prepareStatement(sql); + pstmtUpdate.setLong(1, physicalNetworkId); + pstmtUpdate.setString(2, uuid); + pstmtUpdate.setLong(3, zoneId); + pstmtUpdate.setString(4, vnet); + pstmtUpdate.setString(5, broadcastDomainRange); + pstmtUpdate.setString(6, "Enabled"); + zoneName = zoneName + "-pNtwk" +physicalNetworkId; + pstmtUpdate.setString(7, zoneName); + s_logger.warn("Statement is " + pstmtUpdate.toString()); + pstmtUpdate.executeUpdate(); + pstmtUpdate.close(); + + if (domainId != null && domainId.longValue() != 0) { + s_logger.debug("Updating domain_id for physical network id=" + physicalNetworkId); + sql = "UPDATE `cloud`.`physical_network` set domain_id=? where id=?"; + pstmtUpdate = conn.prepareStatement(sql); + pstmtUpdate.setLong(1, domainId); + pstmtUpdate.setLong(2, physicalNetworkId); + pstmtUpdate.executeUpdate(); + pstmtUpdate.close(); + } + + return physicalNetworkId; + } catch (SQLException e) { + throw new CloudRuntimeException("Exception while adding PhysicalNetworks", e); + } finally { + if (pstmtUpdate != null) { + try { + pstmtUpdate.close(); + } catch (SQLException e) { + } + } + if (pstmt2 != null) { + try { + pstmt2.close(); + } catch (SQLException e) { + } + } + + } + } + + protected void addTrafficType(Connection conn, long physicalNetworkId, String trafficType, String xenPublicLabel, String kvmPublicLabel, String vmwarePublicLabel){ + // add traffic types + PreparedStatement pstmtUpdate = null; + try{ + s_logger.debug("Adding PhysicalNetwork traffic types"); + String insertTraficType = "INSERT INTO `cloud`.`physical_network_traffic_types` (physical_network_id, traffic_type, xen_network_label, kvm_network_label, vmware_network_label, uuid) VALUES ( ?, ?, ?, ?, ?, ?)"; + pstmtUpdate = conn.prepareStatement(insertTraficType); + pstmtUpdate.setLong(1, physicalNetworkId); + pstmtUpdate.setString(2, trafficType); + pstmtUpdate.setString(3, xenPublicLabel); + pstmtUpdate.setString(4, kvmPublicLabel); + pstmtUpdate.setString(5, vmwarePublicLabel); + pstmtUpdate.setString(6, UUID.randomUUID().toString()); + pstmtUpdate.executeUpdate(); + pstmtUpdate.close(); + }catch (SQLException e) { + throw new CloudRuntimeException("Exception while adding PhysicalNetworks", e); + } finally { + if (pstmtUpdate != null) { + try { + pstmtUpdate.close(); + } catch (SQLException e) { + } + } + } + } + + + protected void addDefaultSGProvider(Connection conn, long physicalNetworkId, long zoneId, String networkType, boolean is304){ + PreparedStatement pstmtUpdate = null, pstmt2 = null; + try{ + //add security group service provider (if security group service is enabled for at least one guest network) + boolean isSGServiceEnabled = false; + String selectSG = ""; + + if(is304){ + selectSG = "SELECT nm.* FROM `cloud`.`ntwk_service_map` nm JOIN `cloud`.`networks` n ON nm.network_id = n.id where n.data_center_id = ? and nm.service='SecurityGroup'"; + }else{ + selectSG = "SELECT * from `cloud`.`networks` where is_security_group_enabled=1 and data_center_id=?"; + } + + pstmt2 = conn.prepareStatement(selectSG); + pstmt2.setLong(1, zoneId); + ResultSet sgDcSet = pstmt2.executeQuery(); + if (sgDcSet.next()) { + isSGServiceEnabled = true; + } + sgDcSet.close(); + pstmt2.close(); + + if(isSGServiceEnabled){ + s_logger.debug("Adding PhysicalNetworkServiceProvider SecurityGroupProvider to the physical network id=" + physicalNetworkId); + String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,0,0,0,0,0,0,0,0,0,0,1)"; + pstmtUpdate = conn.prepareStatement(insertPNSP); + pstmtUpdate.setString(1, UUID.randomUUID().toString()); + pstmtUpdate.setLong(2, physicalNetworkId); + pstmtUpdate.setString(3, "SecurityGroupProvider"); + pstmtUpdate.setString(4, "Enabled"); + + pstmtUpdate.executeUpdate(); + pstmtUpdate.close(); + } + + }catch (SQLException e) { + throw new CloudRuntimeException("Exception while adding default Security Group Provider", e); + } finally { + if (pstmtUpdate != null) { + try { + pstmtUpdate.close(); + } catch (SQLException e) { + } + } + if (pstmt2 != null) { + try { + pstmt2.close(); + } catch (SQLException e) { + } + } + } + } + + protected void addDefaultVRProvider(Connection conn, long physicalNetworkId, long zoneId){ + PreparedStatement pstmtUpdate = null, pstmt2 = null; + try{ + // add physical network service provider - VirtualRouter + s_logger.debug("Adding PhysicalNetworkServiceProvider VirtualRouter"); + String insertPNSP = "INSERT INTO `cloud`.`physical_network_service_providers` (`uuid`, `physical_network_id` , `provider_name`, `state` ," + + "`destination_physical_network_id`, `vpn_service_provided`, `dhcp_service_provided`, `dns_service_provided`, `gateway_service_provided`," + + "`firewall_service_provided`, `source_nat_service_provided`, `load_balance_service_provided`, `static_nat_service_provided`," + + "`port_forwarding_service_provided`, `user_data_service_provided`, `security_group_service_provided`) VALUES (?,?,?,?,0,1,1,1,1,1,1,1,1,1,1,0)"; + + String routerUUID = UUID.randomUUID().toString(); + pstmtUpdate = conn.prepareStatement(insertPNSP); + pstmtUpdate.setString(1, routerUUID ); + pstmtUpdate.setLong(2, physicalNetworkId); + pstmtUpdate.setString(3, "VirtualRouter"); + pstmtUpdate.setString(4, "Enabled"); + pstmtUpdate.executeUpdate(); + pstmtUpdate.close(); + + // add virtual_router_element + String fetchNSPid = "SELECT id from `cloud`.`physical_network_service_providers` where physical_network_id=" + physicalNetworkId + " AND provider_name = 'VirtualRouter' AND uuid = ?"; + pstmt2 = conn.prepareStatement(fetchNSPid); + pstmt2.setString(1, routerUUID); + ResultSet rsNSPid = pstmt2.executeQuery(); + rsNSPid.next(); + long nspId = rsNSPid.getLong(1); + pstmt2.close(); + + String insertRouter = "INSERT INTO `cloud`.`virtual_router_providers` (`nsp_id`, `uuid` , `type` , `enabled`) " + + "VALUES (?,?,?,?)"; + pstmtUpdate = conn.prepareStatement(insertRouter); + pstmtUpdate.setLong(1, nspId); + pstmtUpdate.setString(2, UUID.randomUUID().toString()); + pstmtUpdate.setString(3, "VirtualRouter"); + pstmtUpdate.setInt(4, 1); + pstmtUpdate.executeUpdate(); + pstmtUpdate.close(); + }catch (SQLException e) { + throw new CloudRuntimeException("Exception while adding PhysicalNetworks", e); + } finally { + if (pstmtUpdate != null) { + try { + pstmtUpdate.close(); + } catch (SQLException e) { + } + } + if (pstmt2 != null) { + try { + pstmt2.close(); + } catch (SQLException e) { + } + } + } + } + + protected void addPhysicalNtwk_To_Ntwk_IP_Vlan(Connection conn, long physicalNetworkId, long networkId){ + PreparedStatement pstmtUpdate = null; + try{ + // add physicalNetworkId to vlan for this zone + String updateVLAN = "UPDATE `cloud`.`vlan` SET physical_network_id = " + physicalNetworkId + " WHERE network_id = " + networkId; + pstmtUpdate = conn.prepareStatement(updateVLAN); + pstmtUpdate.executeUpdate(); + pstmtUpdate.close(); + + // add physicalNetworkId to user_ip_address for this zone + String updateUsrIp = "UPDATE `cloud`.`user_ip_address` SET physical_network_id = " + physicalNetworkId + " WHERE source_network_id = " + networkId; + pstmtUpdate = conn.prepareStatement(updateUsrIp); + pstmtUpdate.executeUpdate(); + pstmtUpdate.close(); + + // add physicalNetworkId to guest networks for this zone + String updateNet = "UPDATE `cloud`.`networks` SET physical_network_id = " + physicalNetworkId + " WHERE id = " + networkId + " AND traffic_type = 'Guest'"; + pstmtUpdate = conn.prepareStatement(updateNet); + pstmtUpdate.executeUpdate(); + pstmtUpdate.close(); + }catch (SQLException e) { + throw new CloudRuntimeException("Exception while adding PhysicalNetworks", e); + } finally { + if (pstmtUpdate != null) { + try { + pstmtUpdate.close(); + } catch (SQLException e) { + } + } + } + + } + + + + +} diff --git a/server/src/com/cloud/upgrade/dao/Upgrade410to420.java b/server/src/com/cloud/upgrade/dao/Upgrade410to420.java index 8ce118f3cbc..05e2b49ffe4 100644 --- a/server/src/com/cloud/upgrade/dao/Upgrade410to420.java +++ b/server/src/com/cloud/upgrade/dao/Upgrade410to420.java @@ -17,6 +17,10 @@ package com.cloud.upgrade.dao; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.script.Script; +import org.apache.log4j.Logger; + import java.io.File; import java.sql.Connection; import java.sql.PreparedStatement; @@ -24,11 +28,6 @@ import java.sql.ResultSet; import java.sql.SQLException; import java.util.UUID; -import org.apache.log4j.Logger; - -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.script.Script; - public class Upgrade410to420 implements DbUpgrade { final static Logger s_logger = Logger.getLogger(Upgrade410to420.class); @@ -62,7 +61,15 @@ public class Upgrade410to420 implements DbUpgrade { upgradeVmwareLabels(conn); createPlaceHolderNics(conn); updateRemoteAccessVpn(conn); - PreparedStatement sql = null; + updateSystemVmTemplates(conn); + updateCluster_details(conn); + updatePrimaryStore(conn); + addEgressFwRulesForSRXGuestNw(conn); + upgradeEIPNetworkOfferings(conn); + } + + private void updateSystemVmTemplates(Connection conn) { + PreparedStatement sql = null; try { sql = conn.prepareStatement("update vm_template set image_data_store_id = 1 where type = 'SYSTEM' or type = 'BUILTIN'"); sql.executeUpdate(); @@ -76,8 +83,39 @@ public class Upgrade410to420 implements DbUpgrade { } } } - updateCluster_details(conn); - } + } + + private void updatePrimaryStore(Connection conn) { + PreparedStatement sql = null; + PreparedStatement sql2 = null; + try { + sql = conn.prepareStatement("update storage_pool set storage_provider_name = ? , scope = ? where pool_type = 'Filesystem' or pool_type = 'LVM'"); + sql.setString(1, "ancient primary data store provider"); + sql.setString(2, "HOST"); + sql.executeUpdate(); + + sql2 = conn.prepareStatement("update storage_pool set storage_provider_name = ? , scope = ? where pool_type != 'Filesystem' and pool_type != 'LVM'"); + sql2.setString(1, "ancient primary data store provider"); + sql2.setString(2, "CLUSTER"); + sql2.executeUpdate(); + } catch (SQLException e) { + throw new CloudRuntimeException("Failed to upgrade vm template data store uuid: " + e.toString()); + } finally { + if (sql != null) { + try { + sql.close(); + } catch (SQLException e) { + } + } + + if (sql2 != null) { + try { + sql2.close(); + } catch (SQLException e) { + } + } + } + } //update the cluster_details table with default overcommit ratios. private void updateCluster_details(Connection conn) { @@ -211,7 +249,7 @@ public class Upgrade410to420 implements DbUpgrade { String ip = rs.getString(3); String uuid = UUID.randomUUID().toString(); //Insert placeholder nic for each Domain router nic in Shared network - pstmt = conn.prepareStatement("INSERT INTO `cloud`.`nics` (uuid, ip4_address, gateway, network_id, state, strategy) VALUES (?, ?, ?, ?, 'Reserved', 'PlaceHolder')"); + pstmt = conn.prepareStatement("INSERT INTO `cloud`.`nics` (uuid, ip4_address, gateway, network_id, state, strategy, vm_type) VALUES (?, ?, ?, ?, 'Reserved', 'PlaceHolder', 'DomainRouter')"); pstmt.setString(1, uuid); pstmt.setString(2, ip); pstmt.setString(3, gateway); @@ -268,4 +306,97 @@ public class Upgrade410to420 implements DbUpgrade { } } } + private void addEgressFwRulesForSRXGuestNw(Connection conn) { + PreparedStatement pstmt = null; + ResultSet rs = null; + ResultSet rsId = null; + ResultSet rsNw = null; + try { + pstmt = conn.prepareStatement("select network_id FROM `cloud`.`ntwk_service_map` where service='Firewall' and provider='JuniperSRX' "); + rs = pstmt.executeQuery(); + while (rs.next()) { + long netId = rs.getLong(1); + //checking for Isolated OR Virtual + pstmt = conn.prepareStatement("select account_id, domain_id FROM `cloud`.`networks` where (guest_type='Isolated' OR guest_type='Virtual') and traffic_type='Guest' and vpc_id is NULL and (state='implemented' OR state='Shutdown') and id=? "); + pstmt.setLong(1, netId); + s_logger.debug("Getting account_id, domain_id from networks table: " + pstmt); + rsNw = pstmt.executeQuery(); + + if(rsNw.next()) { + long accountId = rsNw.getLong(1); + long domainId = rsNw.getLong(2); + + //Add new rule for the existing networks + s_logger.debug("Adding default egress firewall rule for network " + netId); + pstmt = conn.prepareStatement("INSERT INTO firewall_rules (uuid, state, protocol, purpose, account_id, domain_id, network_id, xid, created, traffic_type) VALUES (?, 'Active', 'all', 'Firewall', ?, ?, ?, ?, now(), 'Egress')"); + pstmt.setString(1, UUID.randomUUID().toString()); + pstmt.setLong(2, accountId); + pstmt.setLong(3, domainId); + pstmt.setLong(4, netId); + pstmt.setString(5, UUID.randomUUID().toString()); + s_logger.debug("Inserting default egress firewall rule " + pstmt); + pstmt.executeUpdate(); + + pstmt = conn.prepareStatement("select id from firewall_rules where protocol='all' and network_id=?"); + pstmt.setLong(1, netId); + rsId = pstmt.executeQuery(); + + long firewallRuleId; + if(rsId.next()) { + firewallRuleId = rsId.getLong(1); + pstmt = conn.prepareStatement("insert into firewall_rules_cidrs (firewall_rule_id,source_cidr) values (?, '0.0.0.0/0')"); + pstmt.setLong(1, firewallRuleId); + s_logger.debug("Inserting rule for cidr 0.0.0.0/0 for the new Firewall rule id=" + firewallRuleId + " with statement " + pstmt); + pstmt.executeUpdate(); + } + } + } + } catch (SQLException e) { + throw new CloudRuntimeException("Unable to set egress firewall rules ", e); + } finally { + try { + if (rs != null) { + rs.close(); + } + if (pstmt != null) { + pstmt.close(); + } + } catch (SQLException e) { + } + } + } + + private void upgradeEIPNetworkOfferings(Connection conn) { + + PreparedStatement pstmt = null; + ResultSet rs = null; + + try { + pstmt = conn.prepareStatement("select id, elastic_ip_service from `cloud`.`network_offerings` where traffic_type='Guest'"); + rs = pstmt.executeQuery(); + while (rs.next()) { + long id = rs.getLong(1); + // check if elastic IP service is enabled for network offering + if (rs.getLong(2) != 0) { + //update network offering with eip_associate_public_ip set to true + pstmt = conn.prepareStatement("UPDATE `cloud`.`network_offerings` set eip_associate_public_ip=? where id=?"); + pstmt.setBoolean(1, true); + pstmt.setLong(2, id); + pstmt.executeUpdate(); + } + } + } catch (SQLException e) { + throw new CloudRuntimeException("Unable to set elastic_ip_service for network offerings with EIP service enabled.", e); + } finally { + try { + if (rs != null) { + rs.close(); + } + if (pstmt != null) { + pstmt.close(); + } + } catch (SQLException e) { + } + } + } } diff --git a/server/src/com/cloud/usage/UsageNetworkOfferingVO.java b/server/src/com/cloud/usage/UsageNetworkOfferingVO.java index 72903345fdc..fdf758bd4e4 100644 --- a/server/src/com/cloud/usage/UsageNetworkOfferingVO.java +++ b/server/src/com/cloud/usage/UsageNetworkOfferingVO.java @@ -53,11 +53,14 @@ public class UsageNetworkOfferingVO { @Column(name="deleted") @Temporal(value=TemporalType.TIMESTAMP) private Date deleted = null; + + @Column(name="nic_id") + private Long nicId; protected UsageNetworkOfferingVO() { } - public UsageNetworkOfferingVO(long zoneId, long accountId, long domainId, long vmInstanceId, long networkOfferingId, boolean isDefault, Date created, Date deleted) { + public UsageNetworkOfferingVO(long zoneId, long accountId, long domainId, long vmInstanceId, long networkOfferingId, long nicId, boolean isDefault, Date created, Date deleted) { this.zoneId = zoneId; this.accountId = accountId; this.domainId = domainId; @@ -66,6 +69,7 @@ public class UsageNetworkOfferingVO { this.isDefault = isDefault; this.created = created; this.deleted = deleted; + this.nicId = nicId; } public long getZoneId() { @@ -102,4 +106,12 @@ public class UsageNetworkOfferingVO { public void setDeleted(Date deleted) { this.deleted = deleted; } + + public Long getNicId() { + return nicId; + } + + public void setNicId(Long nicId) { + this.nicId = nicId; + } } diff --git a/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java b/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java index a6539dd6ebb..c3fc5a6f6c1 100644 --- a/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java +++ b/server/src/com/cloud/usage/dao/UsageNetworkOfferingDaoImpl.java @@ -39,15 +39,15 @@ public class UsageNetworkOfferingDaoImpl extends GenericDaoBase= ?)))"; - protected static final String GET_USAGE_RECORDS_BY_DOMAIN = "SELECT zone_id, account_id, domain_id, vm_instance_id, network_offering_id, is_default, created, deleted " + + protected static final String GET_USAGE_RECORDS_BY_DOMAIN = "SELECT zone_id, account_id, domain_id, vm_instance_id, network_offering_id, nic_id, is_default, created, deleted " + "FROM usage_network_offering " + "WHERE domain_id = ? AND ((deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?)))"; - protected static final String GET_ALL_USAGE_RECORDS = "SELECT zone_id, account_id, domain_id, vm_instance_id, network_offering_id, is_default, created, deleted " + + protected static final String GET_ALL_USAGE_RECORDS = "SELECT zone_id, account_id, domain_id, vm_instance_id, network_offering_id, nic_id, is_default, created, deleted " + "FROM usage_network_offering " + "WHERE (deleted IS NULL) OR (created BETWEEN ? AND ?) OR " + " (deleted BETWEEN ? AND ?) OR ((created <= ?) AND (deleted >= ?))"; @@ -124,6 +124,7 @@ public class UsageNetworkOfferingDaoImpl extends GenericDaoBase _userAuthenticators; List _userPasswordEncoders; @@ -238,7 +240,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M public List getUserAuthenticators() { return _userAuthenticators; } - + public void setUserAuthenticators(List authenticators) { _userAuthenticators = authenticators; } @@ -623,6 +625,10 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M int numRemoved = _securityGroupDao.removeByAccountId(accountId); s_logger.info("deleteAccount: Deleted " + numRemoved + " network groups for account " + accountId); + // Cleanup affinity groups + int numAGRemoved = _affinityGroupDao.removeByAccountId(accountId); + s_logger.info("deleteAccount: Deleted " + numAGRemoved + " affinity groups for account " + accountId); + // Delete all the networks boolean networksDeleted = true; s_logger.debug("Deleting networks for account " + account.getId()); @@ -683,13 +689,13 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M accountCleanupNeeded = true; } - // delete account specific Virtual vlans (belong to system Public Network) - only when networks are cleaned + // release account specific Virtual vlans (belong to system Public Network) - only when networks are cleaned // up successfully if (networksDeleted) { - if (!_configMgr.deleteAccountSpecificVirtualRanges(accountId)) { + if (!_configMgr.releaseAccountSpecificVirtualRanges(accountId)) { accountCleanupNeeded = true; } else { - s_logger.debug("Account specific Virtual IP ranges " + " are successfully deleted as a part of account id=" + accountId + " cleanup."); + s_logger.debug("Account specific Virtual IP ranges " + " are successfully released as a part of account id=" + accountId + " cleanup."); } } @@ -1171,8 +1177,9 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M checkAccess(caller, null, true, account); - if (account.getId() == Account.ACCOUNT_ID_SYSTEM) { - throw new PermissionDeniedException("Account id : " + accountId + " is a system account, delete is not allowed"); + //don't allow to delete default account (system and admin) + if (account.isDefault()) { + throw new InvalidParameterValueException("The account is default and can't be removed"); } // Account that manages project(s) can't be removed @@ -1377,9 +1384,10 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M if (account.getType() == Account.ACCOUNT_TYPE_PROJECT) { throw new InvalidParameterValueException("The specified user doesn't exist in the system"); } - - if (account.getId() == Account.ACCOUNT_ID_SYSTEM) { - throw new InvalidParameterValueException("Account id : " + user.getAccountId() + " is a system account, delete for user associated with this account is not allowed"); + + //don't allow to delete default user (system and admin users) + if (user.isDefault()) { + throw new InvalidParameterValueException("The user is default and can't be removed"); } checkAccess(UserContext.current().getCaller(), null, true, account); @@ -1984,6 +1992,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M } @Override @DB + @ActionEvent(eventType = EventTypes.EVENT_REGISTER_FOR_SECRET_API_KEY, eventDescription = "register for the developer API keys") public String[] createApiKeyAndSecretKey(RegisterCmd cmd) { Long userId = cmd.getId(); @@ -2137,7 +2146,6 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M permittedAccounts, Ternary domainIdRecursiveListProject, boolean listAll, boolean forProjectInvitation) { Long domainId = domainIdRecursiveListProject.first(); - if (domainId != null) { Domain domain = _domainDao.findById(domainId); if (domain == null) { @@ -2153,10 +2161,13 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M } Account userAccount = null; + Domain domain = null; if (domainId != null) { userAccount = _accountDao.findActiveAccount(accountName, domainId); + domain = _domainDao.findById(domainId); } else { userAccount = _accountDao.findActiveAccount(accountName, caller.getDomainId()); + domain = _domainDao.findById(caller.getDomainId()); } if (userAccount != null) { @@ -2164,7 +2175,7 @@ public class AccountManagerImpl extends ManagerBase implements AccountManager, M //check permissions permittedAccounts.add(userAccount.getId()); } else { - throw new InvalidParameterValueException("could not find account " + accountName + " in domain " + domainId); + throw new InvalidParameterValueException("could not find account " + accountName + " in domain " + domain.getUuid()); } } diff --git a/server/src/com/cloud/vm/NicVO.java b/server/src/com/cloud/vm/NicVO.java index 987596cff32..833cec5b293 100644 --- a/server/src/com/cloud/vm/NicVO.java +++ b/server/src/com/cloud/vm/NicVO.java @@ -29,11 +29,9 @@ import javax.persistence.GenerationType; import javax.persistence.Id; import javax.persistence.Table; -import org.apache.cloudstack.api.Identity; import com.cloud.network.Networks.AddressFormat; import com.cloud.network.Networks.Mode; import com.cloud.utils.db.GenericDao; -import org.apache.cloudstack.api.InternalIdentity; @Entity @Table(name = "nics") @@ -360,4 +358,8 @@ public class NicVO implements Nic { public void setSecondaryIp(boolean secondaryIp) { this.secondaryIp = secondaryIp; } + + public void setVmType(VirtualMachine.Type vmType) { + this.vmType = vmType; + } } diff --git a/server/src/com/cloud/vm/UserVmManagerImpl.java b/server/src/com/cloud/vm/UserVmManagerImpl.java index 24bce8b1705..ebc5757770e 100755 --- a/server/src/com/cloud/vm/UserVmManagerImpl.java +++ b/server/src/com/cloud/vm/UserVmManagerImpl.java @@ -32,17 +32,33 @@ import javax.ejb.Local; import javax.inject.Inject; import javax.naming.ConfigurationException; -import com.cloud.api.ApiDBUtils; import org.apache.cloudstack.acl.ControlledEntity.ACLType; import org.apache.cloudstack.acl.SecurityChecker.AccessType; +import org.apache.cloudstack.affinity.AffinityGroupVO; +import org.apache.cloudstack.affinity.dao.AffinityGroupDao; +import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; +import org.apache.cloudstack.api.BaseCmd.HTTPMethod; import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd; import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd; -import org.apache.cloudstack.api.command.user.vm.*; +import org.apache.cloudstack.api.command.user.vm.AddNicToVMCmd; +import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; +import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd; +import org.apache.cloudstack.api.command.user.vm.RebootVMCmd; +import org.apache.cloudstack.api.command.user.vm.RemoveNicFromVMCmd; +import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd; +import org.apache.cloudstack.api.command.user.vm.ResetVMSSHKeyCmd; +import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd; +import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd; +import org.apache.cloudstack.api.command.user.vm.StartVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpdateDefaultNicForVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd; import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd; import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd; import org.apache.cloudstack.engine.cloud.entity.api.VirtualMachineEntity; import org.apache.cloudstack.engine.service.api.OrchestrationService; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.apache.commons.codec.binary.Base64; import org.apache.log4j.Logger; @@ -63,6 +79,7 @@ import com.cloud.agent.api.to.VirtualMachineTO; import com.cloud.agent.api.to.VolumeTO; import com.cloud.agent.manager.Commands; import com.cloud.alert.AlertManager; +import com.cloud.api.ApiDBUtils; import com.cloud.api.query.dao.UserVmJoinDao; import com.cloud.api.query.vo.UserVmJoinVO; import com.cloud.async.AsyncJobManager; @@ -105,6 +122,7 @@ import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.hypervisor.HypervisorCapabilitiesVO; import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao; import com.cloud.network.Network; import com.cloud.network.Network.IpAddresses; @@ -222,7 +240,9 @@ import com.cloud.vm.dao.UserVmCloneSettingDao; import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.UserVmDetailsDao; import com.cloud.vm.dao.VMInstanceDao; +import com.cloud.vm.snapshot.VMSnapshot; import com.cloud.vm.snapshot.VMSnapshotManager; +import com.cloud.vm.snapshot.VMSnapshotVO; import com.cloud.vm.snapshot.dao.VMSnapshotDao; @Local(value = { UserVmManager.class, UserVmService.class }) @@ -367,7 +387,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use VpcManager _vpcMgr; @Inject TemplateManager templateMgr; - @Inject + @Inject protected GuestOSCategoryDao _guestOSCategoryDao; @Inject UsageEventDao _usageEventDao; @@ -376,6 +396,11 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use @Inject protected VMSnapshotManager _vmSnapshotMgr; + @Inject + AffinityGroupVMMapDao _affinityGroupVMMapDao; + @Inject + AffinityGroupDao _affinityGroupDao; + @Inject List plannerSelectors; @@ -393,6 +418,8 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use private int _createprivatetemplatefromvolumewait; private int _createprivatetemplatefromsnapshotwait; private final int MAX_VM_NAME_LEN = 80; + private final int MAX_HTTP_GET_LENGTH = 2 * MAX_USER_DATA_LENGTH_BYTES; + private final int MAX_HTTP_POST_LENGTH = 16 * MAX_USER_DATA_LENGTH_BYTES; @Inject protected OrchestrationService _orchSrvc; @@ -682,7 +709,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use try { VirtualMachineEntity vmEntity = _orchSrvc.getVirtualMachine(vm.getUuid()); - status = vmEntity.stop(new Long(userId).toString()); + status = vmEntity.stop(new Long(userId).toString()); } catch (ResourceUnavailableException e) { s_logger.debug("Unable to stop due to ", e); status = false; @@ -699,22 +726,6 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use } } - - - - private void checkVMSnapshots(UserVmVO vm, Long volumeId, boolean attach) { - // Check that if vm has any VM snapshot - /*Long vmId = vm.getId(); - List listSnapshot = _vmSnapshotDao.listByInstanceId(vmId, - VMSnapshot.State.Ready, VMSnapshot.State.Creating, VMSnapshot.State.Reverting, VMSnapshot.State.Expunging); - if (listSnapshot != null && listSnapshot.size() != 0) { - throw new InvalidParameterValueException( - "The VM has VM snapshots, do not allowed to attach volume. Please delete the VM snapshots first."); - }*/ - } - - - private UserVm rebootVirtualMachine(long userId, long vmId) throws InsufficientCapacityException, ResourceUnavailableException { UserVmVO vm = _vmDao.findById(vmId); @@ -777,7 +788,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use _itMgr.checkIfCanUpgrade(vmInstance, svcOffId); // remove diskAndMemory VM snapshots - /* List vmSnapshots = _vmSnapshotDao.findByVm(vmId); + List vmSnapshots = _vmSnapshotDao.findByVm(vmId); for (VMSnapshotVO vmSnapshotVO : vmSnapshots) { if(vmSnapshotVO.getType() == VMSnapshot.Type.DiskAndMemory){ if(!_vmSnapshotMgr.deleteAllVMSnapshots(vmId, VMSnapshot.Type.DiskAndMemory)){ @@ -787,7 +798,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use } } - }*/ + } _itMgr.upgradeVmDb(vmId, svcOffId); @@ -1509,6 +1520,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use @Override public void run() { + UserContext.registerContext(_accountMgr.getSystemUser().getId(), _accountMgr.getSystemAccount(), null, false); GlobalLock scanLock = GlobalLock.getInternLock("UserVMExpunge"); try { if (scanLock.lock(ACQUIRE_GLOBAL_LOCK_TIMEOUT_FOR_COOPERATION)) { @@ -1542,6 +1554,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use } } finally { scanLock.releaseRef(); + UserContext.unregisterContext(); } } } @@ -1608,7 +1621,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use if (userData != null) { // check and replace newlines userData = userData.replace("\\n", ""); - validateUserData(userData); + validateUserData(userData, cmd.getHttpMethod()); // update userData on domain router. updateUserdata = true; } else { @@ -1930,7 +1943,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use @Override public UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List securityGroupIdList, Account owner, - String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, String userData, String sshKeyPair, Map requestedIps, IpAddresses defaultIps, String keyboard) + String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, + HypervisorType hypervisor, HTTPMethod httpmethod, String userData, String sshKeyPair, + Map requestedIps, IpAddresses defaultIps, String keyboard, + List affinityGroupIdList) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { Account caller = UserContext.current().getCaller(); @@ -1980,14 +1996,17 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use } return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, - diskSize, networkList, securityGroupIdList, group, userData, sshKeyPair, hypervisor, caller, requestedIps, defaultIps, keyboard); + diskSize, networkList, securityGroupIdList, group, httpmethod, userData, sshKeyPair, hypervisor, + caller, requestedIps, defaultIps, keyboard, affinityGroupIdList); } @Override public UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, - List securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, String userData, - String sshKeyPair, Map requestedIps, IpAddresses defaultIps, String keyboard) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, - ResourceAllocationException { + List securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, + Long diskSize, String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData, + String sshKeyPair, Map requestedIps, IpAddresses defaultIps, String keyboard, + List affinityGroupIdList) throws InsufficientCapacityException, ConcurrentOperationException, + ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { Account caller = UserContext.current().getCaller(); List networkList = new ArrayList(); @@ -2032,7 +2051,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use isSecurityGroupEnabledNetworkUsed = true; } else { - // Verify that all the networks are Shared/Guest; can't create combination of SG enabled and disabled networks + // Verify that all the networks are Shared/Guest; can't create combination of SG enabled and disabled networks for (Long networkId : networkIdList) { NetworkVO network = _networkDao.findById(networkId); @@ -2048,7 +2067,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use } isSecurityGroupEnabledNetworkUsed = true; - } + } if (!(network.getTrafficType() == TrafficType.Guest && network.getGuestType() == Network.GuestType.Shared)) { throw new InvalidParameterValueException("Can specify only Shared Guest networks when" + @@ -2093,12 +2112,15 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use } return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, - diskSize, networkList, securityGroupIdList, group, userData, sshKeyPair, hypervisor, caller, requestedIps, defaultIps, keyboard); + diskSize, networkList, securityGroupIdList, group, httpmethod, userData, sshKeyPair, hypervisor, + caller, requestedIps, defaultIps, keyboard, affinityGroupIdList); } @Override public UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, Account owner, String hostName, - String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, String userData, String sshKeyPair, Map requestedIps, IpAddresses defaultIps, String keyboard) + String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, + HTTPMethod httpmethod, String userData, String sshKeyPair, Map requestedIps, + IpAddresses defaultIps, String keyboard, List affinityGroupIdList) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { Account caller = UserContext.current().getCaller(); @@ -2206,7 +2228,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use } } - return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, diskSize, networkList, null, group, userData, sshKeyPair, hypervisor, caller, requestedIps, defaultIps, keyboard); + return createVirtualMachine(zone, serviceOffering, template, hostName, displayName, owner, diskOfferingId, + diskSize, networkList, null, group, httpmethod, userData, sshKeyPair, hypervisor, caller, requestedIps, + defaultIps, keyboard, affinityGroupIdList); } @@ -2219,7 +2243,9 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use @DB @ActionEvent(eventType = EventTypes.EVENT_VM_CREATE, eventDescription = "deploying Vm", create = true) protected UserVm createVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, String hostName, String displayName, Account owner, Long diskOfferingId, - Long diskSize, List networkList, List securityGroupIdList, String group, String userData, String sshKeyPair, HypervisorType hypervisor, Account caller, Map requestedIps, IpAddresses defaultIps, String keyboard) + Long diskSize, List networkList, List securityGroupIdList, String group, HTTPMethod httpmethod, + String userData, String sshKeyPair, HypervisorType hypervisor, Account caller, Map requestedIps, + IpAddresses defaultIps, String keyboard, List affinityGroupIdList) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException, StorageUnavailableException, ResourceAllocationException { _accountMgr.checkAccess(caller, null, true, owner); @@ -2256,9 +2282,14 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use // check if account/domain is with in resource limits to create a new vm boolean isIso = Storage.ImageFormat.ISO == template.getFormat(); + long size = _templateHostDao.findByTemplateId(template.getId()).getSize(); + if (diskOfferingId != null) { + size += _diskOfferingDao.findById(diskOfferingId).getDiskSize(); + } resourceLimitCheck(owner, new Long(offering.getCpu()), new Long(offering.getRamSize())); _resourceLimitMgr.checkResourceLimit(owner, ResourceType.volume, (isIso || diskOfferingId == null ? 1 : 2)); + _resourceLimitMgr.checkResourceLimit(owner, ResourceType.primary_storage, new Long (size)); // verify security group ids if (securityGroupIdList != null) { @@ -2275,6 +2306,19 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use } } + // check that the affinity groups exist + if (affinityGroupIdList != null) { + for (Long affinityGroupId : affinityGroupIdList) { + AffinityGroupVO ag = _affinityGroupDao.findById(affinityGroupId); + if (ag == null) { + throw new InvalidParameterValueException("Unable to find affinity group by id " + affinityGroupId); + } else { + // verify permissions + _accountMgr.checkAccess(caller, null, true, owner, ag); + } + } + } + if (template.getHypervisorType() != null && template.getHypervisorType() != HypervisorType.BareMetal) { // check if we have available pools for vm deployment long availablePools = _storagePoolDao.countPoolsByStatus(StoragePoolStatus.Up); @@ -2309,7 +2353,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use } // check if the user data is correct - validateUserData(userData); + validateUserData(userData, httpmethod); // Find an SSH public key corresponding to the key pair name, if one is // given @@ -2452,7 +2496,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use // * verify that there are no duplicates if (hostNames.contains(hostName)) { throw new InvalidParameterValueException("The vm with hostName " + hostName - + " already exists in the network domain: " + ntwkDomain + "; network=" + + " already exists in the network domain: " + ntwkDomain + "; network=" + _networkModel.getNetwork(ntwkId)); } } @@ -2499,6 +2543,21 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use _vmCloneSettingDao.persist(vmCloneSettingVO); } + long guestOSId = template.getGuestOSId(); + GuestOSVO guestOS = _guestOSDao.findById(guestOSId); + long guestOSCategoryId = guestOS.getCategoryId(); + GuestOSCategoryVO guestOSCategory = _guestOSCategoryDao.findById(guestOSCategoryId); + + + // If hypervisor is vSphere and OS is OS X, set special settings. + if (hypervisorType.equals(HypervisorType.VMware)) { + if (guestOS.getDisplayName().toLowerCase().contains("apple mac os")){ + vm.setDetail("smc.present", "TRUE"); + vm.setDetail(VmDetailConstants.ROOK_DISK_CONTROLLER, "scsi"); + vm.setDetail("firmware", "efi"); + s_logger.info("guestOS is OSX : overwrite root disk controller to scsi, use smc and efi"); + } + } _vmDao.persist(vm); _vmDao.saveDetails(vm); @@ -2506,16 +2565,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use s_logger.debug("Allocating in the DB for vm"); DataCenterDeployment plan = new DataCenterDeployment(zone.getId()); - - long guestOSId = template.getGuestOSId(); - GuestOSVO guestOS = _guestOSDao.findById(guestOSId); - long guestOSCategoryId = guestOS.getCategoryId(); - GuestOSCategoryVO guestOSCategory = _guestOSCategoryDao.findById(guestOSCategoryId); - List computeTags = new ArrayList(); computeTags.add(offering.getHostTag()); - List rootDiskTags = new ArrayList(); + List rootDiskTags = new ArrayList(); rootDiskTags.add(offering.getTags()); if(isIso){ @@ -2557,25 +2610,43 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use _securityGroupMgr.addInstanceToGroups(vm.getId(), securityGroupIdList); + if (affinityGroupIdList != null && !affinityGroupIdList.isEmpty()) { + _affinityGroupVMMapDao.updateMap(vm.getId(), affinityGroupIdList); + } + return vm; } - private void validateUserData(String userData) { + private void validateUserData(String userData, HTTPMethod httpmethod) { byte[] decodedUserData = null; if (userData != null) { if (!Base64.isBase64(userData)) { throw new InvalidParameterValueException( "User data is not base64 encoded"); } - if (userData.length() >= 2 * MAX_USER_DATA_LENGTH_BYTES) { - throw new InvalidParameterValueException( - "User data is too long"); - } - decodedUserData = Base64.decodeBase64(userData.getBytes()); - if (decodedUserData.length > MAX_USER_DATA_LENGTH_BYTES) { - throw new InvalidParameterValueException( - "User data is too long"); + // If GET, use 4K. If POST, support upto 32K. + if (httpmethod.equals(HTTPMethod.GET)) { + if (userData.length() >= MAX_HTTP_GET_LENGTH) { + throw new InvalidParameterValueException( + "User data is too long for an http GET request"); + } + decodedUserData = Base64.decodeBase64(userData.getBytes()); + if (decodedUserData.length > MAX_HTTP_GET_LENGTH) { + throw new InvalidParameterValueException( + "User data is too long for GET request"); + } + } else if (httpmethod.equals(HTTPMethod.POST)) { + if (userData.length() >= MAX_HTTP_POST_LENGTH) { + throw new InvalidParameterValueException( + "User data is too long for an http POST request"); + } + decodedUserData = Base64.decodeBase64(userData.getBytes()); + if (decodedUserData.length > MAX_HTTP_POST_LENGTH) { + throw new InvalidParameterValueException( + "User data is too long for POST request"); + } } + if (decodedUserData.length < 1) { throw new InvalidParameterValueException( "User data is too short"); @@ -2736,7 +2807,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use NetworkVO network = _networkDao.findById(nic.getNetworkId()); long isDefault = (nic.isDefaultNic()) ? 1 : 0; UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, vm.getAccountId(), - vm.getDataCenterId(), vm.getId(), vm.getHostName(), network.getNetworkOfferingId(), + vm.getDataCenterId(), vm.getId(), Long.toString(nic.getId()), network.getNetworkOfferingId(), null, isDefault, VirtualMachine.class.getName(), vm.getUuid()); if (network.getTrafficType() == TrafficType.Guest) { originalIp = nic.getIp4Address(); @@ -2834,7 +2905,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use try { VirtualMachineEntity vmEntity = _orchSrvc.getVirtualMachine(vm.getUuid()); - vmEntity.stop(new Long(userId).toString()); + vmEntity.stop(new Long(userId).toString()); } catch (ResourceUnavailableException e) { throw new CloudRuntimeException( "Unable to contact the agent to stop the virtual machine " @@ -2856,6 +2927,10 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use if (ip != null && ip.getSystem()) { UserContext ctx = UserContext.current(); try { + long networkId = ip.getAssociatedWithNetworkId(); + Network guestNetwork = _networkDao.findById(networkId); + NetworkOffering offering = _configMgr.getNetworkOffering(guestNetwork.getNetworkOfferingId()); + assert (offering.getAssociatePublicIP() == true) : "User VM should not have system owned public IP associated with it when offering configured not to associate public IP."; _rulesMgr.disableStaticNat(ip.getId(), ctx.getCaller(), ctx.getCallerUserId(), true); } catch (Exception ex) { s_logger.warn( @@ -3049,7 +3124,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use try { VirtualMachineEntity vmEntity = _orchSrvc.getVirtualMachine(vm.getUuid()); - status = vmEntity.destroy(new Long(userId).toString()); + status = vmEntity.destroy(new Long(userId).toString()); } catch (CloudException e) { CloudRuntimeException ex = new CloudRuntimeException( "Unable to destroy with specified vmId", e); @@ -3459,6 +3534,127 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use return migratedVm; } + @Override + @ActionEvent(eventType = EventTypes.EVENT_VM_MIGRATE, eventDescription = "migrating VM", async = true) + public VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinationHost, + Map volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException, + ManagementServerException, VirtualMachineMigrationException { + // Access check - only root administrator can migrate VM. + Account caller = UserContext.current().getCaller(); + if (caller.getType() != Account.ACCOUNT_TYPE_ADMIN) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Caller is not a root admin, permission denied to migrate the VM"); + } + throw new PermissionDeniedException("No permission to migrate VM, Only Root Admin can migrate a VM!"); + } + + VMInstanceVO vm = _vmInstanceDao.findById(vmId); + if (vm == null) { + throw new InvalidParameterValueException("Unable to find the vm by id " + vmId); + } + + if (vm.getState() != State.Running) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("VM is not Running, unable to migrate the vm " + vm); + } + CloudRuntimeException ex = new CloudRuntimeException("VM is not Running, unable to migrate the vm with" + + " specified id"); + ex.addProxyObject(vm, vmId, "vmId"); + throw ex; + } + + if (!vm.getHypervisorType().equals(HypervisorType.XenServer) && + !vm.getHypervisorType().equals(HypervisorType.VMware) && + !vm.getHypervisorType().equals(HypervisorType.KVM) && + !vm.getHypervisorType().equals(HypervisorType.Ovm)) { + throw new InvalidParameterValueException("Unsupported hypervisor type for vm migration, we support" + + " XenServer/VMware/KVM only"); + } + + long srcHostId = vm.getHostId(); + Host srcHost = _resourceMgr.getHost(srcHostId); + // Check if src and destination hosts are valid and migrating to same host + if (destinationHost.getId() == srcHostId) { + throw new InvalidParameterValueException("Cannot migrate VM, VM is already present on this host, please" + + " specify valid destination host to migrate the VM"); + } + + // Check if the source and destination hosts are of the same type and support storage motion. + if (!(srcHost.getHypervisorType().equals(destinationHost.getHypervisorType()) && + srcHost.getHypervisorVersion().equals(destinationHost.getHypervisorVersion()))) { + throw new CloudRuntimeException("The source and destination hosts are not of the same type and version. " + + "Source hypervisor type and version: " + srcHost.getHypervisorType().toString() + " " + + srcHost.getHypervisorVersion() + ", Destination hypervisor type and version: " + + destinationHost.getHypervisorType().toString() + " " + destinationHost.getHypervisorVersion()); + } + + HypervisorCapabilitiesVO capabilities = _hypervisorCapabilitiesDao.findByHypervisorTypeAndVersion( + srcHost.getHypervisorType(), srcHost.getHypervisorVersion()); + if (!capabilities.isStorageMotionSupported()) { + throw new CloudRuntimeException("Migration with storage isn't supported on hypervisor " + + srcHost.getHypervisorType() + " of version " + srcHost.getHypervisorVersion()); + } + + // Check if destination host is up. + if (destinationHost.getStatus() != com.cloud.host.Status.Up || + destinationHost.getResourceState() != ResourceState.Enabled){ + throw new CloudRuntimeException("Cannot migrate VM, destination host is not in correct state, has " + + "status: " + destinationHost.getStatus() + ", state: " + destinationHost.getResourceState()); + } + + List vmVolumes = _volsDao.findUsableVolumesForInstance(vm.getId()); + Map volToPoolObjectMap = new HashMap(); + if (!isVMUsingLocalStorage(vm) && destinationHost.getClusterId() == srcHost.getClusterId()) { + if (volumeToPool.isEmpty()) { + // If the destination host is in the same cluster and volumes do not have to be migrated across pools + // then fail the call. migrateVirtualMachine api should have been used. + throw new InvalidParameterValueException("Migration of the vm " + vm + "from host " + srcHost + + " to destination host " + destinationHost + " doesn't involve migrating the volumes."); + } + } + + if (!volumeToPool.isEmpty()) { + // Check if all the volumes and pools passed as parameters are valid. + for (Map.Entry entry : volumeToPool.entrySet()) { + VolumeVO volume = _volsDao.findByUuid(entry.getKey()); + StoragePoolVO pool = _storagePoolDao.findByUuid(entry.getValue()); + if (volume == null) { + throw new InvalidParameterValueException("There is no volume present with the given id " + + entry.getKey()); + } else if (pool == null) { + throw new InvalidParameterValueException("There is no storage pool present with the given id " + + entry.getValue()); + } else { + // Verify the volume given belongs to the vm. + if (!vmVolumes.contains(volume)) { + throw new InvalidParameterValueException("There volume " + volume + " doesn't belong to " + + "the virtual machine "+ vm + " that has to be migrated"); + } + volToPoolObjectMap.put(volume, pool); + } + } + } + + // Check if all the volumes are in the correct state. + for (VolumeVO volume : vmVolumes) { + if (volume.getState() != Volume.State.Ready) { + throw new CloudRuntimeException("Volume " + volume + " of the VM is not in Ready state. Cannot " + + "migrate the vm with its volumes."); + } + } + + // Check max guest vm limit for the destinationHost. + HostVO destinationHostVO = _hostDao.findById(destinationHost.getId()); + if(_capacityMgr.checkIfHostReachMaxGuestLimit(destinationHostVO)){ + throw new VirtualMachineMigrationException("Host name: " + destinationHost.getName() + ", hostId: " + + destinationHost.getId() + " already has max running vms (count includes system VMs). Cannot" + + " migrate to this host"); + } + + VMInstanceVO migratedVm = _itMgr.migrateWithStorage(vm, srcHostId, destinationHost.getId(), volToPoolObjectMap); + return migratedVm; + } + @DB @Override @ActionEvent(eventType = EventTypes.EVENT_VM_MOVE, eventDescription = "move VM to another user", async = false) @@ -3930,7 +4126,7 @@ public class UserVmManagerImpl extends ManagerBase implements UserVmManager, Use needRestart = true; } - List rootVols = _volsDao.findByInstance(vmId); + List rootVols = _volsDao.findByInstanceAndType(vmId, Volume.Type.ROOT); if (rootVols.isEmpty()) { InvalidParameterValueException ex = new InvalidParameterValueException( "Can not find root volume for VM " + vm.getUuid()); diff --git a/server/src/com/cloud/vm/UserVmStateListener.java b/server/src/com/cloud/vm/UserVmStateListener.java index 04aa8180b67..3feecbb05f6 100644 --- a/server/src/com/cloud/vm/UserVmStateListener.java +++ b/server/src/com/cloud/vm/UserVmStateListener.java @@ -72,21 +72,26 @@ public class UserVmStateListener implements StateListener nics = _nicDao.listByVmId(vo.getId()); for (NicVO nic : nics) { NetworkVO network = _networkDao.findById(nic.getNetworkId()); - UsageEventUtils.saveUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vo.getAccountId(), vo.getDataCenterId(), vo.getId(), null, network.getNetworkOfferingId(), null, 0L); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vo.getAccountId(), vo.getDataCenterId(), + vo.getId(), Long.toString(nic.getId()),network.getNetworkOfferingId(), null, 0L, vo.getClass().getName(), vo.getUuid()); } } else if (VirtualMachine.State.isVmDestroyed(oldState, event, newState)) { - UsageEventUtils.saveUsageEvent(EventTypes.EVENT_VM_DESTROY, vo.getAccountId(), vo.getDataCenterId(), vo.getId(), vo.getHostName(), vo.getServiceOfferingId(), - vo.getTemplateId(), vo.getHypervisorType().toString()); + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_VM_DESTROY, vo.getAccountId(), vo.getDataCenterId(), vo.getId(), + vo.getHostName(), vo.getServiceOfferingId(),vo.getTemplateId(), vo.getHypervisorType().toString(), + vo.getClass().getName(), vo.getUuid()); } return true; } diff --git a/server/src/com/cloud/vm/VirtualMachineManager.java b/server/src/com/cloud/vm/VirtualMachineManager.java index 4a30d97cc54..ea9f7bbb2c9 100644 --- a/server/src/com/cloud/vm/VirtualMachineManager.java +++ b/server/src/com/cloud/vm/VirtualMachineManager.java @@ -20,6 +20,7 @@ import java.net.URI; import java.util.List; import java.util.Map; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; @@ -41,6 +42,7 @@ import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.StoragePool; import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.VolumeVO; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.utils.Pair; @@ -109,6 +111,8 @@ public interface VirtualMachineManager extends Manager { T migrate(T vm, long srcHostId, DeployDestination dest) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException; + T migrateWithStorage(T vm, long srcId, long destId, Map volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException; + T reboot(T vm, Map params, User caller, Account account) throws InsufficientCapacityException, ResourceUnavailableException; T advanceReboot(T vm, Map params, User caller, Account account) throws InsufficientCapacityException, ResourceUnavailableException, ConcurrentOperationException, OperationTimedoutException; diff --git a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java index af2271660fa..252fc99ca0d 100755 --- a/server/src/com/cloud/vm/VirtualMachineManagerImpl.java +++ b/server/src/com/cloud/vm/VirtualMachineManagerImpl.java @@ -5,7 +5,7 @@ // to you under the Apache License, Version 2.0 (the // "License"); you may not use this file except in compliance // with the License. You may obtain a copy of the License at -// +// // http://www.apache.org/licenses/LICENSE-2.0 // // Unless required by applicable law or agreed to in writing, @@ -24,6 +24,7 @@ import java.util.Collections; import java.util.Date; import java.util.HashMap; import java.util.HashSet; +import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.Set; @@ -38,7 +39,12 @@ import javax.naming.ConfigurationException; import com.cloud.capacity.CapacityManager; import org.apache.cloudstack.engine.subsystem.api.storage.DataStoreManager; +import org.apache.cloudstack.engine.subsystem.api.storage.ObjectInDataStoreStateMachine; +import org.apache.cloudstack.engine.subsystem.api.storage.StoragePoolAllocator; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeDataFactory; +import org.apache.cloudstack.engine.subsystem.api.storage.VolumeInfo; import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import com.cloud.dc.*; import com.cloud.agent.api.*; @@ -50,6 +56,8 @@ import com.cloud.agent.Listener; import com.cloud.agent.api.StartupRoutingCommand.VmState; import com.cloud.agent.api.to.NicTO; import com.cloud.agent.api.to.VirtualMachineTO; +import com.cloud.agent.api.to.StorageFilerTO; +import com.cloud.agent.api.to.VolumeTO; import com.cloud.agent.manager.Commands; import com.cloud.agent.manager.allocator.HostAllocator; import com.cloud.alert.AlertManager; @@ -57,6 +65,7 @@ import com.cloud.cluster.ClusterManager; import com.cloud.configuration.Config; import com.cloud.configuration.ConfigurationManager; import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.dc.dao.ClusterDao; import com.cloud.dc.DataCenter; import com.cloud.dc.DataCenterVO; import com.cloud.dc.HostPodVO; @@ -68,7 +77,11 @@ import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; import com.cloud.deploy.DeploymentPlanner; import com.cloud.deploy.DeploymentPlanner.ExcludeList; +import com.cloud.deploy.DeploymentPlanningManager; import com.cloud.domain.dao.DomainDao; +import com.cloud.event.EventTypes; +import com.cloud.event.UsageEventUtils; +import com.cloud.exception.AffinityConflictException; import com.cloud.exception.AgentUnavailableException; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.ConnectionException; @@ -109,10 +122,13 @@ import com.cloud.storage.Volume; import com.cloud.storage.Volume.Type; import com.cloud.storage.VolumeManager; import com.cloud.storage.VolumeVO; +import com.cloud.storage.dao.DiskOfferingDao; import com.cloud.storage.dao.GuestOSCategoryDao; import com.cloud.storage.dao.GuestOSDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; +import com.cloud.storage.dao.StoragePoolHostDao; +import com.cloud.storage.snapshot.SnapshotManager; import com.cloud.user.Account; import com.cloud.user.AccountManager; import com.cloud.user.User; @@ -162,6 +178,8 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Inject protected ServiceOfferingDao _offeringDao; @Inject + protected DiskOfferingDao _diskOfferingDao; + @Inject protected VMTemplateDao _templateDao; @Inject protected UserDao _userDao; @@ -200,13 +218,19 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Inject protected DataCenterDao _dcDao; @Inject + protected ClusterDao _clusterDao; + @Inject protected PrimaryDataStoreDao _storagePoolDao; @Inject protected HypervisorGuruManager _hvGuruMgr; @Inject protected NetworkDao _networkDao; @Inject + protected StoragePoolHostDao _poolHostDao; + @Inject protected VMSnapshotDao _vmSnapshotDao; + @Inject + protected VolumeDataFactory volFactory; protected List _planners; public List getPlanners() { @@ -224,10 +248,16 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac this._hostAllocators = _hostAllocators; } - @Inject + @Inject + protected List _storagePoolAllocators; + + @Inject protected ResourceManager _resourceMgr; - - @Inject + + @Inject + protected SnapshotManager _snapshotMgr; + + @Inject protected VMSnapshotManager _vmSnapshotMgr = null; @Inject protected ClusterDetailsDao _clusterDetailsDao; @@ -239,6 +269,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Inject VolumeManager volumeMgr; + @Inject + DeploymentPlanningManager _dpMgr; + Map> _vmGurus = new HashMap>(); protected StateMachine2 _stateMachine; @@ -402,6 +435,29 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac //remove the overcommit detials from the uservm details _uservmDetailsDao.deleteDetails(vm.getId()); + // send hypervisor-dependent commands before removing + HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType()); + List finalizeExpungeCommands = hvGuru.finalizeExpunge(vm); + if(finalizeExpungeCommands != null && finalizeExpungeCommands.size() > 0){ + Long hostId = vm.getHostId() != null ? vm.getHostId() : vm.getLastHostId(); + if(hostId != null){ + Commands cmds = new Commands(OnError.Stop); + for (Command command : finalizeExpungeCommands) { + cmds.addCommand(command); + } + _agentMgr.send(hostId, cmds); + if(!cmds.isSuccessful()){ + for (Answer answer : cmds.getAnswers()){ + if(answer != null && !answer.getResult()){ + s_logger.warn("Failed to expunge vm due to: " + answer.getDetails()); + break; + } + } + return false; + } + } + } + if (s_logger.isDebugEnabled()) { s_logger.debug("Expunged " + vm); } @@ -586,7 +642,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac ConcurrentOperationException, ResourceUnavailableException { return advanceStart(vm, params, caller, account, null); } - + @Override public T advanceStart(T vm, Map params, User caller, Account account, DeploymentPlan planToDeploy) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException { @@ -695,17 +751,13 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vm, template, offering, account, params); DeployDestination dest = null; - for (DeploymentPlanner planner : _planners) { - if (planner.canHandle(vmProfile, plan, avoids)) { - dest = planner.plan(vmProfile, plan, avoids); - } else { - continue; - } - if (dest != null) { - avoids.addHost(dest.getHost().getId()); - journal.record("Deployment found ", vmProfile, dest); - break; - } + try { + dest = _dpMgr.planDeployment(vmProfile, plan, avoids); + } catch (AffinityConflictException e2) { + s_logger.warn("Unable to create deployment, affinity rules associted to the VM conflict", e2); + throw new CloudRuntimeException( + "Unable to create deployment, affinity rules associted to the VM conflict"); + } if (dest == null) { @@ -719,6 +771,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac throw new InsufficientServerCapacityException("Unable to create a deployment for " + vmProfile, DataCenter.class, plan.getDataCenterId()); } + if (dest != null) { + avoids.addHost(dest.getHost().getId()); + journal.record("Deployment found ", vmProfile, dest); + } + long destHostId = dest.getHost().getId(); vm.setPodId(dest.getPod().getId()); Long cluster_id = dest.getCluster().getId(); @@ -739,7 +796,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac if (s_logger.isDebugEnabled()) { s_logger.debug("VM is being created in podId: " + vm.getPodIdToDeployIn()); } - _networkMgr.prepare(vmProfile, dest, ctx); + _networkMgr.prepare(vmProfile, dest, ctx); if (vm.getHypervisorType() != HypervisorType.BareMetal) { this.volumeMgr.prepare(vmProfile, dest); } @@ -797,7 +854,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac StopCommand cmd = new StopCommand(vm); StopAnswer answer = (StopAnswer) _agentMgr.easySend(destHostId, cmd); if (answer == null || !answer.getResult()) { - s_logger.warn("Unable to stop " + vm + " due to " + (answer != null ? answer.getDetails() : "no answers")); + s_logger.warn("Unable to stop " + vm + " due to " + (answer != null ? answer.getDetails() : "no answers")); _haMgr.scheduleStop(vm, destHostId, WorkType.ForceStop); throw new ExecutionException("Unable to stop " + vm + " so we are unable to retry the start operation"); } @@ -860,6 +917,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } } + if (startedVm == null) { + throw new CloudRuntimeException("Unable to start instance '" + vm.getHostName() + + "' (" + vm.getUuid() + "), see management server log for details"); + } + return startedVm; } @@ -1121,7 +1183,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac _workDao.update(work.getId(), work); } - return stateTransitTo(vm, Event.OperationSucceeded, null, null); + return stateTransitTo(vm, Event.OperationSucceeded, null); } catch (NoTransitionException e) { s_logger.warn(e.getMessage()); return false; @@ -1144,7 +1206,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac s_logger.error("State transit with event: " + e + " failed due to: " + vm.getInstanceName() + " has active VM snapshots tasks"); return false; } - + State oldState = vm.getState(); if (oldState == State.Starting) { if (e == Event.OperationSucceeded) { @@ -1179,12 +1241,12 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac s_logger.debug("Unable to stop " + vm); return false; } - + if (!_vmSnapshotMgr.deleteAllVMSnapshots(vm.getId(),null)){ s_logger.debug("Unable to delete all snapshots for " + vm); return false; } - + try { if (!stateTransitTo(vm, VirtualMachine.Event.DestroyRequested, vm.getHostId())) { s_logger.debug("Unable to destroy the vm because it is not in the correct state: " + vm); @@ -1416,6 +1478,189 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } } + private Map getPoolListForVolumesForMigration(VirtualMachineProfile profile, + Host host, Map volumeToPool) { + List allVolumes = _volsDao.findUsableVolumesForInstance(profile.getId()); + for (VolumeVO volume : allVolumes) { + StoragePoolVO pool = volumeToPool.get(volume); + DiskOfferingVO diskOffering = _diskOfferingDao.findById(volume.getDiskOfferingId()); + StoragePoolVO currentPool = _storagePoolDao.findById(volume.getPoolId()); + if (pool != null) { + // Check if pool is accessible from the destination host and disk offering with which the volume was + // created is compliant with the pool type. + if (_poolHostDao.findByPoolHost(pool.getId(), host.getId()) == null || + pool.isLocal() != diskOffering.getUseLocalStorage()) { + // Cannot find a pool for the volume. Throw an exception. + throw new CloudRuntimeException("Cannot migrate volume " + volume + " to storage pool " + pool + + " while migrating vm to host " + host + ". Either the pool is not accessible from the " + + "host or because of the offering with which the volume is created it cannot be placed on " + + "the given pool."); + } else if (pool.getId() == currentPool.getId()){ + // If the pool to migrate too is the same as current pool, remove the volume from the list of + // volumes to be migrated. + volumeToPool.remove(volume); + } + } else { + // Find a suitable pool for the volume. Call the storage pool allocator to find the list of pools. + DiskProfile diskProfile = new DiskProfile(volume, diskOffering, profile.getHypervisorType()); + DataCenterDeployment plan = new DataCenterDeployment(host.getDataCenterId(), host.getPodId(), + host.getClusterId(), host.getId(), null, null); + ExcludeList avoid = new ExcludeList(); + boolean currentPoolAvailable = false; + + for (StoragePoolAllocator allocator : _storagePoolAllocators) { + List poolList = allocator.allocateToPool(diskProfile, profile, plan, avoid, + StoragePoolAllocator.RETURN_UPTO_ALL); + if (poolList != null && !poolList.isEmpty()) { + // Volume needs to be migrated. Pick the first pool from the list. Add a mapping to migrate the + // volume to a pool only if it is required; that is the current pool on which the volume resides + // is not available on the destination host. + if (poolList.contains(currentPool)) { + currentPoolAvailable = true; + } else { + volumeToPool.put(volume, _storagePoolDao.findByUuid(poolList.get(0).getUuid())); + } + + break; + } + } + + if (!currentPoolAvailable && !volumeToPool.containsKey(volume)) { + // Cannot find a pool for the volume. Throw an exception. + throw new CloudRuntimeException("Cannot find a storage pool which is available for volume " + + volume + " while migrating virtual machine " + profile.getVirtualMachine() + " to host " + + host); + } + } + } + + return volumeToPool; + } + + private void moveVmToMigratingState(T vm, Long hostId, ItWorkVO work) + throws ConcurrentOperationException { + // Put the vm in migrating state. + try { + if (!changeState(vm, Event.MigrationRequested, hostId, work, Step.Migrating)) { + s_logger.info("Migration cancelled because state has changed: " + vm); + throw new ConcurrentOperationException("Migration cancelled because state has changed: " + vm); + } + } catch (NoTransitionException e) { + s_logger.info("Migration cancelled because " + e.getMessage()); + throw new ConcurrentOperationException("Migration cancelled because " + e.getMessage()); + } + } + + private void moveVmOutofMigratingStateOnSuccess(T vm, Long hostId, ItWorkVO work) + throws ConcurrentOperationException { + // Put the vm in running state. + try { + if (!changeState(vm, Event.OperationSucceeded, hostId, work, Step.Started)) { + s_logger.error("Unable to change the state for " + vm); + throw new ConcurrentOperationException("Unable to change the state for " + vm); + } + } catch (NoTransitionException e) { + s_logger.error("Unable to change state due to " + e.getMessage()); + throw new ConcurrentOperationException("Unable to change state due to " + e.getMessage()); + } + } + + @Override + public T migrateWithStorage(T vm, long srcHostId, long destHostId, + Map volumeToPool) throws ResourceUnavailableException, ConcurrentOperationException, + ManagementServerException, VirtualMachineMigrationException { + + HostVO srcHost = _hostDao.findById(srcHostId); + HostVO destHost = _hostDao.findById(destHostId); + VirtualMachineGuru vmGuru = getVmGuru(vm); + + DataCenterVO dc = _dcDao.findById(destHost.getDataCenterId()); + HostPodVO pod = _podDao.findById(destHost.getPodId()); + Cluster cluster = _clusterDao.findById(destHost.getClusterId()); + DeployDestination destination = new DeployDestination(dc, pod, cluster, destHost); + + // Create a map of which volume should go in which storage pool. + long vmId = vm.getId(); + vm = vmGuru.findById(vmId); + VirtualMachineProfile profile = new VirtualMachineProfileImpl(vm); + volumeToPool = getPoolListForVolumesForMigration(profile, destHost, volumeToPool); + + // If none of the volumes have to be migrated, fail the call. Administrator needs to make a call for migrating + // a vm and not migrating a vm with storage. + if (volumeToPool.isEmpty()) { + throw new InvalidParameterValueException("Migration of the vm " + vm + "from host " + srcHost + + " to destination host " + destHost + " doesn't involve migrating the volumes."); + } + + short alertType = AlertManager.ALERT_TYPE_USERVM_MIGRATE; + if (VirtualMachine.Type.DomainRouter.equals(vm.getType())) { + alertType = AlertManager.ALERT_TYPE_DOMAIN_ROUTER_MIGRATE; + } else if (VirtualMachine.Type.ConsoleProxy.equals(vm.getType())) { + alertType = AlertManager.ALERT_TYPE_CONSOLE_PROXY_MIGRATE; + } + + _networkMgr.prepareNicForMigration(profile, destination); + this.volumeMgr.prepareForMigration(profile, destination); + HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vm.getHypervisorType()); + VirtualMachineTO to = hvGuru.implement(profile); + + ItWorkVO work = new ItWorkVO(UUID.randomUUID().toString(), _nodeId, State.Migrating, vm.getType(), vm.getId()); + work.setStep(Step.Prepare); + work.setResourceType(ItWorkVO.ResourceType.Host); + work.setResourceId(destHostId); + work = _workDao.persist(work); + + // Put the vm in migrating state. + vm.setLastHostId(srcHostId); + moveVmToMigratingState(vm, destHostId, work); + + boolean migrated = false; + try { + // Migrate the vm and its volume. + this.volumeMgr.migrateVolumes(vm, to, srcHost, destHost, volumeToPool); + + // Put the vm back to running state. + moveVmOutofMigratingStateOnSuccess(vm, destHost.getId(), work); + + try { + if (!checkVmOnHost(vm, destHostId)) { + s_logger.error("Vm not found on destination host. Unable to complete migration for " + vm); + try { + _agentMgr.send(srcHostId, new Commands(cleanup(vm.getInstanceName())), null); + } catch (AgentUnavailableException e) { + s_logger.error("AgentUnavailableException while cleanup on source host: " + srcHostId); + } + cleanup(vmGuru, new VirtualMachineProfileImpl(vm), work, Event.AgentReportStopped, true, + _accountMgr.getSystemUser(), _accountMgr.getSystemAccount()); + return null; + } + } catch (OperationTimedoutException e) { + s_logger.warn("Error while checking the vm " + vm + " is on host " + destHost, e); + } + + migrated = true; + return vm; + } finally { + if (!migrated) { + s_logger.info("Migration was unsuccessful. Cleaning up: " + vm); + _alertMgr.sendAlert(alertType, srcHost.getDataCenterId(), srcHost.getPodId(), "Unable to migrate vm " + + vm.getInstanceName() + " from host " + srcHost.getName() + " in zone " + dc.getName() + + " and pod " + dc.getName(), "Migrate Command failed. Please check logs."); + try { + _agentMgr.send(destHostId, new Commands(cleanup(vm.getInstanceName())), null); + stateTransitTo(vm, Event.OperationFailed, srcHostId); + } catch (AgentUnavailableException e) { + s_logger.warn("Looks like the destination Host is unavailable for cleanup.", e); + } catch (NoTransitionException e) { + s_logger.error("Error while transitioning vm from migrating to running state.", e); + } + } + + work.setStep(Step.Done); + _workDao.update(work.getId(), work); + } + } + @Override public VirtualMachineTO toVmTO(VirtualMachineProfile profile) { HypervisorGuru hvGuru = _hvGuruMgr.getGuru(profile.getVirtualMachine().getHypervisorType()); @@ -1487,25 +1732,23 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac DeployDestination dest = null; while (true) { - for (DeploymentPlanner planner : _planners) { - if (planner.canHandle(profile, plan, excludes)) { - dest = planner.plan(profile, plan, excludes); - } else { - continue; - } - if (dest != null) { - if (s_logger.isDebugEnabled()) { - s_logger.debug("Planner " + planner + " found " + dest + " for migrating to."); - } - break; - } - if (s_logger.isDebugEnabled()) { - s_logger.debug("Planner " + planner + " was unable to find anything."); - } + try { + dest = _dpMgr.planDeployment(profile, plan, excludes); + } catch (AffinityConflictException e2) { + s_logger.warn("Unable to create deployment, affinity rules associted to the VM conflict", e2); + throw new CloudRuntimeException( + "Unable to create deployment, affinity rules associted to the VM conflict"); } - if (dest == null) { + if (dest != null) { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Found destination " + dest + " for migrating to."); + } + } else { + if (s_logger.isDebugEnabled()) { + s_logger.debug("Unable to find destination for migrating the vm " + profile); + } throw new InsufficientServerCapacityException("Unable to find a server to migrate to.", host.getClusterId()); } @@ -1559,7 +1802,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public boolean isVirtualMachineUpgradable(VirtualMachine vm, ServiceOffering offering) { - boolean isMachineUpgradable = true; + boolean isMachineUpgradable = true; for(HostAllocator allocator : _hostAllocators) { isMachineUpgradable = allocator.isVirtualMachineUpgradable(vm, offering); if(isMachineUpgradable) @@ -1628,7 +1871,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return new StopCommand(vmName); } - public Commands fullHostSync(final long hostId, StartupRoutingCommand startup) { + public Commands fullHostSync(final long hostId, StartupRoutingCommand startup) { Commands commands = new Commands(OnError.Continue); Map infos = convertToInfos(startup); @@ -1637,7 +1880,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac s_logger.debug("Found " + vms.size() + " VMs for host " + hostId); for (VMInstanceVO vm : vms) { AgentVmInfo info = infos.remove(vm.getId()); - + // sync VM Snapshots related transient states List vmSnapshotsInTrasientStates = _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging,VMSnapshot.State.Reverting, VMSnapshot.State.Creating); if(vmSnapshotsInTrasientStates.size() > 1){ @@ -1649,11 +1892,11 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac s_logger.info("Successfully sync VM with transient snapshot: " + vm.getInstanceName()); } } - + VMInstanceVO castedVm = null; if (info == null) { info = new AgentVmInfo(vm.getInstanceName(), getVmGuru(vm), vm, State.Stopped); - } + } castedVm = info.guru.findById(vm.getId()); HypervisorGuru hvGuru = _hvGuruMgr.getGuru(castedVm.getHypervisorType()); @@ -1767,7 +2010,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac for (VMInstanceVO vm : set_vms) { AgentVmInfo info = infos.remove(vm.getId()); VMInstanceVO castedVm = null; - + // sync VM Snapshots related transient states List vmSnapshotsInExpungingStates = _vmSnapshotDao.listByInstanceId(vm.getId(), VMSnapshot.State.Expunging, VMSnapshot.State.Creating,VMSnapshot.State.Reverting); if(vmSnapshotsInExpungingStates.size() > 0){ @@ -1785,9 +2028,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac s_logger.info("Successfully sync VM with transient snapshot: " + vm.getInstanceName()); } } - - if ((info == null && (vm.getState() == State.Running || vm.getState() == State.Starting )) - || (info != null && (info.state == State.Running && vm.getState() == State.Starting))) + + if ((info == null && (vm.getState() == State.Running || vm.getState() == State.Starting )) + || (info != null && (info.state == State.Running && vm.getState() == State.Starting))) { s_logger.info("Found vm " + vm.getInstanceName() + " in inconsistent state. " + vm.getState() + " on CS while " + (info == null ? "Stopped" : "Running") + " on agent"); info = new AgentVmInfo(vm.getInstanceName(), getVmGuru(vm), vm, State.Stopped); @@ -1925,7 +2168,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac return map; } - protected Map convertToInfos(StartupRoutingCommand cmd) { + protected Map convertToInfos(StartupRoutingCommand cmd) { final Map states = cmd.getVmStates(); final HashMap map = new HashMap(); if (states == null) { @@ -1989,7 +2232,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac * compareState does as its name suggests and compares the states between * management server and agent. It returns whether something should be * cleaned up - * + * */ protected Command compareState(long hostId, VMInstanceVO vm, final AgentVmInfo info, final boolean fullSync, boolean trackExternalChange) { State agentState = info.state; @@ -2192,7 +2435,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac List nics = _nicsDao.listByVmId(profile.getId()); for (NicVO nic : nics) { Network network = _networkModel.getNetwork(nic.getNetworkId()); - NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, + NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), null, _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(profile.getHypervisorType(), network)); profile.addNic(nicProfile); } @@ -2319,7 +2562,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac s_logger.fatal("The Cluster VM sync process failed for cluster id " + clusterId + " with ", e); } } - else { // for others KVM and VMWare + else { // for others KVM and VMWare StartupRoutingCommand startup = (StartupRoutingCommand) cmd; Commands commands = fullHostSync(agentId, startup); @@ -2492,7 +2735,7 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } @Override - public NicProfile addVmToNetwork(VirtualMachine vm, Network network, NicProfile requested) throws ConcurrentOperationException, + public NicProfile addVmToNetwork(VirtualMachine vm, Network network, NicProfile requested) throws ConcurrentOperationException, ResourceUnavailableException, InsufficientCapacityException { s_logger.debug("Adding vm " + vm + " to network " + network + "; requested nic profile " + requested); @@ -2502,14 +2745,14 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac } else { vmVO = _vmDao.findById(vm.getId()); } - ReservationContext context = new ReservationContextImpl(null, null, _accountMgr.getActiveUser(User.UID_SYSTEM), + ReservationContext context = new ReservationContextImpl(null, null, _accountMgr.getActiveUser(User.UID_SYSTEM), _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM)); - VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmVO, null, + VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmVO, null, null, null, null); DataCenter dc = _configMgr.getZone(network.getDataCenterId()); - Host host = _hostDao.findById(vm.getHostId()); + Host host = _hostDao.findById(vm.getHostId()); DeployDestination dest = new DeployDestination(dc, null, null, host); //check vm state @@ -2528,13 +2771,27 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac VirtualMachineGuru vmGuru = getVmGuru(vmVO); s_logger.debug("Plugging nic for vm " + vm + " in network " + network); - if (vmGuru.plugNic(network, nicTO, vmTO, context, dest)) { - s_logger.debug("Nic is plugged successfully for vm " + vm + " in network " + network + ". Vm is a part of network now"); - return nic; - } else { - s_logger.warn("Failed to plug nic to the vm " + vm + " in network " + network); - return null; - } + + boolean result = false; + try{ + result = vmGuru.plugNic(network, nicTO, vmTO, context, dest); + if (result) { + s_logger.debug("Nic is plugged successfully for vm " + vm + " in network " + network + ". Vm is a part of network now"); + long isDefault = (nic.isDefaultNic()) ? 1 : 0; + // insert nic's Id into DB as resource_name + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_ASSIGN, vmVO.getAccountId(), + vmVO.getDataCenterId(), vmVO.getId(), Long.toString(nic.getId()), nic.getNetworkId(), + null, isDefault, VirtualMachine.class.getName(), vmVO.getUuid()); + return nic; + } else { + s_logger.warn("Failed to plug nic to the vm " + vm + " in network " + network); + return null; + } + }finally{ + if(!result){ + _networkMgr.removeNic(vmProfile, _nicsDao.findById(nic.getId())); + } + } } else if (vm.getState() == State.Stopped) { //1) allocate nic return _networkMgr.createNicForVm(network, requested, context, vmProfile, false); @@ -2557,14 +2814,14 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac public boolean removeNicFromVm(VirtualMachine vm, NicVO nic) throws ConcurrentOperationException, ResourceUnavailableException { VMInstanceVO vmVO = _vmDao.findById(vm.getId()); NetworkVO network = _networkDao.findById(nic.getNetworkId()); - ReservationContext context = new ReservationContextImpl(null, null, _accountMgr.getActiveUser(User.UID_SYSTEM), + ReservationContext context = new ReservationContextImpl(null, null, _accountMgr.getActiveUser(User.UID_SYSTEM), _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM)); - VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmVO, null, + VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmVO, null, null, null, null); DataCenter dc = _configMgr.getZone(network.getDataCenterId()); - Host host = _hostDao.findById(vm.getHostId()); + Host host = _hostDao.findById(vm.getHostId()); DeployDestination dest = new DeployDestination(dc, null, null, host); VirtualMachineGuru vmGuru = getVmGuru(vmVO); HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vmProfile.getVirtualMachine().getHypervisorType()); @@ -2576,9 +2833,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac throw new CloudRuntimeException("Failed to remove nic from " + vm + " in " + network + ", nic is default."); } - NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), - _networkModel.getNetworkRate(network.getId(), vm.getId()), - _networkModel.isSecurityGroupSupportedInNetwork(network), + NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), + _networkModel.getNetworkRate(network.getId(), vm.getId()), + _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network)); //1) Unplug the nic @@ -2588,6 +2845,10 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac boolean result = vmGuru.unplugNic(network, nicTO, vmTO, context, dest); if (result) { s_logger.debug("Nic is unplugged successfully for vm " + vm + " in network " + network ); + long isDefault = (nic.isDefaultNic()) ? 1 : 0; + UsageEventUtils.publishUsageEvent(EventTypes.EVENT_NETWORK_OFFERING_REMOVE, vm.getAccountId(), vm.getDataCenterId(), + vm.getId(), Long.toString(nic.getId()), network.getNetworkOfferingId(), null, + isDefault, VirtualMachine.class.getName(), vm.getUuid()); } else { s_logger.warn("Failed to unplug nic for the vm " + vm + " from network " + network); return false; @@ -2611,14 +2872,14 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac @Override public boolean removeVmFromNetwork(VirtualMachine vm, Network network, URI broadcastUri) throws ConcurrentOperationException, ResourceUnavailableException { VMInstanceVO vmVO = _vmDao.findById(vm.getId()); - ReservationContext context = new ReservationContextImpl(null, null, _accountMgr.getActiveUser(User.UID_SYSTEM), + ReservationContext context = new ReservationContextImpl(null, null, _accountMgr.getActiveUser(User.UID_SYSTEM), _accountMgr.getAccount(Account.ACCOUNT_ID_SYSTEM)); - VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmVO, null, + VirtualMachineProfileImpl vmProfile = new VirtualMachineProfileImpl(vmVO, null, null, null, null); DataCenter dc = _configMgr.getZone(network.getDataCenterId()); - Host host = _hostDao.findById(vm.getHostId()); + Host host = _hostDao.findById(vm.getHostId()); DeployDestination dest = new DeployDestination(dc, null, null, host); VirtualMachineGuru vmGuru = getVmGuru(vmVO); HypervisorGuru hvGuru = _hvGuruMgr.getGuru(vmProfile.getVirtualMachine().getHypervisorType()); @@ -2643,9 +2904,9 @@ public class VirtualMachineManagerImpl extends ManagerBase implements VirtualMac throw new CloudRuntimeException("Failed to remove nic from " + vm + " in " + network + ", nic is default."); } - NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), - _networkModel.getNetworkRate(network.getId(), vm.getId()), - _networkModel.isSecurityGroupSupportedInNetwork(network), + NicProfile nicProfile = new NicProfile(nic, network, nic.getBroadcastUri(), nic.getIsolationUri(), + _networkModel.getNetworkRate(network.getId(), vm.getId()), + _networkModel.isSecurityGroupSupportedInNetwork(network), _networkModel.getNetworkTag(vmProfile.getVirtualMachine().getHypervisorType(), network)); //1) Unplug the nic diff --git a/server/src/com/cloud/vm/dao/NicDao.java b/server/src/com/cloud/vm/dao/NicDao.java index eb38a8d7a1b..67c1e07c70a 100644 --- a/server/src/com/cloud/vm/dao/NicDao.java +++ b/server/src/com/cloud/vm/dao/NicDao.java @@ -65,4 +65,5 @@ public interface NicDao extends GenericDao { List listPlaceholderNicsByNetworkId(long networkId); + List listPlaceholderNicsByNetworkIdAndVmType(long networkId, VirtualMachine.Type vmType); } diff --git a/server/src/com/cloud/vm/dao/NicDaoImpl.java b/server/src/com/cloud/vm/dao/NicDaoImpl.java index b427d4e23df..c70d19432ef 100644 --- a/server/src/com/cloud/vm/dao/NicDaoImpl.java +++ b/server/src/com/cloud/vm/dao/NicDaoImpl.java @@ -229,4 +229,13 @@ public class NicDaoImpl extends GenericDaoBase implements NicDao { return listBy(sc); } + @Override + public List listPlaceholderNicsByNetworkIdAndVmType(long networkId, VirtualMachine.Type vmType) { + SearchCriteria sc = AllFieldsSearch.create(); + sc.setParameters("network", networkId); + sc.setParameters("strategy", Nic.ReservationStrategy.PlaceHolder.toString()); + sc.setParameters("vmType", vmType); + return listBy(sc); + } + } diff --git a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java index 49228287f67..c2fd6481875 100755 --- a/server/src/com/cloud/vm/dao/UserVmDaoImpl.java +++ b/server/src/com/cloud/vm/dao/UserVmDaoImpl.java @@ -55,24 +55,24 @@ import com.cloud.vm.VirtualMachine.State; import com.cloud.vm.dao.UserVmData.NicData; import com.cloud.vm.dao.UserVmData.SecurityGroupData; - -@Local(value={UserVmDao.class}) -public class UserVmDaoImpl extends GenericDaoBase implements UserVmDao { - public static final Logger s_logger = Logger.getLogger(UserVmDaoImpl.class); - - protected SearchBuilder AccountPodSearch; - protected SearchBuilder AccountDataCenterSearch; - protected SearchBuilder AccountSearch; - protected SearchBuilder HostSearch; - protected SearchBuilder LastHostSearch; - protected SearchBuilder HostUpSearch; - protected SearchBuilder HostRunningSearch; - protected SearchBuilder StateChangeSearch; - protected SearchBuilder AccountHostSearch; - - protected SearchBuilder DestroySearch; - protected SearchBuilder AccountDataCenterVirtualSearch; - protected GenericSearchBuilder CountByAccountPod; + +@Local(value={UserVmDao.class}) +public class UserVmDaoImpl extends GenericDaoBase implements UserVmDao { + public static final Logger s_logger = Logger.getLogger(UserVmDaoImpl.class); + + protected SearchBuilder AccountPodSearch; + protected SearchBuilder AccountDataCenterSearch; + protected SearchBuilder AccountSearch; + protected SearchBuilder HostSearch; + protected SearchBuilder LastHostSearch; + protected SearchBuilder HostUpSearch; + protected SearchBuilder HostRunningSearch; + protected SearchBuilder StateChangeSearch; + protected SearchBuilder AccountHostSearch; + + protected SearchBuilder DestroySearch; + protected SearchBuilder AccountDataCenterVirtualSearch; + protected GenericSearchBuilder CountByAccountPod; protected GenericSearchBuilder CountByAccount; protected GenericSearchBuilder PodsHavingVmsForAccount; @@ -81,46 +81,46 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use protected Attribute _updateTimeAttr; // ResourceTagsDaoImpl _tagsDao = ComponentLocator.inject(ResourceTagsDaoImpl.class); @Inject ResourceTagDao _tagsDao; - - private static final String LIST_PODS_HAVING_VMS_FOR_ACCOUNT = "SELECT pod_id FROM cloud.vm_instance WHERE data_center_id = ? AND account_id = ? AND pod_id IS NOT NULL AND (state = 'Running' OR state = 'Stopped') " + - "GROUP BY pod_id HAVING count(id) > 0 ORDER BY count(id) DESC"; - - private static String VM_DETAILS = "select vm_instance.id, " + - "account.id, account.account_name, account.type, domain.name, instance_group.id, instance_group.name," + - "data_center.id, data_center.name, data_center.is_security_group_enabled, host.id, host.name, " + - "vm_template.id, vm_template.name, vm_template.display_text, iso.id, iso.name, " + - "vm_template.enable_password, service_offering.id, disk_offering.name, storage_pool.id, storage_pool.pool_type, " + - "service_offering.cpu, service_offering.speed, service_offering.ram_size, volumes.id, volumes.device_id, volumes.volume_type, security_group.id, security_group.name, " + - "security_group.description, nics.id, nics.ip4_address, nics.default_nic, nics.gateway, nics.network_id, nics.netmask, nics.mac_address, nics.broadcast_uri, nics.isolation_uri, " + - "networks.traffic_type, networks.guest_type, user_ip_address.id, user_ip_address.public_ip_address from vm_instance " + - "left join account on vm_instance.account_id=account.id " + - "left join domain on vm_instance.domain_id=domain.id " + - "left join instance_group_vm_map on vm_instance.id=instance_group_vm_map.instance_id " + - "left join instance_group on instance_group_vm_map.group_id=instance_group.id " + - "left join data_center on vm_instance.data_center_id=data_center.id " + - "left join host on vm_instance.host_id=host.id " + - "left join vm_template on vm_instance.vm_template_id=vm_template.id " + - "left join user_vm on vm_instance.id=user_vm.id " + - "left join vm_template iso on iso.id=user_vm.iso_id " + - "left join service_offering on vm_instance.service_offering_id=service_offering.id " + - "left join disk_offering on vm_instance.service_offering_id=disk_offering.id " + - "left join volumes on vm_instance.id=volumes.instance_id " + - "left join storage_pool on volumes.pool_id=storage_pool.id " + - "left join security_group_vm_map on vm_instance.id=security_group_vm_map.instance_id " + - "left join security_group on security_group_vm_map.security_group_id=security_group.id " + - "left join nics on vm_instance.id=nics.instance_id " + - "left join networks on nics.network_id=networks.id " + - "left join user_ip_address on user_ip_address.vm_id=vm_instance.id " + - "where vm_instance.id in ("; - - private static final int VM_DETAILS_BATCH_SIZE=100; - - @Inject protected UserVmDetailsDao _detailsDao; - @Inject protected NicDao _nicDao; - - public UserVmDaoImpl() { + + private static final String LIST_PODS_HAVING_VMS_FOR_ACCOUNT = "SELECT pod_id FROM cloud.vm_instance WHERE data_center_id = ? AND account_id = ? AND pod_id IS NOT NULL AND (state = 'Running' OR state = 'Stopped') " + + "GROUP BY pod_id HAVING count(id) > 0 ORDER BY count(id) DESC"; + + private static String VM_DETAILS = "select vm_instance.id, " + + "account.id, account.account_name, account.type, domain.name, instance_group.id, instance_group.name," + + "data_center.id, data_center.name, data_center.is_security_group_enabled, host.id, host.name, " + + "vm_template.id, vm_template.name, vm_template.display_text, iso.id, iso.name, " + + "vm_template.enable_password, service_offering.id, disk_offering.name, storage_pool.id, storage_pool.pool_type, " + + "service_offering.cpu, service_offering.speed, service_offering.ram_size, volumes.id, volumes.device_id, volumes.volume_type, security_group.id, security_group.name, " + + "security_group.description, nics.id, nics.ip4_address, nics.default_nic, nics.gateway, nics.network_id, nics.netmask, nics.mac_address, nics.broadcast_uri, nics.isolation_uri, " + + "networks.traffic_type, networks.guest_type, user_ip_address.id, user_ip_address.public_ip_address from vm_instance " + + "left join account on vm_instance.account_id=account.id " + + "left join domain on vm_instance.domain_id=domain.id " + + "left join instance_group_vm_map on vm_instance.id=instance_group_vm_map.instance_id " + + "left join instance_group on instance_group_vm_map.group_id=instance_group.id " + + "left join data_center on vm_instance.data_center_id=data_center.id " + + "left join host on vm_instance.host_id=host.id " + + "left join vm_template on vm_instance.vm_template_id=vm_template.id " + + "left join user_vm on vm_instance.id=user_vm.id " + + "left join vm_template iso on iso.id=user_vm.iso_id " + + "left join service_offering on vm_instance.service_offering_id=service_offering.id " + + "left join disk_offering on vm_instance.service_offering_id=disk_offering.id " + + "left join volumes on vm_instance.id=volumes.instance_id " + + "left join storage_pool on volumes.pool_id=storage_pool.id " + + "left join security_group_vm_map on vm_instance.id=security_group_vm_map.instance_id " + + "left join security_group on security_group_vm_map.security_group_id=security_group.id " + + "left join nics on vm_instance.id=nics.instance_id " + + "left join networks on nics.network_id=networks.id " + + "left join user_ip_address on user_ip_address.vm_id=vm_instance.id " + + "where vm_instance.id in ("; + + private static final int VM_DETAILS_BATCH_SIZE=100; + + @Inject protected UserVmDetailsDao _detailsDao; + @Inject protected NicDao _nicDao; + + public UserVmDaoImpl() { } - + @PostConstruct void init() { AccountSearch = createSearchBuilder(); @@ -203,56 +203,56 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use _updateTimeAttr = _allAttributes.get("updateTime"); assert _updateTimeAttr != null : "Couldn't get this updateTime attribute"; - } - - @Override - public List listByAccountAndPod(long accountId, long podId) { - SearchCriteria sc = AccountPodSearch.create(); - sc.setParameters("account", accountId); - sc.setParameters("pod", podId); - - return listIncludingRemovedBy(sc); - } - - @Override - public List listByAccountAndDataCenter(long accountId, long dcId) { - SearchCriteria sc = AccountDataCenterSearch.create(); - sc.setParameters("account", accountId); - sc.setParameters("dc", dcId); - - return listIncludingRemovedBy(sc); - } - - @Override - public void updateVM(long id, String displayName, boolean enable, Long osTypeId, String userData) { - UserVmVO vo = createForUpdate(); - vo.setDisplayName(displayName); - vo.setHaEnabled(enable); - vo.setGuestOSId(osTypeId); - vo.setUserData(userData); - update(id, vo); - } - - @Override - public List findDestroyedVms(Date date) { - SearchCriteria sc = DestroySearch.create(); - sc.setParameters("state", State.Destroyed, State.Expunging, State.Error); - sc.setParameters("updateTime", date); - - return listBy(sc); - } - - @Override - public List listByAccountId(long id) { - SearchCriteria sc = AccountSearch.create(); - sc.setParameters("account", id); - return listBy(sc); - } - - @Override - public List listByHostId(Long id) { - SearchCriteria sc = HostSearch.create(); - sc.setParameters("host", id); + } + + @Override + public List listByAccountAndPod(long accountId, long podId) { + SearchCriteria sc = AccountPodSearch.create(); + sc.setParameters("account", accountId); + sc.setParameters("pod", podId); + + return listIncludingRemovedBy(sc); + } + + @Override + public List listByAccountAndDataCenter(long accountId, long dcId) { + SearchCriteria sc = AccountDataCenterSearch.create(); + sc.setParameters("account", accountId); + sc.setParameters("dc", dcId); + + return listIncludingRemovedBy(sc); + } + + @Override + public void updateVM(long id, String displayName, boolean enable, Long osTypeId, String userData) { + UserVmVO vo = createForUpdate(); + vo.setDisplayName(displayName); + vo.setHaEnabled(enable); + vo.setGuestOSId(osTypeId); + vo.setUserData(userData); + update(id, vo); + } + + @Override + public List findDestroyedVms(Date date) { + SearchCriteria sc = DestroySearch.create(); + sc.setParameters("state", State.Destroyed, State.Expunging, State.Error); + sc.setParameters("updateTime", date); + + return listBy(sc); + } + + @Override + public List listByAccountId(long id) { + SearchCriteria sc = AccountSearch.create(); + sc.setParameters("account", id); + return listBy(sc); + } + + @Override + public List listByHostId(Long id) { + SearchCriteria sc = HostSearch.create(); + sc.setParameters("host", id); return listBy(sc); } @@ -267,311 +267,311 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use @Override public List listUpByHostId(Long hostId) { SearchCriteria sc = HostUpSearch.create(); - sc.setParameters("host", hostId); - sc.setParameters("states", new Object[] {State.Destroyed, State.Stopped, State.Expunging}); - return listBy(sc); - } - - @Override - public List listRunningByHostId(long hostId) { - SearchCriteria sc = HostRunningSearch.create(); - sc.setParameters("host", hostId); - sc.setParameters("state", State.Running); - - return listBy(sc); - } - - @Override - public List listVirtualNetworkInstancesByAcctAndZone(long accountId, long dcId, long networkId) { - - SearchCriteria sc = AccountDataCenterVirtualSearch.create(); - sc.setParameters("account", accountId); - sc.setParameters("dc", dcId); - sc.setJoinParameters("nicSearch", "networkId", networkId); - - return listBy(sc); - } - - @Override - public List listByNetworkIdAndStates(long networkId, State... states) { - if (UserVmSearch == null) { - SearchBuilder nicSearch = _nicDao.createSearchBuilder(); - nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ); + sc.setParameters("host", hostId); + sc.setParameters("states", new Object[] {State.Destroyed, State.Stopped, State.Expunging}); + return listBy(sc); + } + + @Override + public List listRunningByHostId(long hostId) { + SearchCriteria sc = HostRunningSearch.create(); + sc.setParameters("host", hostId); + sc.setParameters("state", State.Running); + + return listBy(sc); + } + + @Override + public List listVirtualNetworkInstancesByAcctAndZone(long accountId, long dcId, long networkId) { + + SearchCriteria sc = AccountDataCenterVirtualSearch.create(); + sc.setParameters("account", accountId); + sc.setParameters("dc", dcId); + sc.setJoinParameters("nicSearch", "networkId", networkId); + + return listBy(sc); + } + + @Override + public List listByNetworkIdAndStates(long networkId, State... states) { + if (UserVmSearch == null) { + SearchBuilder nicSearch = _nicDao.createSearchBuilder(); + nicSearch.and("networkId", nicSearch.entity().getNetworkId(), SearchCriteria.Op.EQ); nicSearch.and().op("ip4Address", nicSearch.entity().getIp4Address(), SearchCriteria.Op.NNULL); nicSearch.or("ip6Address", nicSearch.entity().getIp6Address(), SearchCriteria.Op.NNULL); nicSearch.cp(); - - UserVmSearch = createSearchBuilder(); - UserVmSearch.and("states", UserVmSearch.entity().getState(), SearchCriteria.Op.IN); - UserVmSearch.join("nicSearch", nicSearch, UserVmSearch.entity().getId(), nicSearch.entity().getInstanceId(), JoinBuilder.JoinType.INNER); - UserVmSearch.done(); - } - - SearchCriteria sc = UserVmSearch.create(); - if (states != null && states.length != 0) { - sc.setParameters("states", (Object[]) states); - } - sc.setJoinParameters("nicSearch", "networkId", networkId); - - return listBy(sc); - } - - @Override - public List listByLastHostId(Long hostId) { - SearchCriteria sc = LastHostSearch.create(); - sc.setParameters("lastHost", hostId); - sc.setParameters("state", State.Stopped); - return listBy(sc); - } - - @Override - public List listByAccountIdAndHostId(long accountId, long hostId) { - SearchCriteria sc = AccountHostSearch.create(); - sc.setParameters("hostId", hostId); - sc.setParameters("accountId", accountId); - return listBy(sc); - } - - @Override - public void loadDetails(UserVmVO vm) { - Map details = _detailsDao.findDetails(vm.getId()); - vm.setDetails(details); - } - - @Override - public void saveDetails(UserVmVO vm) { - Map details = vm.getDetails(); - if (details == null) { - return; - } - _detailsDao.persist(vm.getId(), details); - } - - @Override - public List listPodIdsHavingVmsforAccount(long zoneId, long accountId){ - Transaction txn = Transaction.currentTxn(); - PreparedStatement pstmt = null; - List result = new ArrayList(); - - try { - String sql = LIST_PODS_HAVING_VMS_FOR_ACCOUNT; - pstmt = txn.prepareAutoCloseStatement(sql); - pstmt.setLong(1, zoneId); - pstmt.setLong(2, accountId); - - ResultSet rs = pstmt.executeQuery(); - while (rs.next()) { - result.add(rs.getLong(1)); - } - return result; - } catch (SQLException e) { - throw new CloudRuntimeException("DB Exception on: " + LIST_PODS_HAVING_VMS_FOR_ACCOUNT, e); - } catch (Throwable e) { - throw new CloudRuntimeException("Caught: " + LIST_PODS_HAVING_VMS_FOR_ACCOUNT, e); - } - } - - @Override - public Hashtable listVmDetails(Hashtable userVmDataHash){ - Transaction txn = Transaction.currentTxn(); - PreparedStatement pstmt = null; - - try { - int curr_index=0; - - List userVmDataList = new ArrayList(userVmDataHash.values()); - - if (userVmDataList.size() > VM_DETAILS_BATCH_SIZE){ - pstmt = txn.prepareStatement(VM_DETAILS + getQueryBatchAppender(VM_DETAILS_BATCH_SIZE)); - while ( (curr_index + VM_DETAILS_BATCH_SIZE) <= userVmDataList.size()){ - // set the vars value - for (int k=1,j=curr_index;j 0){ - userVmData.setGroupId(grp_id); - userVmData.setGroup(rs.getString("instance_group.name")); - } - - //"data_center.id, data_center.name, host.id, host.name, vm_template.id, vm_template.name, vm_template.display_text, vm_template.enable_password, - userVmData.setZoneId(rs.getLong("data_center.id")); - userVmData.setZoneName(rs.getString("data_center.name")); - - userVmData.setHostId(rs.getLong("host.id")); - userVmData.setHostName(rs.getString("host.name")); - - long template_id = rs.getLong("vm_template.id"); - if (template_id > 0){ - userVmData.setTemplateId(template_id); - userVmData.setTemplateName(rs.getString("vm_template.name")); - userVmData.setTemplateDisplayText(rs.getString("vm_template.display_text")); - userVmData.setPasswordEnabled(rs.getBoolean("vm_template.enable_password")); - } - else { - userVmData.setTemplateId(-1L); - userVmData.setTemplateName("ISO Boot"); - userVmData.setTemplateDisplayText("ISO Boot"); - userVmData.setPasswordEnabled(false); - } - - long iso_id = rs.getLong("iso.id"); - if (iso_id > 0){ - userVmData.setIsoId(iso_id); - userVmData.setIsoName(rs.getString("iso.name")); - } - - - //service_offering.id, disk_offering.name, " - //"service_offering.cpu, service_offering.speed, service_offering.ram_size, - userVmData.setServiceOfferingId(rs.getLong("service_offering.id")); - userVmData.setServiceOfferingName(rs.getString("disk_offering.name")); - userVmData.setCpuNumber(rs.getInt("service_offering.cpu")); - userVmData.setCpuSpeed(rs.getInt("service_offering.speed")); - userVmData.setMemory(rs.getInt("service_offering.ram_size")); - - // volumes.device_id, volumes.volume_type, - long vol_id = rs.getLong("volumes.id"); - if (vol_id > 0){ - userVmData.setRootDeviceId(rs.getLong("volumes.device_id")); - userVmData.setRootDeviceType(rs.getString("volumes.volume_type")); - // storage pool - long pool_id = rs.getLong("storage_pool.id"); - if (pool_id > 0){ - userVmData.setRootDeviceType(rs.getString("storage_pool.pool_type")); - } - else { - userVmData.setRootDeviceType("Not created"); - } - } - userVmData.setInitialized(); - } - - - Long securityGroupId = rs.getLong("security_group.id"); - if (securityGroupId != null && securityGroupId.longValue() != 0){ - SecurityGroupData resp = userVmData.newSecurityGroupData(); - resp.setId(rs.getLong("security_group.id")); - resp.setName(rs.getString("security_group.name")); - resp.setDescription(rs.getString("security_group.description")); - resp.setObjectName("securitygroup"); - userVmData.addSecurityGroup(resp); - } - - long nic_id = rs.getLong("nics.id"); - if (nic_id > 0){ - NicData nicResponse = userVmData.newNicData(); - nicResponse.setId(nic_id); - nicResponse.setIpaddress(rs.getString("nics.ip4_address")); - nicResponse.setGateway(rs.getString("nics.gateway")); - nicResponse.setNetmask(rs.getString("nics.netmask")); - nicResponse.setNetworkid(rs.getLong("nics.network_id")); - nicResponse.setMacAddress(rs.getString("nics.mac_address")); - - int account_type = rs.getInt("account.type"); - if (account_type == Account.ACCOUNT_TYPE_ADMIN) { - nicResponse.setBroadcastUri(rs.getString("nics.broadcast_uri")); - nicResponse.setIsolationUri(rs.getString("nics.isolation_uri")); - } - - - nicResponse.setTrafficType(rs.getString("networks.traffic_type")); - nicResponse.setType(rs.getString("networks.guest_type")); - nicResponse.setIsDefault(rs.getBoolean("nics.default_nic")); - nicResponse.setObjectName("nic"); - userVmData.addNic(nicResponse); - } - - long publicIpId = rs.getLong("user_ip_address.id"); - if (publicIpId > 0){ - userVmData.setPublicIpId(publicIpId); - userVmData.setPublicIp(rs.getString("user_ip_address.public_ip_address")); - } - - return userVmData; - } - - public String getQueryBatchAppender(int count){ - StringBuilder sb = new StringBuilder(); - for (int i=0;i sc = CountByAccount.create(); - sc.setParameters("account", accountId); - sc.setParameters("type", VirtualMachine.Type.User); - sc.setParameters("state", new Object[] {State.Destroyed, State.Error, State.Expunging}); - return customSearch(sc, null).get(0); - } - + + UserVmSearch = createSearchBuilder(); + UserVmSearch.and("states", UserVmSearch.entity().getState(), SearchCriteria.Op.IN); + UserVmSearch.join("nicSearch", nicSearch, UserVmSearch.entity().getId(), nicSearch.entity().getInstanceId(), JoinBuilder.JoinType.INNER); + UserVmSearch.done(); + } + + SearchCriteria sc = UserVmSearch.create(); + if (states != null && states.length != 0) { + sc.setParameters("states", (Object[]) states); + } + sc.setJoinParameters("nicSearch", "networkId", networkId); + + return listBy(sc); + } + + @Override + public List listByLastHostId(Long hostId) { + SearchCriteria sc = LastHostSearch.create(); + sc.setParameters("lastHost", hostId); + sc.setParameters("state", State.Stopped); + return listBy(sc); + } + + @Override + public List listByAccountIdAndHostId(long accountId, long hostId) { + SearchCriteria sc = AccountHostSearch.create(); + sc.setParameters("hostId", hostId); + sc.setParameters("accountId", accountId); + return listBy(sc); + } + + @Override + public void loadDetails(UserVmVO vm) { + Map details = _detailsDao.findDetails(vm.getId()); + vm.setDetails(details); + } + + @Override + public void saveDetails(UserVmVO vm) { + Map details = vm.getDetails(); + if (details == null) { + return; + } + _detailsDao.persist(vm.getId(), details); + } + + @Override + public List listPodIdsHavingVmsforAccount(long zoneId, long accountId){ + Transaction txn = Transaction.currentTxn(); + PreparedStatement pstmt = null; + List result = new ArrayList(); + + try { + String sql = LIST_PODS_HAVING_VMS_FOR_ACCOUNT; + pstmt = txn.prepareAutoCloseStatement(sql); + pstmt.setLong(1, zoneId); + pstmt.setLong(2, accountId); + + ResultSet rs = pstmt.executeQuery(); + while (rs.next()) { + result.add(rs.getLong(1)); + } + return result; + } catch (SQLException e) { + throw new CloudRuntimeException("DB Exception on: " + LIST_PODS_HAVING_VMS_FOR_ACCOUNT, e); + } catch (Throwable e) { + throw new CloudRuntimeException("Caught: " + LIST_PODS_HAVING_VMS_FOR_ACCOUNT, e); + } + } + + @Override + public Hashtable listVmDetails(Hashtable userVmDataHash){ + Transaction txn = Transaction.currentTxn(); + PreparedStatement pstmt = null; + + try { + int curr_index=0; + + List userVmDataList = new ArrayList(userVmDataHash.values()); + + if (userVmDataList.size() > VM_DETAILS_BATCH_SIZE){ + pstmt = txn.prepareStatement(VM_DETAILS + getQueryBatchAppender(VM_DETAILS_BATCH_SIZE)); + while ( (curr_index + VM_DETAILS_BATCH_SIZE) <= userVmDataList.size()){ + // set the vars value + for (int k=1,j=curr_index;j 0){ + userVmData.setGroupId(grp_id); + userVmData.setGroup(rs.getString("instance_group.name")); + } + + //"data_center.id, data_center.name, host.id, host.name, vm_template.id, vm_template.name, vm_template.display_text, vm_template.enable_password, + userVmData.setZoneId(rs.getLong("data_center.id")); + userVmData.setZoneName(rs.getString("data_center.name")); + + userVmData.setHostId(rs.getLong("host.id")); + userVmData.setHostName(rs.getString("host.name")); + + long template_id = rs.getLong("vm_template.id"); + if (template_id > 0){ + userVmData.setTemplateId(template_id); + userVmData.setTemplateName(rs.getString("vm_template.name")); + userVmData.setTemplateDisplayText(rs.getString("vm_template.display_text")); + userVmData.setPasswordEnabled(rs.getBoolean("vm_template.enable_password")); + } + else { + userVmData.setTemplateId(-1L); + userVmData.setTemplateName("ISO Boot"); + userVmData.setTemplateDisplayText("ISO Boot"); + userVmData.setPasswordEnabled(false); + } + + long iso_id = rs.getLong("iso.id"); + if (iso_id > 0){ + userVmData.setIsoId(iso_id); + userVmData.setIsoName(rs.getString("iso.name")); + } + + + //service_offering.id, disk_offering.name, " + //"service_offering.cpu, service_offering.speed, service_offering.ram_size, + userVmData.setServiceOfferingId(rs.getLong("service_offering.id")); + userVmData.setServiceOfferingName(rs.getString("disk_offering.name")); + userVmData.setCpuNumber(rs.getInt("service_offering.cpu")); + userVmData.setCpuSpeed(rs.getInt("service_offering.speed")); + userVmData.setMemory(rs.getInt("service_offering.ram_size")); + + // volumes.device_id, volumes.volume_type, + long vol_id = rs.getLong("volumes.id"); + if (vol_id > 0){ + userVmData.setRootDeviceId(rs.getLong("volumes.device_id")); + userVmData.setRootDeviceType(rs.getString("volumes.volume_type")); + // storage pool + long pool_id = rs.getLong("storage_pool.id"); + if (pool_id > 0){ + userVmData.setRootDeviceType(rs.getString("storage_pool.pool_type")); + } + else { + userVmData.setRootDeviceType("Not created"); + } + } + userVmData.setInitialized(); + } + + + Long securityGroupId = rs.getLong("security_group.id"); + if (securityGroupId != null && securityGroupId.longValue() != 0){ + SecurityGroupData resp = userVmData.newSecurityGroupData(); + resp.setId(rs.getLong("security_group.id")); + resp.setName(rs.getString("security_group.name")); + resp.setDescription(rs.getString("security_group.description")); + resp.setObjectName("securitygroup"); + userVmData.addSecurityGroup(resp); + } + + long nic_id = rs.getLong("nics.id"); + if (nic_id > 0){ + NicData nicResponse = userVmData.newNicData(); + nicResponse.setId(nic_id); + nicResponse.setIpaddress(rs.getString("nics.ip4_address")); + nicResponse.setGateway(rs.getString("nics.gateway")); + nicResponse.setNetmask(rs.getString("nics.netmask")); + nicResponse.setNetworkid(rs.getLong("nics.network_id")); + nicResponse.setMacAddress(rs.getString("nics.mac_address")); + + int account_type = rs.getInt("account.type"); + if (account_type == Account.ACCOUNT_TYPE_ADMIN) { + nicResponse.setBroadcastUri(rs.getString("nics.broadcast_uri")); + nicResponse.setIsolationUri(rs.getString("nics.isolation_uri")); + } + + + nicResponse.setTrafficType(rs.getString("networks.traffic_type")); + nicResponse.setType(rs.getString("networks.guest_type")); + nicResponse.setIsDefault(rs.getBoolean("nics.default_nic")); + nicResponse.setObjectName("nic"); + userVmData.addNic(nicResponse); + } + + long publicIpId = rs.getLong("user_ip_address.id"); + if (publicIpId > 0){ + userVmData.setPublicIpId(publicIpId); + userVmData.setPublicIp(rs.getString("user_ip_address.public_ip_address")); + } + + return userVmData; + } + + public String getQueryBatchAppender(int count){ + StringBuilder sb = new StringBuilder(); + for (int i=0;i sc = CountByAccount.create(); + sc.setParameters("account", accountId); + sc.setParameters("type", VirtualMachine.Type.User); + sc.setParameters("state", new Object[] {State.Destroyed, State.Error, State.Expunging}); + return customSearch(sc, null).get(0); + } + @Override public boolean remove(Long id) { Transaction txn = Transaction.currentTxn(); @@ -580,6 +580,6 @@ public class UserVmDaoImpl extends GenericDaoBase implements Use boolean result = super.remove(id); txn.commit(); return result; - } - -} + } + +} diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java index 638be6c0c9b..86871635b02 100644 --- a/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java +++ b/server/src/com/cloud/vm/snapshot/VMSnapshotManagerImpl.java @@ -59,6 +59,7 @@ import com.cloud.host.Host; import com.cloud.host.HostVO; import com.cloud.host.dao.HostDao; import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao; import com.cloud.hypervisor.HypervisorGuruManager; import com.cloud.projects.Project.ListProjectResourcesCriteria; import com.cloud.storage.GuestOSVO; @@ -119,7 +120,9 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana @Inject VirtualMachineManager _itMgr; @Inject DataStoreManager dataStoreMgr; @Inject ConfigurationDao _configDao; + @Inject HypervisorCapabilitiesDao _hypervisorCapabilitiesDao; int _vmSnapshotMax; + int _wait; StateMachine2 _vmSnapshottateMachine ; @Override @@ -131,6 +134,9 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana } _vmSnapshotMax = NumbersUtil.parseInt(_configDao.getValue("vmsnapshot.max"), VMSNAPSHOTMAX); + + String value = _configDao.getValue("vmsnapshot.create.wait"); + _wait = NumbersUtil.parseInt(value, 1800); _vmSnapshottateMachine = VMSnapshot.State.getStateMachine(); return true; @@ -240,7 +246,11 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana if (userVmVo == null) { throw new InvalidParameterValueException("Creating VM snapshot failed due to VM:" + vmId + " is a system VM or does not exist"); } - + + // check hypervisor capabilities + if(!_hypervisorCapabilitiesDao.isVmSnapshotEnabled(userVmVo.getHypervisorType(), "default")) + throw new InvalidParameterValueException("VM snapshot is not enabled for hypervisor type: " + userVmVo.getHypervisorType()); + // parameter length check if(vsDisplayName != null && vsDisplayName.length()>255) throw new InvalidParameterValueException("Creating VM snapshot failed due to length of VM snapshot vsDisplayName should not exceed 255"); @@ -361,6 +371,7 @@ public class VMSnapshotManagerImpl extends ManagerBase implements VMSnapshotMana vmSnapshot.setParent(current.getId()); CreateVMSnapshotCommand ccmd = new CreateVMSnapshotCommand(userVm.getInstanceName(),target ,volumeTOs, guestOS.getDisplayName(),userVm.getState()); + ccmd.setWait(_wait); answer = (CreateVMSnapshotAnswer) sendToPool(hostId, ccmd); if (answer != null && answer.getResult()) { diff --git a/server/src/com/cloud/vm/snapshot/VMSnapshotVO.java b/server/src/com/cloud/vm/snapshot/VMSnapshotVO.java deleted file mode 100644 index 03d4945fda0..00000000000 --- a/server/src/com/cloud/vm/snapshot/VMSnapshotVO.java +++ /dev/null @@ -1,224 +0,0 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package com.cloud.vm.snapshot; - -import java.util.Date; -import java.util.UUID; - -import javax.persistence.Column; -import javax.persistence.Entity; -import javax.persistence.EnumType; -import javax.persistence.Enumerated; -import javax.persistence.GeneratedValue; -import javax.persistence.GenerationType; -import javax.persistence.Id; -import javax.persistence.Table; -import javax.persistence.TableGenerator; -import javax.persistence.Temporal; -import javax.persistence.TemporalType; - -import com.cloud.utils.db.GenericDao; - -@Entity -@Table(name = "vm_snapshots") -public class VMSnapshotVO implements VMSnapshot { - @Id - @TableGenerator(name = "vm_snapshots_sq", table = "sequence", pkColumnName = "name", valueColumnName = "value", pkColumnValue = "vm_snapshots_seq", allocationSize = 1) - @GeneratedValue(strategy = GenerationType.TABLE) - @Column(name = "id") - long id; - - @Column(name = "uuid") - String uuid = UUID.randomUUID().toString(); - - @Column(name = "name") - String name; - - @Column(name = "display_name") - String displayName; - - @Column(name = "description") - String description; - - @Column(name = "vm_id") - long vmId; - - @Column(name = "account_id") - long accountId; - - @Column(name = "domain_id") - long domainId; - - @Column(name = "vm_snapshot_type") - @Enumerated(EnumType.STRING) - VMSnapshot.Type type; - - @Column(name = "state", updatable = true, nullable = false) - @Enumerated(value = EnumType.STRING) - private State state; - - @Column(name = GenericDao.CREATED_COLUMN) - Date created; - - @Column(name = GenericDao.REMOVED_COLUMN) - Date removed; - - @Column(name = "current") - Boolean current; - - @Column(name = "parent") - Long parent; - - @Column(name = "updated") - @Temporal(value = TemporalType.TIMESTAMP) - Date updated; - - @Column(name="update_count", updatable = true, nullable=false) - protected long updatedCount; - - public Long getParent() { - return parent; - } - - public void setParent(Long parent) { - this.parent = parent; - } - - public VMSnapshotVO() { - - } - - public Date getRemoved() { - return removed; - } - - public VMSnapshotVO(Long accountId, Long domainId, Long vmId, - String description, String vmSnapshotName, String vsDisplayName, - Long serviceOfferingId, Type type, Boolean current) { - this.accountId = accountId; - this.domainId = domainId; - this.vmId = vmId; - this.state = State.Allocated; - this.description = description; - this.name = vmSnapshotName; - this.displayName = vsDisplayName; - this.type = type; - this.current = current; - } - - public String getDescription() { - return description; - } - - @Override - public Date getCreated() { - return created; - } - - public void setCreated(Date created) { - this.created = created; - } - - @Override - public long getId() { - return id; - } - - @Override - public Long getVmId() { - return vmId; - } - - public void setVmId(Long vmId) { - this.vmId = vmId; - } - - @Override - public String getName() { - return name; - } - - public void setName(String name) { - this.name = name; - } - - @Override - public State getState() { - return state; - } - - public void setState(State state) { - this.state = state; - } - - @Override - public String getUuid() { - return uuid; - } - - @Override - public long getAccountId() { - return accountId; - } - - @Override - public long getDomainId() { - return domainId; - } - - @Override - public String getDisplayName() { - return displayName; - } - - public void setDisplayName(String displayName) { - this.displayName = displayName; - } - - public Boolean getCurrent() { - return current; - } - - public void setCurrent(Boolean current) { - this.current = current; - } - - @Override - public long getUpdatedCount() { - return updatedCount; - } - - @Override - public void incrUpdatedCount() { - this.updatedCount++; - } - - @Override - public Date getUpdated() { - return updated; - } - - @Override - public Type getType() { - return type; - } - - public void setRemoved(Date removed) { - this.removed = removed; - } -} diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java new file mode 100644 index 00000000000..fc2cfcf8d95 --- /dev/null +++ b/server/src/org/apache/cloudstack/affinity/AffinityGroupServiceImpl.java @@ -0,0 +1,346 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import java.util.ArrayList; +import java.util.HashMap; +import java.util.List; +import java.util.Map; +import java.util.Map.Entry; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +import org.apache.cloudstack.affinity.dao.AffinityGroupDao; +import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; +import org.apache.log4j.Logger; +import org.springframework.context.annotation.Primary; + + +import com.cloud.deploy.DeploymentPlanner; +import com.cloud.event.ActionEvent; +import com.cloud.event.EventTypes; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceInUseException; +import com.cloud.network.security.SecurityGroup; +import com.cloud.user.Account; +import com.cloud.user.AccountManager; +import com.cloud.user.UserContext; +import com.cloud.uservm.UserVm; +import com.cloud.utils.Pair; +import com.cloud.utils.component.ComponentContext; +import com.cloud.utils.component.Manager; +import com.cloud.utils.component.ManagerBase; +import com.cloud.utils.db.DB; +import com.cloud.utils.db.Filter; +import com.cloud.utils.db.JoinBuilder; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.Transaction; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.fsm.StateListener; +import com.cloud.vm.UserVmVO; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachine.Event; +import com.cloud.vm.VirtualMachine.State; +import com.cloud.vm.dao.UserVmDao; + +@Local(value = { AffinityGroupService.class }) +public class AffinityGroupServiceImpl extends ManagerBase implements AffinityGroupService, Manager, + StateListener { + + public static final Logger s_logger = Logger.getLogger(AffinityGroupServiceImpl.class); + private String _name; + + @Inject + AccountManager _accountMgr; + + @Inject + AffinityGroupDao _affinityGroupDao; + + @Inject + AffinityGroupVMMapDao _affinityGroupVMMapDao; + + @Inject + private UserVmDao _userVmDao; + + @Override + @ActionEvent(eventType = EventTypes.EVENT_AFFINITY_GROUP_CREATE, eventDescription = "Creating Affinity Group", create = true) + public AffinityGroup createAffinityGroup(String account, Long domainId, String affinityGroupName, + String affinityGroupType, String description) { + + Account caller = UserContext.current().getCaller(); + Account owner = _accountMgr.finalizeOwner(caller, account, domainId, null); + + if (_affinityGroupDao.isNameInUse(owner.getAccountId(), owner.getDomainId(), affinityGroupName)) { + throw new InvalidParameterValueException("Unable to create affinity group, a group with name " + + affinityGroupName + + " already exisits."); + } + + + //validate the affinityGroupType + Map typeProcessorMap = getAffinityTypeToProcessorMap(); + if (typeProcessorMap != null && !typeProcessorMap.isEmpty()) { + if (!typeProcessorMap.containsKey(affinityGroupType)) { + throw new InvalidParameterValueException("Unable to create affinity group, invalid affinity group type" + + affinityGroupType); + } + } else { + throw new InvalidParameterValueException( + "Unable to create affinity group, no Affinity Group Types configured"); + } + + if (domainId == null) { + domainId = owner.getDomainId(); + } + + AffinityGroupVO group = new AffinityGroupVO(affinityGroupName, affinityGroupType, description, domainId, + owner.getId()); + _affinityGroupDao.persist(group); + + if (s_logger.isDebugEnabled()) { + s_logger.debug("Created affinity group =" + affinityGroupName); + } + + return group; + } + + @DB + @Override + @ActionEvent(eventType = EventTypes.EVENT_AFFINITY_GROUP_DELETE, eventDescription = "Deleting affinity group") + public boolean deleteAffinityGroup(Long affinityGroupId, String account, Long domainId, String affinityGroupName) + throws ResourceInUseException { + + Account caller = UserContext.current().getCaller(); + Account owner = _accountMgr.finalizeOwner(caller, account, domainId, null); + + AffinityGroupVO group = null; + if (affinityGroupId != null) { + group = _affinityGroupDao.findById(affinityGroupId); + if (group == null) { + throw new InvalidParameterValueException("Unable to find affinity group: " + affinityGroupId + + "; failed to delete group."); + } + } else if (affinityGroupName != null) { + group = _affinityGroupDao.findByAccountAndName(owner.getAccountId(), affinityGroupName); + if (group == null) { + throw new InvalidParameterValueException("Unable to find affinity group: " + affinityGroupName + + "; failed to delete group."); + } + } else { + throw new InvalidParameterValueException( + "Either the affinity group Id or group name must be specified to delete the group"); + } + if (affinityGroupId == null) { + affinityGroupId = group.getId(); + } + // check permissions + _accountMgr.checkAccess(caller, null, true, group); + + final Transaction txn = Transaction.currentTxn(); + txn.start(); + + group = _affinityGroupDao.lockRow(affinityGroupId, true); + if (group == null) { + throw new InvalidParameterValueException("Unable to find affinity group by id " + affinityGroupId); + } + + List affinityGroupVmMap = _affinityGroupVMMapDao.listByAffinityGroup(affinityGroupId); + if (!affinityGroupVmMap.isEmpty()) { + throw new ResourceInUseException("Cannot delete affinity group when it's in use by virtual machines"); + } + + _affinityGroupDao.expunge(affinityGroupId); + txn.commit(); + + if (s_logger.isDebugEnabled()) { + s_logger.debug("Deleted affinity group id=" + affinityGroupId); + } + return true; + } + + @Override + public Pair, Integer> listAffinityGroups(Long affinityGroupId, String affinityGroupName, String affinityGroupType, Long vmId, Long startIndex, Long pageSize) { + Filter searchFilter = new Filter(AffinityGroupVO.class, "id", Boolean.TRUE, startIndex, pageSize); + + Account caller = UserContext.current().getCaller(); + + Long accountId = caller.getAccountId(); + Long domainId = caller.getDomainId(); + + SearchBuilder vmInstanceSearch = _affinityGroupVMMapDao.createSearchBuilder(); + vmInstanceSearch.and("instanceId", vmInstanceSearch.entity().getInstanceId(), SearchCriteria.Op.EQ); + + SearchBuilder groupSearch = _affinityGroupDao.createSearchBuilder(); + + SearchCriteria sc = groupSearch.create(); + + if (accountId != null) { + sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId); + } + + if (domainId != null) { + sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId); + } + + if (affinityGroupId != null) { + sc.addAnd("id", SearchCriteria.Op.EQ, affinityGroupId); + } + + if (affinityGroupName != null) { + sc.addAnd("name", SearchCriteria.Op.EQ, affinityGroupName); + } + + if (affinityGroupType != null) { + sc.addAnd("type", SearchCriteria.Op.EQ, affinityGroupType); + } + + if (vmId != null) { + UserVmVO userVM = _userVmDao.findById(vmId); + if (userVM == null) { + throw new InvalidParameterValueException("Unable to list affinity groups for virtual machine instance " + + vmId + "; instance not found."); + } + _accountMgr.checkAccess(caller, null, true, userVM); + // add join to affinity_groups_vm_map + groupSearch.join("vmInstanceSearch", vmInstanceSearch, groupSearch.entity().getId(), vmInstanceSearch + .entity().getAffinityGroupId(), JoinBuilder.JoinType.INNER); + sc.setJoinParameters("vmInstanceSearch", "instanceId", vmId); + } + + Pair, Integer> result = _affinityGroupDao.searchAndCount(sc, searchFilter); + return new Pair, Integer>(result.first(), result.second()); + } + + + @Override + public List listAffinityGroupTypes() { + List types = new ArrayList(); + Map componentMap = ComponentContext.getComponentsOfType(AffinityGroupProcessor.class); + + if (componentMap.size() > 0) { + for (Entry entry : componentMap.entrySet()) { + types.add(entry.getValue().getType()); + } + + } + return types; + } + + protected Map getAffinityTypeToProcessorMap() { + Map typeProcessorMap = new HashMap(); + Map componentMap = ComponentContext + .getComponentsOfType(AffinityGroupProcessor.class); + + if (componentMap.size() > 0) { + for (Entry entry : componentMap.entrySet()) { + typeProcessorMap.put(entry.getValue().getType(), entry.getValue()); + } + } + return typeProcessorMap; + } + + @Override + public boolean configure(final String name, final Map params) throws ConfigurationException { + _name = name; + VirtualMachine.State.getStateMachine().registerListener(this); + return true; + } + + @Override + public boolean start() { + return true; + } + + @Override + public boolean stop() { + return true; + } + + @Override + public String getName() { + return _name; + } + + @Override + public AffinityGroup getAffinityGroup(Long groupId) { + return _affinityGroupDao.findById(groupId); + } + + @Override + public boolean preStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, + boolean status, Object opaque) { + return true; + } + + @Override + public boolean postStateTransitionEvent(State oldState, Event event, State newState, VirtualMachine vo, + boolean status, Object opaque) { + if (!status) { + return false; + } + if ((newState == State.Expunging) || (newState == State.Error)) { + // cleanup all affinity groups associations of the Expunged VM + SearchCriteria sc = _affinityGroupVMMapDao.createSearchCriteria(); + sc.addAnd("instanceId", SearchCriteria.Op.EQ, vo.getId()); + _affinityGroupVMMapDao.expunge(sc); + } + return true; + } + + @Override + public UserVm updateVMAffinityGroups(Long vmId, List affinityGroupIds) { + // Verify input parameters + UserVmVO vmInstance = _userVmDao.findById(vmId); + if (vmInstance == null) { + throw new InvalidParameterValueException("unable to find a virtual machine with id " + vmId); + } + + // Check that the VM is stopped + if (!vmInstance.getState().equals(State.Stopped)) { + s_logger.warn("Unable to update affinity groups of the virtual machine " + vmInstance.toString() + + " in state " + vmInstance.getState()); + throw new InvalidParameterValueException("Unable update affinity groups of the virtual machine " + + vmInstance.toString() + " " + "in state " + vmInstance.getState() + + "; make sure the virtual machine is stopped and not in an error state before updating."); + } + + Account caller = UserContext.current().getCaller(); + Account owner = _accountMgr.getAccount(vmInstance.getAccountId()); + + // check that the affinity groups exist + for (Long affinityGroupId : affinityGroupIds) { + AffinityGroupVO ag = _affinityGroupDao.findById(affinityGroupId); + if (ag == null) { + throw new InvalidParameterValueException("Unable to find affinity group by id " + affinityGroupId); + } else { + // verify permissions + _accountMgr.checkAccess(caller, null, true, owner, ag); + } + } + _affinityGroupVMMapDao.updateMap(vmId, affinityGroupIds); + if (s_logger.isDebugEnabled()) { + s_logger.debug("Updated VM :" + vmId + " affinity groups to =" + affinityGroupIds); + } + // APIResponseHelper will pull out the updated affinitygroups. + return vmInstance; + + } + +} diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java new file mode 100644 index 00000000000..f84e4c351aa --- /dev/null +++ b/server/src/org/apache/cloudstack/affinity/AffinityGroupVMMapVO.java @@ -0,0 +1,66 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.PrimaryKeyJoinColumn; +import javax.persistence.SecondaryTable; +import javax.persistence.SecondaryTables; +import javax.persistence.Table; + +import org.apache.cloudstack.api.InternalIdentity; + +@Entity +@Table(name = ("affinity_group_vm_map")) +public class AffinityGroupVMMapVO implements InternalIdentity { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private Long id; + + @Column(name = "affinity_group_id") + private long affinityGroupId; + + @Column(name = "instance_id") + private long instanceId; + + public AffinityGroupVMMapVO() { + } + + public AffinityGroupVMMapVO(long affinityGroupId, long instanceId) { + this.affinityGroupId = affinityGroupId; + this.instanceId = instanceId; + } + + public long getId() { + return id; + } + + public long getAffinityGroupId() { + return affinityGroupId; + } + + + public long getInstanceId() { + return instanceId; + } + +} diff --git a/server/src/org/apache/cloudstack/affinity/AffinityGroupVO.java b/server/src/org/apache/cloudstack/affinity/AffinityGroupVO.java new file mode 100644 index 00000000000..f418cefd781 --- /dev/null +++ b/server/src/org/apache/cloudstack/affinity/AffinityGroupVO.java @@ -0,0 +1,114 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import java.util.UUID; + +import javax.persistence.Column; +import javax.persistence.Entity; +import javax.persistence.GeneratedValue; +import javax.persistence.GenerationType; +import javax.persistence.Id; +import javax.persistence.Table; + + +@Entity +@Table(name = ("affinity_group")) +public class AffinityGroupVO implements AffinityGroup { + @Id + @GeneratedValue(strategy = GenerationType.IDENTITY) + @Column(name = "id") + private long id; + + @Column(name = "name") + private String name; + + @Column(name = "type") + private String type; + + @Column(name = "description") + private String description; + + @Column(name = "domain_id") + private long domainId; + + @Column(name = "account_id") + private long accountId; + + @Column(name = "uuid") + private String uuid; + + public AffinityGroupVO() { + this.uuid = UUID.randomUUID().toString(); + } + + public AffinityGroupVO(String name, String type, String description, long domainId, long accountId) { + this.name = name; + this.description = description; + this.domainId = domainId; + this.accountId = accountId; + this.uuid = UUID.randomUUID().toString(); + this.type = type; + } + + @Override + public long getId() { + return id; + } + + @Override + public String getName() { + return name; + } + + @Override + public String getDescription() { + return description; + } + + @Override + public long getDomainId() { + return domainId; + } + + @Override + public long getAccountId() { + return accountId; + } + + @Override + public String getUuid() { + return this.uuid; + } + + public void setUuid(String uuid) { + this.uuid = uuid; + } + + @Override + public String getType() { + return type; + } + + @Override + public String toString() { + StringBuilder buf = new StringBuilder("AffinityGroup["); + buf.append(uuid).append("]"); + return buf.toString(); + } + +} diff --git a/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java b/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java new file mode 100644 index 00000000000..296e7b1d043 --- /dev/null +++ b/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupDao.java @@ -0,0 +1,30 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity.dao; + +import java.util.List; + +import org.apache.cloudstack.affinity.AffinityGroupVO; +import com.cloud.utils.db.GenericDao; + +public interface AffinityGroupDao extends GenericDao { + List listByAccountId(long accountId); + boolean isNameInUse(Long accountId, Long domainId, String name); + AffinityGroupVO findByAccountAndName(Long accountId, String name); + List findByAccountAndNames(Long accountId, String... names); + int removeByAccountId(long accountId); +} diff --git a/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java b/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java new file mode 100644 index 00000000000..d189d609ff2 --- /dev/null +++ b/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupDaoImpl.java @@ -0,0 +1,102 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity.dao; + +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.ejb.Local; +import org.apache.cloudstack.affinity.AffinityGroupVO; +import org.springframework.stereotype.Component; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; + +@Local(value = { AffinityGroupDao.class }) +public class AffinityGroupDaoImpl extends GenericDaoBase implements AffinityGroupDao { + private SearchBuilder AccountIdSearch; + private SearchBuilder AccountIdNameSearch; + private SearchBuilder AccountIdNamesSearch; + + + public AffinityGroupDaoImpl() { + + } + + @PostConstruct + protected void init() { + AccountIdSearch = createSearchBuilder(); + AccountIdSearch.and("accountId", AccountIdSearch.entity().getAccountId(), SearchCriteria.Op.EQ); + AccountIdSearch.done(); + + AccountIdNameSearch = createSearchBuilder(); + AccountIdNameSearch.and("accountId", AccountIdNameSearch.entity().getAccountId(), SearchCriteria.Op.EQ); + AccountIdNameSearch.and("name", AccountIdNameSearch.entity().getName(), SearchCriteria.Op.EQ); + + AccountIdNamesSearch = createSearchBuilder(); + AccountIdNamesSearch.and("accountId", AccountIdNamesSearch.entity().getAccountId(), SearchCriteria.Op.EQ); + AccountIdNamesSearch.and("groupNames", AccountIdNamesSearch.entity().getName(), SearchCriteria.Op.IN); + AccountIdNameSearch.done(); + } + + @Override + public List listByAccountId(long accountId) { + SearchCriteria sc = AccountIdSearch.create(); + sc.setParameters("accountId", accountId); + return listBy(sc); + } + + @Override + public boolean isNameInUse(Long accountId, Long domainId, String name) { + SearchCriteria sc = createSearchCriteria(); + sc.addAnd("name", SearchCriteria.Op.EQ, name); + if (accountId != null) { + sc.addAnd("accountId", SearchCriteria.Op.EQ, accountId); + } else { + sc.addAnd("domainId", SearchCriteria.Op.EQ, domainId); + sc.addAnd("accountId", SearchCriteria.Op.NULL); + } + + List AffinityGroups = listBy(sc); + return ((AffinityGroups != null) && !AffinityGroups.isEmpty()); + } + + @Override + public AffinityGroupVO findByAccountAndName(Long accountId, String name) { + SearchCriteria sc = AccountIdNameSearch.create(); + sc.setParameters("accountId", accountId); + sc.setParameters("name", name); + + return findOneIncludingRemovedBy(sc); + } + + @Override + public List findByAccountAndNames(Long accountId, String... names) { + SearchCriteria sc = AccountIdNamesSearch.create(); + sc.setParameters("accountId", accountId); + + sc.setParameters("groupNames", (Object [])names); + + return listBy(sc); + } + @Override + public int removeByAccountId(long accountId) { + SearchCriteria sc = AccountIdSearch.create(); + sc.setParameters("accountId", accountId); + return expunge(sc); + } +} diff --git a/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDao.java b/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDao.java new file mode 100644 index 00000000000..f2951bc8d91 --- /dev/null +++ b/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDao.java @@ -0,0 +1,47 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity.dao; + +import java.util.List; + +import org.apache.cloudstack.affinity.AffinityGroupVMMapVO; + +import com.cloud.utils.Pair; +import com.cloud.utils.db.Filter; +import com.cloud.utils.db.GenericDao; +import com.cloud.vm.VirtualMachine.State; + +public interface AffinityGroupVMMapDao extends GenericDao { + + List listByInstanceId(long instanceId); + + Pair, Integer> listByInstanceId(long instanceId, Filter filter); + + List listByAffinityGroup(long affinityGroupId); + + List listVmIdsByAffinityGroup(long affinityGroupId); + + AffinityGroupVMMapVO findByVmIdGroupId(long instanceId, long affinityGroupId); + + long countAffinityGroupsForVm(long instanceId); + + int deleteVM(long instanceId); + + List findByVmIdType(long instanceId, String type); + + void updateMap(Long vmId, List affinityGroupIds); +} diff --git a/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java b/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java new file mode 100644 index 00000000000..e03e73c6320 --- /dev/null +++ b/server/src/org/apache/cloudstack/affinity/dao/AffinityGroupVMMapDaoImpl.java @@ -0,0 +1,167 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity.dao; + +import java.util.List; + +import javax.annotation.PostConstruct; +import javax.ejb.Local; +import javax.inject.Inject; + +import org.apache.cloudstack.affinity.AffinityGroupVMMapVO; +import org.apache.cloudstack.affinity.AffinityGroupVO; +import org.springframework.stereotype.Component; + +import com.cloud.host.HostTagVO; +import com.cloud.utils.Pair; +import com.cloud.utils.db.Filter; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.utils.db.GenericSearchBuilder; +import com.cloud.utils.db.JoinBuilder.JoinType; +import com.cloud.utils.db.SearchBuilder; +import com.cloud.utils.db.SearchCriteria; +import com.cloud.utils.db.SearchCriteria.Func; +import com.cloud.utils.db.Transaction; + +@Local(value = { AffinityGroupVMMapDao.class }) +public class AffinityGroupVMMapDaoImpl extends GenericDaoBase implements + AffinityGroupVMMapDao { + private SearchBuilder ListByVmId; + private SearchBuilder ListByVmIdGroupId; + protected GenericSearchBuilder CountSGForVm; + private GenericSearchBuilder ListVmIdByAffinityGroup; + private SearchBuilder ListByAffinityGroup; + private SearchBuilder ListByVmIdType; + + @Inject + protected AffinityGroupDao _affinityGroupDao; + + public AffinityGroupVMMapDaoImpl() { + } + + @PostConstruct + protected void init() { + ListVmIdByAffinityGroup = createSearchBuilder(Long.class); + ListVmIdByAffinityGroup.and("affinityGroupId", ListVmIdByAffinityGroup.entity().getAffinityGroupId(), + SearchCriteria.Op.EQ); + ListVmIdByAffinityGroup.selectField(ListVmIdByAffinityGroup.entity().getInstanceId()); + ListVmIdByAffinityGroup.done(); + + ListByAffinityGroup = createSearchBuilder(); + ListByAffinityGroup.and("affinityGroupId", ListByAffinityGroup.entity().getAffinityGroupId(), + SearchCriteria.Op.EQ); + ListByAffinityGroup.done(); + + ListByVmId = createSearchBuilder(); + ListByVmId.and("instanceId", ListByVmId.entity().getInstanceId(), SearchCriteria.Op.EQ); + ListByVmId.done(); + + ListByVmIdGroupId = createSearchBuilder(); + ListByVmIdGroupId.and("instanceId", ListByVmIdGroupId.entity().getInstanceId(), SearchCriteria.Op.EQ); + ListByVmIdGroupId.and("affinityGroupId", ListByVmIdGroupId.entity().getAffinityGroupId(), SearchCriteria.Op.EQ); + ListByVmIdGroupId.done(); + + SearchBuilder groupSearch = _affinityGroupDao.createSearchBuilder(); + groupSearch.and("type", groupSearch.entity().getType(), SearchCriteria.Op.EQ); + + ListByVmIdType = createSearchBuilder(); + ListByVmIdType.and("instanceId", ListByVmIdType.entity().getInstanceId(), SearchCriteria.Op.EQ); + ListByVmIdType.join("groupSearch", groupSearch, ListByVmIdType.entity().getAffinityGroupId(), groupSearch.entity().getId(), JoinType.INNER); + ListByVmIdType.done(); + + CountSGForVm = createSearchBuilder(Long.class); + CountSGForVm.select(null, Func.COUNT, null); + CountSGForVm.and("vmId", CountSGForVm.entity().getInstanceId(), SearchCriteria.Op.EQ); + CountSGForVm.done(); + } + + @Override + public List listByAffinityGroup(long affinityGroupId) { + SearchCriteria sc = ListByAffinityGroup.create(); + sc.setParameters("affinityGroupId", affinityGroupId); + return listBy(sc); + } + + @Override + public List listByInstanceId(long vmId) { + SearchCriteria sc = ListByVmId.create(); + sc.setParameters("instanceId", vmId); + return listBy(sc); + } + + @Override + public Pair, Integer> listByInstanceId(long instanceId, Filter filter) { + SearchCriteria sc = ListByVmId.create(); + sc.setParameters("instanceId", instanceId); + return this.searchAndCount(sc, filter); + } + + @Override + public int deleteVM(long instanceId) { + SearchCriteria sc = ListByVmId.create(); + sc.setParameters("instanceId", instanceId); + return super.expunge(sc); + } + + @Override + public List listVmIdsByAffinityGroup(long affinityGroupId) { + SearchCriteria sc = ListVmIdByAffinityGroup.create(); + sc.setParameters("affinityGroupId", affinityGroupId); + return customSearchIncludingRemoved(sc, null); + } + + @Override + public AffinityGroupVMMapVO findByVmIdGroupId(long instanceId, long affinityGroupId) { + SearchCriteria sc = ListByVmIdGroupId.create(); + sc.setParameters("affinityGroupId", affinityGroupId); + sc.setParameters("instanceId", instanceId); + return findOneIncludingRemovedBy(sc); + } + + @Override + public long countAffinityGroupsForVm(long instanceId) { + SearchCriteria sc = CountSGForVm.create(); + sc.setParameters("vmId", instanceId); + return customSearch(sc, null).get(0); + } + + @Override + public List findByVmIdType(long instanceId, String type) { + SearchCriteria sc = ListByVmIdType.create(); + sc.setParameters("instanceId", instanceId); + sc.setJoinParameters("groupSearch", "type", type); + return listBy(sc); + } + + @Override + public void updateMap(Long vmId, List affinityGroupIds) { + Transaction txn = Transaction.currentTxn(); + txn.start(); + + SearchCriteria sc = createSearchCriteria(); + sc.addAnd("instanceId", SearchCriteria.Op.EQ, vmId); + expunge(sc); + + for (Long groupId : affinityGroupIds) { + AffinityGroupVMMapVO vo = new AffinityGroupVMMapVO(groupId, vmId); + persist(vo); + } + + txn.commit(); + + } +} diff --git a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java index 696e6e9aa48..56c46b01c79 100644 --- a/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java +++ b/server/src/org/apache/cloudstack/region/gslb/GlobalLoadBalancingRulesServiceImpl.java @@ -392,6 +392,7 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR //mark all the GSLB-LB mapping to be in revoke state for (GlobalLoadBalancerLbRuleMapVO gslbLbMap : gslbLbMapVos) { gslbLbMap.setRevoke(true); + _gslbLbMapDao.update(gslbLbMap.getId(), gslbLbMap); } } @@ -411,6 +412,16 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR throw new CloudRuntimeException("Failed to update the gloabal load balancer"); } + txn.start(); + //remove all mappings between GSLB rule and load balancer rules + if (gslbLbMapVos != null) { + for (GlobalLoadBalancerLbRuleMapVO gslbLbMap : gslbLbMapVos) { + _gslbLbMapDao.remove(gslbLbMap.getId()); + } + } + //remove the GSLB rule itself + _gslbRuleDao.remove(gslbRuleId); + txn.commit(); return success; } @@ -500,6 +511,20 @@ public class GlobalLoadBalancingRulesServiceImpl implements GlobalLoadBalancingR return null; } + @Override + public List listSiteLoadBalancers(long gslbRuleId) { + List gslbLbMapVos = _gslbLbMapDao.listByGslbRuleId(gslbRuleId); + List siteLoadBalancers = new ArrayList(); + if (gslbLbMapVos != null) { + for (GlobalLoadBalancerLbRuleMapVO gslbLbMapVo : gslbLbMapVos) { + LoadBalancerVO loadBalancer = _lbDao.findById(gslbLbMapVo.getLoadBalancerId()); + siteLoadBalancers.add(loadBalancer); + } + return siteLoadBalancers; + } + return null; + } + private boolean applyGlobalLoadBalancerRuleConfig(long gslbRuleId, boolean revoke) throws ResourceUnavailableException { GlobalLoadBalancerRuleVO gslbRule = _gslbRuleDao.findById(gslbRuleId); diff --git a/server/test/com/cloud/async/TestSyncQueueManager.java b/server/test/com/cloud/async/TestSyncQueueManager.java index 2322aecd332..59afb11e1c6 100644 --- a/server/test/com/cloud/async/TestSyncQueueManager.java +++ b/server/test/com/cloud/async/TestSyncQueueManager.java @@ -33,163 +33,163 @@ public class TestSyncQueueManager extends TestCase { private volatile long expectingCurrent = 1; @Inject SyncQueueManager mgr; - public void leftOverItems() { - - List l = mgr.getActiveQueueItems(1L, false); - if(l != null && l.size() > 0) { - for(SyncQueueItemVO item : l) { - s_logger.info("Left over item: " + item.toString()); - mgr.purgeItem(item.getId()); - } - } - } - - public void dequeueFromOneQueue() { - final int totalRuns = 5000; - final SyncQueueVO queue = mgr.queue("vm_instance", 1L, "Async-job", 1, 1); - for(int i = 1; i < totalRuns; i++) - mgr.queue("vm_instance", 1L, "Async-job", i+1, 1); - - count = 0; - expectingCurrent = 1; - Thread thread1 = new Thread(new Runnable() { + public void leftOverItems() { + + List l = mgr.getActiveQueueItems(1L, false); + if(l != null && l.size() > 0) { + for(SyncQueueItemVO item : l) { + s_logger.info("Left over item: " + item.toString()); + mgr.purgeItem(item.getId()); + } + } + } + + public void dequeueFromOneQueue() { + final int totalRuns = 5000; + final SyncQueueVO queue = mgr.queue("vm_instance", 1L, "Async-job", 1, 1); + for(int i = 1; i < totalRuns; i++) + mgr.queue("vm_instance", 1L, "Async-job", i+1, 1); + + count = 0; + expectingCurrent = 1; + Thread thread1 = new Thread(new Runnable() { @Override - public void run() { - while(count < totalRuns) { - SyncQueueItemVO item = mgr.dequeueFromOne(queue.getId(), 1L); - if(item != null) { - s_logger.info("Thread 1 process item: " + item.toString()); - - Assert.assertEquals(expectingCurrent, item.getContentId().longValue()); - expectingCurrent++; - count++; - - mgr.purgeItem(item.getId()); - } - try { - Thread.sleep(100); - } catch (InterruptedException e) { - } - } - } - } - ); - - Thread thread2 = new Thread(new Runnable() { + public void run() { + while(count < totalRuns) { + SyncQueueItemVO item = mgr.dequeueFromOne(queue.getId(), 1L); + if(item != null) { + s_logger.info("Thread 1 process item: " + item.toString()); + + Assert.assertEquals(expectingCurrent, item.getContentId().longValue()); + expectingCurrent++; + count++; + + mgr.purgeItem(item.getId()); + } + try { + Thread.sleep(100); + } catch (InterruptedException e) { + } + } + } + } + ); + + Thread thread2 = new Thread(new Runnable() { @Override - public void run() { - while(count < totalRuns) { - SyncQueueItemVO item = mgr.dequeueFromOne(queue.getId(), 1L); - if(item != null) { - s_logger.info("Thread 2 process item: " + item.toString()); - - Assert.assertEquals(expectingCurrent, item.getContentId().longValue()); - expectingCurrent++; - count++; - mgr.purgeItem(item.getId()); - } - - try { - Thread.sleep(100); - } catch (InterruptedException e) { - } - } - } - } - ); - - thread1.start(); - thread2.start(); - try { - thread1.join(); - } catch (InterruptedException e) { - } - try { - thread2.join(); - } catch (InterruptedException e) { - } - - Assert.assertEquals(totalRuns, count); - } - - public void dequeueFromAnyQueue() { - // simulate 30 queues - final int queues = 30; - final int totalRuns = 100; - final int itemsPerRun = 20; - for(int q = 1; q <= queues; q++) - for(int i = 0; i < totalRuns; i++) - mgr.queue("vm_instance", q, "Async-job", i+1, 1); - - count = 0; - Thread thread1 = new Thread(new Runnable() { + public void run() { + while(count < totalRuns) { + SyncQueueItemVO item = mgr.dequeueFromOne(queue.getId(), 1L); + if(item != null) { + s_logger.info("Thread 2 process item: " + item.toString()); + + Assert.assertEquals(expectingCurrent, item.getContentId().longValue()); + expectingCurrent++; + count++; + mgr.purgeItem(item.getId()); + } + + try { + Thread.sleep(100); + } catch (InterruptedException e) { + } + } + } + } + ); + + thread1.start(); + thread2.start(); + try { + thread1.join(); + } catch (InterruptedException e) { + } + try { + thread2.join(); + } catch (InterruptedException e) { + } + + Assert.assertEquals(totalRuns, count); + } + + public void dequeueFromAnyQueue() { + // simulate 30 queues + final int queues = 30; + final int totalRuns = 100; + final int itemsPerRun = 20; + for(int q = 1; q <= queues; q++) + for(int i = 0; i < totalRuns; i++) + mgr.queue("vm_instance", q, "Async-job", i+1, 1); + + count = 0; + Thread thread1 = new Thread(new Runnable() { @Override - public void run() { - while(count < totalRuns*queues) { - List l = mgr.dequeueFromAny(1L, itemsPerRun); - if(l != null && l.size() > 0) { - s_logger.info("Thread 1 get " + l.size() + " dequeued items"); - - for(SyncQueueItemVO item : l) { - s_logger.info("Thread 1 process item: " + item.toString()); - count++; - - mgr.purgeItem(item.getId()); - } - } - try { - Thread.sleep(100); - } catch (InterruptedException e) { - } - } - } - } - ); - - Thread thread2 = new Thread(new Runnable() { + public void run() { + while(count < totalRuns*queues) { + List l = mgr.dequeueFromAny(1L, itemsPerRun); + if(l != null && l.size() > 0) { + s_logger.info("Thread 1 get " + l.size() + " dequeued items"); + + for(SyncQueueItemVO item : l) { + s_logger.info("Thread 1 process item: " + item.toString()); + count++; + + mgr.purgeItem(item.getId()); + } + } + try { + Thread.sleep(100); + } catch (InterruptedException e) { + } + } + } + } + ); + + Thread thread2 = new Thread(new Runnable() { @Override - public void run() { - while(count < totalRuns*queues) { - List l = mgr.dequeueFromAny(1L, itemsPerRun); - if(l != null && l.size() > 0) { - s_logger.info("Thread 2 get " + l.size() + " dequeued items"); - - for(SyncQueueItemVO item : l) { - s_logger.info("Thread 2 process item: " + item.toString()); - count++; - mgr.purgeItem(item.getId()); - } - } - - try { - Thread.sleep(100); - } catch (InterruptedException e) { - } - } - } - } - ); - - thread1.start(); - thread2.start(); - try { - thread1.join(); - } catch (InterruptedException e) { - } - try { - thread2.join(); - } catch (InterruptedException e) { - } - Assert.assertEquals(queues*totalRuns, count); - } - - public void testPopulateQueueData() { - final int queues = 30000; - final int totalRuns = 100; - - for(int q = 1; q <= queues; q++) - for(int i = 0; i < totalRuns; i++) - mgr.queue("vm_instance", q, "Async-job", i+1, 1); + public void run() { + while(count < totalRuns*queues) { + List l = mgr.dequeueFromAny(1L, itemsPerRun); + if(l != null && l.size() > 0) { + s_logger.info("Thread 2 get " + l.size() + " dequeued items"); + + for(SyncQueueItemVO item : l) { + s_logger.info("Thread 2 process item: " + item.toString()); + count++; + mgr.purgeItem(item.getId()); + } + } + + try { + Thread.sleep(100); + } catch (InterruptedException e) { + } + } + } + } + ); + + thread1.start(); + thread2.start(); + try { + thread1.join(); + } catch (InterruptedException e) { + } + try { + thread2.join(); + } catch (InterruptedException e) { + } + Assert.assertEquals(queues*totalRuns, count); + } + + public void testPopulateQueueData() { + final int queues = 30000; + final int totalRuns = 100; + + for(int q = 1; q <= queues; q++) + for(int i = 0; i < totalRuns; i++) + mgr.queue("vm_instance", q, "Async-job", i+1, 1); } public void testSyncQueue() { diff --git a/server/test/com/cloud/configuration/ConfigurationManagerTest.java b/server/test/com/cloud/configuration/ConfigurationManagerTest.java new file mode 100755 index 00000000000..5c1cabfe774 --- /dev/null +++ b/server/test/com/cloud/configuration/ConfigurationManagerTest.java @@ -0,0 +1,413 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package com.cloud.configuration; + +import java.util.ArrayList; +import java.util.List; +import java.util.UUID; +import java.lang.reflect.Field; + +import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd; +import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd; +import org.apache.log4j.Logger; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; + +import com.cloud.configuration.Resource.ResourceType; +import com.cloud.dc.AccountVlanMapVO; +import com.cloud.dc.DataCenterVO; +import com.cloud.dc.Vlan; +import com.cloud.dc.VlanVO; +import com.cloud.dc.DataCenter.NetworkType; +import com.cloud.dc.dao.AccountVlanMapDao; +import com.cloud.dc.dao.DataCenterDao; +import com.cloud.dc.dao.VlanDao; +import com.cloud.network.NetworkManager; +import com.cloud.network.dao.FirewallRulesDao; +import com.cloud.network.dao.IPAddressDao; +import com.cloud.network.dao.IPAddressVO; +import com.cloud.projects.ProjectManager; +import com.cloud.user.Account; +import com.cloud.user.AccountManager; +import com.cloud.user.AccountVO; +import com.cloud.user.ResourceLimitService; +import com.cloud.user.UserContext; +import com.cloud.user.dao.AccountDao; +import com.cloud.utils.db.Transaction; +import com.cloud.utils.net.Ip; + +import junit.framework.Assert; + +import static org.mockito.Matchers.*; +import static org.mockito.Mockito.when; +import static org.mockito.Mockito.doNothing; + +public class ConfigurationManagerTest { + + private static final Logger s_logger = Logger.getLogger(ConfigurationManagerTest.class); + + ConfigurationManagerImpl configurationMgr = new ConfigurationManagerImpl(); + + DedicatePublicIpRangeCmd dedicatePublicIpRangesCmd = new DedicatePublicIpRangeCmdExtn(); + Class _dedicatePublicIpRangeClass = dedicatePublicIpRangesCmd.getClass().getSuperclass(); + + ReleasePublicIpRangeCmd releasePublicIpRangesCmd = new ReleasePublicIpRangeCmdExtn(); + Class _releasePublicIpRangeClass = releasePublicIpRangesCmd.getClass().getSuperclass(); + + @Mock AccountManager _accountMgr; + @Mock ProjectManager _projectMgr; + @Mock ResourceLimitService _resourceLimitMgr; + @Mock NetworkManager _networkMgr; + @Mock AccountDao _accountDao; + @Mock VlanDao _vlanDao; + @Mock AccountVlanMapDao _accountVlanMapDao; + @Mock IPAddressDao _publicIpAddressDao; + @Mock DataCenterDao _zoneDao; + @Mock FirewallRulesDao _firewallDao; + + VlanVO vlan = new VlanVO(Vlan.VlanType.VirtualNetwork, "vlantag", "vlangateway","vlannetmask", 1L, "iprange", 1L, 1L, null, null, null); + + @Before + public void setup() throws Exception { + MockitoAnnotations.initMocks(this); + configurationMgr._accountMgr = _accountMgr; + configurationMgr._projectMgr = _projectMgr; + configurationMgr._resourceLimitMgr = _resourceLimitMgr; + configurationMgr._networkMgr = _networkMgr; + configurationMgr._accountDao = _accountDao; + configurationMgr._vlanDao = _vlanDao; + configurationMgr._accountVlanMapDao = _accountVlanMapDao; + configurationMgr._publicIpAddressDao = _publicIpAddressDao; + configurationMgr._zoneDao = _zoneDao; + configurationMgr._firewallDao = _firewallDao; + + Account account = (Account) new AccountVO("testaccount", 1, "networkdomain", (short) 0, UUID.randomUUID().toString()); + when(configurationMgr._accountMgr.getAccount(anyLong())).thenReturn(account); + when(configurationMgr._accountDao.findActiveAccount(anyString(), anyLong())).thenReturn(account); + when(configurationMgr._accountMgr.getActiveAccountById(anyLong())).thenReturn(account); + + when(configurationMgr._publicIpAddressDao.countIPs(anyLong(), anyLong(), anyBoolean())).thenReturn(1); + + doNothing().when(configurationMgr._resourceLimitMgr).checkResourceLimit(any(Account.class), + any(ResourceType.class), anyLong()); + + when(configurationMgr._accountVlanMapDao.persist(any(AccountVlanMapVO.class))).thenReturn(new AccountVlanMapVO()); + + when(configurationMgr._vlanDao.acquireInLockTable(anyLong(), anyInt())).thenReturn(vlan); + + UserContext.registerContext(1, account, null, true); + + Field dedicateIdField = _dedicatePublicIpRangeClass.getDeclaredField("id"); + dedicateIdField.setAccessible(true); + dedicateIdField.set(dedicatePublicIpRangesCmd, 1L); + + Field accountNameField = _dedicatePublicIpRangeClass.getDeclaredField("accountName"); + accountNameField.setAccessible(true); + accountNameField.set(dedicatePublicIpRangesCmd, "accountname"); + + Field projectIdField = _dedicatePublicIpRangeClass.getDeclaredField("projectId"); + projectIdField.setAccessible(true); + projectIdField.set(dedicatePublicIpRangesCmd, null); + + Field domainIdField = _dedicatePublicIpRangeClass.getDeclaredField("domainId"); + domainIdField.setAccessible(true); + domainIdField.set(dedicatePublicIpRangesCmd, 1L); + + Field releaseIdField = _releasePublicIpRangeClass.getDeclaredField("id"); + releaseIdField.setAccessible(true); + releaseIdField.set(releasePublicIpRangesCmd, 1L); + } + + @Test + public void testDedicatePublicIpRange() throws Exception { + + s_logger.info("Running tests for DedicatePublicIpRange API"); + + /* + * TEST 1: given valid parameters DedicatePublicIpRange should succeed + */ + runDedicatePublicIpRangePostiveTest(); + + /* + * TEST 2: given invalid public ip range DedicatePublicIpRange should fail + */ + runDedicatePublicIpRangeInvalidRange(); + /* + * TEST 3: given public IP range that is already dedicated to a different account DedicatePublicIpRange should fail + */ + runDedicatePublicIpRangeDedicatedRange(); + + /* + * TEST 4: given zone is of type Basic DedicatePublicIpRange should fail + */ + runDedicatePublicIpRangeInvalidZone(); + + /* + * TEST 5: given range is already allocated to a different account DedicatePublicIpRange should fail + */ + runDedicatePublicIpRangeIPAdressAllocated(); + } + + @Test + public void testReleasePublicIpRange() throws Exception { + + s_logger.info("Running tests for DedicatePublicIpRange API"); + + /* + * TEST 1: given valid parameters and no allocated public ip's in the range ReleasePublicIpRange should succeed + */ + runReleasePublicIpRangePostiveTest1(); + + /* + * TEST 2: given valid parameters ReleasePublicIpRange should succeed + */ + runReleasePublicIpRangePostiveTest2(); + + /* + * TEST 3: given range doesn't exist + */ + runReleasePublicIpRangeInvalidIpRange(); + + /* + * TEST 4: given range is not dedicated to any account + */ + runReleaseNonDedicatedPublicIpRange(); + } + + void runDedicatePublicIpRangePostiveTest() throws Exception { + Transaction txn = Transaction.open("runDedicatePublicIpRangePostiveTest"); + + when(configurationMgr._vlanDao.findById(anyLong())).thenReturn(vlan); + + when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByAccount(anyLong())).thenReturn(null); + + DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", + null, null, NetworkType.Advanced, null, null, true, true, null, null); + when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc); + + List ipAddressList = new ArrayList(); + IPAddressVO ipAddress = new IPAddressVO(new Ip("75.75.75.75"), 1, 0xaabbccddeeffL, 10, false); + ipAddressList.add(ipAddress); + when(configurationMgr._publicIpAddressDao.listByVlanId(anyLong())).thenReturn(ipAddressList); + + try { + Vlan result = configurationMgr.dedicatePublicIpRange(dedicatePublicIpRangesCmd); + Assert.assertNotNull(result); + } catch (Exception e) { + s_logger.info("exception in testing runDedicatePublicIpRangePostiveTest message: " + e.toString()); + } finally { + txn.close("runDedicatePublicIpRangePostiveTest"); + } + } + + void runDedicatePublicIpRangeInvalidRange() throws Exception { + Transaction txn = Transaction.open("runDedicatePublicIpRangeInvalidRange"); + + when(configurationMgr._vlanDao.findById(anyLong())).thenReturn(null); + try { + configurationMgr.dedicatePublicIpRange(dedicatePublicIpRangesCmd); + } catch (Exception e) { + Assert.assertTrue(e.getMessage().contains("Unable to find vlan by id")); + } finally { + txn.close("runDedicatePublicIpRangeInvalidRange"); + } + } + + void runDedicatePublicIpRangeDedicatedRange() throws Exception { + Transaction txn = Transaction.open("runDedicatePublicIpRangeDedicatedRange"); + + when(configurationMgr._vlanDao.findById(anyLong())).thenReturn(vlan); + + // public ip range is already dedicated + List accountVlanMaps = new ArrayList(); + AccountVlanMapVO accountVlanMap = new AccountVlanMapVO(1, 1); + accountVlanMaps.add(accountVlanMap); + when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByVlan(anyLong())).thenReturn(accountVlanMaps); + + DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", + null, null, NetworkType.Advanced, null, null, true, true, null, null); + when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc); + + List ipAddressList = new ArrayList(); + IPAddressVO ipAddress = new IPAddressVO(new Ip("75.75.75.75"), 1, 0xaabbccddeeffL, 10, false); + ipAddressList.add(ipAddress); + when(configurationMgr._publicIpAddressDao.listByVlanId(anyLong())).thenReturn(ipAddressList); + + try { + configurationMgr.dedicatePublicIpRange(dedicatePublicIpRangesCmd); + } catch (Exception e) { + Assert.assertTrue(e.getMessage().contains("Public IP range has already been dedicated")); + } finally { + txn.close("runDedicatePublicIpRangePublicIpRangeDedicated"); + } + } + + void runDedicatePublicIpRangeInvalidZone() throws Exception { + Transaction txn = Transaction.open("runDedicatePublicIpRangeInvalidZone"); + + when(configurationMgr._vlanDao.findById(anyLong())).thenReturn(vlan); + + when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByVlan(anyLong())).thenReturn(null); + + // public ip range belongs to zone of type basic + DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", + null, null, NetworkType.Basic, null, null, true, true, null, null); + when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc); + + List ipAddressList = new ArrayList(); + IPAddressVO ipAddress = new IPAddressVO(new Ip("75.75.75.75"), 1, 0xaabbccddeeffL, 10, false); + ipAddressList.add(ipAddress); + when(configurationMgr._publicIpAddressDao.listByVlanId(anyLong())).thenReturn(ipAddressList); + + try { + configurationMgr.dedicatePublicIpRange(dedicatePublicIpRangesCmd); + } catch (Exception e) { + Assert.assertTrue(e.getMessage().contains("Public IP range can be dedicated to an account only in the zone of type Advanced")); + } finally { + txn.close("runDedicatePublicIpRangeInvalidZone"); + } + } + + void runDedicatePublicIpRangeIPAdressAllocated() throws Exception { + Transaction txn = Transaction.open("runDedicatePublicIpRangeIPAdressAllocated"); + + when(configurationMgr._vlanDao.findById(anyLong())).thenReturn(vlan); + + when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByAccount(anyLong())).thenReturn(null); + + DataCenterVO dc = new DataCenterVO(UUID.randomUUID().toString(), "test", "8.8.8.8", null, "10.0.0.1", null, "10.0.0.1/24", + null, null, NetworkType.Advanced, null, null, true, true, null, null); + when(configurationMgr._zoneDao.findById(anyLong())).thenReturn(dc); + + // one of the ip addresses of the range is allocated to different account + List ipAddressList = new ArrayList(); + IPAddressVO ipAddress = new IPAddressVO(new Ip("75.75.75.75"), 1, 0xaabbccddeeffL, 10, false); + ipAddress.setAllocatedToAccountId(1L); + ipAddressList.add(ipAddress); + when(configurationMgr._publicIpAddressDao.listByVlanId(anyLong())).thenReturn(ipAddressList); + + try { + configurationMgr.dedicatePublicIpRange(dedicatePublicIpRangesCmd); + } catch (Exception e) { + Assert.assertTrue(e.getMessage().contains("Public IP address in range is allocated to another account")); + } finally { + txn.close("runDedicatePublicIpRangeIPAdressAllocated"); + } + } + + void runReleasePublicIpRangePostiveTest1() throws Exception { + Transaction txn = Transaction.open("runReleasePublicIpRangePostiveTest1"); + + when(configurationMgr._vlanDao.findById(anyLong())).thenReturn(vlan); + + List accountVlanMaps = new ArrayList(); + AccountVlanMapVO accountVlanMap = new AccountVlanMapVO(1, 1); + accountVlanMaps.add(accountVlanMap); + when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByVlan(anyLong())).thenReturn(accountVlanMaps); + + // no allocated ip's + when(configurationMgr._publicIpAddressDao.countIPs(anyLong(), anyLong(), anyBoolean())).thenReturn(0); + + when(configurationMgr._accountVlanMapDao.remove(anyLong())).thenReturn(true); + try { + Boolean result = configurationMgr.releasePublicIpRange(releasePublicIpRangesCmd); + Assert.assertTrue(result); + } catch (Exception e) { + s_logger.info("exception in testing runReleasePublicIpRangePostiveTest1 message: " + e.toString()); + } finally { + txn.close("runReleasePublicIpRangePostiveTest1"); + } + } + + void runReleasePublicIpRangePostiveTest2() throws Exception { + Transaction txn = Transaction.open("runReleasePublicIpRangePostiveTest2"); + + when(configurationMgr._vlanDao.findById(anyLong())).thenReturn(vlan); + + List accountVlanMaps = new ArrayList(); + AccountVlanMapVO accountVlanMap = new AccountVlanMapVO(1, 1); + accountVlanMaps.add(accountVlanMap); + when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByVlan(anyLong())).thenReturn(accountVlanMaps); + + when(configurationMgr._publicIpAddressDao.countIPs(anyLong(), anyLong(), anyBoolean())).thenReturn(1); + + List ipAddressList = new ArrayList(); + IPAddressVO ipAddress = new IPAddressVO(new Ip("75.75.75.75"), 1, 0xaabbccddeeffL, 10, false); + ipAddressList.add(ipAddress); + when(configurationMgr._publicIpAddressDao.listByVlanId(anyLong())).thenReturn(ipAddressList); + + when(configurationMgr._firewallDao.countRulesByIpId(anyLong())).thenReturn(0L); + + when(configurationMgr._networkMgr.disassociatePublicIpAddress(anyLong(), anyLong(), any(Account.class))).thenReturn(true); + + when(configurationMgr._vlanDao.releaseFromLockTable(anyLong())).thenReturn(true); + + when(configurationMgr._accountVlanMapDao.remove(anyLong())).thenReturn(true); + try { + Boolean result = configurationMgr.releasePublicIpRange(releasePublicIpRangesCmd); + Assert.assertTrue(result); + } catch (Exception e) { + s_logger.info("exception in testing runReleasePublicIpRangePostiveTest2 message: " + e.toString()); + } finally { + txn.close("runReleasePublicIpRangePostiveTest2"); + } + } + + void runReleasePublicIpRangeInvalidIpRange() throws Exception { + Transaction txn = Transaction.open("runReleasePublicIpRangeInvalidIpRange"); + + when(configurationMgr._vlanDao.findById(anyLong())).thenReturn(null); + try { + configurationMgr.releasePublicIpRange(releasePublicIpRangesCmd); + } catch (Exception e) { + Assert.assertTrue(e.getMessage().contains("Please specify a valid IP range id")); + } finally { + txn.close("runReleasePublicIpRangeInvalidIpRange"); + } + } + + void runReleaseNonDedicatedPublicIpRange() throws Exception { + Transaction txn = Transaction.open("runReleaseNonDedicatedPublicIpRange"); + + when(configurationMgr._vlanDao.findById(anyLong())).thenReturn(vlan); + + when(configurationMgr._accountVlanMapDao.listAccountVlanMapsByVlan(anyLong())).thenReturn(null); + try { + configurationMgr.releasePublicIpRange(releasePublicIpRangesCmd); + } catch (Exception e) { + Assert.assertTrue(e.getMessage().contains("as it not dedicated to any account")); + } finally { + txn.close("runReleaseNonDedicatedPublicIpRange"); + } + } + + + public class DedicatePublicIpRangeCmdExtn extends DedicatePublicIpRangeCmd { + public long getEntityOwnerId() { + return 1; + } + } + + public class ReleasePublicIpRangeCmdExtn extends ReleasePublicIpRangeCmd { + public long getEntityOwnerId() { + return 1; + } + } +} diff --git a/server/test/com/cloud/network/MockNetworkManagerImpl.java b/server/test/com/cloud/network/MockNetworkManagerImpl.java index 6da48ece087..e9987bd1b66 100755 --- a/server/test/com/cloud/network/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/network/MockNetworkManagerImpl.java @@ -16,33 +16,13 @@ // under the License. package com.cloud.network; -import java.util.List; -import java.util.Map; -import java.util.Set; - -import javax.ejb.Local; -import javax.naming.ConfigurationException; - -import org.apache.cloudstack.acl.ControlledEntity.ACLType; -import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd; -import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; -import org.apache.cloudstack.api.command.user.network.ListNetworksCmd; -import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd; -import org.springframework.stereotype.Component; -import org.apache.cloudstack.api.command.user.vm.ListNicsCmd; - import com.cloud.dc.DataCenter; import com.cloud.dc.Pod; import com.cloud.dc.Vlan.VlanType; import com.cloud.deploy.DataCenterDeployment; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientAddressCapacityException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InsufficientVirtualNetworkCapcityException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; +import com.cloud.exception.*; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; import com.cloud.network.Networks.TrafficType; @@ -62,7 +42,6 @@ import com.cloud.offerings.NetworkOfferingVO; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.utils.Pair; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; import com.cloud.vm.Nic; import com.cloud.vm.NicProfile; @@ -71,8 +50,22 @@ import com.cloud.vm.NicVO; import com.cloud.vm.ReservationContext; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.VirtualMachineProfileImpl; +import org.apache.cloudstack.acl.ControlledEntity.ACLType; +import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd; +import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworksCmd; +import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd; +import org.apache.cloudstack.api.command.user.vm.ListNicsCmd; +import org.springframework.stereotype.Component; + +import javax.ejb.Local; +import javax.naming.ConfigurationException; +import java.util.List; +import java.util.Map; +import java.util.Set; @Component @Local(value = { NetworkManager.class, NetworkService.class }) @@ -329,7 +322,7 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkManage } @Override - public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List tags, String newVnetRangeString, String state) { + public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List tags, String newVnetRangeString, String state, String removeVlan) { // TODO Auto-generated method stub return null; } @@ -823,7 +816,7 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkManage * @see com.cloud.network.NetworkService#allocateIP(com.cloud.user.Account, boolean, long) */ @Override - public IpAddress allocateIP(Account ipOwner, boolean isSystem, long zoneId) throws ResourceAllocationException, + public IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) throws ResourceAllocationException, InsufficientAddressCapacityException, ConcurrentOperationException { // TODO Auto-generated method stub return null; @@ -842,7 +835,7 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkManage } @Override - public String allocateSecondaryGuestIP(Account account, long zoneId, + public NicSecondaryIp allocateSecondaryGuestIP(Account account, long zoneId, Long nicId, Long networkId, String ipaddress) { // TODO Auto-generated method stub return null; @@ -884,7 +877,7 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkManage } @Override - public NicVO savePlaceholderNic(Network network, String ip4Address) { + public NicVO savePlaceholderNic(Network network, String ip4Address, Type vmType) { // TODO Auto-generated method stub return null; } diff --git a/server/test/com/cloud/network/MockNetworkModelImpl.java b/server/test/com/cloud/network/MockNetworkModelImpl.java index c5789659008..511249fff5a 100644 --- a/server/test/com/cloud/network/MockNetworkModelImpl.java +++ b/server/test/com/cloud/network/MockNetworkModelImpl.java @@ -839,15 +839,15 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel { return null; } - @Override - public Nic getPlaceholderNic(Network network, Long podId) { - // TODO Auto-generated method stub - return null; - } - @Override public boolean isProviderEnabledInZone(long zoneId, String provider) { // TODO Auto-generated method stub return false; } + + @Override + public Nic getPlaceholderNicForRouter(Network network, Long podId) { + // TODO Auto-generated method stub + return null; + } } diff --git a/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java b/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java new file mode 100644 index 00000000000..ca9d149214f --- /dev/null +++ b/server/test/com/cloud/network/UpdatePhysicalNetworkTest.java @@ -0,0 +1,68 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.network; +import com.cloud.capacity.CapacityManagerImpl; +import com.cloud.dc.DataCenterVO; +import com.cloud.dc.dao.DataCenterDao; +import com.cloud.network.NetworkServiceImpl; +import com.cloud.network.dao.PhysicalNetworkDao; +import com.cloud.network.dao.PhysicalNetworkVO; +import com.cloud.utils.Pair; +import org.junit.Test; +import org.junit.*; +import org.mockito.ArgumentCaptor; +import org.mockito.MockitoAnnotations.*; + +import java.util.ArrayList; +import java.util.List; + +import static org.junit.Assert.assertEquals; +import static org.mockito.Matchers.*; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.verify; +import static org.mockito.Mockito.when; + + +public class UpdatePhysicalNetworkTest { + private PhysicalNetworkDao _physicalNetworkDao = mock(PhysicalNetworkDao.class); + private DataCenterDao _datacenterDao = mock(DataCenterDao.class); + private DataCenterVO datacentervo = mock(DataCenterVO.class); + private PhysicalNetworkVO physicalNetworkVO = mock(PhysicalNetworkVO.class); + List> existingRange = new ArrayList>(); + ArgumentCaptor argumentCaptor = ArgumentCaptor.forClass(String.class); + + public NetworkServiceImpl setUp() { + NetworkServiceImpl networkService = new NetworkServiceImpl(); + ((NetworkServiceImpl)networkService)._dcDao= _datacenterDao; + networkService._physicalNetworkDao = _physicalNetworkDao; + return networkService; + } + + @Test + public void updatePhysicalNetworkTest(){ + NetworkServiceImpl networkService = setUp(); + existingRange.add(new Pair(520, 524)); + when(_physicalNetworkDao.findById(anyLong())).thenReturn(physicalNetworkVO); + when(_datacenterDao.findById(anyLong())).thenReturn(datacentervo); + when(_physicalNetworkDao.update(anyLong(), any(physicalNetworkVO.getClass()))).thenReturn(true); + when(physicalNetworkVO.getVnet()).thenReturn(existingRange); + networkService.updatePhysicalNetwork(1l, null, null, "525-530", null, null); + verify(physicalNetworkVO).setVnet(argumentCaptor.capture()); + assertEquals("520-530", argumentCaptor.getValue()); + } + +} diff --git a/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java b/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java index 5969948f8f7..b3a9ff12dab 100644 --- a/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java +++ b/server/test/com/cloud/network/security/SecurityGroupManagerTestConfiguration.java @@ -1,158 +1,158 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package com.cloud.network.security; - -import java.io.IOException; - -import org.mockito.Mockito; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScan.Filter; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.FilterType; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.core.type.filter.TypeFilter; - -import com.cloud.agent.AgentManager; -import com.cloud.api.query.dao.SecurityGroupJoinDaoImpl; -import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; -import com.cloud.configuration.dao.ConfigurationDaoImpl; -import com.cloud.dc.dao.ClusterDaoImpl; -import com.cloud.dc.dao.DataCenterDaoImpl; -import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; -import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; -import com.cloud.dc.dao.DataCenterVnetDaoImpl; -import com.cloud.dc.dao.DcDetailsDaoImpl; -import com.cloud.dc.dao.HostPodDaoImpl; -import com.cloud.dc.dao.PodVlanDaoImpl; -import com.cloud.domain.dao.DomainDaoImpl; -import com.cloud.event.dao.UsageEventDaoImpl; -import com.cloud.host.dao.HostDaoImpl; -import com.cloud.host.dao.HostDetailsDaoImpl; -import com.cloud.host.dao.HostTagsDaoImpl; -import com.cloud.network.NetworkManager; -import com.cloud.network.NetworkModel; -import com.cloud.network.security.SecurityGroupManagerTestConfiguration.Library; -import com.cloud.network.security.dao.SecurityGroupDaoImpl; -import com.cloud.network.security.dao.SecurityGroupRuleDaoImpl; -import com.cloud.network.security.dao.SecurityGroupRulesDaoImpl; -import com.cloud.network.security.dao.SecurityGroupVMMapDaoImpl; -import com.cloud.network.security.dao.SecurityGroupWorkDaoImpl; -import com.cloud.network.security.dao.VmRulesetLogDaoImpl; -import com.cloud.projects.ProjectManager; -import com.cloud.tags.dao.ResourceTagsDaoImpl; -import com.cloud.user.AccountManager; -import com.cloud.user.DomainManager; -import com.cloud.user.dao.AccountDaoImpl; -import com.cloud.utils.component.SpringComponentScanUtils; -import com.cloud.vm.UserVmManager; -import com.cloud.vm.VirtualMachineManager; -import com.cloud.vm.dao.NicDaoImpl; -import com.cloud.vm.dao.UserVmDaoImpl; -import com.cloud.vm.dao.UserVmDetailsDaoImpl; -import com.cloud.vm.dao.VMInstanceDaoImpl; - -@Configuration -@ComponentScan(basePackageClasses={ - SecurityGroupRulesDaoImpl.class, - UserVmDaoImpl.class, - AccountDaoImpl.class, - ConfigurationDaoImpl.class, - SecurityGroupWorkDaoImpl.class, - VmRulesetLogDaoImpl.class, - VMInstanceDaoImpl.class, - DomainDaoImpl.class, - UsageEventDaoImpl.class, - ResourceTagsDaoImpl.class, - HostDaoImpl.class, - HostDetailsDaoImpl.class, - HostTagsDaoImpl.class, - ClusterDaoImpl.class, - HostPodDaoImpl.class, - DataCenterDaoImpl.class, - DataCenterIpAddressDaoImpl.class, - HostTransferMapDaoImpl.class, - SecurityGroupManagerImpl2.class, - SecurityGroupDaoImpl.class, - SecurityGroupVMMapDaoImpl.class, - UserVmDetailsDaoImpl.class, - DataCenterIpAddressDaoImpl.class, - DataCenterLinkLocalIpAddressDaoImpl.class, - DataCenterVnetDaoImpl.class, - PodVlanDaoImpl.class, - DcDetailsDaoImpl.class, - SecurityGroupRuleDaoImpl.class, - NicDaoImpl.class, - SecurityGroupJoinDaoImpl.class}, - includeFilters={@Filter(value=Library.class, type=FilterType.CUSTOM)}, - useDefaultFilters=false - ) -public class SecurityGroupManagerTestConfiguration { - - @Bean - public NetworkModel networkModel() { - return Mockito.mock(NetworkModel.class); - } - - @Bean - public AgentManager agentManager() { - return Mockito.mock(AgentManager.class); - } - - @Bean - public VirtualMachineManager virtualMachineManager(){ - return Mockito.mock(VirtualMachineManager.class); - } - - @Bean - public UserVmManager userVmManager() { - return Mockito.mock(UserVmManager.class); - } - - @Bean - public NetworkManager networkManager(){ - return Mockito.mock(NetworkManager.class); - } - - @Bean - public AccountManager accountManager() { - return Mockito.mock(AccountManager.class); - } - - @Bean - public DomainManager domainManager() { - return Mockito.mock(DomainManager.class); - } - - @Bean - public ProjectManager projectManager() { - return Mockito.mock(ProjectManager.class); - } - - public static class Library implements TypeFilter { - - @Override - public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { - mdr.getClassMetadata().getClassName(); - ComponentScan cs = SecurityGroupManagerTestConfiguration.class.getAnnotation(ComponentScan.class); - return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); - } - - } -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package com.cloud.network.security; + +import java.io.IOException; + +import org.mockito.Mockito; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.ComponentScan.Filter; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.core.type.filter.TypeFilter; + +import com.cloud.agent.AgentManager; +import com.cloud.api.query.dao.SecurityGroupJoinDaoImpl; +import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; +import com.cloud.configuration.dao.ConfigurationDaoImpl; +import com.cloud.dc.dao.ClusterDaoImpl; +import com.cloud.dc.dao.DataCenterDaoImpl; +import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; +import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; +import com.cloud.dc.dao.DataCenterVnetDaoImpl; +import com.cloud.dc.dao.DcDetailsDaoImpl; +import com.cloud.dc.dao.HostPodDaoImpl; +import com.cloud.dc.dao.PodVlanDaoImpl; +import com.cloud.domain.dao.DomainDaoImpl; +import com.cloud.event.dao.UsageEventDaoImpl; +import com.cloud.host.dao.HostDaoImpl; +import com.cloud.host.dao.HostDetailsDaoImpl; +import com.cloud.host.dao.HostTagsDaoImpl; +import com.cloud.network.NetworkManager; +import com.cloud.network.NetworkModel; +import com.cloud.network.security.SecurityGroupManagerTestConfiguration.Library; +import com.cloud.network.security.dao.SecurityGroupDaoImpl; +import com.cloud.network.security.dao.SecurityGroupRuleDaoImpl; +import com.cloud.network.security.dao.SecurityGroupRulesDaoImpl; +import com.cloud.network.security.dao.SecurityGroupVMMapDaoImpl; +import com.cloud.network.security.dao.SecurityGroupWorkDaoImpl; +import com.cloud.network.security.dao.VmRulesetLogDaoImpl; +import com.cloud.projects.ProjectManager; +import com.cloud.tags.dao.ResourceTagsDaoImpl; +import com.cloud.user.AccountManager; +import com.cloud.user.DomainManager; +import com.cloud.user.dao.AccountDaoImpl; +import com.cloud.utils.component.SpringComponentScanUtils; +import com.cloud.vm.UserVmManager; +import com.cloud.vm.VirtualMachineManager; +import com.cloud.vm.dao.NicDaoImpl; +import com.cloud.vm.dao.UserVmDaoImpl; +import com.cloud.vm.dao.UserVmDetailsDaoImpl; +import com.cloud.vm.dao.VMInstanceDaoImpl; + +@Configuration +@ComponentScan(basePackageClasses={ + SecurityGroupRulesDaoImpl.class, + UserVmDaoImpl.class, + AccountDaoImpl.class, + ConfigurationDaoImpl.class, + SecurityGroupWorkDaoImpl.class, + VmRulesetLogDaoImpl.class, + VMInstanceDaoImpl.class, + DomainDaoImpl.class, + UsageEventDaoImpl.class, + ResourceTagsDaoImpl.class, + HostDaoImpl.class, + HostDetailsDaoImpl.class, + HostTagsDaoImpl.class, + ClusterDaoImpl.class, + HostPodDaoImpl.class, + DataCenterDaoImpl.class, + DataCenterIpAddressDaoImpl.class, + HostTransferMapDaoImpl.class, + SecurityGroupManagerImpl2.class, + SecurityGroupDaoImpl.class, + SecurityGroupVMMapDaoImpl.class, + UserVmDetailsDaoImpl.class, + DataCenterIpAddressDaoImpl.class, + DataCenterLinkLocalIpAddressDaoImpl.class, + DataCenterVnetDaoImpl.class, + PodVlanDaoImpl.class, + DcDetailsDaoImpl.class, + SecurityGroupRuleDaoImpl.class, + NicDaoImpl.class, + SecurityGroupJoinDaoImpl.class}, + includeFilters={@Filter(value=Library.class, type=FilterType.CUSTOM)}, + useDefaultFilters=false + ) +public class SecurityGroupManagerTestConfiguration { + + @Bean + public NetworkModel networkModel() { + return Mockito.mock(NetworkModel.class); + } + + @Bean + public AgentManager agentManager() { + return Mockito.mock(AgentManager.class); + } + + @Bean + public VirtualMachineManager virtualMachineManager(){ + return Mockito.mock(VirtualMachineManager.class); + } + + @Bean + public UserVmManager userVmManager() { + return Mockito.mock(UserVmManager.class); + } + + @Bean + public NetworkManager networkManager(){ + return Mockito.mock(NetworkManager.class); + } + + @Bean + public AccountManager accountManager() { + return Mockito.mock(AccountManager.class); + } + + @Bean + public DomainManager domainManager() { + return Mockito.mock(DomainManager.class); + } + + @Bean + public ProjectManager projectManager() { + return Mockito.mock(ProjectManager.class); + } + + public static class Library implements TypeFilter { + + @Override + public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { + mdr.getClassMetadata().getClassName(); + ComponentScan cs = SecurityGroupManagerTestConfiguration.class.getAnnotation(ComponentScan.class); + return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); + } + + } +} diff --git a/server/test/com/cloud/network/security/SecurityGroupQueueTest.java b/server/test/com/cloud/network/security/SecurityGroupQueueTest.java index b9e417675e4..e6237850825 100644 --- a/server/test/com/cloud/network/security/SecurityGroupQueueTest.java +++ b/server/test/com/cloud/network/security/SecurityGroupQueueTest.java @@ -139,7 +139,7 @@ public class SecurityGroupQueueTest extends TestCase { testNumJobsEqToNumVms2(400,5000); testNumJobsEqToNumVms2(1,1); testNumJobsEqToNumVms2(1,1000000); - testNumJobsEqToNumVms2(1000,1); + testNumJobsEqToNumVms2(750,1); } diff --git a/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java b/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java index 128a62cb097..cc410dbc4ca 100644 --- a/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java +++ b/server/test/com/cloud/snapshot/SnapshotDaoTestConfiguration.java @@ -1,72 +1,72 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package com.cloud.snapshot; - -import java.io.IOException; - -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScan.Filter; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.FilterType; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.core.type.filter.TypeFilter; - -import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; -import com.cloud.dc.dao.ClusterDaoImpl; -import com.cloud.dc.dao.HostPodDaoImpl; -import com.cloud.host.dao.HostDaoImpl; -import com.cloud.host.dao.HostDetailsDaoImpl; -import com.cloud.host.dao.HostTagsDaoImpl; -import com.cloud.storage.dao.SnapshotDaoImpl; -import com.cloud.storage.dao.VolumeDaoImpl; -import com.cloud.tags.dao.ResourceTagsDaoImpl; -import com.cloud.utils.component.SpringComponentScanUtils; -import com.cloud.vm.dao.NicDaoImpl; -import com.cloud.vm.dao.VMInstanceDaoImpl; - -@Configuration -@ComponentScan(basePackageClasses={ - SnapshotDaoImpl.class, - ResourceTagsDaoImpl.class, - VMInstanceDaoImpl.class, - VolumeDaoImpl.class, - NicDaoImpl.class, - HostDaoImpl.class, - HostDetailsDaoImpl.class, - HostTagsDaoImpl.class, - HostTransferMapDaoImpl.class, - ClusterDaoImpl.class, - HostPodDaoImpl.class}, - includeFilters={@Filter(value=SnapshotDaoTestConfiguration.Library.class, type=FilterType.CUSTOM)}, - useDefaultFilters=false - ) -public class SnapshotDaoTestConfiguration { - - - public static class Library implements TypeFilter { - - @Override - public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { - mdr.getClassMetadata().getClassName(); - ComponentScan cs = SnapshotDaoTestConfiguration.class.getAnnotation(ComponentScan.class); - return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); - } - - } -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package com.cloud.snapshot; + +import java.io.IOException; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.ComponentScan.Filter; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.core.type.filter.TypeFilter; + +import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; +import com.cloud.dc.dao.ClusterDaoImpl; +import com.cloud.dc.dao.HostPodDaoImpl; +import com.cloud.host.dao.HostDaoImpl; +import com.cloud.host.dao.HostDetailsDaoImpl; +import com.cloud.host.dao.HostTagsDaoImpl; +import com.cloud.storage.dao.SnapshotDaoImpl; +import com.cloud.storage.dao.VolumeDaoImpl; +import com.cloud.tags.dao.ResourceTagsDaoImpl; +import com.cloud.utils.component.SpringComponentScanUtils; +import com.cloud.vm.dao.NicDaoImpl; +import com.cloud.vm.dao.VMInstanceDaoImpl; + +@Configuration +@ComponentScan(basePackageClasses={ + SnapshotDaoImpl.class, + ResourceTagsDaoImpl.class, + VMInstanceDaoImpl.class, + VolumeDaoImpl.class, + NicDaoImpl.class, + HostDaoImpl.class, + HostDetailsDaoImpl.class, + HostTagsDaoImpl.class, + HostTransferMapDaoImpl.class, + ClusterDaoImpl.class, + HostPodDaoImpl.class}, + includeFilters={@Filter(value=SnapshotDaoTestConfiguration.Library.class, type=FilterType.CUSTOM)}, + useDefaultFilters=false + ) +public class SnapshotDaoTestConfiguration { + + + public static class Library implements TypeFilter { + + @Override + public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { + mdr.getClassMetadata().getClassName(); + ComponentScan cs = SnapshotDaoTestConfiguration.class.getAnnotation(ComponentScan.class); + return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); + } + + } +} diff --git a/server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java b/server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java index de0a4edb655..58de4d2730b 100644 --- a/server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java +++ b/server/test/com/cloud/storage/dao/StoragePoolDaoTestConfiguration.java @@ -1,53 +1,53 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package com.cloud.storage.dao; - -import java.io.IOException; - -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScan.Filter; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.FilterType; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.core.type.filter.TypeFilter; - -import com.cloud.utils.component.SpringComponentScanUtils; - -@Configuration -@ComponentScan(basePackageClasses={ - PrimaryDataStoreDaoImpl.class, - StoragePoolDetailsDaoImpl.class}, - includeFilters={@Filter(value=StoragePoolDaoTestConfiguration.Library.class, type=FilterType.CUSTOM)}, - useDefaultFilters=false - ) -public class StoragePoolDaoTestConfiguration { - - - public static class Library implements TypeFilter { - - @Override - public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { - mdr.getClassMetadata().getClassName(); - ComponentScan cs = StoragePoolDaoTestConfiguration.class.getAnnotation(ComponentScan.class); - return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); - } - - } -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package com.cloud.storage.dao; + +import java.io.IOException; + +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.ComponentScan.Filter; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.core.type.filter.TypeFilter; + +import com.cloud.utils.component.SpringComponentScanUtils; + +@Configuration +@ComponentScan(basePackageClasses={ + PrimaryDataStoreDaoImpl.class, + StoragePoolDetailsDaoImpl.class}, + includeFilters={@Filter(value=StoragePoolDaoTestConfiguration.Library.class, type=FilterType.CUSTOM)}, + useDefaultFilters=false + ) +public class StoragePoolDaoTestConfiguration { + + + public static class Library implements TypeFilter { + + @Override + public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { + mdr.getClassMetadata().getClassName(); + ComponentScan cs = StoragePoolDaoTestConfiguration.class.getAnnotation(ComponentScan.class); + return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); + } + + } +} diff --git a/server/test/com/cloud/vm/MockUserVmManagerImpl.java b/server/test/com/cloud/vm/MockUserVmManagerImpl.java index dd8dd83df58..d886fd8697f 100644 --- a/server/test/com/cloud/vm/MockUserVmManagerImpl.java +++ b/server/test/com/cloud/vm/MockUserVmManagerImpl.java @@ -23,9 +23,22 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.api.BaseCmd.HTTPMethod; import org.apache.cloudstack.api.command.admin.vm.AssignVMCmd; import org.apache.cloudstack.api.command.admin.vm.RecoverVMCmd; -import org.apache.cloudstack.api.command.user.vm.*; +import org.apache.cloudstack.api.command.user.vm.AddNicToVMCmd; +import org.apache.cloudstack.api.command.user.vm.DeployVMCmd; +import org.apache.cloudstack.api.command.user.vm.DestroyVMCmd; +import org.apache.cloudstack.api.command.user.vm.RebootVMCmd; +import org.apache.cloudstack.api.command.user.vm.RemoveNicFromVMCmd; +import org.apache.cloudstack.api.command.user.vm.ResetVMPasswordCmd; +import org.apache.cloudstack.api.command.user.vm.ResetVMSSHKeyCmd; +import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd; +import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd; +import org.apache.cloudstack.api.command.user.vm.StartVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpdateDefaultNicForVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpdateVMCmd; +import org.apache.cloudstack.api.command.user.vm.UpgradeVMCmd; import org.apache.cloudstack.api.command.user.vmgroup.CreateVMGroupCmd; import org.apache.cloudstack.api.command.user.vmgroup.DeleteVMGroupCmd; import org.springframework.stereotype.Component; @@ -40,13 +53,13 @@ import com.cloud.dc.DataCenter; import com.cloud.deploy.DeployDestination; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; +import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ManagementServerException; +import com.cloud.exception.PermissionDeniedException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; import com.cloud.exception.StorageUnavailableException; import com.cloud.exception.VirtualMachineMigrationException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.PermissionDeniedException; import com.cloud.host.Host; import com.cloud.hypervisor.Hypervisor.HypervisorType; import com.cloud.network.Network; @@ -59,10 +72,9 @@ import com.cloud.template.VirtualMachineTemplate; import com.cloud.user.Account; import com.cloud.uservm.UserVm; import com.cloud.utils.Pair; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; -import com.cloud.utils.exception.ExecutionException; import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.exception.ExecutionException; @Component @Local(value = { UserVmManager.class, UserVmService.class }) @@ -253,13 +265,13 @@ public class MockUserVmManagerImpl extends ManagerBase implements UserVmManager, // TODO Auto-generated method stub return null; } - + @Override public UserVm removeNicFromVirtualMachine(RemoveNicFromVMCmd cmd) throws InvalidParameterValueException, PermissionDeniedException, CloudRuntimeException { // TODO Auto-generated method stub return null; } - + @Override public UserVm updateDefaultNicForVirtualMachine(UpdateDefaultNicForVMCmd cmd) throws InvalidParameterValueException, CloudRuntimeException { // TODO Auto-generated method stub @@ -329,8 +341,10 @@ public class MockUserVmManagerImpl extends ManagerBase implements UserVmManager, @Override public UserVm createBasicSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List securityGroupIdList, Account owner, - String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, String userData, String sshKeyPair, Map requestedIps, - IpAddresses defaultIp, String keyboard) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, + String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, + HTTPMethod httpmethod, String userData, String sshKeyPair, Map requestedIps, + IpAddresses defaultIp, String keyboard, List affinityGroupIdList) + throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { // TODO Auto-generated method stub return null; @@ -338,17 +352,21 @@ public class MockUserVmManagerImpl extends ManagerBase implements UserVmManager, @Override public UserVm createAdvancedSecurityGroupVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, - List securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, String userData, - String sshKeyPair, Map requestedIps, IpAddresses defaultIps, String keyboard) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, - StorageUnavailableException, ResourceAllocationException { + List securityGroupIdList, Account owner, String hostName, String displayName, Long diskOfferingId, Long diskSize, + String group, HypervisorType hypervisor, HTTPMethod httpmethod, String userData, + String sshKeyPair, Map requestedIps, IpAddresses defaultIps, + String keyboard, List affinityGroupIdList) throws InsufficientCapacityException, + ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { // TODO Auto-generated method stub return null; } @Override public UserVm createAdvancedVirtualMachine(DataCenter zone, ServiceOffering serviceOffering, VirtualMachineTemplate template, List networkIdList, Account owner, String hostName, - String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, String userData, String sshKeyPair, Map requestedIps, IpAddresses defaultIps, - String keyboard) throws InsufficientCapacityException, ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { + String displayName, Long diskOfferingId, Long diskSize, String group, HypervisorType hypervisor, + HTTPMethod httpmethod, String userData, String sshKeyPair, Map requestedIps, + IpAddresses defaultIps, String keyboard, List affinityGroupIdList) throws InsufficientCapacityException, + ConcurrentOperationException, ResourceUnavailableException, StorageUnavailableException, ResourceAllocationException { // TODO Auto-generated method stub return null; } @@ -360,6 +378,14 @@ public class MockUserVmManagerImpl extends ManagerBase implements UserVmManager, return null; } + @Override + public VirtualMachine migrateVirtualMachineWithVolume(Long vmId, Host destinationHost, Map volumeToPool) + throws ResourceUnavailableException, ConcurrentOperationException, ManagementServerException, + VirtualMachineMigrationException { + // TODO Auto-generated method stub + return null; + } + @Override public UserVm moveVMToUser(AssignVMCmd moveUserVMCmd) throws ResourceAllocationException, ConcurrentOperationException, diff --git a/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java b/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java index 4917e77cdef..94ddea68879 100755 --- a/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java +++ b/server/test/com/cloud/vm/MockVirtualMachineManagerImpl.java @@ -23,6 +23,7 @@ import java.util.Map; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; import org.springframework.stereotype.Component; import com.cloud.agent.api.to.NicTO; @@ -45,6 +46,7 @@ import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.DiskOfferingVO; import com.cloud.storage.StoragePool; import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.VolumeVO; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.utils.Pair; @@ -142,6 +144,14 @@ public class MockVirtualMachineManagerImpl extends ManagerBase implements Virtua return null; } + @Override + public T migrateWithStorage(T vm, long srcHostId, long destHostId, + Map volumeToPool) throws ResourceUnavailableException, + ConcurrentOperationException, ManagementServerException, VirtualMachineMigrationException { + // TODO Auto-generated method stub + return null; + } + @Override public VMInstanceVO findByIdAndType(Type type, long vmId) { // TODO Auto-generated method stub diff --git a/server/test/com/cloud/vm/UserVmManagerTest.java b/server/test/com/cloud/vm/UserVmManagerTest.java index bb1c07b2784..e5e2ff2c0a8 100755 --- a/server/test/com/cloud/vm/UserVmManagerTest.java +++ b/server/test/com/cloud/vm/UserVmManagerTest.java @@ -17,45 +17,54 @@ package com.cloud.vm; +import static org.mockito.Matchers.anyBoolean; +import static org.mockito.Matchers.anyFloat; +import static org.mockito.Matchers.anyInt; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.eq; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.when; + import java.lang.reflect.Field; import java.util.List; -import com.cloud.api.ApiDBUtils; -import com.cloud.capacity.CapacityManager; -import com.cloud.configuration.ConfigurationManager; -import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.hypervisor.Hypervisor; -import com.cloud.offering.ServiceOffering; -import com.cloud.service.ServiceOfferingVO; -import com.cloud.user.*; -import com.cloud.vm.dao.VMInstanceDao; import org.apache.cloudstack.api.ServerApiException; import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd; import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd; -import org.apache.log4j.Logger; -import org.junit.Test; import org.junit.Before; +import org.junit.Test; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; +import com.cloud.capacity.CapacityManager; +import com.cloud.configuration.ConfigurationManager; +import com.cloud.configuration.dao.ConfigurationDao; import com.cloud.exception.ConcurrentOperationException; import com.cloud.exception.InsufficientCapacityException; import com.cloud.exception.InvalidParameterValueException; import com.cloud.exception.ResourceAllocationException; import com.cloud.exception.ResourceUnavailableException; -import com.cloud.storage.StorageManager; +import com.cloud.hypervisor.Hypervisor; +import com.cloud.offering.ServiceOffering; +import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.VMTemplateVO; +import com.cloud.storage.Volume; import com.cloud.storage.VolumeManager; import com.cloud.storage.VolumeVO; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; +import com.cloud.user.Account; +import com.cloud.user.AccountManager; +import com.cloud.user.AccountVO; +import com.cloud.user.UserContext; +import com.cloud.user.UserVO; import com.cloud.user.dao.AccountDao; import com.cloud.user.dao.UserDao; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.vm.dao.UserVmDao; - -import static org.mockito.Mockito.*; +import com.cloud.vm.dao.VMInstanceDao; public class UserVmManagerTest { @@ -127,7 +136,7 @@ public class UserVmManagerTest { doReturn(VirtualMachine.State.Stopped).when(_vmMock).getState(); when(_vmDao.findById(anyLong())).thenReturn(_vmMock); - when(_volsDao.findByInstance(anyLong())).thenReturn(_rootVols); + when(_volsDao.findByInstanceAndType(314L,Volume.Type.ROOT)).thenReturn(_rootVols); doReturn(false).when(_rootVols).isEmpty(); when(_rootVols.get(eq(0))).thenReturn(_volumeMock); doReturn(3L).when(_volumeMock).getTemplateId(); @@ -150,7 +159,7 @@ public class UserVmManagerTest { doReturn(VirtualMachine.State.Running).when(_vmMock).getState(); when(_vmDao.findById(anyLong())).thenReturn(_vmMock); - when(_volsDao.findByInstance(anyLong())).thenReturn(_rootVols); + when(_volsDao.findByInstanceAndType(314L,Volume.Type.ROOT)).thenReturn(_rootVols); doReturn(false).when(_rootVols).isEmpty(); when(_rootVols.get(eq(0))).thenReturn(_volumeMock); doReturn(3L).when(_volumeMock).getTemplateId(); @@ -174,7 +183,7 @@ public class UserVmManagerTest { ConcurrentOperationException, ResourceAllocationException { doReturn(VirtualMachine.State.Running).when(_vmMock).getState(); when(_vmDao.findById(anyLong())).thenReturn(_vmMock); - when(_volsDao.findByInstance(anyLong())).thenReturn(_rootVols); + when(_volsDao.findByInstanceAndType(314L,Volume.Type.ROOT)).thenReturn(_rootVols); doReturn(false).when(_rootVols).isEmpty(); when(_rootVols.get(eq(0))).thenReturn(_volumeMock); doReturn(3L).when(_volumeMock).getTemplateId(); @@ -361,6 +370,6 @@ public class UserVmManagerTest { return serviceOffering; } - + } \ No newline at end of file diff --git a/server/test/com/cloud/vm/VirtualMachineManagerImplTest.java b/server/test/com/cloud/vm/VirtualMachineManagerImplTest.java index 322f051c675..dd51e74a618 100644 --- a/server/test/com/cloud/vm/VirtualMachineManagerImplTest.java +++ b/server/test/com/cloud/vm/VirtualMachineManagerImplTest.java @@ -31,6 +31,41 @@ import com.cloud.service.ServiceOfferingVO; import com.cloud.storage.VMTemplateVO; import com.cloud.storage.VolumeManager; import com.cloud.storage.VolumeVO; +import com.cloud.agent.api.PrepareForMigrationAnswer; +import com.cloud.agent.api.PrepareForMigrationCommand; +import com.cloud.agent.api.MigrateWithStorageAnswer; +import com.cloud.agent.api.MigrateWithStorageCommand; +import com.cloud.agent.api.MigrateWithStorageReceiveAnswer; +import com.cloud.agent.api.MigrateWithStorageReceiveCommand; +import com.cloud.agent.api.MigrateWithStorageSendAnswer; +import com.cloud.agent.api.MigrateWithStorageSendCommand; +import com.cloud.agent.api.MigrateWithStorageCompleteAnswer; +import com.cloud.agent.api.MigrateWithStorageCompleteCommand; +import com.cloud.agent.api.CheckVirtualMachineAnswer; +import com.cloud.agent.api.CheckVirtualMachineCommand; +import com.cloud.capacity.CapacityManager; +import com.cloud.configuration.ConfigurationManager; +import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.dc.dao.ClusterDao; +import com.cloud.dc.dao.DataCenterDao; +import com.cloud.dc.dao.HostPodDao; +import com.cloud.exception.ConcurrentOperationException; +import com.cloud.exception.ManagementServerException; +import com.cloud.exception.ResourceUnavailableException; +import com.cloud.exception.VirtualMachineMigrationException; +import com.cloud.exception.OperationTimedoutException; +import com.cloud.host.HostVO; +import com.cloud.host.dao.HostDao; +import com.cloud.hypervisor.HypervisorGuru; +import com.cloud.hypervisor.HypervisorGuruManager; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.network.NetworkManager; +import com.cloud.storage.DiskOfferingVO; +import com.cloud.storage.StoragePoolHostVO; +import com.cloud.storage.VolumeManager; +import com.cloud.storage.VolumeVO; +import com.cloud.storage.dao.DiskOfferingDao; +import com.cloud.storage.dao.StoragePoolHostDao; import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VolumeDao; import com.cloud.user.*; @@ -41,20 +76,33 @@ import com.cloud.vm.dao.UserVmDao; import com.cloud.vm.dao.VMInstanceDao; import org.apache.cloudstack.api.command.user.vm.RestoreVMCmd; import org.apache.cloudstack.api.command.user.vm.ScaleVMCmd; +import com.cloud.utils.Pair; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.vm.dao.UserVmDao; +import com.cloud.vm.dao.VMInstanceDao; +import com.cloud.vm.snapshot.VMSnapshotManager; +import com.cloud.vm.VirtualMachine.Event; +import com.cloud.vm.VirtualMachine.State; + +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.apache.cloudstack.storage.datastore.db.StoragePoolVO; + import org.junit.Test; import org.junit.Before; import org.mockito.Mock; import org.mockito.MockitoAnnotations; import org.mockito.Spy; +import static org.mockito.Matchers.anyLong; import static org.mockito.Mockito.*; - import java.lang.reflect.Field; import java.util.List; +import java.util.Map; +import java.util.HashMap; +import java.util.Iterator; public class VirtualMachineManagerImplTest { - @Spy VirtualMachineManagerImpl _vmMgr = new VirtualMachineManagerImpl(); @Mock VolumeManager _storageMgr; @@ -106,6 +154,25 @@ public class VirtualMachineManagerImplTest { List _rootVols; @Mock ItWorkVO _work; + + @Mock ClusterDao _clusterDao; + @Mock HostPodDao _podDao; + @Mock DataCenterDao _dcDao; + @Mock DiskOfferingDao _diskOfferingDao; + @Mock PrimaryDataStoreDao _storagePoolDao; + @Mock StoragePoolHostDao _poolHostDao; + @Mock NetworkManager _networkMgr; + @Mock HypervisorGuruManager _hvGuruMgr; + @Mock VMSnapshotManager _vmSnapshotMgr; + + // Mock objects for vm migration with storage test. + @Mock DiskOfferingVO _diskOfferingMock; + @Mock StoragePoolVO _srcStoragePoolMock; + @Mock StoragePoolVO _destStoragePoolMock; + @Mock HostVO _srcHostMock; + @Mock HostVO _destHostMock; + @Mock Map _volumeToPoolMock; + @Before public void setup(){ MockitoAnnotations.initMocks(this); @@ -122,6 +189,16 @@ public class VirtualMachineManagerImplTest { _vmMgr._nodeId = 1L; _vmMgr._workDao = _workDao; _vmMgr._agentMgr = _agentMgr; + _vmMgr._podDao = _podDao; + _vmMgr._clusterDao = _clusterDao; + _vmMgr._dcDao = _dcDao; + _vmMgr._diskOfferingDao = _diskOfferingDao; + _vmMgr._storagePoolDao = _storagePoolDao; + _vmMgr._poolHostDao= _poolHostDao; + _vmMgr._networkMgr = _networkMgr; + _vmMgr._hvGuruMgr = _hvGuruMgr; + _vmMgr._vmSnapshotMgr = _vmSnapshotMgr; + _vmMgr._vmDao = _vmInstanceDao; when(_vmMock.getId()).thenReturn(314l); when(_vmInstance.getId()).thenReturn(1L); @@ -204,5 +281,155 @@ public class VirtualMachineManagerImplTest { return serviceOffering; } + private void initializeMockConfigForMigratingVmWithVolumes() throws OperationTimedoutException, + ResourceUnavailableException { + // Mock the source and destination hosts. + when(_srcHostMock.getId()).thenReturn(5L); + when(_destHostMock.getId()).thenReturn(6L); + when(_hostDao.findById(5L)).thenReturn(_srcHostMock); + when(_hostDao.findById(6L)).thenReturn(_destHostMock); + + // Mock the vm being migrated. + when(_vmMock.getId()).thenReturn(1L); + when(_vmMock.getHypervisorType()).thenReturn(HypervisorType.XenServer); + when(_vmMock.getState()).thenReturn(State.Running).thenReturn(State.Running).thenReturn(State.Migrating) + .thenReturn(State.Migrating); + when(_vmMock.getHostId()).thenReturn(5L); + when(_vmInstance.getId()).thenReturn(1L); + when(_vmInstance.getServiceOfferingId()).thenReturn(2L); + when(_vmInstance.getInstanceName()).thenReturn("myVm"); + when(_vmInstance.getHostId()).thenReturn(5L); + when(_vmInstance.getType()).thenReturn(VirtualMachine.Type.User); + when(_vmInstance.getState()).thenReturn(State.Running).thenReturn(State.Running).thenReturn(State.Migrating) + .thenReturn(State.Migrating); + + // Mock the work item. + when(_workDao.persist(any(ItWorkVO.class))).thenReturn(_work); + when(_workDao.update("1", _work)).thenReturn(true); + when(_work.getId()).thenReturn("1"); + doNothing().when(_work).setStep(ItWorkVO.Step.Done); + + // Mock the vm guru and the user vm object that gets returned. + _vmMgr._vmGurus = new HashMap>(); + UserVmManagerImpl userVmManager = mock(UserVmManagerImpl.class); + _vmMgr.registerGuru(VirtualMachine.Type.User, userVmManager); + when(userVmManager.findById(anyLong())).thenReturn(_vmMock); + + // Mock the iteration over all the volumes of an instance. + Iterator volumeIterator = mock(Iterator.class); + when(_volsDao.findUsableVolumesForInstance(anyLong())).thenReturn(_rootVols); + when(_rootVols.iterator()).thenReturn(volumeIterator); + when(volumeIterator.hasNext()).thenReturn(true, false); + when(volumeIterator.next()).thenReturn(_volumeMock); + + // Mock the disk offering and pool objects for a volume. + when(_volumeMock.getDiskOfferingId()).thenReturn(5L); + when(_volumeMock.getPoolId()).thenReturn(200L); + when(_diskOfferingDao.findById(anyLong())).thenReturn(_diskOfferingMock); + when(_storagePoolDao.findById(anyLong())).thenReturn(_srcStoragePoolMock); + + // Mock the volume to pool mapping. + when(_volumeToPoolMock.get(_volumeMock)).thenReturn(_destStoragePoolMock); + when(_destStoragePoolMock.getId()).thenReturn(201L); + when(_srcStoragePoolMock.getId()).thenReturn(200L); + when(_destStoragePoolMock.isLocal()).thenReturn(false); + when(_diskOfferingMock.getUseLocalStorage()).thenReturn(false); + when(_poolHostDao.findByPoolHost(anyLong(), anyLong())).thenReturn(mock(StoragePoolHostVO.class)); + + // Mock hypervisor guru. + HypervisorGuru guruMock = mock(HypervisorGuru.class); + when(_hvGuruMgr.getGuru(HypervisorType.XenServer)).thenReturn(guruMock); + + when(_srcHostMock.getClusterId()).thenReturn(3L); + when(_destHostMock.getClusterId()).thenReturn(3L); + + // Mock the commands and answers to the agent. + PrepareForMigrationAnswer prepAnswerMock = mock(PrepareForMigrationAnswer.class); + when(prepAnswerMock.getResult()).thenReturn(true); + when(_agentMgr.send(anyLong(), isA(PrepareForMigrationCommand.class))).thenReturn(prepAnswerMock); + + MigrateWithStorageAnswer migAnswerMock = mock(MigrateWithStorageAnswer.class); + when(migAnswerMock.getResult()).thenReturn(true); + when(_agentMgr.send(anyLong(), isA(MigrateWithStorageCommand.class))).thenReturn(migAnswerMock); + + MigrateWithStorageReceiveAnswer migRecAnswerMock = mock(MigrateWithStorageReceiveAnswer.class); + when(migRecAnswerMock.getResult()).thenReturn(true); + when(_agentMgr.send(anyLong(), isA(MigrateWithStorageReceiveCommand.class))).thenReturn(migRecAnswerMock); + + MigrateWithStorageSendAnswer migSendAnswerMock = mock(MigrateWithStorageSendAnswer.class); + when(migSendAnswerMock.getResult()).thenReturn(true); + when(_agentMgr.send(anyLong(), isA(MigrateWithStorageSendCommand.class))).thenReturn(migSendAnswerMock); + + MigrateWithStorageCompleteAnswer migCompleteAnswerMock = mock(MigrateWithStorageCompleteAnswer.class); + when(migCompleteAnswerMock.getResult()).thenReturn(true); + when(_agentMgr.send(anyLong(), isA(MigrateWithStorageCompleteCommand.class))).thenReturn(migCompleteAnswerMock); + + CheckVirtualMachineAnswer checkVmAnswerMock = mock(CheckVirtualMachineAnswer.class); + when(checkVmAnswerMock.getResult()).thenReturn(true); + when(checkVmAnswerMock.getState()).thenReturn(State.Running); + when(_agentMgr.send(anyLong(), isA(CheckVirtualMachineCommand.class))).thenReturn(checkVmAnswerMock); + + // Mock the state transitions of vm. + Pair opaqueMock = new Pair (_vmMock.getHostId(), _destHostMock.getId()); + when(_vmSnapshotMgr.hasActiveVMSnapshotTasks(anyLong())).thenReturn(false); + when(_vmInstanceDao.updateState(State.Running, Event.MigrationRequested, State.Migrating, _vmMock, opaqueMock)) + .thenReturn(true); + when(_vmInstanceDao.updateState(State.Migrating, Event.OperationSucceeded, State.Running, _vmMock, opaqueMock)) + .thenReturn(true); + } + + // Check migration of a vm with its volumes within a cluster. + @Test + public void testMigrateWithVolumeWithinCluster() throws ResourceUnavailableException, ConcurrentOperationException, + ManagementServerException, VirtualMachineMigrationException, OperationTimedoutException { + + initializeMockConfigForMigratingVmWithVolumes(); + when(_srcHostMock.getClusterId()).thenReturn(3L); + when(_destHostMock.getClusterId()).thenReturn(3L); + + _vmMgr.migrateWithStorage(_vmInstance, _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock); + } + + // Check migration of a vm with its volumes across a cluster. + @Test + public void testMigrateWithVolumeAcrossCluster() throws ResourceUnavailableException, ConcurrentOperationException, + ManagementServerException, VirtualMachineMigrationException, OperationTimedoutException { + + initializeMockConfigForMigratingVmWithVolumes(); + when(_srcHostMock.getClusterId()).thenReturn(3L); + when(_destHostMock.getClusterId()).thenReturn(4L); + + _vmMgr.migrateWithStorage(_vmInstance, _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock); + } + + // Check migration of a vm fails when src and destination pool are not of same type; that is, one is shared and + // other is local. + @Test(expected=CloudRuntimeException.class) + public void testMigrateWithVolumeFail1() throws ResourceUnavailableException, ConcurrentOperationException, + ManagementServerException, VirtualMachineMigrationException, OperationTimedoutException { + + initializeMockConfigForMigratingVmWithVolumes(); + when(_srcHostMock.getClusterId()).thenReturn(3L); + when(_destHostMock.getClusterId()).thenReturn(3L); + + when(_destStoragePoolMock.isLocal()).thenReturn(true); + when(_diskOfferingMock.getUseLocalStorage()).thenReturn(false); + + _vmMgr.migrateWithStorage(_vmInstance, _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock); + } + + // Check migration of a vm fails when vm is not in Running state. + @Test(expected=ConcurrentOperationException.class) + public void testMigrateWithVolumeFail2() throws ResourceUnavailableException, ConcurrentOperationException, + ManagementServerException, VirtualMachineMigrationException, OperationTimedoutException { + + initializeMockConfigForMigratingVmWithVolumes(); + when(_srcHostMock.getClusterId()).thenReturn(3L); + when(_destHostMock.getClusterId()).thenReturn(3L); + + when(_vmMock.getState()).thenReturn(State.Stopped); + + _vmMgr.migrateWithStorage(_vmInstance, _srcHostMock.getId(), _destHostMock.getId(), _volumeToPoolMock); + } } diff --git a/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java b/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java index 0936180383a..12d08ec3b51 100644 --- a/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java +++ b/server/test/com/cloud/vm/dao/UserVmDaoImplTest.java @@ -20,24 +20,47 @@ import javax.inject.Inject; import junit.framework.TestCase; -import com.cloud.hypervisor.Hypervisor.HypervisorType; +import org.apache.commons.lang.RandomStringUtils; +import org.junit.Test; +import com.cloud.hypervisor.Hypervisor; import com.cloud.vm.UserVmVO; import com.cloud.vm.VirtualMachine; - public class UserVmDaoImplTest extends TestCase { @Inject UserVmDao dao; - - public void testPersist() { - - dao.expunge(1000l); - - UserVmVO vo = new UserVmVO(1000l, "instancename", "displayname", 1, HypervisorType.XenServer, 1, true, true, 1, 1, 1, "userdata", "name", null); + + public void makeAndVerifyEntry(Long vmId, String instanceName, String displayName, long templateId, boolean userdataFlag, Hypervisor.HypervisorType hypervisor, + long guestOsId, boolean haEnabled, boolean limitCpuUse, long domainId, long accountId, long serviceOfferingId, String name, Long diskOfferingId) { + + dao.expunge(vmId); + String userdata; + + if (userdataFlag) { + // Generate large userdata to simulate 32k of random string data for userdata submitted through HTTP POST requests. + userdata = RandomStringUtils.randomAlphanumeric(32*1024); + } else { + // Generate normal sized userdata to simulate 2k of random string data. + userdata = RandomStringUtils.randomAlphanumeric(2*1024); + } + + // Persist the data. + UserVmVO vo = new UserVmVO(vmId, instanceName, displayName, templateId, hypervisor, guestOsId, haEnabled, limitCpuUse, domainId, accountId, serviceOfferingId, userdata, name, diskOfferingId); dao.persist(vo); - - vo = dao.findById(1000l); + + vo = dao.findById(vmId); assert (vo.getType() == VirtualMachine.Type.User) : "Incorrect type " + vo.getType(); + + // Check whether the userdata matches what we generated. + assert (vo.getUserData().equals(userdata)) : "User data retrieved does not match userdata generated as input"; + + } + + @Test + public void testPersist() { + Long vmId = 2222l; + makeAndVerifyEntry(vmId, "vm1", "vmdisp1", 1l, false, Hypervisor.HypervisorType.KVM, 1l, false, true, 1l, 1l, 1l, "uservm1", 1l); + makeAndVerifyEntry(vmId, "vm1", "vmdisp1", 1l, true, Hypervisor.HypervisorType.KVM, 1l, false, true, 1l, 1l, 1l, "uservm1", 1l); } } diff --git a/server/test/com/cloud/vm/dao/UserVmDaoTestConfiguration.java b/server/test/com/cloud/vm/dao/UserVmDaoTestConfiguration.java new file mode 100644 index 00000000000..6a63fabd44b --- /dev/null +++ b/server/test/com/cloud/vm/dao/UserVmDaoTestConfiguration.java @@ -0,0 +1,50 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. + +package com.cloud.vm.dao; + +import java.io.IOException; + +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.ComponentScan.Filter; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.core.type.filter.TypeFilter; + +import com.cloud.utils.component.SpringComponentScanUtils; + +@Configuration +@ComponentScan(basePackageClasses={ + UserVmDaoImpl.class}, + includeFilters={@Filter(value=UserVmDaoTestConfiguration.Library.class, type=FilterType.CUSTOM)}, + useDefaultFilters=false + ) + +public class UserVmDaoTestConfiguration { + public static class Library implements TypeFilter { + + @Override + public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { + mdr.getClassMetadata().getClassName(); + ComponentScan cs = UserVmDaoTestConfiguration.class.getAnnotation(ComponentScan.class); + return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); + } + + } +} \ No newline at end of file diff --git a/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java b/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java index a238e52c5d5..41c9d120539 100644 --- a/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java +++ b/server/test/com/cloud/vm/snapshot/VMSnapshotManagerTest.java @@ -1,186 +1,202 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// with the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. -package com.cloud.vm.snapshot; - -import static org.mockito.Matchers.any; -import static org.mockito.Matchers.anyLong; -import static org.mockito.Matchers.anyString; -import static org.mockito.Mockito.doNothing; -import static org.mockito.Mockito.doReturn; -import static org.mockito.Mockito.mock; -import static org.mockito.Mockito.when; - -import java.util.ArrayList; -import java.util.List; - -import org.apache.cloudstack.acl.ControlledEntity; -import org.apache.cloudstack.acl.SecurityChecker.AccessType; -import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; -import org.junit.Before; -import org.junit.Test; -import org.mockito.Mock; -import org.mockito.MockitoAnnotations; -import org.mockito.Spy; - -import com.cloud.agent.AgentManager; -import com.cloud.agent.api.Answer; -import com.cloud.agent.api.CreateVMSnapshotAnswer; -import com.cloud.agent.api.CreateVMSnapshotCommand; -import com.cloud.agent.api.to.VolumeTO; -import com.cloud.configuration.dao.ConfigurationDao; -import com.cloud.exception.AgentUnavailableException; -import com.cloud.exception.InvalidParameterValueException; -import com.cloud.exception.OperationTimedoutException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.host.dao.HostDao; -import com.cloud.hypervisor.HypervisorGuruManager; -import com.cloud.storage.GuestOSVO; -import com.cloud.storage.Snapshot; -import com.cloud.storage.SnapshotVO; -import com.cloud.storage.VolumeVO; -import com.cloud.storage.dao.GuestOSDao; -import com.cloud.storage.dao.SnapshotDao; -import com.cloud.storage.dao.VolumeDao; -import com.cloud.user.Account; -import com.cloud.user.AccountManager; -import com.cloud.user.dao.AccountDao; -import com.cloud.user.dao.UserDao; -import com.cloud.utils.exception.CloudRuntimeException; -import com.cloud.utils.fsm.NoTransitionException; -import com.cloud.vm.UserVmVO; -import com.cloud.vm.VirtualMachine.State; -import com.cloud.vm.VirtualMachineManager; -import com.cloud.vm.dao.UserVmDao; -import com.cloud.vm.dao.VMInstanceDao; -import com.cloud.vm.snapshot.dao.VMSnapshotDao; - - - -public class VMSnapshotManagerTest { - @Spy VMSnapshotManagerImpl _vmSnapshotMgr = new VMSnapshotManagerImpl(); - @Mock Account admin; - @Mock VMSnapshotDao _vmSnapshotDao; - @Mock VolumeDao _volumeDao; - @Mock AccountDao _accountDao; - @Mock VMInstanceDao _vmInstanceDao; - @Mock UserVmDao _userVMDao; - @Mock HostDao _hostDao; - @Mock UserDao _userDao; - @Mock AgentManager _agentMgr; - @Mock HypervisorGuruManager _hvGuruMgr; - @Mock AccountManager _accountMgr; - @Mock GuestOSDao _guestOSDao; - @Mock PrimaryDataStoreDao _storagePoolDao; - @Mock SnapshotDao _snapshotDao; - @Mock VirtualMachineManager _itMgr; - @Mock ConfigurationDao _configDao; - int _vmSnapshotMax = 10; - - private static long TEST_VM_ID = 3L; - @Mock UserVmVO vmMock; - @Mock VolumeVO volumeMock; - - @Before - public void setup(){ - MockitoAnnotations.initMocks(this); - doReturn(admin).when(_vmSnapshotMgr).getCaller(); - _vmSnapshotMgr._accountDao = _accountDao; - _vmSnapshotMgr._userVMDao = _userVMDao; - _vmSnapshotMgr._vmSnapshotDao = _vmSnapshotDao; - _vmSnapshotMgr._volumeDao = _volumeDao; - _vmSnapshotMgr._accountMgr = _accountMgr; - _vmSnapshotMgr._snapshotDao = _snapshotDao; - _vmSnapshotMgr._guestOSDao = _guestOSDao; - - doNothing().when(_accountMgr).checkAccess(any(Account.class), any(AccessType.class), - any(Boolean.class), any(ControlledEntity.class)); - - _vmSnapshotMgr._vmSnapshotMax = _vmSnapshotMax; - - when(_userVMDao.findById(anyLong())).thenReturn(vmMock); - when(_vmSnapshotDao.findByName(anyLong(), anyString())).thenReturn(null); - when(_vmSnapshotDao.findByVm(anyLong())).thenReturn(new ArrayList()); - - List mockVolumeList = new ArrayList(); - mockVolumeList.add(volumeMock); - when(volumeMock.getInstanceId()).thenReturn(TEST_VM_ID); - when(_volumeDao.findByInstance(anyLong())).thenReturn(mockVolumeList); - - when(vmMock.getInstanceName()).thenReturn("i-3-VM-TEST"); - when(vmMock.getState()).thenReturn(State.Running); - - when(_guestOSDao.findById(anyLong())).thenReturn(mock(GuestOSVO.class)); - } - - // vmId null case - @Test(expected=InvalidParameterValueException.class) - public void testAllocVMSnapshotF1() throws ResourceAllocationException{ - when(_userVMDao.findById(TEST_VM_ID)).thenReturn(null); - _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); - } - - // vm state not in [running, stopped] case - @Test(expected=InvalidParameterValueException.class) - public void testAllocVMSnapshotF2() throws ResourceAllocationException{ - when(vmMock.getState()).thenReturn(State.Starting); - _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); - } - - // VM in stopped state & snapshotmemory case - @Test(expected=InvalidParameterValueException.class) - public void testCreateVMSnapshotF3() throws AgentUnavailableException, OperationTimedoutException, ResourceAllocationException{ - when(vmMock.getState()).thenReturn(State.Stopped); - _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); - } - - // max snapshot limit case - @SuppressWarnings("unchecked") - @Test(expected=CloudRuntimeException.class) - public void testAllocVMSnapshotF4() throws ResourceAllocationException{ - List mockList = mock(List.class); - when(mockList.size()).thenReturn(10); - when(_vmSnapshotDao.findByVm(TEST_VM_ID)).thenReturn(mockList); - _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); - } - - // active volume snapshots case - @SuppressWarnings("unchecked") - @Test(expected=CloudRuntimeException.class) - public void testAllocVMSnapshotF5() throws ResourceAllocationException{ - List mockList = mock(List.class); - when(mockList.size()).thenReturn(1); - when(_snapshotDao.listByInstanceId(TEST_VM_ID,Snapshot.State.Creating, - Snapshot.State.CreatedOnPrimary, Snapshot.State.BackingUp)).thenReturn(mockList); - _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); - } - - // successful creation case - @Test - public void testCreateVMSnapshot() throws AgentUnavailableException, OperationTimedoutException, ResourceAllocationException, NoTransitionException{ - when(vmMock.getState()).thenReturn(State.Running); - _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); - - when(_vmSnapshotDao.findCurrentSnapshotByVmId(anyLong())).thenReturn(null); - doReturn(new ArrayList()).when(_vmSnapshotMgr).getVolumeTOList(anyLong()); - doReturn(new CreateVMSnapshotAnswer(null,true,"")).when(_vmSnapshotMgr).sendToPool(anyLong(), any(CreateVMSnapshotCommand.class)); - doNothing().when(_vmSnapshotMgr).processAnswer(any(VMSnapshotVO.class), - any(UserVmVO.class), any(Answer.class), anyLong()); - doReturn(true).when(_vmSnapshotMgr).vmSnapshotStateTransitTo(any(VMSnapshotVO.class),any(VMSnapshot.Event.class)); - _vmSnapshotMgr.createVmSnapshotInternal(vmMock, mock(VMSnapshotVO.class), 5L); - } - -} +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package com.cloud.vm.snapshot; + +import static org.mockito.Matchers.any; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Matchers.anyString; +import static org.mockito.Mockito.doNothing; +import static org.mockito.Mockito.doReturn; +import static org.mockito.Mockito.mock; +import static org.mockito.Mockito.when; + +import java.util.ArrayList; +import java.util.List; + +import javax.inject.Inject; + +import org.apache.cloudstack.acl.ControlledEntity; +import org.apache.cloudstack.acl.SecurityChecker.AccessType; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao; +import org.junit.Before; +import org.junit.Test; +import org.mockito.Mock; +import org.mockito.MockitoAnnotations; +import org.mockito.Spy; + +import com.amazonaws.services.ec2.model.HypervisorType; +import com.cloud.agent.AgentManager; +import com.cloud.agent.api.Answer; +import com.cloud.agent.api.CreateVMSnapshotAnswer; +import com.cloud.agent.api.CreateVMSnapshotCommand; +import com.cloud.agent.api.to.VolumeTO; +import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.exception.AgentUnavailableException; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.OperationTimedoutException; +import com.cloud.exception.ResourceAllocationException; +import com.cloud.host.dao.HostDao; +import com.cloud.hypervisor.Hypervisor; +import com.cloud.hypervisor.HypervisorGuruManager; +import com.cloud.hypervisor.dao.HypervisorCapabilitiesDao; +import com.cloud.storage.GuestOSVO; +import com.cloud.storage.Snapshot; +import com.cloud.storage.SnapshotVO; +import com.cloud.storage.VolumeVO; +import com.cloud.storage.dao.GuestOSDao; +import com.cloud.storage.dao.SnapshotDao; +import com.cloud.storage.dao.VolumeDao; +import com.cloud.user.Account; +import com.cloud.user.AccountManager; +import com.cloud.user.dao.AccountDao; +import com.cloud.user.dao.UserDao; +import com.cloud.utils.exception.CloudRuntimeException; +import com.cloud.utils.fsm.NoTransitionException; +import com.cloud.vm.UserVmVO; +import com.cloud.vm.VirtualMachine.State; +import com.cloud.vm.VirtualMachineManager; +import com.cloud.vm.dao.UserVmDao; +import com.cloud.vm.dao.VMInstanceDao; +import com.cloud.vm.snapshot.dao.VMSnapshotDao; + + + +public class VMSnapshotManagerTest { + @Spy VMSnapshotManagerImpl _vmSnapshotMgr = new VMSnapshotManagerImpl(); + @Mock Account admin; + @Mock VMSnapshotDao _vmSnapshotDao; + @Mock VolumeDao _volumeDao; + @Mock AccountDao _accountDao; + @Mock VMInstanceDao _vmInstanceDao; + @Mock UserVmDao _userVMDao; + @Mock HostDao _hostDao; + @Mock UserDao _userDao; + @Mock AgentManager _agentMgr; + @Mock HypervisorGuruManager _hvGuruMgr; + @Mock AccountManager _accountMgr; + @Mock GuestOSDao _guestOSDao; + @Mock PrimaryDataStoreDao _storagePoolDao; + @Mock SnapshotDao _snapshotDao; + @Mock VirtualMachineManager _itMgr; + @Mock ConfigurationDao _configDao; + @Mock HypervisorCapabilitiesDao _hypervisorCapabilitiesDao; + int _vmSnapshotMax = 10; + + private static long TEST_VM_ID = 3L; + @Mock UserVmVO vmMock; + @Mock VolumeVO volumeMock; + + @Before + public void setup(){ + MockitoAnnotations.initMocks(this); + doReturn(admin).when(_vmSnapshotMgr).getCaller(); + _vmSnapshotMgr._accountDao = _accountDao; + _vmSnapshotMgr._userVMDao = _userVMDao; + _vmSnapshotMgr._vmSnapshotDao = _vmSnapshotDao; + _vmSnapshotMgr._volumeDao = _volumeDao; + _vmSnapshotMgr._accountMgr = _accountMgr; + _vmSnapshotMgr._snapshotDao = _snapshotDao; + _vmSnapshotMgr._guestOSDao = _guestOSDao; + _vmSnapshotMgr._hypervisorCapabilitiesDao = _hypervisorCapabilitiesDao; + + doNothing().when(_accountMgr).checkAccess(any(Account.class), any(AccessType.class), + any(Boolean.class), any(ControlledEntity.class)); + + _vmSnapshotMgr._vmSnapshotMax = _vmSnapshotMax; + + when(_userVMDao.findById(anyLong())).thenReturn(vmMock); + when(_vmSnapshotDao.findByName(anyLong(), anyString())).thenReturn(null); + when(_vmSnapshotDao.findByVm(anyLong())).thenReturn(new ArrayList()); + when(_hypervisorCapabilitiesDao.isVmSnapshotEnabled(Hypervisor.HypervisorType.XenServer, "default")).thenReturn(true); + + List mockVolumeList = new ArrayList(); + mockVolumeList.add(volumeMock); + when(volumeMock.getInstanceId()).thenReturn(TEST_VM_ID); + when(_volumeDao.findByInstance(anyLong())).thenReturn(mockVolumeList); + + when(vmMock.getInstanceName()).thenReturn("i-3-VM-TEST"); + when(vmMock.getState()).thenReturn(State.Running); + when(vmMock.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.XenServer); + when(_guestOSDao.findById(anyLong())).thenReturn(mock(GuestOSVO.class)); + } + + // vmId null case + @Test(expected=InvalidParameterValueException.class) + public void testAllocVMSnapshotF1() throws ResourceAllocationException{ + when(_userVMDao.findById(TEST_VM_ID)).thenReturn(null); + _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); + } + + // hypervisorCapabilities not expected case + @Test(expected=InvalidParameterValueException.class) + public void testAllocVMSnapshotF6() throws ResourceAllocationException{ + when(vmMock.getHypervisorType()).thenReturn(Hypervisor.HypervisorType.Ovm); + when(_hypervisorCapabilitiesDao.isVmSnapshotEnabled(Hypervisor.HypervisorType.Ovm, "default")).thenReturn(false); + _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); + } + + // vm state not in [running, stopped] case + @Test(expected=InvalidParameterValueException.class) + public void testAllocVMSnapshotF2() throws ResourceAllocationException{ + when(vmMock.getState()).thenReturn(State.Starting); + _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); + } + + // VM in stopped state & snapshotmemory case + @Test(expected=InvalidParameterValueException.class) + public void testCreateVMSnapshotF3() throws AgentUnavailableException, OperationTimedoutException, ResourceAllocationException{ + when(vmMock.getState()).thenReturn(State.Stopped); + _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); + } + + // max snapshot limit case + @SuppressWarnings("unchecked") + @Test(expected=CloudRuntimeException.class) + public void testAllocVMSnapshotF4() throws ResourceAllocationException{ + List mockList = mock(List.class); + when(mockList.size()).thenReturn(10); + when(_vmSnapshotDao.findByVm(TEST_VM_ID)).thenReturn(mockList); + _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); + } + + // active volume snapshots case + @SuppressWarnings("unchecked") + @Test(expected=CloudRuntimeException.class) + public void testAllocVMSnapshotF5() throws ResourceAllocationException{ + List mockList = mock(List.class); + when(mockList.size()).thenReturn(1); + when(_snapshotDao.listByInstanceId(TEST_VM_ID,Snapshot.State.Creating, + Snapshot.State.CreatedOnPrimary, Snapshot.State.BackingUp)).thenReturn(mockList); + _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); + } + + // successful creation case + @Test + public void testCreateVMSnapshot() throws AgentUnavailableException, OperationTimedoutException, ResourceAllocationException, NoTransitionException{ + when(vmMock.getState()).thenReturn(State.Running); + _vmSnapshotMgr.allocVMSnapshot(TEST_VM_ID,"","",true); + + when(_vmSnapshotDao.findCurrentSnapshotByVmId(anyLong())).thenReturn(null); + doReturn(new ArrayList()).when(_vmSnapshotMgr).getVolumeTOList(anyLong()); + doReturn(new CreateVMSnapshotAnswer(null,true,"")).when(_vmSnapshotMgr).sendToPool(anyLong(), any(CreateVMSnapshotCommand.class)); + doNothing().when(_vmSnapshotMgr).processAnswer(any(VMSnapshotVO.class), + any(UserVmVO.class), any(Answer.class), anyLong()); + doReturn(true).when(_vmSnapshotMgr).vmSnapshotStateTransitTo(any(VMSnapshotVO.class),any(VMSnapshot.Event.class)); + _vmSnapshotMgr.createVmSnapshotInternal(vmMock, mock(VMSnapshotVO.class), 5L); + } + +} diff --git a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java old mode 100644 new mode 100755 index d96e831cfeb..6cda294fbe7 --- a/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java +++ b/server/test/com/cloud/vpc/MockConfigurationManagerImpl.java @@ -25,6 +25,7 @@ import javax.inject.Inject; import javax.naming.ConfigurationException; import javax.naming.NamingException; +import com.cloud.configuration.ConfigurationVO; import org.apache.cloudstack.api.command.admin.config.UpdateCfgCmd; import org.apache.cloudstack.api.command.admin.ldap.LDAPConfigCmd; import org.apache.cloudstack.api.command.admin.ldap.LDAPRemoveCmd; @@ -40,7 +41,9 @@ import org.apache.cloudstack.api.command.admin.offering.UpdateServiceOfferingCmd import org.apache.cloudstack.api.command.admin.pod.DeletePodCmd; import org.apache.cloudstack.api.command.admin.pod.UpdatePodCmd; import org.apache.cloudstack.api.command.admin.vlan.CreateVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.vlan.DedicatePublicIpRangeCmd; import org.apache.cloudstack.api.command.admin.vlan.DeleteVlanIpRangeCmd; +import org.apache.cloudstack.api.command.admin.vlan.ReleasePublicIpRangeCmd; import org.apache.cloudstack.api.command.admin.zone.CreateZoneCmd; import org.apache.cloudstack.api.command.admin.zone.DeleteZoneCmd; import org.apache.cloudstack.api.command.admin.zone.UpdateZoneCmd; @@ -423,9 +426,9 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu * @see com.cloud.configuration.ConfigurationManager#updateConfiguration(long, java.lang.String, java.lang.String, java.lang.String) */ @Override - public void updateConfiguration(long userId, String name, String category, String value) { + public void updateConfiguration(long userId, String name, String category, String value, String scope, Long resourceId) { // TODO Auto-generated method stub - + } /* (non-Javadoc) @@ -544,7 +547,7 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu * @see com.cloud.configuration.ConfigurationManager#deleteAccountSpecificVirtualRanges(long) */ @Override - public boolean deleteAccountSpecificVirtualRanges(long accountId) { + public boolean releaseAccountSpecificVirtualRanges(long accountId) { // TODO Auto-generated method stub return false; } @@ -613,5 +616,24 @@ public class MockConfigurationManagerImpl extends ManagerBase implements Configu return null; } + @Override + public Vlan dedicatePublicIpRange(DedicatePublicIpRangeCmd cmd) + throws ResourceAllocationException { + // TODO Auto-generated method stub + return null; + } + + @Override + public boolean releasePublicIpRange(ReleasePublicIpRangeCmd cmd) { + // TODO Auto-generated method stub + return false; + } + + @Override + public boolean releasePublicIpRange(long userId, long vlanDbId, + Account caller) { + // TODO Auto-generated method stub + return false; + } } diff --git a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java index ead0051b860..9b18358e258 100644 --- a/server/test/com/cloud/vpc/MockNetworkManagerImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkManagerImpl.java @@ -16,49 +16,17 @@ // under the License. package com.cloud.vpc; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.ejb.Local; -import javax.inject.Inject; -import javax.naming.ConfigurationException; - -import org.apache.cloudstack.acl.ControlledEntity.ACLType; -import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd; -import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; -import org.apache.cloudstack.api.command.user.network.ListNetworksCmd; -import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd; -import org.apache.cloudstack.api.command.user.vm.ListNicsCmd; -import org.apache.log4j.Logger; -import org.springframework.stereotype.Component; - import com.cloud.dc.DataCenter; import com.cloud.dc.Pod; import com.cloud.dc.Vlan.VlanType; import com.cloud.deploy.DataCenterDeployment; import com.cloud.deploy.DeployDestination; import com.cloud.deploy.DeploymentPlan; -import com.cloud.exception.ConcurrentOperationException; -import com.cloud.exception.InsufficientAddressCapacityException; -import com.cloud.exception.InsufficientCapacityException; -import com.cloud.exception.InsufficientVirtualNetworkCapcityException; -import com.cloud.exception.ResourceAllocationException; -import com.cloud.exception.ResourceUnavailableException; -import com.cloud.network.IpAddress; -import com.cloud.network.Network; +import com.cloud.exception.*; +import com.cloud.network.*; import com.cloud.network.Network.Provider; import com.cloud.network.Network.Service; -import com.cloud.network.NetworkManager; -import com.cloud.network.NetworkProfile; -import com.cloud.network.NetworkRuleApplier; -import com.cloud.network.NetworkService; import com.cloud.network.Networks.TrafficType; -import com.cloud.network.PhysicalNetwork; -import com.cloud.network.PhysicalNetworkServiceProvider; -import com.cloud.network.PhysicalNetworkTrafficType; -import com.cloud.network.PublicIpAddress; -import com.cloud.network.UserIpv6Address; import com.cloud.network.addr.PublicIp; import com.cloud.network.dao.IPAddressVO; import com.cloud.network.dao.NetworkServiceMapDao; @@ -78,7 +46,6 @@ import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.user.Account; import com.cloud.user.User; import com.cloud.utils.Pair; -import com.cloud.utils.component.Manager; import com.cloud.utils.component.ManagerBase; import com.cloud.vm.Nic; import com.cloud.vm.NicProfile; @@ -87,8 +54,24 @@ import com.cloud.vm.NicVO; import com.cloud.vm.ReservationContext; import com.cloud.vm.VMInstanceVO; import com.cloud.vm.VirtualMachine; +import com.cloud.vm.VirtualMachine.Type; import com.cloud.vm.VirtualMachineProfile; import com.cloud.vm.VirtualMachineProfileImpl; +import org.apache.cloudstack.acl.ControlledEntity.ACLType; +import org.apache.cloudstack.api.command.admin.usage.ListTrafficTypeImplementorsCmd; +import org.apache.cloudstack.api.command.user.network.CreateNetworkCmd; +import org.apache.cloudstack.api.command.user.network.ListNetworksCmd; +import org.apache.cloudstack.api.command.user.network.RestartNetworkCmd; +import org.apache.cloudstack.api.command.user.vm.ListNicsCmd; +import org.apache.log4j.Logger; +import org.springframework.stereotype.Component; + +import javax.ejb.Local; +import javax.inject.Inject; +import javax.naming.ConfigurationException; +import java.util.HashMap; +import java.util.List; +import java.util.Map; @Component @Local(value = { NetworkManager.class, NetworkService.class }) @@ -187,7 +170,7 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkManage * @see com.cloud.network.NetworkService#allocateIP(com.cloud.user.Account, long, java.lang.Long) */ @Override - public IpAddress allocateIP(Account ipOwner, boolean isSystem, long networkId) throws ResourceAllocationException, + public IpAddress allocateIP(Account ipOwner, long zoneId, Long networkId) throws ResourceAllocationException, InsufficientAddressCapacityException, ConcurrentOperationException { // TODO Auto-generated method stub return null; @@ -345,7 +328,7 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkManage */ @Override public PhysicalNetwork updatePhysicalNetwork(Long id, String networkSpeed, List tags, - String newVnetRangeString, String state) { + String newVnetRangeString, String state, String removeVlan) { // TODO Auto-generated method stub return null; } @@ -1333,7 +1316,7 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkManage } @Override - public String allocateSecondaryGuestIP(Account account, long zoneId, + public NicSecondaryIp allocateSecondaryGuestIP(Account account, long zoneId, Long nicId, Long networkId, String ipaddress) { // TODO Auto-generated method stub return null; @@ -1418,7 +1401,7 @@ public class MockNetworkManagerImpl extends ManagerBase implements NetworkManage @Override - public NicVO savePlaceholderNic(Network network, String ip4Address) { + public NicVO savePlaceholderNic(Network network, String ip4Address, Type vmType) { // TODO Auto-generated method stub return null; } diff --git a/server/test/com/cloud/vpc/MockNetworkModelImpl.java b/server/test/com/cloud/vpc/MockNetworkModelImpl.java index e1534cbf62a..9857964d911 100644 --- a/server/test/com/cloud/vpc/MockNetworkModelImpl.java +++ b/server/test/com/cloud/vpc/MockNetworkModelImpl.java @@ -851,16 +851,16 @@ public class MockNetworkModelImpl extends ManagerBase implements NetworkModel { return null; } - @Override - public Nic getPlaceholderNic(Network network, Long podId) { - // TODO Auto-generated method stub - return null; - } - @Override public boolean isProviderEnabledInZone(long zoneId, String provider) { // TODO Auto-generated method stub return false; } + @Override + public Nic getPlaceholderNicForRouter(Network network, Long podId) { + // TODO Auto-generated method stub + return null; + } + } diff --git a/server/test/com/cloud/vpc/Site2SiteVpnTest.java b/server/test/com/cloud/vpc/Site2SiteVpnTest.java index 8e1b09327bd..083cf252d7c 100644 --- a/server/test/com/cloud/vpc/Site2SiteVpnTest.java +++ b/server/test/com/cloud/vpc/Site2SiteVpnTest.java @@ -25,7 +25,7 @@ import org.springframework.test.context.ContextConfiguration; import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; @RunWith(SpringJUnit4ClassRunner.class) -@ContextConfiguration(locations="classpath:/testContext.xml") +@ContextConfiguration(locations="classpath:/VpcTestContext.xml") public class Site2SiteVpnTest { private final static Logger s_logger = Logger.getLogger(Site2SiteVpnTest.class); diff --git a/server/test/com/cloud/vpc/VpcApiUnitTest.java b/server/test/com/cloud/vpc/VpcApiUnitTest.java index d4d5b29812d..e141c9658b8 100644 --- a/server/test/com/cloud/vpc/VpcApiUnitTest.java +++ b/server/test/com/cloud/vpc/VpcApiUnitTest.java @@ -23,7 +23,6 @@ import javax.inject.Inject; import junit.framework.TestCase; -import org.apache.log4j.Logger; import org.junit.Before; import org.junit.Test; import org.junit.runner.RunWith; @@ -40,68 +39,18 @@ import com.cloud.utils.component.ComponentContext; @RunWith(SpringJUnit4ClassRunner.class) @ContextConfiguration(locations = "classpath:/VpcTestContext.xml") public class VpcApiUnitTest extends TestCase{ - private static final Logger s_logger = Logger.getLogger(VpcApiUnitTest.class); @Inject VpcManagerImpl _vpcService = null; - @Override @Before public void setUp() throws Exception { ComponentContext.initComponentsLifeCycle(); } + @Test - public void test() { - s_logger.debug("Starting test for VpcService interface"); - //Vpc service methods - //getActiveVpc(); - //deleteVpc(); - - //Vpc manager methods - validateNtwkOffForVpc(); - //destroyVpc(); - - } - - protected void deleteVpc() { - //delete existing offering - boolean result = false; - String msg = null; - try { - List svcs = new ArrayList(); - svcs.add(Service.SourceNat.getName()); - result = _vpcService.deleteVpc(1); - } catch (Exception ex) { - msg = ex.getMessage(); - } finally { - if (result) { - s_logger.debug("Delete vpc: Test passed, vpc is deleted"); - } else { - s_logger.error("Delete vpc: TEST FAILED, vpc failed to delete " + msg); - } - } - - //delete non-existing offering - result = false; - msg = null; - try { - List svcs = new ArrayList(); - svcs.add(Service.SourceNat.getName()); - result = _vpcService.deleteVpc(100); - } catch (Exception ex) { - msg = ex.getMessage(); - } finally { - if (!result) { - s_logger.debug("Delete vpc: Test passed, non existing vpc failed to delete "); - } else { - s_logger.error("Delete vpc: TEST FAILED, true is returned when try to delete non existing vpc"); - } - } - } - - protected void getActiveVpc() { + public void getActiveVpc() { //test for active vpc boolean result = false; - String msg = null; Vpc vpc = null; try { List svcs = new ArrayList(); @@ -111,18 +60,12 @@ public class VpcApiUnitTest extends TestCase{ result = true; } } catch (Exception ex) { - msg = ex.getMessage(); } finally { - if (result) { - s_logger.debug("Get active Vpc: Test passed, active vpc is returned"); - } else { - s_logger.error("Get active Vpc: TEST FAILED, active vpc is not returned " + msg); - } + assertTrue("Get active Vpc: TEST FAILED, active vpc is not returned", result); } //test for inactive vpc result = false; - msg = null; vpc = null; try { List svcs = new ArrayList(); @@ -132,66 +75,43 @@ public class VpcApiUnitTest extends TestCase{ result = true; } } catch (Exception ex) { - msg = ex.getMessage(); } finally { - if (!result) { - s_logger.debug("Get active Vpc: Test passed, no vpc is returned"); - } else { - s_logger.error("Get active Vpc: TEST FAILED, non active vpc is returned"); - } + assertFalse("Get active Vpc: TEST FAILED, non active vpc is returned", result); } } - protected void destroyVpc() { - try { - _vpcService.destroyVpc(_vpcService.getVpc(1), new AccountVO(), 1L); - } catch (Exception ex) { - s_logger.error("Destroy VPC TEST FAILED due to exc ", ex); - } - } - protected void validateNtwkOffForVpc() { + @Test + public void validateNtwkOffForVpc() { //validate network offering //1) correct network offering boolean result = false; try { _vpcService.validateNtwkOffForNtwkInVpc(2L, 1, "0.0.0.0", "111-", _vpcService.getVpc(1), "10.1.1.1", new AccountVO()); result = true; - s_logger.debug("Validate network offering: Test passed: the offering is valid for vpc creation"); } catch (Exception ex) { - s_logger.error("Validate network offering: TEST FAILED due to exc ", ex); + } finally { + assertTrue("Validate network offering: Test passed: the offering is valid for vpc creation", result); } //2) invalid offering - source nat is not included result = false; - String msg = null; try { _vpcService.validateNtwkOffForNtwkInVpc(2L, 2, "0.0.0.0", "111-", _vpcService.getVpc(1), "10.1.1.1", new AccountVO()); result = true; } catch (InvalidParameterValueException ex) { - msg = ex.getMessage(); } finally { - if (!result) { - s_logger.debug("Validate network offering: Test passed: " + msg); - } else { - s_logger.error("Validate network offering: TEST FAILED, can't use network offering without SourceNat service"); - } + assertFalse("Validate network offering: TEST FAILED, can't use network offering without SourceNat service", result); } //3) invalid offering - conserve mode is off result = false; - msg = null; try { _vpcService.validateNtwkOffForNtwkInVpc(2L, 3, "0.0.0.0", "111-", _vpcService.getVpc(1), "10.1.1.1", new AccountVO()); result = true; } catch (InvalidParameterValueException ex) { - msg = ex.getMessage(); } finally { - if (!result) { - s_logger.debug("Validate network offering: Test passed: " + msg); - } else { - s_logger.error("Validate network offering: TEST FAILED, can't use network offering without conserve mode = true"); - } + assertFalse("Validate network offering: TEST FAILED, can't use network offering without conserve mode = true", result); } //4) invalid offering - guest type shared @@ -200,13 +120,8 @@ public class VpcApiUnitTest extends TestCase{ _vpcService.validateNtwkOffForNtwkInVpc(2L, 4, "0.0.0.0", "111-", _vpcService.getVpc(1), "10.1.1.1", new AccountVO()); result = true; } catch (InvalidParameterValueException ex) { - msg = ex.getMessage(); } finally { - if (!result) { - s_logger.debug("Validate network offering: Test passed: " + msg); - } else { - s_logger.error("Validate network offering: TEST FAILED, can't use network offering with guest type = Shared"); - } + assertFalse("Validate network offering: TEST FAILED, can't use network offering with guest type = Shared", result); } //5) Invalid offering - no redundant router support @@ -215,30 +130,44 @@ public class VpcApiUnitTest extends TestCase{ _vpcService.validateNtwkOffForNtwkInVpc(2L, 5, "0.0.0.0", "111-", _vpcService.getVpc(1), "10.1.1.1", new AccountVO()); result = true; } catch (InvalidParameterValueException ex) { - msg = ex.getMessage(); } finally { - if (!result) { - s_logger.debug("Validate network offering: Test passed: " + msg); - } else { - s_logger.error("TEST FAILED, can't use network offering with guest type = Shared"); - } - } - - //6) Only one network in the VPC can support LB service - negative scenario - result = false; - try { - _vpcService.validateNtwkOffForNtwkInVpc(2L, 6, "0.0.0.0", "111-", _vpcService.getVpc(1), "10.1.1.1", new AccountVO()); - result = true; - s_logger.debug("Validate network offering: Test passed: the offering is valid for vpc creation"); - } catch (InvalidParameterValueException ex) { - msg = ex.getMessage(); - } finally { - if (!result) { - s_logger.debug("Test passed : " + msg); - } else { - s_logger.error("Validate network offering: TEST FAILED, can't use network offering with guest type = Shared"); - } + assertFalse("TEST FAILED, can't use network offering with guest type = Shared", result); } } - + + +// public void destroyVpc() { +// boolean result = false; +// try { +// result = _vpcService.destroyVpc(_vpcService.getVpc(1), new AccountVO(), 1L); +// } catch (Exception ex) { +// s_logger.debug(ex); +// } finally { +// assertTrue("Failed to destroy VPC", result); +// } +// } +// +// public void deleteVpc() { +// //delete existing offering +// boolean result = false; +// try { +// List svcs = new ArrayList(); +// svcs.add(Service.SourceNat.getName()); +// result = _vpcService.deleteVpc(1); +// } catch (Exception ex) { +// } finally { +// assertTrue("Delete vpc: TEST FAILED, vpc failed to delete" + result, result); +// } +// +// //delete non-existing offering +// result = false; +// try { +// List svcs = new ArrayList(); +// svcs.add(Service.SourceNat.getName()); +// result = _vpcService.deleteVpc(100); +// } catch (Exception ex) { +// } finally { +// assertFalse("Delete vpc: TEST FAILED, true is returned when try to delete non existing vpc" + result, result); +// } +// } } diff --git a/server/test/com/cloud/vpc/VpcTestConfiguration.java b/server/test/com/cloud/vpc/VpcTestConfiguration.java index e250cd12ed2..b1f2f80c076 100644 --- a/server/test/com/cloud/vpc/VpcTestConfiguration.java +++ b/server/test/com/cloud/vpc/VpcTestConfiguration.java @@ -1,231 +1,242 @@ -// Licensed to the Apache Software Foundation (ASF) under one -// or more contributor license agreements. See the NOTICE file -// distributed with this work for additional information -// regarding copyright ownership. The ASF licenses this file -// to you under the Apache License, Version 2.0 (the -// "License"); you may not use this file except in compliance -// the License. You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, -// software distributed under the License is distributed on an -// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -// KIND, either express or implied. See the License for the -// specific language governing permissions and limitations -// under the License. - -package com.cloud.vpc; - -import java.io.IOException; - -import org.mockito.Mockito; -import org.springframework.context.annotation.Bean; -import org.springframework.context.annotation.ComponentScan; -import org.springframework.context.annotation.ComponentScan.Filter; -import org.springframework.context.annotation.Configuration; -import org.springframework.context.annotation.FilterType; -import org.springframework.core.type.classreading.MetadataReader; -import org.springframework.core.type.classreading.MetadataReaderFactory; -import org.springframework.core.type.filter.TypeFilter; - -import com.cloud.alert.AlertManager; -import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; -import com.cloud.configuration.dao.ConfigurationDaoImpl; -import com.cloud.configuration.dao.ResourceLimitDaoImpl; -import com.cloud.dao.EntityManagerImpl; -import com.cloud.dc.dao.AccountVlanMapDaoImpl; -import com.cloud.dc.dao.ClusterDaoImpl; -import com.cloud.dc.dao.DataCenterDaoImpl; -import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; -import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; -import com.cloud.dc.dao.DataCenterVnetDaoImpl; -import com.cloud.dc.dao.DcDetailsDaoImpl; -import com.cloud.dc.dao.HostPodDaoImpl; -import com.cloud.dc.dao.PodVlanDaoImpl; -import com.cloud.dc.dao.PodVlanMapDaoImpl; -import com.cloud.domain.dao.DomainDaoImpl; -import com.cloud.event.dao.UsageEventDao; -import com.cloud.host.dao.HostDaoImpl; -import com.cloud.host.dao.HostDetailsDaoImpl; -import com.cloud.host.dao.HostTagsDaoImpl; -import com.cloud.vpc.MockNetworkModelImpl; -import com.cloud.network.StorageNetworkManager; -import com.cloud.network.dao.IPAddressDaoImpl; -import com.cloud.network.lb.LoadBalancingRulesManager; -import com.cloud.network.rules.RulesManager; -import com.cloud.network.vpc.VpcManagerImpl; -import com.cloud.network.vpc.dao.PrivateIpDaoImpl; -import com.cloud.network.vpc.dao.StaticRouteDaoImpl; -import com.cloud.network.vpc.dao.VpcDao; -import com.cloud.network.vpc.dao.VpcGatewayDaoImpl; -import com.cloud.network.vpc.dao.VpcOfferingDao; -import com.cloud.utils.component.SpringComponentScanUtils; -import com.cloud.vm.UserVmManager; -import com.cloud.vm.dao.DomainRouterDaoImpl; -import com.cloud.vm.dao.NicDaoImpl; -import com.cloud.vm.dao.UserVmDaoImpl; -import com.cloud.vm.dao.UserVmDetailsDaoImpl; -import com.cloud.vm.dao.VMInstanceDaoImpl; -import com.cloud.vpc.dao.MockNetworkOfferingDaoImpl; -import com.cloud.vpc.dao.MockNetworkOfferingServiceMapDaoImpl; -import com.cloud.vpc.dao.MockNetworkServiceMapDaoImpl; -import com.cloud.vpc.dao.MockVpcOfferingDaoImpl; -import com.cloud.vpc.dao.MockVpcOfferingServiceMapDaoImpl; - - -import com.cloud.configuration.dao.ResourceCountDaoImpl; -import com.cloud.dc.dao.VlanDaoImpl; -import com.cloud.network.dao.FirewallRulesCidrsDaoImpl; -import com.cloud.network.dao.FirewallRulesDaoImpl; -import com.cloud.network.dao.LoadBalancerDaoImpl; -import com.cloud.network.dao.NetworkDao; -import com.cloud.network.dao.PhysicalNetworkDaoImpl; -import com.cloud.network.dao.PhysicalNetworkTrafficTypeDaoImpl; -import com.cloud.network.dao.RouterNetworkDaoImpl; -import com.cloud.network.dao.Site2SiteVpnGatewayDaoImpl; -import com.cloud.network.dao.VirtualRouterProviderDaoImpl; -import com.cloud.network.element.NetworkElement; -import com.cloud.network.element.Site2SiteVpnServiceProvider; -import com.cloud.network.vpn.RemoteAccessVpnService; -import com.cloud.network.vpn.Site2SiteVpnManager; -import com.cloud.projects.dao.ProjectAccountDaoImpl; -import com.cloud.projects.dao.ProjectDaoImpl; -import com.cloud.resourcelimit.ResourceLimitManagerImpl; -import com.cloud.storage.dao.SnapshotDaoImpl; -import com.cloud.storage.dao.VMTemplateDaoImpl; -import com.cloud.storage.dao.VMTemplateDetailsDaoImpl; -import com.cloud.storage.dao.VMTemplateZoneDaoImpl; -import com.cloud.storage.dao.VolumeDaoImpl; -import com.cloud.tags.dao.ResourceTagsDaoImpl; -import com.cloud.user.AccountManager; -import com.cloud.user.dao.AccountDaoImpl; -import com.cloud.user.dao.UserStatisticsDaoImpl; - - -@Configuration -@ComponentScan(basePackageClasses={VpcManagerImpl.class, NetworkElement.class, - VpcOfferingDao.class, - ConfigurationDaoImpl.class, - IPAddressDaoImpl.class, - DomainRouterDaoImpl.class, - VpcGatewayDaoImpl.class, - PrivateIpDaoImpl.class, - StaticRouteDaoImpl.class, - PhysicalNetworkDaoImpl.class, - ResourceTagsDaoImpl.class, - FirewallRulesDaoImpl.class, - VlanDaoImpl.class, - AccountDaoImpl.class, - ResourceCountDaoImpl.class, - Site2SiteVpnGatewayDaoImpl.class, - PodVlanMapDaoImpl.class, - AccountVlanMapDaoImpl.class, - HostDaoImpl.class, - HostDetailsDaoImpl.class, - HostTagsDaoImpl.class, - HostTransferMapDaoImpl.class, - ClusterDaoImpl.class, - HostPodDaoImpl.class, - RouterNetworkDaoImpl.class, - UserStatisticsDaoImpl.class, - PhysicalNetworkTrafficTypeDaoImpl.class, - FirewallRulesCidrsDaoImpl.class, - ResourceLimitManagerImpl.class, - ResourceLimitDaoImpl.class, - ResourceCountDaoImpl.class, - DomainDaoImpl.class, - UserVmDaoImpl.class, - UserVmDetailsDaoImpl.class, - NicDaoImpl.class, - SnapshotDaoImpl.class, - VMInstanceDaoImpl.class, - VolumeDaoImpl.class, - VMTemplateDaoImpl.class,VMTemplateZoneDaoImpl.class,VMTemplateDetailsDaoImpl.class,DataCenterDaoImpl.class,DataCenterIpAddressDaoImpl.class,DataCenterLinkLocalIpAddressDaoImpl.class,DataCenterVnetDaoImpl.class,PodVlanDaoImpl.class, - DcDetailsDaoImpl.class,MockNetworkManagerImpl.class,MockVpcVirtualNetworkApplianceManager.class, - EntityManagerImpl.class,LoadBalancerDaoImpl.class,FirewallRulesCidrsDaoImpl.class,VirtualRouterProviderDaoImpl.class, - ProjectDaoImpl.class,ProjectAccountDaoImpl.class,MockVpcOfferingDaoImpl.class, - MockConfigurationManagerImpl.class, MockNetworkOfferingServiceMapDaoImpl.class, - MockNetworkServiceMapDaoImpl.class,MockVpcOfferingServiceMapDaoImpl.class,MockNetworkOfferingDaoImpl.class, MockNetworkModelImpl.class}, - includeFilters={@Filter(value=VpcTestConfiguration.VpcLibrary.class, type=FilterType.CUSTOM)}, - useDefaultFilters=false - ) -public class VpcTestConfiguration { - - - - @Bean - public RulesManager rulesManager() { - return Mockito.mock(RulesManager.class); - } - - - @Bean - public StorageNetworkManager storageNetworkManager() { - return Mockito.mock(StorageNetworkManager.class); - } - - @Bean - public LoadBalancingRulesManager loadBalancingRulesManager() { - return Mockito.mock(LoadBalancingRulesManager.class); - } - - - @Bean - public AlertManager alertManager() { - return Mockito.mock(AlertManager.class); - } - +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. - - @Bean - public UserVmManager userVmManager() { - return Mockito.mock(UserVmManager.class); - } - - - @Bean - public AccountManager accountManager() { - return Mockito.mock(AccountManager.class); - } - - @Bean - public Site2SiteVpnServiceProvider site2SiteVpnServiceProvider() { - return Mockito.mock(Site2SiteVpnServiceProvider.class); - } - - @Bean - public Site2SiteVpnManager site2SiteVpnManager() { - return Mockito.mock(Site2SiteVpnManager.class); - } - - - @Bean - public UsageEventDao usageEventDao() { - return Mockito.mock(UsageEventDao.class); - } - - @Bean - public RemoteAccessVpnService remoteAccessVpnService() { - return Mockito.mock(RemoteAccessVpnService.class); - } - - @Bean - public VpcDao vpcDao() { - return Mockito.mock(VpcDao.class); - } - - @Bean - public NetworkDao networkDao() { - return Mockito.mock(NetworkDao.class); - } - - public static class VpcLibrary implements TypeFilter { - @Override - public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { - mdr.getClassMetadata().getClassName(); - ComponentScan cs = VpcTestConfiguration.class.getAnnotation(ComponentScan.class); - return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); - } - } -} +package com.cloud.vpc; + +import java.io.IOException; + +import org.mockito.Mockito; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.ComponentScan.Filter; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.core.type.filter.TypeFilter; + +import com.cloud.alert.AlertManager; +import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; +import com.cloud.configuration.dao.ConfigurationDaoImpl; +import com.cloud.configuration.dao.ResourceCountDaoImpl; +import com.cloud.configuration.dao.ResourceLimitDaoImpl; +import com.cloud.dao.EntityManagerImpl; +import com.cloud.dc.dao.AccountVlanMapDaoImpl; +import com.cloud.dc.dao.ClusterDaoImpl; +import com.cloud.dc.dao.DataCenterDaoImpl; +import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; +import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; +import com.cloud.dc.dao.DataCenterVnetDaoImpl; +import com.cloud.dc.dao.DcDetailsDaoImpl; +import com.cloud.dc.dao.HostPodDaoImpl; +import com.cloud.dc.dao.PodVlanDaoImpl; +import com.cloud.dc.dao.PodVlanMapDaoImpl; +import com.cloud.dc.dao.VlanDaoImpl; +import com.cloud.domain.dao.DomainDaoImpl; +import com.cloud.event.dao.UsageEventDao; +import com.cloud.host.dao.HostDaoImpl; +import com.cloud.host.dao.HostDetailsDaoImpl; +import com.cloud.host.dao.HostTagsDaoImpl; +import com.cloud.network.Ipv6AddressManagerImpl; +import com.cloud.network.StorageNetworkManager; +import com.cloud.network.dao.FirewallRulesCidrsDaoImpl; +import com.cloud.network.dao.FirewallRulesDaoImpl; +import com.cloud.network.dao.IPAddressDaoImpl; +import com.cloud.network.dao.LoadBalancerDaoImpl; +import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.PhysicalNetworkDaoImpl; +import com.cloud.network.dao.PhysicalNetworkTrafficTypeDaoImpl; +import com.cloud.network.dao.RouterNetworkDaoImpl; +import com.cloud.network.dao.Site2SiteVpnGatewayDaoImpl; +import com.cloud.network.dao.UserIpv6AddressDaoImpl; +import com.cloud.network.dao.VirtualRouterProviderDaoImpl; +import com.cloud.network.element.NetworkElement; +import com.cloud.network.element.Site2SiteVpnServiceProvider; +import com.cloud.network.lb.LoadBalancingRulesManager; +import com.cloud.network.rules.RulesManager; +import com.cloud.network.vpc.VpcManagerImpl; +import com.cloud.network.vpc.dao.PrivateIpDaoImpl; +import com.cloud.network.vpc.dao.StaticRouteDaoImpl; +import com.cloud.network.vpc.dao.VpcDao; +import com.cloud.network.vpc.dao.VpcGatewayDaoImpl; +import com.cloud.network.vpc.dao.VpcOfferingDao; +import com.cloud.network.vpc.dao.VpcServiceMapDaoImpl; +import com.cloud.network.vpn.RemoteAccessVpnService; +import com.cloud.network.vpn.Site2SiteVpnManager; +import com.cloud.projects.dao.ProjectAccountDaoImpl; +import com.cloud.projects.dao.ProjectDaoImpl; +import com.cloud.resourcelimit.ResourceLimitManagerImpl; +import com.cloud.service.dao.ServiceOfferingDaoImpl; +import com.cloud.storage.dao.SnapshotDaoImpl; +import com.cloud.storage.dao.VMTemplateDaoImpl; +import com.cloud.storage.dao.VMTemplateDetailsDaoImpl; +import com.cloud.storage.dao.VMTemplateHostDaoImpl; +import com.cloud.storage.dao.VMTemplateZoneDaoImpl; +import com.cloud.storage.dao.VolumeDaoImpl; +import com.cloud.tags.dao.ResourceTagsDaoImpl; +import com.cloud.user.AccountManager; +import com.cloud.user.dao.AccountDaoImpl; +import com.cloud.user.dao.UserStatisticsDaoImpl; +import com.cloud.utils.component.SpringComponentScanUtils; +import com.cloud.vm.UserVmManager; +import com.cloud.vm.dao.DomainRouterDaoImpl; +import com.cloud.vm.dao.NicDaoImpl; +import com.cloud.vm.dao.NicSecondaryIpDaoImpl; +import com.cloud.vm.dao.UserVmDaoImpl; +import com.cloud.vm.dao.UserVmDetailsDaoImpl; +import com.cloud.vm.dao.VMInstanceDaoImpl; +import com.cloud.vpc.dao.MockNetworkOfferingDaoImpl; +import com.cloud.vpc.dao.MockNetworkOfferingServiceMapDaoImpl; +import com.cloud.vpc.dao.MockNetworkServiceMapDaoImpl; +import com.cloud.vpc.dao.MockVpcDaoImpl; +import com.cloud.vpc.dao.MockVpcOfferingDaoImpl; +import com.cloud.vpc.dao.MockVpcOfferingServiceMapDaoImpl; + + +@Configuration +@ComponentScan(basePackageClasses={VpcManagerImpl.class, NetworkElement.class, + VpcOfferingDao.class, + ConfigurationDaoImpl.class, + IPAddressDaoImpl.class, + DomainRouterDaoImpl.class, + VpcGatewayDaoImpl.class, + PrivateIpDaoImpl.class, + StaticRouteDaoImpl.class, + PhysicalNetworkDaoImpl.class, + ResourceTagsDaoImpl.class, + FirewallRulesDaoImpl.class, + VlanDaoImpl.class, + AccountDaoImpl.class, + ResourceCountDaoImpl.class, + Site2SiteVpnGatewayDaoImpl.class, + PodVlanMapDaoImpl.class, + AccountVlanMapDaoImpl.class, + HostDaoImpl.class, + HostDetailsDaoImpl.class, + HostTagsDaoImpl.class, + HostTransferMapDaoImpl.class, + ClusterDaoImpl.class, + HostPodDaoImpl.class, + RouterNetworkDaoImpl.class, + UserStatisticsDaoImpl.class, + PhysicalNetworkTrafficTypeDaoImpl.class, + FirewallRulesCidrsDaoImpl.class, + ResourceLimitManagerImpl.class, + ResourceLimitDaoImpl.class, + ResourceCountDaoImpl.class, + DomainDaoImpl.class, + UserVmDaoImpl.class, + UserVmDetailsDaoImpl.class, + NicDaoImpl.class, + SnapshotDaoImpl.class, + VMInstanceDaoImpl.class, + VolumeDaoImpl.class, + UserIpv6AddressDaoImpl.class, + NicSecondaryIpDaoImpl.class, + VpcServiceMapDaoImpl.class, + ServiceOfferingDaoImpl.class, + VMTemplateHostDaoImpl.class, + MockVpcDaoImpl.class, + VMTemplateDaoImpl.class,VMTemplateZoneDaoImpl.class,VMTemplateDetailsDaoImpl.class,DataCenterDaoImpl.class,DataCenterIpAddressDaoImpl.class,DataCenterLinkLocalIpAddressDaoImpl.class,DataCenterVnetDaoImpl.class,PodVlanDaoImpl.class, + DcDetailsDaoImpl.class,MockNetworkManagerImpl.class,MockVpcVirtualNetworkApplianceManager.class, + EntityManagerImpl.class,LoadBalancerDaoImpl.class,FirewallRulesCidrsDaoImpl.class,VirtualRouterProviderDaoImpl.class, + ProjectDaoImpl.class,ProjectAccountDaoImpl.class,MockVpcOfferingDaoImpl.class, + MockConfigurationManagerImpl.class, MockNetworkOfferingServiceMapDaoImpl.class, + MockNetworkServiceMapDaoImpl.class,MockVpcOfferingServiceMapDaoImpl.class,MockNetworkOfferingDaoImpl.class, MockNetworkModelImpl.class, Ipv6AddressManagerImpl.class}, + includeFilters={@Filter(value=VpcTestConfiguration.VpcLibrary.class, type=FilterType.CUSTOM)}, + useDefaultFilters=false + ) +public class VpcTestConfiguration { + + + + @Bean + public RulesManager rulesManager() { + return Mockito.mock(RulesManager.class); + } + + + @Bean + public StorageNetworkManager storageNetworkManager() { + return Mockito.mock(StorageNetworkManager.class); + } + + @Bean + public LoadBalancingRulesManager loadBalancingRulesManager() { + return Mockito.mock(LoadBalancingRulesManager.class); + } + + + @Bean + public AlertManager alertManager() { + return Mockito.mock(AlertManager.class); + } + + + + @Bean + public UserVmManager userVmManager() { + return Mockito.mock(UserVmManager.class); + } + + + @Bean + public AccountManager accountManager() { + return Mockito.mock(AccountManager.class); + } + + @Bean + public Site2SiteVpnServiceProvider site2SiteVpnServiceProvider() { + return Mockito.mock(Site2SiteVpnServiceProvider.class); + } + + @Bean + public Site2SiteVpnManager site2SiteVpnManager() { + return Mockito.mock(Site2SiteVpnManager.class); + } + + + @Bean + public UsageEventDao usageEventDao() { + return Mockito.mock(UsageEventDao.class); + } + + @Bean + public RemoteAccessVpnService remoteAccessVpnService() { + return Mockito.mock(RemoteAccessVpnService.class); + } + +// @Bean +// public VpcDao vpcDao() { +// return Mockito.mock(VpcDao.class); +// } + + @Bean + public NetworkDao networkDao() { + return Mockito.mock(NetworkDao.class); + } + + + public static class VpcLibrary implements TypeFilter { + @Override + public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { + mdr.getClassMetadata().getClassName(); + ComponentScan cs = VpcTestConfiguration.class.getAnnotation(ComponentScan.class); + return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); + } + } +} diff --git a/server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java b/server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java new file mode 100644 index 00000000000..fb294697cc6 --- /dev/null +++ b/server/test/org/apache/cloudstack/affinity/AffinityApiTestConfiguration.java @@ -0,0 +1,344 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import java.io.IOException; + +import org.apache.cloudstack.acl.SecurityChecker; +import org.apache.cloudstack.affinity.dao.AffinityGroupDao; +import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; +import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDaoImpl; +import org.mockito.Mockito; +import org.springframework.context.annotation.Bean; +import org.springframework.context.annotation.ComponentScan; +import org.springframework.context.annotation.Configuration; +import org.springframework.context.annotation.FilterType; +import org.springframework.context.annotation.ComponentScan.Filter; +import org.springframework.core.type.classreading.MetadataReader; +import org.springframework.core.type.classreading.MetadataReaderFactory; +import org.springframework.core.type.filter.TypeFilter; +import com.cloud.utils.component.ComponentContext; +import com.cloud.agent.AgentManager; +import com.cloud.alert.AlertManager; +import com.cloud.api.query.dao.UserAccountJoinDaoImpl; +import com.cloud.capacity.dao.CapacityDaoImpl; +import com.cloud.cluster.agentlb.dao.HostTransferMapDaoImpl; +import com.cloud.configuration.dao.ConfigurationDao; +import com.cloud.dc.dao.AccountVlanMapDaoImpl; +import com.cloud.dc.dao.ClusterDaoImpl; +import com.cloud.dc.dao.DataCenterDaoImpl; +import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; +import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDao; +import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; +import com.cloud.dc.dao.DataCenterVnetDaoImpl; +import com.cloud.dc.dao.DcDetailsDaoImpl; +import com.cloud.dc.dao.HostPodDaoImpl; +import com.cloud.dc.dao.PodVlanDaoImpl; +import com.cloud.dc.dao.PodVlanMapDaoImpl; +import com.cloud.dc.dao.VlanDaoImpl; +import com.cloud.domain.dao.DomainDaoImpl; +import com.cloud.event.EventUtils; +import com.cloud.event.dao.EventDao; +import com.cloud.event.dao.EventDaoImpl; +import com.cloud.event.dao.UsageEventDaoImpl; +import com.cloud.host.dao.HostDaoImpl; +import com.cloud.host.dao.HostDetailsDaoImpl; +import com.cloud.host.dao.HostTagsDaoImpl; +import com.cloud.network.Ipv6AddressManager; +import com.cloud.network.NetworkManager; +import com.cloud.network.NetworkModel; +import com.cloud.network.NetworkService; +import com.cloud.network.StorageNetworkManager; +import com.cloud.network.dao.FirewallRulesCidrsDaoImpl; +import com.cloud.network.dao.FirewallRulesDaoImpl; +import com.cloud.network.dao.IPAddressDaoImpl; +import com.cloud.network.dao.LoadBalancerDaoImpl; +import com.cloud.network.dao.NetworkDao; +import com.cloud.network.dao.NetworkDomainDaoImpl; +import com.cloud.network.dao.NetworkServiceMapDaoImpl; +import com.cloud.network.dao.PhysicalNetworkDaoImpl; +import com.cloud.network.dao.PhysicalNetworkServiceProviderDaoImpl; +import com.cloud.network.dao.PhysicalNetworkTrafficTypeDaoImpl; +import com.cloud.network.dao.UserIpv6AddressDaoImpl; +import com.cloud.network.element.DhcpServiceProvider; +import com.cloud.network.element.IpDeployer; +import com.cloud.network.element.NetworkElement; +import com.cloud.network.guru.NetworkGuru; +import com.cloud.network.lb.LoadBalancingRulesManager; +import com.cloud.network.rules.FirewallManager; +import com.cloud.network.rules.RulesManager; +import com.cloud.network.rules.dao.PortForwardingRulesDaoImpl; +import com.cloud.network.vpc.NetworkACLManager; +import com.cloud.network.vpc.VpcManager; +import com.cloud.network.vpc.dao.PrivateIpDaoImpl; +import com.cloud.network.vpn.RemoteAccessVpnService; +import com.cloud.offerings.dao.NetworkOfferingDao; +import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; +import com.cloud.projects.ProjectManager; +import com.cloud.service.dao.ServiceOfferingDaoImpl; +import com.cloud.storage.dao.DiskOfferingDaoImpl; +import com.cloud.storage.dao.S3DaoImpl; +import com.cloud.storage.dao.SnapshotDaoImpl; +import com.cloud.storage.dao.StoragePoolDetailsDaoImpl; +import com.cloud.storage.dao.SwiftDaoImpl; +import com.cloud.storage.dao.VolumeDaoImpl; +import com.cloud.storage.s3.S3Manager; +import com.cloud.storage.secondary.SecondaryStorageVmManager; +import com.cloud.storage.swift.SwiftManager; +import com.cloud.tags.dao.ResourceTagsDaoImpl; +import com.cloud.user.AccountManager; +import com.cloud.user.ResourceLimitService; +import com.cloud.user.UserContext; +import com.cloud.user.UserContextInitializer; +import com.cloud.user.dao.AccountDao; +import com.cloud.user.dao.AccountDaoImpl; +import com.cloud.user.dao.UserDaoImpl; +import com.cloud.utils.component.SpringComponentScanUtils; +import com.cloud.utils.db.GenericDao; +import com.cloud.utils.db.GenericDaoBase; +import com.cloud.vm.UserVmVO; +import com.cloud.vm.dao.InstanceGroupDaoImpl; +import com.cloud.vm.dao.NicDaoImpl; +import com.cloud.vm.dao.NicSecondaryIpDaoImpl; +import com.cloud.vm.dao.UserVmDao; +import com.cloud.vm.dao.VMInstanceDaoImpl; + +@Configuration +@ComponentScan(basePackageClasses = { AccountVlanMapDaoImpl.class, VolumeDaoImpl.class, HostPodDaoImpl.class, + DomainDaoImpl.class, SwiftDaoImpl.class, ServiceOfferingDaoImpl.class, VlanDaoImpl.class, + IPAddressDaoImpl.class, ResourceTagsDaoImpl.class, InstanceGroupDaoImpl.class, + UserAccountJoinDaoImpl.class, CapacityDaoImpl.class, SnapshotDaoImpl.class, HostDaoImpl.class, + VMInstanceDaoImpl.class, HostTransferMapDaoImpl.class, PortForwardingRulesDaoImpl.class, + PrivateIpDaoImpl.class, UsageEventDaoImpl.class, PodVlanMapDaoImpl.class, DiskOfferingDaoImpl.class, + DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, + DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DcDetailsDaoImpl.class, NicSecondaryIpDaoImpl.class, + UserIpv6AddressDaoImpl.class, S3DaoImpl.class, UserDaoImpl.class, NicDaoImpl.class, NetworkDomainDaoImpl.class, + HostDetailsDaoImpl.class, HostTagsDaoImpl.class, ClusterDaoImpl.class, FirewallRulesDaoImpl.class, + FirewallRulesCidrsDaoImpl.class, PhysicalNetworkDaoImpl.class, PhysicalNetworkTrafficTypeDaoImpl.class, + PhysicalNetworkServiceProviderDaoImpl.class, LoadBalancerDaoImpl.class, NetworkServiceMapDaoImpl.class, + PrimaryDataStoreDaoImpl.class, StoragePoolDetailsDaoImpl.class, AffinityGroupServiceImpl.class, + ComponentContext.class, AffinityGroupProcessor.class, UserVmVO.class, EventUtils.class, UserVmVO.class + }, includeFilters = { @Filter(value = AffinityApiTestConfiguration.Library.class, type = FilterType.CUSTOM) }, useDefaultFilters = false) +public class AffinityApiTestConfiguration { + + @Bean + public AccountDao accountDao() { + return Mockito.mock(AccountDao.class); + } + + @Bean + public EventUtils eventUtils() { + return Mockito.mock(EventUtils.class); + } + + @Bean + public AffinityGroupProcessor affinityGroupProcessor() { + return Mockito.mock(AffinityGroupProcessor.class); + } + + @Bean + public ComponentContext componentContext() { + return Mockito.mock(ComponentContext.class); + } + + + @Bean + public UserContextInitializer userContextInitializer() { + return Mockito.mock(UserContextInitializer.class); + } + + @Bean + public UserVmVO userVmVO() { + return Mockito.mock(UserVmVO.class); + } + + @Bean + public AffinityGroupDao affinityGroupDao() { + return Mockito.mock(AffinityGroupDao.class); + } + + @Bean + public AffinityGroupVMMapDao affinityGroupVMMapDao() { + return Mockito.mock(AffinityGroupVMMapDao.class); + } + + @Bean + public AccountManager acctMgr() { + return Mockito.mock(AccountManager.class); + } + + @Bean + public NetworkService ntwkSvc() { + return Mockito.mock(NetworkService.class); + } + + @Bean + public NetworkModel ntwkMdl() { + return Mockito.mock(NetworkModel.class); + } + + @Bean + public AlertManager alertMgr() { + return Mockito.mock(AlertManager.class); + } + + @Bean + public SecurityChecker securityChkr() { + return Mockito.mock(SecurityChecker.class); + } + + @Bean + public ResourceLimitService resourceSvc() { + return Mockito.mock(ResourceLimitService.class); + } + + @Bean + public ProjectManager projectMgr() { + return Mockito.mock(ProjectManager.class); + } + + @Bean + public SecondaryStorageVmManager ssvmMgr() { + return Mockito.mock(SecondaryStorageVmManager.class); + } + + @Bean + public SwiftManager swiftMgr() { + return Mockito.mock(SwiftManager.class); + } + + @Bean + public S3Manager s3Mgr() { + return Mockito.mock(S3Manager.class); + } + + @Bean + public VpcManager vpcMgr() { + return Mockito.mock(VpcManager.class); + } + + @Bean + public UserVmDao userVMDao() { + return Mockito.mock(UserVmDao.class); + } + + @Bean + public RulesManager rulesMgr() { + return Mockito.mock(RulesManager.class); + } + + @Bean + public LoadBalancingRulesManager lbRulesMgr() { + return Mockito.mock(LoadBalancingRulesManager.class); + } + + @Bean + public RemoteAccessVpnService vpnMgr() { + return Mockito.mock(RemoteAccessVpnService.class); + } + + @Bean + public NetworkGuru ntwkGuru() { + return Mockito.mock(NetworkGuru.class); + } + + @Bean + public NetworkElement ntwkElement() { + return Mockito.mock(NetworkElement.class); + } + + @Bean + public IpDeployer ipDeployer() { + return Mockito.mock(IpDeployer.class); + } + + @Bean + public DhcpServiceProvider dhcpProvider() { + return Mockito.mock(DhcpServiceProvider.class); + } + + @Bean + public FirewallManager firewallMgr() { + return Mockito.mock(FirewallManager.class); + } + + @Bean + public AgentManager agentMgr() { + return Mockito.mock(AgentManager.class); + } + + @Bean + public StorageNetworkManager storageNtwkMgr() { + return Mockito.mock(StorageNetworkManager.class); + } + + @Bean + public NetworkACLManager ntwkAclMgr() { + return Mockito.mock(NetworkACLManager.class); + } + + @Bean + public Ipv6AddressManager ipv6Mgr() { + return Mockito.mock(Ipv6AddressManager.class); + } + + @Bean + public ConfigurationDao configDao() { + return Mockito.mock(ConfigurationDao.class); + } + + @Bean + public NetworkManager networkManager() { + return Mockito.mock(NetworkManager.class); + } + + @Bean + public NetworkOfferingDao networkOfferingDao() { + return Mockito.mock(NetworkOfferingDao.class); + } + + @Bean + public EventDao eventDao() { + return Mockito.mock(EventDao.class); + } + + @Bean + public NetworkDao networkDao() { + return Mockito.mock(NetworkDao.class); + } + + @Bean + public NetworkOfferingServiceMapDao networkOfferingServiceMapDao() { + return Mockito.mock(NetworkOfferingServiceMapDao.class); + } + + @Bean + public DataCenterLinkLocalIpAddressDao datacenterLinkLocalIpAddressDao() { + return Mockito.mock(DataCenterLinkLocalIpAddressDao.class); + } + + public static class Library implements TypeFilter { + + @Override + public boolean match(MetadataReader mdr, MetadataReaderFactory arg1) throws IOException { + mdr.getClassMetadata().getClassName(); + ComponentScan cs = AffinityApiTestConfiguration.class.getAnnotation(ComponentScan.class); + return SpringComponentScanUtils.includedInBasePackageClasses(mdr.getClassMetadata().getClassName(), cs); + } + + } +} diff --git a/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java new file mode 100644 index 00000000000..a5e6d15bf0b --- /dev/null +++ b/server/test/org/apache/cloudstack/affinity/AffinityApiUnitTest.java @@ -0,0 +1,187 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +package org.apache.cloudstack.affinity; + +import static org.junit.Assert.*; +import static org.mockito.Matchers.anyLong; +import static org.mockito.Mockito.*; + +import java.util.ArrayList; +import java.util.List; + +import org.apache.cloudstack.affinity.dao.AffinityGroupDao; +import org.apache.cloudstack.affinity.dao.AffinityGroupVMMapDao; +import org.junit.Before; +import org.junit.BeforeClass; +import org.junit.Test; +import org.junit.runner.RunWith; +import org.mockito.Mockito; +import org.springframework.test.context.ContextConfiguration; +import org.springframework.test.context.junit4.SpringJUnit4ClassRunner; + +import com.cloud.event.EventUtils; +import com.cloud.event.EventVO; +import com.cloud.event.dao.EventDao; +import com.cloud.exception.InvalidParameterValueException; +import com.cloud.exception.ResourceInUseException; +import com.cloud.hypervisor.Hypervisor.HypervisorType; +import com.cloud.user.Account; +import com.cloud.user.AccountManager; +import com.cloud.user.AccountVO; +import com.cloud.user.UserContext; +import com.cloud.user.dao.AccountDao; +import com.cloud.utils.component.ComponentContext; +import com.cloud.vm.UserVmVO; +import com.cloud.vm.VirtualMachine; +import com.cloud.vm.dao.UserVmDao; + +import javax.inject.Inject; +import javax.naming.ConfigurationException; + +@RunWith(SpringJUnit4ClassRunner.class) +@ContextConfiguration(locations = "classpath:/affinityContext.xml") +public class AffinityApiUnitTest { + + @Inject + AffinityGroupServiceImpl _affinityService; + + @Inject + AccountManager _acctMgr; + + @Inject + AffinityGroupProcessor _processor; + + @Inject + AffinityGroupDao _groupDao; + + @Inject + UserVmDao _vmDao; + + @Inject + AffinityGroupVMMapDao _affinityGroupVMMapDao; + + @Inject + AffinityGroupDao _affinityGroupDao; + + @Inject + EventUtils _eventUtils; + + @Inject + AccountDao _accountDao; + + @Inject + EventDao _eventDao; + + private static long domainId = 5L; + + + @BeforeClass + public static void setUp() throws ConfigurationException { + + } + + @Before + public void testSetUp() { + ComponentContext.initComponentsLifeCycle(); + AccountVO acct = new AccountVO(200L); + acct.setType(Account.ACCOUNT_TYPE_NORMAL); + acct.setAccountName("user"); + acct.setDomainId(domainId); + + UserContext.registerContext(1, acct, null, true); + + when(_acctMgr.finalizeOwner((Account) anyObject(), anyString(), anyLong(), anyLong())).thenReturn(acct); + when(_processor.getType()).thenReturn("mock"); + when(_accountDao.findByIdIncludingRemoved(0L)).thenReturn(acct); + + AffinityGroupVO group = new AffinityGroupVO("group1", "mock", "mock group", domainId, 200L); + Mockito.when(_affinityGroupDao.persist(Mockito.any(AffinityGroupVO.class))).thenReturn(group); + Mockito.when(_affinityGroupDao.findById(Mockito.anyLong())).thenReturn(group); + Mockito.when(_affinityGroupDao.findByAccountAndName(Mockito.anyLong(), Mockito.anyString())).thenReturn(group); + Mockito.when(_affinityGroupDao.lockRow(Mockito.anyLong(), anyBoolean())).thenReturn(group); + Mockito.when(_affinityGroupDao.expunge(Mockito.anyLong())).thenReturn(true); + Mockito.when(_eventDao.persist(Mockito.any(EventVO.class))).thenReturn(new EventVO()); + } + + @Test + public void createAffinityGroupTest() { + AffinityGroup group = _affinityService.createAffinityGroup("user", domainId, "group1", "mock", + "affinity group one"); + assertNotNull("Affinity group 'group1' of type 'mock' failed to create ", group); + + } + + @Test(expected = InvalidParameterValueException.class) + public void invalidAffinityTypeTest() { + AffinityGroup group = _affinityService.createAffinityGroup("user", domainId, "group1", "invalid", + "affinity group one"); + + } + + @Test(expected = InvalidParameterValueException.class) + public void uniqueAffinityNameTest() { + when(_groupDao.isNameInUse(anyLong(), anyLong(), eq("group1"))).thenReturn(true); + AffinityGroup group2 = _affinityService.createAffinityGroup("user", domainId, "group1", "mock", + "affinity group two"); + } + + @Test(expected = InvalidParameterValueException.class) + public void deleteAffinityGroupInvalidIdTest() throws ResourceInUseException { + when(_groupDao.findById(20L)).thenReturn(null); + _affinityService.deleteAffinityGroup(20L, "user", domainId, "group1"); + } + + @Test(expected = InvalidParameterValueException.class) + public void deleteAffinityGroupInvalidIdName() throws ResourceInUseException { + when(_groupDao.findByAccountAndName(200L, "group1")).thenReturn(null); + _affinityService.deleteAffinityGroup(null, "user", domainId, "group1"); + } + + @Test(expected = InvalidParameterValueException.class) + public void deleteAffinityGroupNullIdName() throws ResourceInUseException { + _affinityService.deleteAffinityGroup(null, "user", domainId, null); + } + + @Test(expected = ResourceInUseException.class) + public void deleteAffinityGroupInUse() throws ResourceInUseException { + List affinityGroupVmMap = new ArrayList(); + AffinityGroupVMMapVO mapVO = new AffinityGroupVMMapVO(20L, 10L); + affinityGroupVmMap.add(mapVO); + when(_affinityGroupVMMapDao.listByAffinityGroup(20L)).thenReturn(affinityGroupVmMap); + + AffinityGroupVO groupVO = new AffinityGroupVO(); + when(_groupDao.findById(20L)).thenReturn(groupVO); + when(_groupDao.lockRow(20L, true)).thenReturn(groupVO); + + _affinityService.deleteAffinityGroup(20L, "user", domainId, null); + } + + @Test(expected = InvalidParameterValueException.class) + public void updateAffinityGroupVMRunning() throws ResourceInUseException { + + UserVmVO vm = new UserVmVO(10L, "test", "test", 101L, HypervisorType.Any, 21L, false, false, domainId, 200L, + 5L, "", "test", 1L); + vm.setState(VirtualMachine.State.Running); + when(_vmDao.findById(10L)).thenReturn(vm); + + List affinityGroupIds = new ArrayList(); + affinityGroupIds.add(20L); + + _affinityService.updateVMAffinityGroups(10L, affinityGroupIds); + } + +} diff --git a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java index 895a5d4416d..f1163ef35ee 100644 --- a/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java +++ b/server/test/org/apache/cloudstack/networkoffering/ChildTestConfiguration.java @@ -41,6 +41,7 @@ import com.cloud.dc.dao.AccountVlanMapDaoImpl; import com.cloud.dc.dao.ClusterDaoImpl; import com.cloud.dc.dao.DataCenterDaoImpl; import com.cloud.dc.dao.DataCenterIpAddressDaoImpl; +import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDao; import com.cloud.dc.dao.DataCenterLinkLocalIpAddressDaoImpl; import com.cloud.dc.dao.DataCenterVnetDaoImpl; import com.cloud.dc.dao.DcDetailsDaoImpl; @@ -135,7 +136,6 @@ import com.cloud.vm.dao.VMInstanceDaoImpl; DiskOfferingDaoImpl.class, DataCenterDaoImpl.class, DataCenterIpAddressDaoImpl.class, - DataCenterLinkLocalIpAddressDaoImpl.class, DataCenterVnetDaoImpl.class, PodVlanDaoImpl.class, DcDetailsDaoImpl.class, @@ -319,6 +319,11 @@ public class ChildTestConfiguration { return Mockito.mock(NetworkOfferingServiceMapDao.class); } + @Bean + public DataCenterLinkLocalIpAddressDao datacenterLinkLocalIpAddressDao() { + return Mockito.mock(DataCenterLinkLocalIpAddressDao.class); + } + public static class Library implements TypeFilter { @Override diff --git a/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java b/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java index 67fae3349c1..cbb6c00e397 100644 --- a/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java +++ b/server/test/org/apache/cloudstack/networkoffering/CreateNetworkOfferingTest.java @@ -49,7 +49,6 @@ import com.cloud.offerings.dao.NetworkOfferingServiceMapDao; import com.cloud.user.AccountManager; import com.cloud.user.AccountVO; import com.cloud.user.UserContext; -import com.cloud.user.UserContextInitializer; import com.cloud.user.UserVO; import com.cloud.utils.component.ComponentContext; diff --git a/server/test/resources/UserVMDaoTestContext.xml b/server/test/resources/UserVMDaoTestContext.xml new file mode 100644 index 00000000000..6045f590229 --- /dev/null +++ b/server/test/resources/UserVMDaoTestContext.xml @@ -0,0 +1,44 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/server/test/resources/affinityContext.xml b/server/test/resources/affinityContext.xml new file mode 100644 index 00000000000..15476c1a1b3 --- /dev/null +++ b/server/test/resources/affinityContext.xml @@ -0,0 +1,47 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/server/test/resources/network-mgr-component.xml b/server/test/resources/network-mgr-component.xml index 42d3c2ebdb1..b55a68b0fcf 100644 --- a/server/test/resources/network-mgr-component.xml +++ b/server/test/resources/network-mgr-component.xml @@ -78,7 +78,7 @@ under the License. - + diff --git a/services/console-proxy/server/conf/agent.properties b/services/console-proxy/server/conf/agent.properties index 4e217f21100..246cb1c3d08 100644 --- a/services/console-proxy/server/conf/agent.properties +++ b/services/console-proxy/server/conf/agent.properties @@ -1,19 +1,2 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - instance=ConsoleProxy resource=com.cloud.agent.resource.consoleproxy.ConsoleProxyResource diff --git a/services/console-proxy/server/conf/environment.properties b/services/console-proxy/server/conf/environment.properties new file mode 100644 index 00000000000..269acad9152 --- /dev/null +++ b/services/console-proxy/server/conf/environment.properties @@ -0,0 +1,2 @@ +paths.script=../../scripts/storage/secondary/ +paths.pid=. diff --git a/services/console-proxy/server/conf/log4j-cloud.xml b/services/console-proxy/server/conf/log4j-cloud.xml index 5b31c9db967..2d1d361c939 100644 --- a/services/console-proxy/server/conf/log4j-cloud.xml +++ b/services/console-proxy/server/conf/log4j-cloud.xml @@ -27,7 +27,7 @@ under the License. - + diff --git a/services/console-proxy/server/pom.xml b/services/console-proxy/server/pom.xml index f57b4caddd6..3ac5d5957f7 100644 --- a/services/console-proxy/server/pom.xml +++ b/services/console-proxy/server/pom.xml @@ -57,6 +57,11 @@ ${project.version} pom + + org.apache.cloudstack + cloud-secondary-storage + ${project.version} + install @@ -254,6 +259,42 @@ + + quickcloud + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + + java + + + + + com.cloud.agent.AgentShell + + zone=1 + pod=1 + host=192.168.56.1 + guid=ConsoleProxy.1 + + + + javax.net.ssl.trustStore + certs/realhostip.keystore + log.home + ${PWD}/ + + + + + + + diff --git a/services/console-proxy/server/scripts/_run.sh b/services/console-proxy/server/scripts/_run.sh index e408378afbc..bd063468cfb 100755 --- a/services/console-proxy/server/scripts/_run.sh +++ b/services/console-proxy/server/scripts/_run.sh @@ -35,6 +35,7 @@ do CP=${CP}:$file done keyvalues= +LOGHOME=/var/log/cloud/ CMDLINE=$(cat /var/cache/cloud/cmdline) @@ -60,4 +61,4 @@ then maxmem=$eightypcnt fi -java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@ +java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@ diff --git a/services/console-proxy/server/scripts/consoleproxy.sh b/services/console-proxy/server/scripts/consoleproxy.sh new file mode 100755 index 00000000000..294d5974bb5 --- /dev/null +++ b/services/console-proxy/server/scripts/consoleproxy.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + +#runs the console proxy as a standalone server +#i.e., not in the system vm + +CP=./:./conf +for file in *.jar +do + CP=${CP}:$file +done +keyvalues= +#LOGHOME=/var/log/cloud/ +LOGHOME=$PWD/ + +java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@ diff --git a/services/console-proxy/server/scripts/secstorage.sh b/services/console-proxy/server/scripts/secstorage.sh new file mode 100755 index 00000000000..b45afc2e8ca --- /dev/null +++ b/services/console-proxy/server/scripts/secstorage.sh @@ -0,0 +1,33 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + +#runs the secondary storage service as a standalone server +#i.e., not in the system vm + +CP=./:./conf +for file in *.jar +do + CP=${CP}:$file +done +keyvalues= +#LOGHOME=/var/log/cloud/ +LOGHOME=$PWD/ + +java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -cp $CP com.cloud.agent.AgentShell $keyvalues $@ diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java index b5c29892a7b..2abce565856 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxy.java @@ -17,6 +17,8 @@ package com.cloud.consoleproxy; import java.io.File; +import java.io.FileInputStream; +import java.io.FileNotFoundException; import java.io.InputStream; import java.lang.reflect.InvocationTargetException; import java.lang.reflect.Method; @@ -34,6 +36,7 @@ import org.apache.commons.codec.binary.Base64; import org.apache.log4j.xml.DOMConfigurator; import com.cloud.consoleproxy.util.Logger; +import com.cloud.utils.PropertiesUtil; import com.google.gson.Gson; import com.sun.net.httpserver.HttpServer; @@ -282,8 +285,17 @@ public class ConsoleProxy { InputStream confs = ConsoleProxy.class.getResourceAsStream("/conf/consoleproxy.properties"); Properties props = new Properties(); if (confs == null) { - s_logger.info("Can't load consoleproxy.properties from classpath, will use default configuration"); - } else { + final File file = PropertiesUtil.findConfigFile("consoleproxy.properties"); + if (file == null) + s_logger.info("Can't load consoleproxy.properties from classpath, will use default configuration"); + else + try { + confs = new FileInputStream(file); + } catch (FileNotFoundException e) { + s_logger.info("Ignoring file not found exception and using defaults"); + } + } + if (confs != null) { try { props.load(confs); diff --git a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java index 29826f0ea92..5a7241ac7e5 100644 --- a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java +++ b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxyPasswordBasedEncryptor.java @@ -16,13 +16,16 @@ // under the License. package com.cloud.consoleproxy; +import java.security.InvalidAlgorithmParameterException; import java.security.InvalidKeyException; import java.security.NoSuchAlgorithmException; +import java.security.SecureRandom; import javax.crypto.BadPaddingException; import javax.crypto.Cipher; import javax.crypto.IllegalBlockSizeException; import javax.crypto.NoSuchPaddingException; +import javax.crypto.spec.IvParameterSpec; import javax.crypto.spec.SecretKeySpec; import org.apache.commons.codec.binary.Base64; @@ -33,110 +36,162 @@ import com.google.gson.GsonBuilder; /** * - * A simple password based encyrptor based on DES. It can serialize simple POJO object into URL safe string + * @author Kelven Yang + * A simple password based encyrptor based on AES/CBC. It can serialize simple POJO object into URL safe string * and deserialize it back. * */ public class ConsoleProxyPasswordBasedEncryptor { - private static final Logger s_logger = Logger.getLogger(ConsoleProxyPasswordBasedEncryptor.class); - - private String password; - private Gson gson; - - public ConsoleProxyPasswordBasedEncryptor(String password) { - this.password = password; - gson = new GsonBuilder().create(); - } - - public String encryptText(String text) { - if(text == null || text.isEmpty()) - return text; - - assert(password != null); - assert(!password.isEmpty()); - - try { - Cipher cipher = Cipher.getInstance("DES"); - int maxKeySize = 8; - SecretKeySpec keySpec = new SecretKeySpec(normalizeKey(password.getBytes(), maxKeySize), "DES"); - cipher.init(Cipher.ENCRYPT_MODE, keySpec); - byte[] encryptedBytes = cipher.doFinal(text.getBytes()); - return Base64.encodeBase64URLSafeString(encryptedBytes); - } catch (NoSuchAlgorithmException e) { - s_logger.error("Unexpected exception ", e); - return null; - } catch (NoSuchPaddingException e) { - s_logger.error("Unexpected exception ", e); - return null; - } catch (IllegalBlockSizeException e) { - s_logger.error("Unexpected exception ", e); - return null; - } catch (BadPaddingException e) { - s_logger.error("Unexpected exception ", e); - return null; - } catch (InvalidKeyException e) { - s_logger.error("Unexpected exception ", e); - return null; - } - } + private static final Logger s_logger = Logger.getLogger(ConsoleProxyPasswordBasedEncryptor.class); + + private Gson gson; + + // key/IV will be set in 128 bit strength + private KeyIVPair keyIvPair; + + public ConsoleProxyPasswordBasedEncryptor(String password) { + gson = new GsonBuilder().create(); + keyIvPair = gson.fromJson(password, KeyIVPair.class); + } + + public String encryptText(String text) { + if(text == null || text.isEmpty()) + return text; + + try { + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + SecretKeySpec keySpec = new SecretKeySpec(keyIvPair.getKeyBytes(), "AES"); - public String decryptText(String encryptedText) { - if(encryptedText == null || encryptedText.isEmpty()) - return encryptedText; + cipher.init(Cipher.ENCRYPT_MODE, keySpec, new IvParameterSpec(keyIvPair.getIvBytes())); + + byte[] encryptedBytes = cipher.doFinal(text.getBytes()); + return Base64.encodeBase64URLSafeString(encryptedBytes); + } catch (NoSuchAlgorithmException e) { + s_logger.error("Unexpected exception ", e); + return null; + } catch (NoSuchPaddingException e) { + s_logger.error("Unexpected exception ", e); + return null; + } catch (IllegalBlockSizeException e) { + s_logger.error("Unexpected exception ", e); + return null; + } catch (BadPaddingException e) { + s_logger.error("Unexpected exception ", e); + return null; + } catch (InvalidKeyException e) { + s_logger.error("Unexpected exception ", e); + return null; + } catch (InvalidAlgorithmParameterException e) { + s_logger.error("Unexpected exception ", e); + return null; + } + } - assert(password != null); - assert(!password.isEmpty()); + public String decryptText(String encryptedText) { + if(encryptedText == null || encryptedText.isEmpty()) + return encryptedText; - try { - Cipher cipher = Cipher.getInstance("DES"); - int maxKeySize = 8; - SecretKeySpec keySpec = new SecretKeySpec(normalizeKey(password.getBytes(), maxKeySize), "DES"); - cipher.init(Cipher.DECRYPT_MODE, keySpec); - - byte[] encryptedBytes = Base64.decodeBase64(encryptedText); - return new String(cipher.doFinal(encryptedBytes)); - } catch (NoSuchAlgorithmException e) { - s_logger.error("Unexpected exception ", e); - return null; - } catch (NoSuchPaddingException e) { - s_logger.error("Unexpected exception ", e); - return null; - } catch (IllegalBlockSizeException e) { - s_logger.error("Unexpected exception ", e); - return null; - } catch (BadPaddingException e) { - s_logger.error("Unexpected exception ", e); - return null; - } catch (InvalidKeyException e) { - s_logger.error("Unexpected exception ", e); - return null; - } - } - - public String encryptObject(Class clz, T obj) { - if(obj == null) - return null; - - String json = gson.toJson(obj); - return encryptText(json); - } - - @SuppressWarnings("unchecked") - public T decryptObject(Class clz, String encrypted) { - if(encrypted == null || encrypted.isEmpty()) - return null; - - String json = decryptText(encrypted); - return (T)gson.fromJson(json, clz); - } - - private static byte[] normalizeKey(byte[] keyBytes, int keySize) { - assert(keySize > 0); - byte[] key = new byte[keySize]; - - for(int i = 0; i < keyBytes.length; i++) - key[i%keySize] ^= keyBytes[i]; - - return key; - } + try { + Cipher cipher = Cipher.getInstance("AES/CBC/PKCS5Padding"); + SecretKeySpec keySpec = new SecretKeySpec(keyIvPair.getKeyBytes(), "AES"); + cipher.init(Cipher.DECRYPT_MODE, keySpec, new IvParameterSpec(keyIvPair.getIvBytes())); + + byte[] encryptedBytes = Base64.decodeBase64(encryptedText); + return new String(cipher.doFinal(encryptedBytes)); + } catch (NoSuchAlgorithmException e) { + s_logger.error("Unexpected exception ", e); + return null; + } catch (NoSuchPaddingException e) { + s_logger.error("Unexpected exception ", e); + return null; + } catch (IllegalBlockSizeException e) { + s_logger.error("Unexpected exception ", e); + return null; + } catch (BadPaddingException e) { + s_logger.error("Unexpected exception ", e); + return null; + } catch (InvalidKeyException e) { + s_logger.error("Unexpected exception ", e); + return null; + } catch (InvalidAlgorithmParameterException e) { + s_logger.error("Unexpected exception ", e); + return null; + } + } + + public String encryptObject(Class clz, T obj) { + if(obj == null) + return null; + + String json = gson.toJson(obj); + return encryptText(json); + } + + @SuppressWarnings("unchecked") + public T decryptObject(Class clz, String encrypted) { + if(encrypted == null || encrypted.isEmpty()) + return null; + + String json = decryptText(encrypted); + return (T)gson.fromJson(json, clz); + } + + public static class KeyIVPair { + String base64EncodedKeyBytes; + String base64EncodedIvBytes; + + public KeyIVPair() { + } + + public KeyIVPair(String base64EncodedKeyBytes, String base64EncodedIvBytes) { + this.base64EncodedKeyBytes = base64EncodedKeyBytes; + this.base64EncodedIvBytes = base64EncodedIvBytes; + } + + public byte[] getKeyBytes() { + return Base64.decodeBase64(base64EncodedKeyBytes); + } + + public void setKeyBytes(byte[] keyBytes) { + base64EncodedKeyBytes = Base64.encodeBase64URLSafeString(keyBytes); + } + + public byte[] getIvBytes() { + return Base64.decodeBase64(base64EncodedIvBytes); + } + + public void setIvBytes(byte[] ivBytes) { + base64EncodedIvBytes = Base64.encodeBase64URLSafeString(ivBytes); + } + } + + public static void main(String[] args) { + SecureRandom random; + try { + random = SecureRandom.getInstance("SHA1PRNG"); + byte[] keyBytes = new byte[16]; + random.nextBytes(keyBytes); + + byte[] ivBytes = new byte[16]; + random.nextBytes(ivBytes); + + KeyIVPair keyIvPair = new KeyIVPair("8x/xUBgX0Up+3UEo39dSeG277JhVj31+ElHkN5+EC0Q=", "Y2SUiIN6JXTdKNK/ZMDyVtLB7gAM9MCCiyrP1xd3bSQ="); + //keyIvPair.setKeyBytes(keyBytes); + //keyIvPair.setIvBytes(ivBytes); + + Gson gson = new GsonBuilder().create(); + ConsoleProxyPasswordBasedEncryptor encryptor = new ConsoleProxyPasswordBasedEncryptor(gson.toJson(keyIvPair)); + + String encrypted = encryptor.encryptText("Hello, world"); + + System.out.println("Encrypted result: " + encrypted); + + String decrypted = encryptor.decryptText(encrypted); + + System.out.println("Decrypted result: " + decrypted); + + } catch (NoSuchAlgorithmException e) { + e.printStackTrace(); + } + } } diff --git a/services/pom.xml b/services/pom.xml index 35ec2e186ba..54b22bbbf62 100644 --- a/services/pom.xml +++ b/services/pom.xml @@ -32,5 +32,6 @@ console-proxy + secondary-storage diff --git a/services/secondary-storage/conf/agent.properties b/services/secondary-storage/conf/agent.properties new file mode 100644 index 00000000000..aab82b63374 --- /dev/null +++ b/services/secondary-storage/conf/agent.properties @@ -0,0 +1,2 @@ +#mount.path=~/secondary-storage/ +resource=org.apache.cloudstack.storage.resource.NfsSecondaryStorageResource diff --git a/services/secondary-storage/conf/environment.properties b/services/secondary-storage/conf/environment.properties new file mode 100644 index 00000000000..269acad9152 --- /dev/null +++ b/services/secondary-storage/conf/environment.properties @@ -0,0 +1,2 @@ +paths.script=../../scripts/storage/secondary/ +paths.pid=. diff --git a/services/secondary-storage/conf/log4j-cloud.xml b/services/secondary-storage/conf/log4j-cloud.xml new file mode 100644 index 00000000000..7d9d22cfa99 --- /dev/null +++ b/services/secondary-storage/conf/log4j-cloud.xml @@ -0,0 +1,102 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/services/secondary-storage/pom.xml b/services/secondary-storage/pom.xml new file mode 100644 index 00000000000..2c8a1d0b9b8 --- /dev/null +++ b/services/secondary-storage/pom.xml @@ -0,0 +1,103 @@ + + + 4.0.0 + cloud-secondary-storage + Apache CloudStack Secondary Storage Service + + org.apache.cloudstack + cloud-services + 4.2.0-SNAPSHOT + ../pom.xml + + + + log4j + log4j + ${cs.log4j.version} + + + com.google.code.gson + gson + ${cs.gson.version} + + + commons-codec + commons-codec + ${cs.codec.version} + + + + org.apache.cloudstack + cloud-agent + ${project.version} + + + org.apache.cloudstack + cloud-patches + ${project.version} + pom + + + org.apache.cloudstack + cloud-server + ${project.version} + + + + install + src + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + + java + + + + + com.cloud.agent.AgentShell + + zone=1 + pod=1 + host=192.168.56.1 + name=192.168.56.10 + eth1ip=192.168.56.10 + eth2ip=192.168.56.10 + guid=SecondaryStorage.1 + secondary.storage.vm=false + instance=Secondary + + + + javax.net.ssl.trustStore + certs/realhostip.keystore + log.home + ${PWD}/ + + + + + + + diff --git a/services/secondary-storage/scripts/_run.sh b/services/secondary-storage/scripts/_run.sh new file mode 100755 index 00000000000..cb9624c58e6 --- /dev/null +++ b/services/secondary-storage/scripts/_run.sh @@ -0,0 +1,64 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + + + +#run.sh runs the console proxy. + +# make sure we delete the old files from the original template +rm console-proxy.jar +rm console-common.jar +rm conf/cloud.properties + +set -x + +CP=./:./conf +for file in *.jar +do + CP=${CP}:$file +done +keyvalues= + +LOGHOME=/var/log/cloud/ +CMDLINE=$(cat /var/cache/cloud/cmdline) + +#CMDLINE="graphical utf8 eth0ip=0.0.0.0 eth0mask=255.255.255.0 eth1ip=192.168.140.40 eth1mask=255.255.255.0 eth2ip=172.24.0.50 eth2mask=255.255.0.0 gateway=172.24.0.1 dns1=72.52.126.11 template=domP dns2=72.52.126.12 host=192.168.1.142 port=8250 mgmtcidr=192.168.1.0/24 localgw=192.168.140.1 zone=5 pod=5" +for i in $CMDLINE + do + KEY=$(echo $i | cut -s -d= -f1) + VALUE=$(echo $i | cut -s -d= -f2) + [ "$KEY" == "" ] && continue + case $KEY in + *) + keyvalues="${keyvalues} $KEY=$VALUE" + esac + done + +tot_mem_k=$(cat /proc/meminfo | grep MemTotal | awk '{print $2}') +let "tot_mem_m=tot_mem_k>>10" +let "eightypcnt=$tot_mem_m*8/10" +let "maxmem=$tot_mem_m-80" + +if [ $maxmem -gt $eightypcnt ] +then + maxmem=$eightypcnt +fi + +java -Djavax.net.ssl.trustStore=./certs/realhostip.keystore -Dlog.home=$LOGHOME -mx${maxmem}m -cp $CP com.cloud.agent.AgentShell $keyvalues $@ diff --git a/services/secondary-storage/scripts/config_auth.sh b/services/secondary-storage/scripts/config_auth.sh new file mode 100755 index 00000000000..4b74f8eb995 --- /dev/null +++ b/services/secondary-storage/scripts/config_auth.sh @@ -0,0 +1,69 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + + + + +BASE_DIR="/var/www/html/copy/template/" +HTACCESS="$BASE_DIR/.htaccess" + +PASSWDFILE="/etc/httpd/.htpasswd" +if [ -d /etc/apache2 ] +then + PASSWDFILE="/etc/apache2/.htpasswd" +fi + +config_htaccess() { + mkdir -p $BASE_DIR + result=$? + echo "Options -Indexes" > $HTACCESS + let "result=$result+$?" + echo "AuthType Basic" >> $HTACCESS + let "result=$result+$?" + echo "AuthName \"Authentication Required\"" >> $HTACCESS + let "result=$result+$?" + echo "AuthUserFile \"$PASSWDFILE\"" >> $HTACCESS + let "result=$result+$?" + echo "Require valid-user" >> $HTACCESS + let "result=$result+$?" + return $result +} + +write_passwd() { + local user=$1 + local passwd=$2 + htpasswd -bc $PASSWDFILE $user $passwd + return $? +} + +if [ $# -ne 2 ] ; then + echo $"Usage: `basename $0` username password " + exit 0 +fi + +write_passwd $1 $2 +if [ $? -ne 0 ] +then + echo "Failed to update password" + exit 2 +fi + +config_htaccess +exit $? diff --git a/services/secondary-storage/scripts/config_ssl.sh b/services/secondary-storage/scripts/config_ssl.sh new file mode 100755 index 00000000000..8d80c4731ad --- /dev/null +++ b/services/secondary-storage/scripts/config_ssl.sh @@ -0,0 +1,174 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + + +help() { + printf " -c use customized key/cert\n" + printf " -k path of private key\n" + printf " -p path of certificate of public key\n" + printf " -t path of certificate chain\n" +} + + +config_httpd_conf() { + local ip=$1 + local srvr=$2 + cp -f /etc/httpd/conf/httpd.conf.orig /etc/httpd/conf/httpd.conf + sed -i -e "s/Listen.*:80$/Listen $ip:80/" /etc/httpd/conf/httpd.conf + echo " " >> /etc/httpd/conf/httpd.conf + echo " DocumentRoot /var/www/html/" >> /etc/httpd/conf/httpd.conf + echo " ServerName $srvr" >> /etc/httpd/conf/httpd.conf + echo " SSLEngine on" >> /etc/httpd/conf/httpd.conf + echo " SSLCertificateFile /etc/httpd/ssl/certs/realhostip.crt" >> /etc/httpd/conf/httpd.conf + echo " SSLCertificateKeyFile /etc/httpd/ssl/keys/realhostip.key" >> /etc/httpd/conf/httpd.conf + echo "" >> /etc/httpd/conf/httpd.conf +} + +config_apache2_conf() { + local ip=$1 + local srvr=$2 + cp -f /etc/apache2/sites-available/default.orig /etc/apache2/sites-available/default + cp -f /etc/apache2/sites-available/default-ssl.orig /etc/apache2/sites-available/default-ssl + sed -i -e "s///" /etc/apache2/sites-available/default + sed -i -e "s///" /etc/apache2/sites-available/default-ssl + sed -i -e "s/Listen .*:80/Listen $ip:80/g" /etc/apache2/ports.conf + sed -i -e "s/Listen .*:443/Listen $ip:443/g" /etc/apache2/ports.conf + sed -i -e "s/NameVirtualHost .*:80/NameVirtualHost $ip:80/g" /etc/apache2/ports.conf + sed -i 's/ssl-cert-snakeoil.key/cert_apache.key/' /etc/apache2/sites-available/default-ssl + sed -i 's/ssl-cert-snakeoil.pem/cert_apache.crt/' /etc/apache2/sites-available/default-ssl +} + +copy_certs() { + local certdir=$(dirname $0)/certs + local mydir=$(dirname $0) + if [ -d $certdir ] && [ -f $customPrivKey ] && [ -f $customPrivCert ] ; then + mkdir -p /etc/httpd/ssl/keys && mkdir -p /etc/httpd/ssl/certs && cp $customprivKey /etc/httpd/ssl/keys && cp $customPrivCert /etc/httpd/ssl/certs + return $? + fi + if [ ! -z customCertChain ] && [ -f $customCertChain ] ; then + cp $customCertChain /etc/httpd/ssl/certs + fi + return 1 +} + +copy_certs_apache2() { + local certdir=$(dirname $0)/certs + local mydir=$(dirname $0) + if [ -f $customPrivKey ] && [ -f $customPrivCert ] ; then + cp $customPrivKey /etc/ssl/private/cert_apache.key && cp $customPrivCert /etc/ssl/certs/cert_apache.crt + fi + if [ ! -z "$customCertChain" ] && [ -f "$customCertChain" ] ; then + cp $customCertChain /etc/ssl/certs/cert_apache_chain.crt + fi + return 0 +} + + +cflag= +cpkflag= +cpcflag= +cccflag= +customPrivKey=$(dirname $0)/certs/realhostip.key +customPrivCert=$(dirname $0)/certs/realhostip.crt +customCertChain= +publicIp= +hostName= +while getopts 'i:h:k:p:t:c' OPTION +do + case $OPTION in + c) cflag=1 + ;; + k) cpkflag=1 + customPrivKey="$OPTARG" + ;; + p) cpcflag=1 + customPrivCert="$OPTARG" + ;; + t) cccflag=1 + customCertChain="$OPTARG" + ;; + i) publicIp="$OPTARG" + ;; + h) hostName="$OPTARG" + ;; + ?) help + ;; + esac +done + + +if [ -z "$publicIp" ] || [ -z "$hostName" ] +then + help + exit 1 +fi + +if [ "$cflag" == "1" ] +then + if [ "$cpkflag$cpcflag" != "11" ] + then + help + exit 1 + fi + if [ ! -f "$customPrivKey" ] + then + printf "priviate key file is not exist\n" + exit 2 + fi + + if [ ! -f "$customPrivCert" ] + then + printf "public certificate is not exist\n" + exit 3 + fi + + if [ "$cccflag" == "1" ] + then + if [ ! -f "$customCertChain" ] + then + printf "certificate chain is not exist\n" + exit 4 + fi + fi +fi + +if [ -d /etc/apache2 ] +then + copy_certs_apache2 +else + copy_certs +fi + +if [ $? -ne 0 ] +then + echo "Failed to copy certificates" + exit 2 +fi + +if [ -d /etc/apache2 ] +then + config_apache2_conf $publicIp $hostName + /etc/init.d/apache2 stop + /etc/init.d/apache2 start +else + config_httpd_conf $publicIp $hostName +fi + + diff --git a/services/secondary-storage/scripts/ipfirewall.sh b/services/secondary-storage/scripts/ipfirewall.sh new file mode 100755 index 00000000000..4711b8ac6db --- /dev/null +++ b/services/secondary-storage/scripts/ipfirewall.sh @@ -0,0 +1,50 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +BASE_DIR="/var/www/html/copy/" +HTACCESS="$BASE_DIR/.htaccess" + +config_htaccess() { + mkdir -p $BASE_DIR + result=$? + echo "Options -Indexes" > $HTACCESS + let "result=$result+$?" + echo "order deny,allow" >> $HTACCESS + let "result=$result+$?" + echo "deny from all" >> $HTACCESS + let "result=$result+$?" + return $result +} + +ips(){ + echo "allow from $1" >> $HTACCESS + result=$? + return $result +} + +is_append="$1" +shift +if [ $is_append != "true" ]; then + config_htaccess +fi +for i in $@ +do + ips "$i" +done +exit $? + diff --git a/services/secondary-storage/scripts/run-proxy.sh b/services/secondary-storage/scripts/run-proxy.sh new file mode 100644 index 00000000000..d6ccf7c0091 --- /dev/null +++ b/services/secondary-storage/scripts/run-proxy.sh @@ -0,0 +1,48 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + + + +#run.sh runs the console proxy. + +# make sure we delete the old files from the original template +rm console-proxy.jar +rm console-common.jar +rm conf/cloud.properties + +CP=./:./conf +for file in *.jar +do + CP=${CP}:$file +done + +#CMDLINE=$(cat /proc/cmdline) +#for i in $CMDLINE +# do +# KEY=$(echo $i | cut -d= -f1) +# VALUE=$(echo $i | cut -d= -f2) +# case $KEY in +# mgmt_host) +# MGMT_HOST=$VALUE +# ;; +# esac +# done + +java -mx700m -cp $CP:./conf com.cloud.consoleproxy.ConsoleProxy $@ diff --git a/services/secondary-storage/scripts/run.bat b/services/secondary-storage/scripts/run.bat new file mode 100644 index 00000000000..ce6dc404574 --- /dev/null +++ b/services/secondary-storage/scripts/run.bat @@ -0,0 +1,18 @@ +rem Licensed to the Apache Software Foundation (ASF) under one +rem or more contributor license agreements. See the NOTICE file +rem distributed with this work for additional information +rem regarding copyright ownership. The ASF licenses this file +rem to you under the Apache License, Version 2.0 (the +rem "License"); you may not use this file except in compliance +rem with the License. You may obtain a copy of the License at +rem +rem http://www.apache.org/licenses/LICENSE-2.0 +rem +rem Unless required by applicable law or agreed to in writing, +rem software distributed under the License is distributed on an +rem "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +rem KIND, either express or implied. See the License for the +rem specific language governing permissions and limitations +rem under the License. + +java -mx700m -cp cloud-console-proxy.jar;;cloud-console-common.jar;log4j-1.2.15.jar;apache-log4j-extras-1.0.jar;gson-1.3.jar;commons-logging-1.1.1.jar;.;.\conf; com.cloud.consoleproxy.ConsoleProxy %* diff --git a/services/secondary-storage/scripts/run.sh b/services/secondary-storage/scripts/run.sh new file mode 100755 index 00000000000..146d96f0287 --- /dev/null +++ b/services/secondary-storage/scripts/run.sh @@ -0,0 +1,45 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + + + + +#_run.sh runs the agent client. + +# set -x + +while true +do + ./_run.sh "$@" & + wait + ex=$? + if [ $ex -eq 0 ] || [ $ex -eq 1 ] || [ $ex -eq 66 ] || [ $ex -gt 128 ]; then + # permanent errors + sleep 5 + fi + + # user stop agent by service cloud stop + grep 'stop' /usr/local/cloud/systemvm/user_request &>/dev/null + if [ $? -eq 0 ]; then + timestamp=$(date) + echo "$timestamp User stops cloud.com service" >> /var/log/cloud.log + exit 0 + fi + sleep 5 +done diff --git a/services/secondary-storage/scripts/ssvm-check.sh b/services/secondary-storage/scripts/ssvm-check.sh new file mode 100644 index 00000000000..a4011647f07 --- /dev/null +++ b/services/secondary-storage/scripts/ssvm-check.sh @@ -0,0 +1,136 @@ +#!/usr/bin/env bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + +# Health check script for the Secondary Storage VM + +# DNS server is specified. + + +CMDLINE=/var/cache/cloud/cmdline +for i in `cat $CMDLINE` +do + key=`echo $i | cut -d= -f1` + value=`echo $i | cut -d= -f2` + case $key in + host) + MGMTSERVER=$value + ;; + esac +done + + +# ping dns server +echo ================================================ +DNSSERVER=`egrep '^nameserver' /etc/resolv.conf | awk '{print $2}'| head -1` +echo "First DNS server is " $DNSSERVER +ping -c 2 $DNSSERVER +if [ $? -eq 0 ] +then + echo "Good: Can ping DNS server" +else + echo "WARNING: cannot ping DNS server" + echo "route follows" + route -n +fi + + +# check dns resolve +echo ================================================ +nslookup download.cloud.com 1> /tmp/dns 2>&1 +grep 'no servers could' /tmp/dns 1> /dev/null 2>&1 +if [ $? -eq 0 ] +then + echo "ERROR: DNS not resolving download.cloud.com" + echo resolv.conf follows + cat /etc/resolv.conf + exit 2 +else + echo "Good: DNS resolves download.cloud.com" +fi + + +# check to see if we have the NFS volume mounted +echo ================================================ +mount|grep -v sunrpc|grep nfs 1> /dev/null 2>&1 +if [ $? -eq 0 ] +then + echo "NFS is currently mounted" + # check for write access + for MOUNTPT in `mount|grep -v sunrpc|grep nfs| awk '{print $3}'` + do + if [ $MOUNTPT != "/proc/xen" ] # mounted by xen + then + echo Mount point is $MOUNTPT + touch $MOUNTPT/foo + if [ $? -eq 0 ] + then + echo "Good: Can write to mount point" + rm $MOUNTPT/foo + else + echo "ERROR: Cannot write to mount point" + echo "You need to export with norootsquash" + fi + fi + done +else + echo "ERROR: NFS is not currently mounted" + echo "Try manually mounting from inside the VM" + NFSSERVER=`awk '{print $17}' $CMDLINE|awk -F= '{print $2}'|awk -F: '{print $1}'` + echo "NFS server is " $NFSSERVER + ping -c 2 $NFSSERVER + if [ $? -eq 0 ] + then + echo "Good: Can ping NFS server" + else + echo "WARNING: cannot ping NFS server" + echo routing table follows + route -n + fi +fi + + +# check for connectivity to the management server +echo ================================================ +echo Management server is $MGMTSERVER. Checking connectivity. +socatout=$(echo | socat - TCP:$MGMTSERVER:8250,connect-timeout=3 2>&1) +if [ $? -eq 0 ] +then + echo "Good: Can connect to management server port 8250" +else + echo "ERROR: Cannot connect to $MGMTSERVER port 8250" + echo $socatout + exit 4 +fi + + +# check for the java process running +echo ================================================ +ps -eaf|grep -v grep|grep java 1> /dev/null 2>&1 +if [ $? -eq 0 ] +then + echo "Good: Java process is running" +else + echo "ERROR: Java process not running. Try restarting the SSVM." + exit 3 +fi + +echo ================================================ +echo Tests Complete. Look for ERROR or WARNING above. + +exit 0 diff --git a/core/src/com/cloud/storage/resource/CifsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/CifsSecondaryStorageResource.java similarity index 98% rename from core/src/com/cloud/storage/resource/CifsSecondaryStorageResource.java rename to services/secondary-storage/src/org/apache/cloudstack/storage/resource/CifsSecondaryStorageResource.java index 285005a1c3a..de4cfe0c97f 100755 --- a/core/src/com/cloud/storage/resource/CifsSecondaryStorageResource.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/CifsSecondaryStorageResource.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.storage.resource; +package org.apache.cloudstack.storage.resource; import java.io.File; import java.net.InetAddress; @@ -27,6 +27,10 @@ import java.util.Random; import javax.naming.ConfigurationException; +import org.apache.cloudstack.storage.template.DownloadManager; +import org.apache.cloudstack.storage.template.DownloadManagerImpl; +import org.apache.cloudstack.storage.template.UploadManager; +import org.apache.cloudstack.storage.template.UploadManagerImpl; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; @@ -58,11 +62,7 @@ import com.cloud.resource.ServerResourceBase; import com.cloud.storage.Storage; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.StorageLayer; -import com.cloud.storage.template.DownloadManager; -import com.cloud.storage.template.DownloadManagerImpl; import com.cloud.storage.template.TemplateInfo; -import com.cloud.storage.template.UploadManager; -import com.cloud.storage.template.UploadManagerImpl; import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.exception.CloudRuntimeException; diff --git a/core/src/com/cloud/storage/resource/LocalSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/LocalSecondaryStorageResource.java similarity index 97% rename from core/src/com/cloud/storage/resource/LocalSecondaryStorageResource.java rename to services/secondary-storage/src/org/apache/cloudstack/storage/resource/LocalSecondaryStorageResource.java index c638c5d874e..b904254b944 100644 --- a/core/src/com/cloud/storage/resource/LocalSecondaryStorageResource.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/LocalSecondaryStorageResource.java @@ -14,13 +14,15 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.storage.resource; +package org.apache.cloudstack.storage.resource; import java.util.HashMap; import java.util.Map; import javax.naming.ConfigurationException; +import org.apache.cloudstack.storage.template.DownloadManager; +import org.apache.cloudstack.storage.template.DownloadManagerImpl; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; @@ -46,8 +48,6 @@ import com.cloud.resource.ServerResourceBase; import com.cloud.storage.Storage; import com.cloud.storage.Storage.StoragePoolType; import com.cloud.storage.StorageLayer; -import com.cloud.storage.template.DownloadManager; -import com.cloud.storage.template.DownloadManagerImpl; import com.cloud.storage.template.TemplateInfo; import com.cloud.utils.component.ComponentContext; diff --git a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java similarity index 94% rename from core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java rename to services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java index e65cbe1312e..638d5cad99d 100755 --- a/core/src/com/cloud/storage/resource/NfsSecondaryStorageResource.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/NfsSecondaryStorageResource.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.storage.resource; +package org.apache.cloudstack.storage.resource; import static com.cloud.utils.S3Utils.deleteDirectory; import static com.cloud.utils.S3Utils.getDirectory; @@ -46,6 +46,11 @@ import java.util.concurrent.Callable; import javax.naming.ConfigurationException; +import org.apache.cloudstack.storage.template.DownloadManager; +import org.apache.cloudstack.storage.template.DownloadManagerImpl; +import org.apache.cloudstack.storage.template.DownloadManagerImpl.ZfsPathParser; +import org.apache.cloudstack.storage.template.UploadManager; +import org.apache.cloudstack.storage.template.UploadManagerImpl; import org.apache.log4j.Logger; import com.cloud.agent.api.Answer; @@ -97,18 +102,12 @@ import com.cloud.host.Host; import com.cloud.host.Host.Type; import com.cloud.resource.ServerResourceBase; import com.cloud.storage.StorageLayer; -import com.cloud.storage.template.DownloadManager; -import com.cloud.storage.template.DownloadManagerImpl; -import com.cloud.storage.template.DownloadManagerImpl.ZfsPathParser; import com.cloud.storage.template.TemplateInfo; import com.cloud.storage.template.TemplateLocation; -import com.cloud.storage.template.UploadManager; -import com.cloud.storage.template.UploadManagerImpl; import com.cloud.utils.NumbersUtil; import com.cloud.utils.S3Utils; import com.cloud.utils.S3Utils.FileNamingStrategy; import com.cloud.utils.S3Utils.ObjectNamingStrategy; -import com.cloud.utils.component.ComponentContext; import com.cloud.utils.exception.CloudRuntimeException; import com.cloud.utils.net.NetUtils; import com.cloud.utils.script.OutputInterpreter; @@ -133,7 +132,7 @@ SecondaryStorageResource { String _role; Map _params; StorageLayer _storage; - boolean _inSystemVM = false; + protected boolean _inSystemVM = false; boolean _sslCopy = false; DownloadManager _dlMgr; @@ -150,7 +149,7 @@ SecondaryStorageResource { private String _storageNetmask; private String _storageGateway; private final List nfsIps = new ArrayList(); - final private String _parent = "/mnt/SecStorage"; + private String _parent = "/mnt/SecStorage"; final private String _tmpltDir = "/var/cloudstack/template"; final private String _tmpltpp = "template.properties"; @Override @@ -397,8 +396,8 @@ SecondaryStorageResource { @Override public boolean accept(final File directory, final String fileName) { - File fileToUpload = new File(directory.getAbsolutePath() + "/" + fileName); - return !fileName.startsWith(".") && !fileToUpload.isDirectory(); + File fileToUpload = new File(directory.getAbsolutePath() + "/" + fileName); + return !fileName.startsWith(".") && !fileToUpload.isDirectory(); } }, new ObjectNamingStrategy() { @Override @@ -1107,9 +1106,7 @@ SecondaryStorageResource { } private Answer execute(ListTemplateCommand cmd) { - if (!_inSystemVM){ - return new Answer(cmd, true, null); - } + if (cmd.getSwift() != null) { Map templateInfos = swiftListTemplate(cmd.getSwift()); return new ListTemplateAnswer(cmd.getSwift().toString(), templateInfos); @@ -1121,9 +1118,6 @@ SecondaryStorageResource { } private Answer execute(ListVolumeCommand cmd) { - if (!_inSystemVM){ - return new Answer(cmd, true, null); - } String root = getRootDir(cmd.getSecUrl()); Map templateInfos = _dlMgr.gatherVolumeInfo(root); @@ -1217,7 +1211,9 @@ SecondaryStorageResource { } public String allowOutgoingOnPrivate(String destCidr) { - + if (!_inSystemVM) { + return null; + } Script command = new Script("/bin/bash", s_logger); String intf = "eth1"; command.add("-c"); @@ -1295,6 +1291,17 @@ SecondaryStorageResource { if (!found && f.getName().equals("template.properties")) { found = true; } + + // KVM HA monitor makes a mess in the templates with its heartbeat tests + // Don't let this stop us from cleaning up the template + if (f.isDirectory() && f.getName().equals("KVMHA")) { + s_logger.debug("Deleting KVMHA directory contents from template location"); + File[] haFiles = f.listFiles(); + for (File haFile : haFiles) { + haFile.delete(); + } + } + if (!f.delete()) { return new Answer(cmd, false, "Unable to delete file " + f.getName() + " under Template path " + relativeTemplatePath); @@ -1343,6 +1350,17 @@ SecondaryStorageResource { if (!found && f.getName().equals("volume.properties")) { found = true; } + + // KVM HA monitor makes a mess in the templates with its heartbeat tests + // Don't let this stop us from cleaning up the template + if (f.isDirectory() && f.getName().equals("KVMHA")) { + s_logger.debug("Deleting KVMHA directory contents from template location"); + File[] haFiles = f.listFiles(); + for (File haFile : haFiles) { + haFile.delete(); + } + } + if (!f.delete()) { return new Answer(cmd, false, "Unable to delete file " + f.getName() + " under Volume path " + relativeVolumePath); @@ -1392,6 +1410,9 @@ SecondaryStorageResource { synchronized public String getRootDir(String secUrl) { + if (!_inSystemVM) { + return _parent; + } try { URI uri = new URI(secUrl); String nfsHost = uri.getHost(); @@ -1465,7 +1486,7 @@ SecondaryStorageResource { if (_eth1ip != null) { //can only happen inside service vm params.put("private.network.device", "eth1"); } else { - s_logger.warn("Wait, what's going on? eth1ip is null!!"); + s_logger.warn("eth1ip parameter has not been configured, assuming that we are not inside a system vm"); } String eth2ip = (String) params.get("eth2ip"); if (eth2ip != null) { @@ -1474,9 +1495,14 @@ SecondaryStorageResource { _publicIp = (String) params.get("eth2ip"); _hostname = (String) params.get("name"); + String inSystemVM = (String) params.get("secondary.storage.vm"); + if (inSystemVM == null || "true".equalsIgnoreCase(inSystemVM)) { + _inSystemVM = true; + } + _storageIp = (String) params.get("storageip"); - if (_storageIp == null) { - s_logger.warn("Wait, there is no storageip in /proc/cmdline, something wrong!"); + if (_storageIp == null && _inSystemVM) { + s_logger.warn("There is no storageip in /proc/cmdline, something wrong!"); } _storageNetmask = (String) params.get("storagenetmask"); _storageGateway = (String) params.get("storagegateway"); @@ -1505,7 +1531,10 @@ SecondaryStorageResource { throw new ConfigurationException("Unable to find class " + value); } } - _storage.mkdirs(_parent); + + if (_inSystemVM) + _storage.mkdirs(_parent); + _configSslScr = Script.findScript(getDefaultScriptsDir(), "config_ssl.sh"); if (_configSslScr != null) { s_logger.info("config_ssl.sh found in " + _configSslScr); @@ -1539,10 +1568,12 @@ SecondaryStorageResource { _instance = (String)params.get("instance"); + if (!_inSystemVM) { + _parent = (String) params.get("mount.path"); + } - String inSystemVM = (String)params.get("secondary.storage.vm"); - if (inSystemVM == null || "true".equalsIgnoreCase(inSystemVM)) { - _inSystemVM = true; + + if (_inSystemVM) { _localgw = (String)params.get("localgw"); if (_localgw != null) { // can only happen inside service vm String mgmtHost = (String) params.get("host"); @@ -1581,6 +1612,9 @@ SecondaryStorageResource { } private void startAdditionalServices() { + if (!_inSystemVM) { + return; + } Script command = new Script("/bin/bash", s_logger); command.add("-c"); command.add("if [ -f /etc/init.d/ssh ]; then service ssh restart; else service sshd restart; fi "); @@ -1598,6 +1632,9 @@ SecondaryStorageResource { } private void addRouteToInternalIpOrCidr(String localgw, String eth1ip, String eth1mask, String destIpOrCidr) { + if (!_inSystemVM) { + return; + } s_logger.debug("addRouteToInternalIp: localgw=" + localgw + ", eth1ip=" + eth1ip + ", eth1mask=" + eth1mask + ",destIp=" + destIpOrCidr); if (destIpOrCidr == null) { s_logger.debug("addRouteToInternalIp: destIp is null"); @@ -1637,6 +1674,9 @@ SecondaryStorageResource { } private void configureSSL() { + if (!_inSystemVM) { + return; + } Script command = new Script(_configSslScr); command.add("-i", _publicIp); command.add("-h", _hostname); @@ -1647,6 +1687,9 @@ SecondaryStorageResource { } private void configureSSL(String prvkeyPath, String prvCertPath, String certChainPath) { + if (!_inSystemVM) { + return; + } Script command = new Script(_configSslScr); command.add("-i", _publicIp); command.add("-h", _hostname); @@ -1758,13 +1801,15 @@ SecondaryStorageResource { if(_publicIp != null) cmd.setPublicIpAddress(_publicIp); - Script command = new Script("/bin/bash", s_logger); - command.add("-c"); - command.add("ln -sf " + _parent + " /var/www/html/copy"); - String result = command.execute(); - if (result != null) { - s_logger.warn("Error in linking err=" + result); - return null; + if (_inSystemVM) { + Script command = new Script("/bin/bash", s_logger); + command.add("-c"); + command.add("ln -sf " + _parent + " /var/www/html/copy"); + String result = command.execute(); + if (result != null) { + s_logger.warn("Error in linking err=" + result); + return null; + } } return new StartupCommand[] {cmd}; } @@ -1810,33 +1855,50 @@ SecondaryStorageResource { return "./scripts/storage/secondary"; } - @Override - public void setName(String name) { - // TODO Auto-generated method stub - - } + @Override + public void setName(String name) { + // TODO Auto-generated method stub - @Override - public void setConfigParams(Map params) { - // TODO Auto-generated method stub - - } + } - @Override - public Map getConfigParams() { - // TODO Auto-generated method stub - return null; - } + @Override + public void setConfigParams(Map params) { + // TODO Auto-generated method stub - @Override - public int getRunLevel() { - // TODO Auto-generated method stub - return 0; - } + } - @Override - public void setRunLevel(int level) { - // TODO Auto-generated method stub - - } + @Override + public Map getConfigParams() { + // TODO Auto-generated method stub + return null; + } + + @Override + public int getRunLevel() { + // TODO Auto-generated method stub + return 0; + } + + @Override + public void setRunLevel(int level) { + // TODO Auto-generated method stub + + } + + @Override + public void fillNetworkInformation(final StartupCommand cmd) { + final String dummyMac = "00:06:0A:0B:0C:0D"; + final String dummyNetmask = "255.255.255.0"; + if (!_inSystemVM) { + cmd.setPrivateIpAddress(_eth1ip); + cmd.setPrivateMacAddress(dummyMac); + cmd.setPrivateNetmask(dummyNetmask); + cmd.setPublicIpAddress(_publicIp); + cmd.setPublicMacAddress(dummyMac); + cmd.setPublicNetmask(dummyNetmask); + cmd.setName(_hostname); + } else { + super.fillNetworkInformation(cmd); + } + } } diff --git a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java similarity index 98% rename from server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java rename to services/secondary-storage/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java index 3ca74a351e8..d3af792faa5 100755 --- a/server/src/com/cloud/storage/secondary/SecondaryStorageDiscoverer.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/SecondaryStorageDiscoverer.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.storage.secondary; +package org.apache.cloudstack.storage.resource; import java.io.File; import java.lang.reflect.Constructor; @@ -47,8 +47,6 @@ import com.cloud.storage.dao.VMTemplateDao; import com.cloud.storage.dao.VMTemplateHostDao; import com.cloud.storage.dao.VMTemplateZoneDao; import com.cloud.storage.resource.DummySecondaryStorageResource; -import com.cloud.storage.resource.LocalSecondaryStorageResource; -import com.cloud.storage.resource.NfsSecondaryStorageResource; import com.cloud.utils.component.ComponentContext; import com.cloud.utils.net.NfsUtils; import com.cloud.utils.script.Script; diff --git a/core/src/com/cloud/storage/resource/SecondaryStorageResource.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/SecondaryStorageResource.java similarity index 95% rename from core/src/com/cloud/storage/resource/SecondaryStorageResource.java rename to services/secondary-storage/src/org/apache/cloudstack/storage/resource/SecondaryStorageResource.java index 37c6686afd8..5c87b0dcc92 100755 --- a/core/src/com/cloud/storage/resource/SecondaryStorageResource.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/SecondaryStorageResource.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.storage.resource; +package org.apache.cloudstack.storage.resource; import com.cloud.agent.api.storage.ssCommand; import com.cloud.resource.ServerResource; /** diff --git a/core/src/com/cloud/storage/resource/SecondaryStorageResourceHandler.java b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/SecondaryStorageResourceHandler.java similarity index 95% rename from core/src/com/cloud/storage/resource/SecondaryStorageResourceHandler.java rename to services/secondary-storage/src/org/apache/cloudstack/storage/resource/SecondaryStorageResourceHandler.java index 28b96b621ed..d03d983dcd8 100644 --- a/core/src/com/cloud/storage/resource/SecondaryStorageResourceHandler.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/resource/SecondaryStorageResourceHandler.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.storage.resource; +package org.apache.cloudstack.storage.resource; import com.cloud.agent.api.Answer; import com.cloud.agent.api.Command; diff --git a/core/src/com/cloud/storage/template/DownloadManager.java b/services/secondary-storage/src/org/apache/cloudstack/storage/template/DownloadManager.java similarity index 94% rename from core/src/com/cloud/storage/template/DownloadManager.java rename to services/secondary-storage/src/org/apache/cloudstack/storage/template/DownloadManager.java index f4f8a0f17fa..3e5072abfa3 100644 --- a/core/src/com/cloud/storage/template/DownloadManager.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/template/DownloadManager.java @@ -14,18 +14,20 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.storage.template; +package org.apache.cloudstack.storage.template; -import java.util.List; import java.util.Map; +import org.apache.cloudstack.storage.resource.SecondaryStorageResource; + import com.cloud.agent.api.storage.DownloadAnswer; import com.cloud.agent.api.storage.DownloadCommand; import com.cloud.agent.api.storage.DownloadCommand.Proxy; import com.cloud.agent.api.storage.DownloadCommand.ResourceType; -import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.Storage.ImageFormat; -import com.cloud.storage.resource.SecondaryStorageResource; +import com.cloud.storage.VMTemplateHostVO; +import com.cloud.storage.template.TemplateDownloader; +import com.cloud.storage.template.TemplateInfo; import com.cloud.utils.component.Manager; public interface DownloadManager extends Manager { diff --git a/core/src/com/cloud/storage/template/DownloadManagerImpl.java b/services/secondary-storage/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java similarity index 95% rename from core/src/com/cloud/storage/template/DownloadManagerImpl.java rename to services/secondary-storage/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java index 22e78a081c1..a9d23cb7779 100755 --- a/core/src/com/cloud/storage/template/DownloadManagerImpl.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/template/DownloadManagerImpl.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.storage.template; +package org.apache.cloudstack.storage.template; import java.io.BufferedReader; import java.io.File; @@ -41,6 +41,7 @@ import java.util.concurrent.Executors; import javax.ejb.Local; import javax.naming.ConfigurationException; +import org.apache.cloudstack.storage.resource.SecondaryStorageResource; import org.apache.log4j.Logger; import com.cloud.agent.api.storage.DownloadAnswer; @@ -54,10 +55,22 @@ import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.StorageLayer; import com.cloud.storage.VMTemplateHostVO; import com.cloud.storage.VMTemplateStorageResourceAssoc; -import com.cloud.storage.resource.SecondaryStorageResource; +import com.cloud.storage.template.HttpTemplateDownloader; +import com.cloud.storage.template.IsoProcessor; +import com.cloud.storage.template.LocalTemplateDownloader; +import com.cloud.storage.template.Processor; import com.cloud.storage.template.Processor.FormatInfo; +import com.cloud.storage.template.QCOW2Processor; +import com.cloud.storage.template.RawImageProcessor; +import com.cloud.storage.template.ScpTemplateDownloader; +import com.cloud.storage.template.TemplateConstants; +import com.cloud.storage.template.TemplateDownloader; import com.cloud.storage.template.TemplateDownloader.DownloadCompleteCallback; import com.cloud.storage.template.TemplateDownloader.Status; +import com.cloud.storage.template.TemplateInfo; +import com.cloud.storage.template.TemplateLocation; +import com.cloud.storage.template.VhdProcessor; +import com.cloud.storage.template.VmdkProcessor; import com.cloud.utils.NumbersUtil; import com.cloud.utils.component.ManagerBase; import com.cloud.utils.exception.CloudRuntimeException; @@ -743,21 +756,27 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager TemplateInfo tInfo = loc.getTemplateInfo(); - if ((tInfo.size == tInfo.physicalSize) && (tInfo.installPath.endsWith(ImageFormat.OVA.getFileExtension()))) { + if ((tInfo.getSize() == tInfo.getPhysicalSize()) + && (tInfo.getInstallPath().endsWith(ImageFormat.OVA.getFileExtension()))) { try { Processor processor = _processors.get("VMDK Processor"); VmdkProcessor vmdkProcessor = (VmdkProcessor)processor; - long vSize = vmdkProcessor.getTemplateVirtualSize(path, tInfo.installPath.substring(tInfo.installPath.lastIndexOf(File.separator) + 1)); - tInfo.size = vSize; + long vSize = + vmdkProcessor.getTemplateVirtualSize( + path, + tInfo.getInstallPath().substring( + tInfo.getInstallPath().lastIndexOf(File.separator) + 1)); + tInfo.setSize(vSize); loc.updateVirtualSize(vSize); loc.save(); } catch (Exception e) { - s_logger.error("Unable to get the virtual size of the template: " + tInfo.installPath + " due to " + e.getMessage()); + s_logger.error("Unable to get the virtual size of the template: " + tInfo.getInstallPath() + + " due to " + e.getMessage()); } } - result.put(tInfo.templateName, tInfo); - s_logger.debug("Added template name: " + tInfo.templateName + ", path: " + tmplt); + result.put(tInfo.getTemplateName(), tInfo); + s_logger.debug("Added template name: " + tInfo.getTemplateName() + ", path: " + tmplt); } /* for (String tmplt : isoTmplts) { @@ -800,21 +819,27 @@ public class DownloadManagerImpl extends ManagerBase implements DownloadManager TemplateInfo vInfo = loc.getTemplateInfo(); - if ((vInfo.size == vInfo.physicalSize) && (vInfo.installPath.endsWith(ImageFormat.OVA.getFileExtension()))) { + if ((vInfo.getSize() == vInfo.getPhysicalSize()) + && (vInfo.getInstallPath().endsWith(ImageFormat.OVA.getFileExtension()))) { try { Processor processor = _processors.get("VMDK Processor"); VmdkProcessor vmdkProcessor = (VmdkProcessor)processor; - long vSize = vmdkProcessor.getTemplateVirtualSize(path, vInfo.installPath.substring(vInfo.installPath.lastIndexOf(File.separator) + 1)); - vInfo.size = vSize; + long vSize = + vmdkProcessor.getTemplateVirtualSize( + path, + vInfo.getInstallPath().substring( + vInfo.getInstallPath().lastIndexOf(File.separator) + 1)); + vInfo.setSize(vSize); loc.updateVirtualSize(vSize); loc.save(); } catch (Exception e) { - s_logger.error("Unable to get the virtual size of the volume: " + vInfo.installPath + " due to " + e.getMessage()); + s_logger.error("Unable to get the virtual size of the volume: " + vInfo.getInstallPath() + + " due to " + e.getMessage()); } } result.put(vInfo.getId(), vInfo); - s_logger.debug("Added volume name: " + vInfo.templateName + ", path: " + vol); + s_logger.debug("Added volume name: " + vInfo.getTemplateName() + ", path: " + vol); } return result; } diff --git a/core/src/com/cloud/storage/template/UploadManager.java b/services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManager.java similarity index 94% rename from core/src/com/cloud/storage/template/UploadManager.java rename to services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManager.java index fa40b8c9ac6..14de1500104 100755 --- a/core/src/com/cloud/storage/template/UploadManager.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManager.java @@ -14,7 +14,9 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.storage.template; +package org.apache.cloudstack.storage.template; + +import org.apache.cloudstack.storage.resource.SecondaryStorageResource; import com.cloud.agent.api.storage.CreateEntityDownloadURLAnswer; import com.cloud.agent.api.storage.CreateEntityDownloadURLCommand; @@ -24,7 +26,7 @@ import com.cloud.agent.api.storage.UploadAnswer; import com.cloud.agent.api.storage.UploadCommand; import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.Upload.Status; -import com.cloud.storage.resource.SecondaryStorageResource; +import com.cloud.storage.template.TemplateUploader; import com.cloud.utils.component.Manager; public interface UploadManager extends Manager { diff --git a/core/src/com/cloud/storage/template/UploadManagerImpl.java b/services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java similarity index 98% rename from core/src/com/cloud/storage/template/UploadManagerImpl.java rename to services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java index 2492a1be2b2..88623a9e0fb 100755 --- a/core/src/com/cloud/storage/template/UploadManagerImpl.java +++ b/services/secondary-storage/src/org/apache/cloudstack/storage/template/UploadManagerImpl.java @@ -14,7 +14,7 @@ // KIND, either express or implied. See the License for the // specific language governing permissions and limitations // under the License. -package com.cloud.storage.template; +package org.apache.cloudstack.storage.template; import java.io.File; import java.net.URI; @@ -30,6 +30,7 @@ import java.util.concurrent.Executors; import javax.naming.ConfigurationException; +import org.apache.cloudstack.storage.resource.SecondaryStorageResource; import org.apache.log4j.Logger; import com.cloud.agent.api.storage.CreateEntityDownloadURLAnswer; @@ -43,7 +44,9 @@ import com.cloud.storage.Storage.ImageFormat; import com.cloud.storage.StorageLayer; import com.cloud.storage.Upload; import com.cloud.storage.UploadVO; -import com.cloud.storage.resource.SecondaryStorageResource; +import com.cloud.storage.template.FtpTemplateUploader; +import com.cloud.storage.template.Processor; +import com.cloud.storage.template.TemplateUploader; import com.cloud.storage.template.TemplateUploader.Status; import com.cloud.storage.template.TemplateUploader.UploadCompleteCallback; import com.cloud.utils.NumbersUtil; diff --git a/setup/bindir/cloud-setup-databases.in b/setup/bindir/cloud-setup-databases.in index 0b5cbaca249..b58dc24ed04 100755 --- a/setup/bindir/cloud-setup-databases.in +++ b/setup/bindir/cloud-setup-databases.in @@ -67,7 +67,7 @@ class DBDeployer(object): dbDotProperties = {} dbDotPropertiesIndex = 0 encryptionKeyFile = '@MSCONF@/key' - encryptionJarPath = '@JAVADIR@/jasypt-1.9.0.jar' + encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.0.jar' success = False magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate' tmpMysqlFile = os.path.join(os.path.expanduser('~/'), 'cloudstackmysql.tmp.sql') diff --git a/setup/bindir/cloud-setup-encryption.in b/setup/bindir/cloud-setup-encryption.in index 19ad721ccbe..cf27b37103c 100755 --- a/setup/bindir/cloud-setup-encryption.in +++ b/setup/bindir/cloud-setup-encryption.in @@ -63,7 +63,7 @@ class DBDeployer(object): dbDotProperties = {} dbDotPropertiesIndex = 0 encryptionKeyFile = '@MSCONF@/key' - encryptionJarPath = '@JAVADIR@/cloud-jasypt-1.8.jar:@JAVADIR@/jasypt-1.8.jar:@JAVADIR@/jasypt-1.9.0.jar' + encryptionJarPath = '@COMMONLIBDIR@/lib/jasypt-1.9.0.jar' success = False magicString = 'This_is_a_magic_string_i_think_no_one_will_duplicate' diff --git a/setup/db/db/schema-40to410.sql b/setup/db/db/schema-40to410.sql index e333810cb06..ff1d9085329 100644 --- a/setup/db/db/schema-40to410.sql +++ b/setup/db/db/schema-40to410.sql @@ -263,8 +263,6 @@ CREATE TABLE `cloud`.`region` ( INSERT INTO `cloud`.`region` values ('1','Local','http://localhost:8080/client/'); -ALTER TABLE `cloud_usage`.`account` ADD COLUMN `region_id` int unsigned NOT NULL DEFAULT '1'; - CREATE TABLE `cloud`.`nicira_nvp_router_map` ( `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', `logicalrouter_uuid` varchar(255) NOT NULL UNIQUE COMMENT 'nicira uuid of logical router', @@ -406,35 +404,6 @@ INSERT INTO `cloud`.`counter` (id, uuid, source, name, value,created) VALUES (1, INSERT INTO `cloud`.`counter` (id, uuid, source, name, value,created) VALUES (2, UUID(), 'snmp','Linux System CPU - percentage', '1.3.6.1.4.1.2021.11.10.0', now()); INSERT INTO `cloud`.`counter` (id, uuid, source, name, value,created) VALUES (3, UUID(), 'snmp','Linux CPU Idle - percentage', '1.3.6.1.4.1.2021.11.11.0', now()); INSERT INTO `cloud`.`counter` (id, uuid, source, name, value,created) VALUES (100, UUID(), 'netscaler','Response Time - microseconds', 'RESPTIME', now()); -CREATE TABLE `cloud`.`vm_snapshots` ( - `id` bigint(20) unsigned NOT NULL auto_increment COMMENT 'Primary Key', - `uuid` varchar(40) NOT NULL, - `name` varchar(255) NOT NULL, - `display_name` varchar(255) default NULL, - `description` varchar(255) default NULL, - `vm_id` bigint(20) unsigned NOT NULL, - `account_id` bigint(20) unsigned NOT NULL, - `domain_id` bigint(20) unsigned NOT NULL, - `vm_snapshot_type` varchar(32) default NULL, - `state` varchar(32) NOT NULL, - `parent` bigint unsigned default NULL, - `current` int(1) unsigned default NULL, - `update_count` bigint unsigned NOT NULL DEFAULT 0, - `updated` datetime default NULL, - `created` datetime default NULL, - `removed` datetime default NULL, - PRIMARY KEY (`id`), - CONSTRAINT UNIQUE KEY `uc_vm_snapshots_uuid` (`uuid`), - INDEX `vm_snapshots_name` (`name`), - INDEX `vm_snapshots_vm_id` (`vm_id`), - INDEX `vm_snapshots_account_id` (`account_id`), - INDEX `vm_snapshots_display_name` (`display_name`), - INDEX `vm_snapshots_removed` (`removed`), - INDEX `vm_snapshots_parent` (`parent`), - CONSTRAINT `fk_vm_snapshots_vm_id__vm_instance_id` FOREIGN KEY `fk_vm_snapshots_vm_id__vm_instance_id` (`vm_id`) REFERENCES `vm_instance` (`id`), - CONSTRAINT `fk_vm_snapshots_account_id__account_id` FOREIGN KEY `fk_vm_snapshots_account_id__account_id` (`account_id`) REFERENCES `account` (`id`), - CONSTRAINT `fk_vm_snapshots_domain_id__domain_id` FOREIGN KEY `fk_vm_snapshots_domain_id__domain_id` (`domain_id`) REFERENCES `domain` (`id`) -) ENGINE=InnoDB DEFAULT CHARSET=utf8; CREATE TABLE `cloud`.`user_ipv6_address` ( `id` bigint unsigned NOT NULL UNIQUE auto_increment, @@ -517,7 +486,7 @@ CREATE VIEW `cloud`.`user_vm_view` AS vm_instance.vm_type vm_type, data_center.id data_center_id, data_center.uuid data_center_uuid, - data_center.name data_center_name, + data_center.name data_center_name, data_center.is_security_group_enabled security_group_enabled, host.id host_id, host.uuid host_uuid, @@ -1479,13 +1448,14 @@ CREATE VIEW `cloud`.`storage_pool_view` AS storage_pool.created, storage_pool.removed, storage_pool.capacity_bytes, + storage_pool.scope, cluster.id cluster_id, cluster.uuid cluster_uuid, cluster.name cluster_name, cluster.cluster_type, data_center.id data_center_id, data_center.uuid data_center_uuid, - data_center.name data_center_name, + data_center.name data_center_name, host_pod_ref.id pod_id, host_pod_ref.uuid pod_uuid, host_pod_ref.name pod_name, @@ -1659,3 +1629,7 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'manag INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Network', 'DEFAULT', 'management-server', 'network.ipv6.search.retry.max' , 10000, 'The maximum number of retrying times to search for an available IPv6 address in the table'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Usage', 'DEFAULT', 'management-server', 'traffic.sentinel.exclude.zones' , '', 'Traffic going into specified list of zones is not metered'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Usage', 'DEFAULT', 'management-server', 'traffic.sentinel.include.zones' , 'EXTERNAL', 'Traffic going into specified list of zones is metered. For metering all traffic leave this parameter empty'); + + +INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (163, UUID(), 10, 'Ubuntu 12.04 (32-bit)'); +INSERT IGNORE INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (164, UUID(), 10, 'Ubuntu 12.04 (64-bit)'); diff --git a/setup/db/db/schema-410to420.sql b/setup/db/db/schema-410to420.sql index ab9df05103b..78444fd5576 100644 --- a/setup/db/db/schema-410to420.sql +++ b/setup/db/db/schema-410to420.sql @@ -23,7 +23,9 @@ SET foreign_key_checks = 0; ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `max_hosts_per_cluster` int unsigned DEFAULT NULL COMMENT 'Max. hosts in cluster supported by hypervisor'; +ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `storage_motion_supported` int(1) unsigned DEFAULT 0 COMMENT 'Is storage motion supported'; UPDATE `cloud`.`hypervisor_capabilities` SET `max_hosts_per_cluster`=32 WHERE `hypervisor_type`='VMware'; +INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_data_volumes_limit, storage_motion_supported) VALUES ('XenServer', '6.1.0', 50, 1, 13, 1); INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled, max_hosts_per_cluster) VALUES ('VMware', '5.1', 128, 0, 32); DELETE FROM `cloud`.`configuration` where name='vmware.percluster.host.max'; INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'AgentManager', 'xen.nics.max', '7', 'Maximum allowed nics for Vms created on Xen'); @@ -124,6 +126,15 @@ INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Windows 8 (64 bit)', 209); INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Windows 8 Server (64 bit)', 210); +INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (211, UUID(), 7, 'Apple Mac OS X 10.6 (32 bits)'); +INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (212, UUID(), 7, 'Apple Mac OS X 10.6 (64 bits)'); +INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (213, UUID(), 7, 'Apple Mac OS X 10.7 (32 bits)'); +INSERT INTO `cloud`.`guest_os` (id, uuid, category_id, display_name) VALUES (214, UUID(), 7, 'Apple Mac OS X 10.7 (64 bits)'); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Apple Mac OS X 10.6 (32 bits)', 211); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Apple Mac OS X 10.6 (64 bits)', 212); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Apple Mac OS X 10.7 (32 bits)', 213); +INSERT INTO `cloud`.`guest_os_hypervisor` (hypervisor_type, guest_os_name, guest_os_id) VALUES ("VmWare", 'Apple Mac OS X 10.7 (64 bits)', 214); + CREATE TABLE `cloud`.`user_vm_clone_setting` ( `vm_id` bigint unsigned NOT NULL COMMENT 'guest VM id', `clone_type` varchar(10) NOT NULL COMMENT 'Full or Linked Clone (applicable to VMs on ESX)', @@ -133,8 +144,30 @@ CREATE TABLE `cloud`.`user_vm_clone_setting` ( INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Advanced', 'DEFAULT', 'UserVmManager', 'vmware.create.full.clone' , 'false', 'If set to true, creates VMs as full clones on ESX hypervisor'); --- Re-enable foreign key checking, at the end of the upgrade path -SET foreign_key_checks = 1; +CREATE TABLE `cloud`.`affinity_group` ( + `id` bigint unsigned NOT NULL auto_increment, + `name` varchar(255) NOT NULL, + `type` varchar(255) NOT NULL, + `uuid` varchar(40), + `description` varchar(4096) NULL, + `domain_id` bigint unsigned NOT NULL, + `account_id` bigint unsigned NOT NULL, + UNIQUE (`name`, `account_id`), + PRIMARY KEY (`id`), + CONSTRAINT `fk_affinity_group__account_id` FOREIGN KEY(`account_id`) REFERENCES `account`(`id`), + CONSTRAINT `fk_affinity_group__domain_id` FOREIGN KEY(`domain_id`) REFERENCES `domain`(`id`), + CONSTRAINT `uc_affinity_group__uuid` UNIQUE (`uuid`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`affinity_group_vm_map` ( + `id` bigint unsigned NOT NULL auto_increment, + `affinity_group_id` bigint unsigned NOT NULL, + `instance_id` bigint unsigned NOT NULL, + PRIMARY KEY (`id`), + CONSTRAINT `fk_agvm__group_id` FOREIGN KEY(`affinity_group_id`) REFERENCES `affinity_group`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_affinity_group_vm_map___instance_id` FOREIGN KEY(`instance_id`) REFERENCES `user_vm` (`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + CREATE TABLE nic_secondary_ips ( @@ -248,6 +281,690 @@ INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT' INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT', 'management-server', 'max.project.primary.storage', '200', 'The default maximum primary storage space (in GiB) that can be used for a project'); INSERT IGNORE INTO `cloud`.`configuration` VALUES ('Project Defaults', 'DEFAULT', 'management-server', 'max.project.secondary.storage', '400', 'The default maximum secondary storage space (in GiB) that can be used for a project'); + + +ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id'; +ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `uuid` varchar(40) UNIQUE; + +-- START: support for LXC + +INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES ('LXC', 'default', 50, 1); +ALTER TABLE `cloud`.`physical_network_traffic_types` ADD COLUMN `lxc_network_label` varchar(255) DEFAULT 'cloudbr0' COMMENT 'The network name label of the physical device dedicated to this traffic on a LXC host'; + +UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,LXC' WHERE name='hypervisor.list'; + +INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) + VALUES (10, 'routing-10', 'SystemVM Template (LXC)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2', '2755de1f9ef2ce4d6f2bee2efbb4da92', 0, 'SystemVM Template (LXC)', 'QCOW2', 15, 0, 1, 'LXC'); + +ALTER TABLE `cloud`.`user_vm` MODIFY user_data TEXT(32768); + +-- END: support for LXC + +CREATE TABLE `cloud`.`vm_snapshots` ( + `id` bigint(20) unsigned NOT NULL auto_increment COMMENT 'Primary Key', + `uuid` varchar(40) NOT NULL, + `name` varchar(255) NOT NULL, + `display_name` varchar(255) default NULL, + `description` varchar(255) default NULL, + `vm_id` bigint(20) unsigned NOT NULL, + `account_id` bigint(20) unsigned NOT NULL, + `domain_id` bigint(20) unsigned NOT NULL, + `vm_snapshot_type` varchar(32) default NULL, + `state` varchar(32) NOT NULL, + `parent` bigint unsigned default NULL, + `current` int(1) unsigned default NULL, + `update_count` bigint unsigned NOT NULL DEFAULT 0, + `updated` datetime default NULL, + `created` datetime default NULL, + `removed` datetime default NULL, + PRIMARY KEY (`id`), + CONSTRAINT UNIQUE KEY `uc_vm_snapshots_uuid` (`uuid`), + INDEX `vm_snapshots_name` (`name`), + INDEX `vm_snapshots_vm_id` (`vm_id`), + INDEX `vm_snapshots_account_id` (`account_id`), + INDEX `vm_snapshots_display_name` (`display_name`), + INDEX `vm_snapshots_removed` (`removed`), + INDEX `vm_snapshots_parent` (`parent`), + CONSTRAINT `fk_vm_snapshots_vm_id__vm_instance_id` FOREIGN KEY `fk_vm_snapshots_vm_id__vm_instance_id` (`vm_id`) REFERENCES `vm_instance` (`id`), + CONSTRAINT `fk_vm_snapshots_account_id__account_id` FOREIGN KEY `fk_vm_snapshots_account_id__account_id` (`account_id`) REFERENCES `account` (`id`), + CONSTRAINT `fk_vm_snapshots_domain_id__domain_id` FOREIGN KEY `fk_vm_snapshots_domain_id__domain_id` (`domain_id`) REFERENCES `domain` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +ALTER TABLE `cloud`.`hypervisor_capabilities` ADD COLUMN `vm_snapshot_enabled` tinyint(1) DEFAULT 0 NOT NULL COMMENT 'Whether VM snapshot is supported by hypervisor'; +UPDATE `cloud`.`hypervisor_capabilities` SET `vm_snapshot_enabled`=1 WHERE `hypervisor_type` in ('VMware', 'XenServer'); + + +DROP VIEW IF EXISTS `cloud`.`user_vm_view`; +CREATE VIEW `cloud`.`user_vm_view` AS + select + vm_instance.id id, + vm_instance.name name, + user_vm.display_name display_name, + user_vm.user_data user_data, + account.id account_id, + account.uuid account_uuid, + account.account_name account_name, + account.type account_type, + domain.id domain_id, + domain.uuid domain_uuid, + domain.name domain_name, + domain.path domain_path, + projects.id project_id, + projects.uuid project_uuid, + projects.name project_name, + instance_group.id instance_group_id, + instance_group.uuid instance_group_uuid, + instance_group.name instance_group_name, + vm_instance.uuid uuid, + vm_instance.last_host_id last_host_id, + vm_instance.vm_type type, + vm_instance.vnc_password vnc_password, + vm_instance.limit_cpu_use limit_cpu_use, + vm_instance.created created, + vm_instance.state state, + vm_instance.removed removed, + vm_instance.ha_enabled ha_enabled, + vm_instance.hypervisor_type hypervisor_type, + vm_instance.instance_name instance_name, + vm_instance.guest_os_id guest_os_id, + guest_os.uuid guest_os_uuid, + vm_instance.pod_id pod_id, + host_pod_ref.uuid pod_uuid, + vm_instance.private_ip_address private_ip_address, + vm_instance.private_mac_address private_mac_address, + vm_instance.vm_type vm_type, + data_center.id data_center_id, + data_center.uuid data_center_uuid, + data_center.name data_center_name, + data_center.networktype data_center_type, + data_center.is_security_group_enabled security_group_enabled, + host.id host_id, + host.uuid host_uuid, + host.name host_name, + vm_template.id template_id, + vm_template.uuid template_uuid, + vm_template.name template_name, + vm_template.display_text template_display_text, + vm_template.enable_password password_enabled, + iso.id iso_id, + iso.uuid iso_uuid, + iso.name iso_name, + iso.display_text iso_display_text, + service_offering.id service_offering_id, + disk_offering.uuid service_offering_uuid, + service_offering.cpu cpu, + service_offering.speed speed, + service_offering.ram_size ram_size, + disk_offering.name service_offering_name, + storage_pool.id pool_id, + storage_pool.uuid pool_uuid, + storage_pool.pool_type pool_type, + volumes.id volume_id, + volumes.uuid volume_uuid, + volumes.device_id volume_device_id, + volumes.volume_type volume_type, + security_group.id security_group_id, + security_group.uuid security_group_uuid, + security_group.name security_group_name, + security_group.description security_group_description, + nics.id nic_id, + nics.uuid nic_uuid, + nics.network_id network_id, + nics.ip4_address ip_address, + nics.ip6_address ip6_address, + nics.ip6_gateway ip6_gateway, + nics.ip6_cidr ip6_cidr, + nics.default_nic is_default_nic, + nics.gateway gateway, + nics.netmask netmask, + nics.mac_address mac_address, + nics.broadcast_uri broadcast_uri, + nics.isolation_uri isolation_uri, + vpc.id vpc_id, + vpc.uuid vpc_uuid, + networks.uuid network_uuid, + networks.name network_name, + networks.traffic_type traffic_type, + networks.guest_type guest_type, + user_ip_address.id public_ip_id, + user_ip_address.uuid public_ip_uuid, + user_ip_address.public_ip_address public_ip_address, + ssh_keypairs.keypair_name keypair_name, + resource_tags.id tag_id, + resource_tags.uuid tag_uuid, + resource_tags.key tag_key, + resource_tags.value tag_value, + resource_tags.domain_id tag_domain_id, + resource_tags.account_id tag_account_id, + resource_tags.resource_id tag_resource_id, + resource_tags.resource_uuid tag_resource_uuid, + resource_tags.resource_type tag_resource_type, + resource_tags.customer tag_customer, + async_job.id job_id, + async_job.uuid job_uuid, + async_job.job_status job_status, + async_job.account_id job_account_id, + affinity_group.id affinity_group_id, + affinity_group.uuid affinity_group_uuid, + affinity_group.name affinity_group_name, + affinity_group.description affinity_group_description + from + `cloud`.`user_vm` + inner join + `cloud`.`vm_instance` ON vm_instance.id = user_vm.id + and vm_instance.removed is NULL + inner join + `cloud`.`account` ON vm_instance.account_id = account.id + inner join + `cloud`.`domain` ON vm_instance.domain_id = domain.id + left join + `cloud`.`guest_os` ON vm_instance.guest_os_id = guest_os.id + left join + `cloud`.`host_pod_ref` ON vm_instance.pod_id = host_pod_ref.id + left join + `cloud`.`projects` ON projects.project_account_id = account.id + left join + `cloud`.`instance_group_vm_map` ON vm_instance.id = instance_group_vm_map.instance_id + left join + `cloud`.`instance_group` ON instance_group_vm_map.group_id = instance_group.id + left join + `cloud`.`data_center` ON vm_instance.data_center_id = data_center.id + left join + `cloud`.`host` ON vm_instance.host_id = host.id + left join + `cloud`.`vm_template` ON vm_instance.vm_template_id = vm_template.id + left join + `cloud`.`vm_template` iso ON iso.id = user_vm.iso_id + left join + `cloud`.`service_offering` ON vm_instance.service_offering_id = service_offering.id + left join + `cloud`.`disk_offering` ON vm_instance.service_offering_id = disk_offering.id + left join + `cloud`.`volumes` ON vm_instance.id = volumes.instance_id + left join + `cloud`.`storage_pool` ON volumes.pool_id = storage_pool.id + left join + `cloud`.`security_group_vm_map` ON vm_instance.id = security_group_vm_map.instance_id + left join + `cloud`.`security_group` ON security_group_vm_map.security_group_id = security_group.id + left join + `cloud`.`nics` ON vm_instance.id = nics.instance_id + left join + `cloud`.`networks` ON nics.network_id = networks.id + left join + `cloud`.`vpc` ON networks.vpc_id = vpc.id + left join + `cloud`.`user_ip_address` ON user_ip_address.vm_id = vm_instance.id + left join + `cloud`.`user_vm_details` ON user_vm_details.vm_id = vm_instance.id + and user_vm_details.name = 'SSH.PublicKey' + left join + `cloud`.`ssh_keypairs` ON ssh_keypairs.public_key = user_vm_details.value + left join + `cloud`.`resource_tags` ON resource_tags.resource_id = vm_instance.id + and resource_tags.resource_type = 'UserVm' + left join + `cloud`.`async_job` ON async_job.instance_id = vm_instance.id + and async_job.instance_type = 'VirtualMachine' + and async_job.job_status = 0 + left join + `cloud`.`affinity_group_vm_map` ON vm_instance.id = affinity_group_vm_map.instance_id + left join + `cloud`.`affinity_group` ON affinity_group_vm_map.affinity_group_id = affinity_group.id; + +DROP VIEW IF EXISTS `cloud`.`affinity_group_view`; +CREATE VIEW `cloud`.`affinity_group_view` AS + select + affinity_group.id id, + affinity_group.name name, + affinity_group.type type, + affinity_group.description description, + affinity_group.uuid uuid, + account.id account_id, + account.uuid account_uuid, + account.account_name account_name, + account.type account_type, + domain.id domain_id, + domain.uuid domain_uuid, + domain.name domain_name, + domain.path domain_path, + vm_instance.id vm_id, + vm_instance.uuid vm_uuid, + vm_instance.name vm_name, + vm_instance.state vm_state, + user_vm.display_name vm_display_name + from + `cloud`.`affinity_group` + inner join + `cloud`.`account` ON affinity_group.account_id = account.id + inner join + `cloud`.`domain` ON affinity_group.domain_id = domain.id + left join + `cloud`.`affinity_group_vm_map` ON affinity_group.id = affinity_group_vm_map.affinity_group_id + left join + `cloud`.`vm_instance` ON vm_instance.id = affinity_group_vm_map.instance_id + left join + `cloud`.`user_vm` ON user_vm.id = vm_instance.id; + +DROP VIEW IF EXISTS `cloud`.`host_view`; +CREATE VIEW `cloud`.`host_view` AS + select + host.id, + host.uuid, + host.name, + host.status, + host.disconnected, + host.type, + host.private_ip_address, + host.version, + host.hypervisor_type, + host.hypervisor_version, + host.capabilities, + host.last_ping, + host.created, + host.removed, + host.resource_state, + host.mgmt_server_id, + host.cpus, + host.speed, + host.ram, + cluster.id cluster_id, + cluster.uuid cluster_uuid, + cluster.name cluster_name, + cluster.cluster_type, + data_center.id data_center_id, + data_center.uuid data_center_uuid, + data_center.name data_center_name, + data_center.networktype data_center_type, + host_pod_ref.id pod_id, + host_pod_ref.uuid pod_uuid, + host_pod_ref.name pod_name, + host_tags.tag, + guest_os_category.id guest_os_category_id, + guest_os_category.uuid guest_os_category_uuid, + guest_os_category.name guest_os_category_name, + mem_caps.used_capacity memory_used_capacity, + mem_caps.reserved_capacity memory_reserved_capacity, + cpu_caps.used_capacity cpu_used_capacity, + cpu_caps.reserved_capacity cpu_reserved_capacity, + async_job.id job_id, + async_job.uuid job_uuid, + async_job.job_status job_status, + async_job.account_id job_account_id + from + `cloud`.`host` + left join + `cloud`.`cluster` ON host.cluster_id = cluster.id + left join + `cloud`.`data_center` ON host.data_center_id = data_center.id + left join + `cloud`.`host_pod_ref` ON host.pod_id = host_pod_ref.id + left join + `cloud`.`host_details` ON host.id = host_details.id + and host_details.name = 'guest.os.category.id' + left join + `cloud`.`guest_os_category` ON guest_os_category.id = CONVERT( host_details.value , UNSIGNED) + left join + `cloud`.`host_tags` ON host_tags.host_id = host.id + left join + `cloud`.`op_host_capacity` mem_caps ON host.id = mem_caps.host_id + and mem_caps.capacity_type = 0 + left join + `cloud`.`op_host_capacity` cpu_caps ON host.id = cpu_caps.host_id + and cpu_caps.capacity_type = 1 + left join + `cloud`.`async_job` ON async_job.instance_id = host.id + and async_job.instance_type = 'Host' + and async_job.job_status = 0; + +DROP VIEW IF EXISTS `cloud`.`volume_view`; +CREATE VIEW `cloud`.`volume_view` AS + select + volumes.id, + volumes.uuid, + volumes.name, + volumes.device_id, + volumes.volume_type, + volumes.size, + volumes.created, + volumes.state, + volumes.attached, + volumes.removed, + volumes.pod_id, + account.id account_id, + account.uuid account_uuid, + account.account_name account_name, + account.type account_type, + domain.id domain_id, + domain.uuid domain_uuid, + domain.name domain_name, + domain.path domain_path, + projects.id project_id, + projects.uuid project_uuid, + projects.name project_name, + data_center.id data_center_id, + data_center.uuid data_center_uuid, + data_center.name data_center_name, + data_center.networktype data_center_type, + vm_instance.id vm_id, + vm_instance.uuid vm_uuid, + vm_instance.name vm_name, + vm_instance.state vm_state, + vm_instance.vm_type, + user_vm.display_name vm_display_name, + volume_host_ref.size volume_host_size, + volume_host_ref.created volume_host_created, + volume_host_ref.format, + volume_host_ref.download_pct, + volume_host_ref.download_state, + volume_host_ref.error_str, + disk_offering.id disk_offering_id, + disk_offering.uuid disk_offering_uuid, + disk_offering.name disk_offering_name, + disk_offering.display_text disk_offering_display_text, + disk_offering.use_local_storage, + disk_offering.system_use, + storage_pool.id pool_id, + storage_pool.uuid pool_uuid, + storage_pool.name pool_name, + cluster.hypervisor_type, + vm_template.id template_id, + vm_template.uuid template_uuid, + vm_template.extractable, + vm_template.type template_type, + resource_tags.id tag_id, + resource_tags.uuid tag_uuid, + resource_tags.key tag_key, + resource_tags.value tag_value, + resource_tags.domain_id tag_domain_id, + resource_tags.account_id tag_account_id, + resource_tags.resource_id tag_resource_id, + resource_tags.resource_uuid tag_resource_uuid, + resource_tags.resource_type tag_resource_type, + resource_tags.customer tag_customer, + async_job.id job_id, + async_job.uuid job_uuid, + async_job.job_status job_status, + async_job.account_id job_account_id + from + `cloud`.`volumes` + inner join + `cloud`.`account` ON volumes.account_id = account.id + inner join + `cloud`.`domain` ON volumes.domain_id = domain.id + left join + `cloud`.`projects` ON projects.project_account_id = account.id + left join + `cloud`.`data_center` ON volumes.data_center_id = data_center.id + left join + `cloud`.`vm_instance` ON volumes.instance_id = vm_instance.id + left join + `cloud`.`user_vm` ON user_vm.id = vm_instance.id + left join + `cloud`.`volume_host_ref` ON volumes.id = volume_host_ref.volume_id + and volumes.data_center_id = volume_host_ref.zone_id + left join + `cloud`.`disk_offering` ON volumes.disk_offering_id = disk_offering.id + left join + `cloud`.`storage_pool` ON volumes.pool_id = storage_pool.id + left join + `cloud`.`cluster` ON storage_pool.cluster_id = cluster.id + left join + `cloud`.`vm_template` ON volumes.template_id = vm_template.id + left join + `cloud`.`resource_tags` ON resource_tags.resource_id = volumes.id + and resource_tags.resource_type = 'Volume' + left join + `cloud`.`async_job` ON async_job.instance_id = volumes.id + and async_job.instance_type = 'Volume' + and async_job.job_status = 0; + +DROP VIEW IF EXISTS `cloud`.`storage_pool_view`; +CREATE VIEW `cloud`.`storage_pool_view` AS + select + storage_pool.id, + storage_pool.uuid, + storage_pool.name, + storage_pool.status, + storage_pool.path, + storage_pool.pool_type, + storage_pool.host_address, + storage_pool.created, + storage_pool.removed, + storage_pool.capacity_bytes, + storage_pool.scope, + cluster.id cluster_id, + cluster.uuid cluster_uuid, + cluster.name cluster_name, + cluster.cluster_type, + data_center.id data_center_id, + data_center.uuid data_center_uuid, + data_center.name data_center_name, + data_center.networktype data_center_type, + host_pod_ref.id pod_id, + host_pod_ref.uuid pod_uuid, + host_pod_ref.name pod_name, + storage_pool_details.name tag, + op_host_capacity.used_capacity disk_used_capacity, + op_host_capacity.reserved_capacity disk_reserved_capacity, + async_job.id job_id, + async_job.uuid job_uuid, + async_job.job_status job_status, + async_job.account_id job_account_id + from + `cloud`.`storage_pool` + left join + `cloud`.`cluster` ON storage_pool.cluster_id = cluster.id + left join + `cloud`.`data_center` ON storage_pool.data_center_id = data_center.id + left join + `cloud`.`host_pod_ref` ON storage_pool.pod_id = host_pod_ref.id + left join + `cloud`.`storage_pool_details` ON storage_pool_details.pool_id = storage_pool.id + and storage_pool_details.value = 'true' + left join + `cloud`.`op_host_capacity` ON storage_pool.id = op_host_capacity.host_id + and op_host_capacity.capacity_type = 3 + left join + `cloud`.`async_job` ON async_job.instance_id = storage_pool.id + and async_job.instance_type = 'StoragePool' + and async_job.job_status = 0; + + +DROP VIEW IF EXISTS `cloud`.`domain_router_view`; +CREATE VIEW `cloud`.`domain_router_view` AS + select + vm_instance.id id, + vm_instance.name name, + account.id account_id, + account.uuid account_uuid, + account.account_name account_name, + account.type account_type, + domain.id domain_id, + domain.uuid domain_uuid, + domain.name domain_name, + domain.path domain_path, + projects.id project_id, + projects.uuid project_uuid, + projects.name project_name, + vm_instance.uuid uuid, + vm_instance.created created, + vm_instance.state state, + vm_instance.removed removed, + vm_instance.pod_id pod_id, + vm_instance.instance_name instance_name, + host_pod_ref.uuid pod_uuid, + data_center.id data_center_id, + data_center.uuid data_center_uuid, + data_center.name data_center_name, + data_center.networktype data_center_type, + data_center.dns1 dns1, + data_center.dns2 dns2, + data_center.ip6_dns1 ip6_dns1, + data_center.ip6_dns2 ip6_dns2, + host.id host_id, + host.uuid host_uuid, + host.name host_name, + vm_template.id template_id, + vm_template.uuid template_uuid, + service_offering.id service_offering_id, + disk_offering.uuid service_offering_uuid, + disk_offering.name service_offering_name, + nics.id nic_id, + nics.uuid nic_uuid, + nics.network_id network_id, + nics.ip4_address ip_address, + nics.ip6_address ip6_address, + nics.ip6_gateway ip6_gateway, + nics.ip6_cidr ip6_cidr, + nics.default_nic is_default_nic, + nics.gateway gateway, + nics.netmask netmask, + nics.mac_address mac_address, + nics.broadcast_uri broadcast_uri, + nics.isolation_uri isolation_uri, + vpc.id vpc_id, + vpc.uuid vpc_uuid, + networks.uuid network_uuid, + networks.name network_name, + networks.network_domain network_domain, + networks.traffic_type traffic_type, + networks.guest_type guest_type, + async_job.id job_id, + async_job.uuid job_uuid, + async_job.job_status job_status, + async_job.account_id job_account_id, + domain_router.template_version template_version, + domain_router.scripts_version scripts_version, + domain_router.is_redundant_router is_redundant_router, + domain_router.redundant_state redundant_state, + domain_router.stop_pending stop_pending + from + `cloud`.`domain_router` + inner join + `cloud`.`vm_instance` ON vm_instance.id = domain_router.id + inner join + `cloud`.`account` ON vm_instance.account_id = account.id + inner join + `cloud`.`domain` ON vm_instance.domain_id = domain.id + left join + `cloud`.`host_pod_ref` ON vm_instance.pod_id = host_pod_ref.id + left join + `cloud`.`projects` ON projects.project_account_id = account.id + left join + `cloud`.`data_center` ON vm_instance.data_center_id = data_center.id + left join + `cloud`.`host` ON vm_instance.host_id = host.id + left join + `cloud`.`vm_template` ON vm_instance.vm_template_id = vm_template.id + left join + `cloud`.`service_offering` ON vm_instance.service_offering_id = service_offering.id + left join + `cloud`.`disk_offering` ON vm_instance.service_offering_id = disk_offering.id + left join + `cloud`.`volumes` ON vm_instance.id = volumes.instance_id + left join + `cloud`.`storage_pool` ON volumes.pool_id = storage_pool.id + left join + `cloud`.`nics` ON vm_instance.id = nics.instance_id + left join + `cloud`.`networks` ON nics.network_id = networks.id + left join + `cloud`.`vpc` ON domain_router.vpc_id = vpc.id + left join + `cloud`.`async_job` ON async_job.instance_id = vm_instance.id + and async_job.instance_type = 'DomainRouter' + and async_job.job_status = 0; + +CREATE TABLE `cloud`.`external_cisco_vnmc_devices` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `uuid` varchar(255) UNIQUE, + `physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which cisco vnmc device is added', + `provider_name` varchar(255) NOT NULL COMMENT 'Service Provider name corresponding to this cisco vnmc device', + `device_name` varchar(255) NOT NULL COMMENT 'name of the cisco vnmc device', + `host_id` bigint unsigned NOT NULL COMMENT 'host id coresponding to the external cisco vnmc device', + PRIMARY KEY (`id`), + CONSTRAINT `fk_external_cisco_vnmc_devices__host_id` FOREIGN KEY (`host_id`) REFERENCES `host`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_external_cisco_vnmc_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`external_cisco_asa1000v_devices` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `uuid` varchar(255) UNIQUE, + `physical_network_id` bigint unsigned NOT NULL COMMENT 'id of the physical network in to which cisco asa1kv device is added', + `management_ip` varchar(255) UNIQUE NOT NULL COMMENT 'mgmt. ip of cisco asa1kv device', + `in_port_profile` varchar(255) NOT NULL COMMENT 'inside port profile name of cisco asa1kv device', + `cluster_id` bigint unsigned NOT NULL COMMENT 'id of the Vmware cluster to which cisco asa1kv device is attached (cisco n1kv switch)', + PRIMARY KEY (`id`), + CONSTRAINT `fk_external_cisco_asa1000v_devices__physical_network_id` FOREIGN KEY (`physical_network_id`) REFERENCES `physical_network`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_external_cisco_asa1000v_devices__cluster_id` FOREIGN KEY (`cluster_id`) REFERENCES `cluster`(`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + +CREATE TABLE `cloud`.`network_asa1000v_map` ( + `id` bigint unsigned NOT NULL AUTO_INCREMENT COMMENT 'id', + `network_id` bigint unsigned NOT NULL UNIQUE COMMENT 'id of guest network', + `asa1000v_id` bigint unsigned NOT NULL UNIQUE COMMENT 'id of asa1000v device', + PRIMARY KEY (`id`), + CONSTRAINT `fk_network_asa1000v_map__network_id` FOREIGN KEY (`network_id`) REFERENCES `networks`(`id`) ON DELETE CASCADE, + CONSTRAINT `fk_network_asa1000v_map__asa1000v_id` FOREIGN KEY (`asa1000v_id`) REFERENCES `external_cisco_asa1000v_devices`(`id`) ON DELETE CASCADE +) ENGINE=InnoDB DEFAULT CHARSET=utf8; + + +ALTER TABLE `cloud`.`network_offerings` ADD COLUMN `eip_associate_public_ip` int(1) unsigned NOT NULL DEFAULT 0 COMMENT 'true if public IP is associated with user VM creation by default when EIP service is enabled.' AFTER `elastic_ip_service`; + +-- Re-enable foreign key checking, at the end of the upgrade path +SET foreign_key_checks = 1; + + +-- Add "default" field to account/user tables +ALTER TABLE `cloud`.`account` ADD COLUMN `default` int(1) unsigned NOT NULL DEFAULT '0' COMMENT '1 if account is default'; +ALTER TABLE `cloud`.`user` ADD COLUMN `default` int(1) unsigned NOT NULL DEFAULT '0' COMMENT '1 if user is default'; +UPDATE `cloud`.`account` SET `cloud`.`account`.`default`=1 WHERE id IN (1,2); +UPDATE `cloud`.`user` SET `cloud`.`user`.`default`=1 WHERE id IN (1,2); + +ALTER VIEW `cloud`.`user_view` AS + select + user.id, + user.uuid, + user.username, + user.password, + user.firstname, + user.lastname, + user.email, + user.state, + user.api_key, + user.secret_key, + user.created, + user.removed, + user.timezone, + user.registration_token, + user.is_registered, + user.incorrect_login_attempts, + user.default, + account.id account_id, + account.uuid account_uuid, + account.account_name account_name, + account.type account_type, + domain.id domain_id, + domain.uuid domain_uuid, + domain.name domain_name, + domain.path domain_path, + async_job.id job_id, + async_job.uuid job_uuid, + async_job.job_status job_status, + async_job.account_id job_account_id + from + `cloud`.`user` + inner join + `cloud`.`account` ON user.account_id = account.id + inner join + `cloud`.`domain` ON account.domain_id = domain.id + left join + `cloud`.`async_job` ON async_job.instance_id = user.id + and async_job.instance_type = 'User' + and async_job.job_status = 0; + + DROP VIEW IF EXISTS `cloud`.`account_view`; CREATE VIEW `cloud`.`account_view` AS select @@ -259,6 +976,7 @@ CREATE VIEW `cloud`.`account_view` AS account.removed, account.cleanup_needed, account.network_domain, + account.default, domain.id domain_id, domain.uuid domain_uuid, domain.name domain_name, @@ -391,17 +1109,4 @@ CREATE VIEW `cloud`.`account_view` AS and async_job.instance_type = 'Account' and async_job.job_status = 0; -ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `id` bigint unsigned NOT NULL UNIQUE AUTO_INCREMENT COMMENT 'id'; -ALTER TABLE `cloud`.`remote_access_vpn` ADD COLUMN `uuid` varchar(40) UNIQUE; - --- START: support for LXC - -INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(hypervisor_type, hypervisor_version, max_guests_limit, security_group_enabled) VALUES ('LXC', 'default', 50, 1); -ALTER TABLE `cloud`.`physical_network_traffic_types` ADD COLUMN `lxc_network_label` varchar(255) DEFAULT 'cloudbr0' COMMENT 'The network name label of the physical device dedicated to this traffic on a LXC host'; - -UPDATE configuration SET value='KVM,XenServer,VMware,BareMetal,Ovm,LXC' WHERE name='hypervisor.list'; - -INSERT INTO `cloud`.`vm_template` (id, unique_name, name, public, created, type, hvm, bits, account_id, url, checksum, enable_password, display_text, format, guest_os_id, featured, cross_zones, hypervisor_type) - VALUES (10, 'routing-10', 'SystemVM Template (LXC)', 0, now(), 'SYSTEM', 0, 64, 1, 'http://download.cloud.com/templates/acton/acton-systemvm-02062012.qcow2.bz2', '2755de1f9ef2ce4d6f2bee2efbb4da92', 0, 'SystemVM Template (LXC)', 'QCOW2', 15, 0, 1, 'LXC'); - --- END: support for LXC +alter table `cloud_usage`.`usage_network_offering` add column nic_id bigint(20) unsigned NOT NULL; diff --git a/setup/dev/basic.cfg b/setup/dev/basic.cfg index fb99b8b5498..3f56a3ce980 100644 --- a/setup/dev/basic.cfg +++ b/setup/dev/basic.cfg @@ -57,7 +57,7 @@ "startip": "60.147.41.2", "endip": "60.147.41.254", "netmask": "255.255.255.0", - "gateway": "60.147.40.1" + "gateway": "60.147.41.1" } ], "netmask": "255.255.255.0", @@ -102,11 +102,11 @@ "logger": [ { "name": "TestClient", - "file": "/var/log/testclient.log" + "file": "/tmp/testclient.log" }, { "name": "TestCase", - "file": "/var/log/testcase.log" + "file": "/tmp/testcase.log" } ], "globalConfig": [ diff --git a/setup/dev/local.cfg b/setup/dev/local.cfg new file mode 100644 index 00000000000..ce956a54e63 --- /dev/null +++ b/setup/dev/local.cfg @@ -0,0 +1,44 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +{ + "dbSvr": { + "dbSvr": "localhost", + "passwd": "cloud", + "db": "cloud", + "port": 3306, + "user": "cloud" + }, + "logger": [ + { + "name": "TestClient", + "file": "/tmp/testclient.log" + }, + { + "name": "TestCase", + "file": "/tmp/testcase.log" + } + ], + "mgtSvr": [ + { + "mgtSvrIp": "localhost", + "passwd": "password", + "user": "root", + "port": 8096 + } + ] +} diff --git a/test/integration/component/test_accounts.py b/test/integration/component/test_accounts.py index cdb3e58dd94..459cfb3a251 100644 --- a/test/integration/component/test_accounts.py +++ b/test/integration/component/test_accounts.py @@ -95,7 +95,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced' } @@ -110,6 +109,7 @@ class TestAccounts(cloudstackTestCase): cls.services = Services().services # Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, @@ -239,6 +239,7 @@ class TestRemoveUserFromAccount(cloudstackTestCase): cls.services = Services().services # Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, @@ -506,7 +507,7 @@ class TestNonRootAdminsPrivileges(cloudstackTestCase): cls.services = Services().services # Get Zone settings cls.zone = get_zone(cls.api_client, cls.services) - + cls.services['mode'] = cls.zone.networktype # Create an account, domain etc cls.domain = Domain.create( cls.api_client, @@ -852,6 +853,7 @@ class TesttemplateHierarchy(cloudstackTestCase): cls.services = Services().services # Get Zone settings cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.services["template"]["zoneid"] = cls.zone.id # Create domains, accounts and template @@ -1000,6 +1002,7 @@ class TestAddVmToSubDomain(cloudstackTestCase): cls.api_client, cls.services, ) + cls.services['mode'] = cls.zone.networktype cls.sub_domain = Domain.create( cls.api_client, cls.services["domain"], @@ -1145,6 +1148,7 @@ class TestUserDetails(cloudstackTestCase): # Get Zone, Domain etc cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls._cleanup = [] return @@ -1451,6 +1455,7 @@ class TestUserLogin(cloudstackTestCase): # Get Zone, Domain etc cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls._cleanup = [] return @@ -1615,6 +1620,7 @@ class TestDomainForceRemove(cloudstackTestCase): cls.api_client, cls.services, ) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, diff --git a/test/integration/component/test_allocation_states.py b/test/integration/component/test_allocation_states.py index 103cb10c0cc..fe4c35f3b9f 100644 --- a/test/integration/component/test_allocation_states.py +++ b/test/integration/component/test_allocation_states.py @@ -79,7 +79,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced', } @@ -94,6 +93,7 @@ class TestAllocationState(cloudstackTestCase): cls.services = Services().services # Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls._cleanup = [] return diff --git a/test/integration/component/test_asa1000v_fw.py b/test/integration/component/test_asa1000v_fw.py new file mode 100644 index 00000000000..0b66f971946 --- /dev/null +++ b/test/integration/component/test_asa1000v_fw.py @@ -0,0 +1,134 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +""" Cisco ASA1000v external firewall +""" +#Import Local Modules +import marvin +from nose.plugins.attrib import attr +from marvin.cloudstackTestCase import * +from marvin.cloudstackAPI import * +from marvin.integration.lib.utils import * +from marvin.integration.lib.base import * +from marvin.integration.lib.common import * +from marvin.remoteSSHClient import remoteSSHClient +import datetime + + +class Services: + """Test Cisco ASA1000v services + """ + + def __init__(self): + self.services = { + "vnmc": { + "ipaddress": '10.147.28.236', + "username": 'admin', + "password": 'Password_123', + }, + "asa": { + "ipaddress": '10.147.28.238', + "insideportprofile": 'asa-in123', + }, + "network_offering": { + "name": 'CiscoVnmc', + "displaytext": 'CiscoVnmc', + "guestiptype": 'Isolated', + "supportedservices": 'Dhcp,Dns,SourceNat,PortForwarding,Firewall,UserData,StaticNat', + "traffictype": 'GUEST', + "availability": 'Optional', + "serviceProviderList": { + "Dhcp": 'VirtualRouter', + "Dns": 'VirtualRouter', + "SourceNat": 'CiscoVnmc', + "PortForwarding": 'CiscoVnmc', + "Firewall": 'CiscoVnmc', + "UserData": 'VirtualRouter', + "StaticNat": 'CiscoVnmc', + }, + }, + "network": { + "name": "CiscoVnmc", + "displaytext": "CiscoVnmc", + }, + } + +class TestASASetup(cloudstackTestCase): + + @classmethod + def setUpClass(cls): + cls.apiclient = super( + TestASASetup, + cls + ).getClsTestClient().getApiClient() + cls.services = Services().services + cls.network_offering = NetworkOffering.create( + cls.apiclient, + cls.services["network_offering"], + conservemode=True) + # Enable network offering + cls.network_offering.update(cls.apiclient, state='Enabled') + + cls._cleanup = [ + cls.network_offering, + ] + return + + @classmethod + def tearDownClass(cls): + try: + # Cleanup + cleanup_resources(cls.apiclient, cls._cleanup) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + return + + def setUp(self): + self.apiclient = self.testClient.getApiClient() + self.dbclient = self.testClient.getDbConnection() + + self.zone = get_zone(self.apiclient, self.services) + self.physicalnetworks = PhysicalNetwork.list(self.apiclient, zoneid=self.zone.id) + self.assertNotEqual(len(self.physicalnetworks), 0, "Check if the list physical network API returns a non-empty response") + self.clusters = Cluster.list(self.apiclient, hypervisor='VMware') + self.assertNotEqual(len(self.clusters), 0, "Check if the list cluster API returns a non-empty response") + + return + + def tearDown(self): + try: + self.debug("Cleaning up the resources") + # Cleanup + cleanup_resources(self.apiclient, self._cleanup) + self.debug("Cleanup complete!") + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + return + + def test_registerVnmc(self): + Vnmc = VNMC.create(self.apiclient, self.services["vnmc"]["ipaddress"], self.services["vnmc"]["username"], self.services["vnmc"]["password"], self.physicalnetworks[0].id) + self.debug("Cisco VNMC appliance with id %s deployed"%(Vnmc.id)) + VnmcList = VNMC.list(self.apiclient, physicalnetworkid = self.physicalnetworks[0].id) + self.assertNotEqual(len(VnmcList), 0, "List VNMC API returned an empty response") + Vnmc.delete(self.apiclient) + + def test_registerAsa1000v(self): + Asa = ASA1000V.create(self.apiclient, self.services["asa"]["ipaddress"], self.services["asa"]["insideportprofile"], self.clusters[0].id, self.physicalnetworks[0].id) + self.debug("Cisco ASA 1000v appliance with id %s deployed"%(Asa.id)) + AsaList = ASA1000V.list(self.apiclient, physicalnetworkid = self.physicalnetworks[0].id) + self.assertNotEqual(len(AsaList), 0, "List ASA 1000v API returned an empty response") + Asa.delete(self.apiclient) \ No newline at end of file diff --git a/test/integration/component/test_blocker_bugs.py b/test/integration/component/test_blocker_bugs.py index 33e4a73f712..bfd1c13cb19 100644 --- a/test/integration/component/test_blocker_bugs.py +++ b/test/integration/component/test_blocker_bugs.py @@ -101,8 +101,6 @@ class Services: "ostype": 'CentOS 5.3 (64-bit)', # Cent OS 5.3 (64 bit) "sleep": 60, - "mode": 'advanced', - # Networking mode, Advanced, Basic } @@ -115,6 +113,7 @@ class TestSnapshots(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"] @@ -422,6 +421,7 @@ class TestTemplate(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.services["templates"]["zoneid"] = cls.zone.id @@ -543,6 +543,7 @@ class TestNATRules(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, @@ -737,6 +738,7 @@ class TestRouters(cloudstackTestCase): cls.services = Services().services # Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, @@ -863,6 +865,7 @@ class TestRouterRestart(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, @@ -992,6 +995,7 @@ class TestTemplates(cloudstackTestCase): # Get Zone, templates etc cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, diff --git a/test/integration/component/test_egress_rules.py b/test/integration/component/test_egress_rules.py index 6b9cd4f25fc..7972aa50639 100644 --- a/test/integration/component/test_egress_rules.py +++ b/test/integration/component/test_egress_rules.py @@ -122,8 +122,6 @@ class Services: # CentOS 5.3 (64-bit) "sleep": 60, "timeout": 10, - "mode": 'basic', - # Networking mode: Basic or Advanced } @@ -156,6 +154,7 @@ class TestDefaultSecurityGroupEgress(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -314,6 +313,7 @@ class TestAuthorizeIngressRule(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -471,6 +471,7 @@ class TestDefaultGroupEgress(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -671,6 +672,7 @@ class TestDefaultGroupEgressAfterDeploy(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -853,6 +855,7 @@ class TestRevokeEgressRule(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -1114,6 +1117,7 @@ class TestInvalidAccountAuthroize(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -1235,6 +1239,7 @@ class TestMultipleAccountsEgressRuleNeg(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -1482,6 +1487,7 @@ class TestMultipleAccountsEgressRule(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -1778,6 +1784,7 @@ class TestStartStopVMWithEgressRule(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -1989,6 +1996,7 @@ class TestInvalidParametersForEgress(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -2171,6 +2179,7 @@ class TestEgressAfterHostMaintainance(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.pod = get_pod( cls.api_client, zoneid=cls.zone.id diff --git a/test/integration/component/test_eip_elb.py b/test/integration/component/test_eip_elb.py index 89fdd25fb25..c1ad50530b5 100644 --- a/test/integration/component/test_eip_elb.py +++ b/test/integration/component/test_eip_elb.py @@ -85,7 +85,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'basic' } class TestEIP(cloudstackTestCase): @@ -97,6 +96,7 @@ class TestEIP(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, @@ -919,6 +919,7 @@ class TestELB(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, diff --git a/test/integration/component/test_network_offering.py b/test/integration/component/test_network_offering.py index 0de03aa0938..8b12525103a 100644 --- a/test/integration/component/test_network_offering.py +++ b/test/integration/component/test_network_offering.py @@ -142,7 +142,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced' } @@ -158,6 +157,7 @@ class TestNOVirtualRouter(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, @@ -736,6 +736,7 @@ class TestNOWithNetscaler(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, @@ -1371,6 +1372,7 @@ class TestNetworkUpgrade(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, @@ -1827,6 +1829,7 @@ class TestSharedNetworkWithoutIp(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, diff --git a/test/integration/component/test_project_configs.py b/test/integration/component/test_project_configs.py index 854b5a42853..f1469f22e52 100644 --- a/test/integration/component/test_project_configs.py +++ b/test/integration/component/test_project_configs.py @@ -102,7 +102,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced' } @@ -117,6 +116,7 @@ class TestUserProjectCreation(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype configs = Configurations.list( cls.api_client, @@ -282,6 +282,7 @@ class TestProjectCreationNegative(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype # Checking for prereqisits - global configs configs = Configurations.list( @@ -427,6 +428,7 @@ class TestProjectInviteRequired(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype # Create domains, account etc. cls.domain = get_domain(cls.api_client, cls.services) @@ -578,6 +580,7 @@ class TestProjectInviteRequiredTrue(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype # Create domains, account etc. cls.domain = get_domain(cls.api_client, cls.services) @@ -730,6 +733,7 @@ class TestProjectInviteTimeout(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype # Create domains, account etc. cls.domain = get_domain(cls.api_client, cls.services) diff --git a/test/integration/component/test_project_limits.py b/test/integration/component/test_project_limits.py index afae1808d04..ab13238e187 100644 --- a/test/integration/component/test_project_limits.py +++ b/test/integration/component/test_project_limits.py @@ -116,7 +116,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced', } @@ -131,6 +130,7 @@ class TestProjectLimits(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype # Create domains, account etc. cls.domain = Domain.create( @@ -481,6 +481,7 @@ class TestResourceLimitsProject(cloudstackTestCase): cls.services = Services().services # Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, @@ -921,6 +922,7 @@ class TestMaxProjectNetworks(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, diff --git a/test/integration/component/test_project_resources.py b/test/integration/component/test_project_resources.py index 24091d2f89c..191ceb54cb6 100644 --- a/test/integration/component/test_project_resources.py +++ b/test/integration/component/test_project_resources.py @@ -134,7 +134,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced', } @@ -149,6 +148,7 @@ class TestOfferings(cloudstackTestCase): cls.services = Services().services # Get Zone and template cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, @@ -329,6 +329,7 @@ class TestNetwork(cloudstackTestCase): cls.services = Services().services # Get Zone and template cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, @@ -516,6 +517,7 @@ class TestTemplates(cloudstackTestCase): cls.services = Services().services # Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, @@ -745,6 +747,7 @@ class TestSnapshots(cloudstackTestCase): cls.services = Services().services # Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, @@ -891,6 +894,7 @@ class TestPublicIpAddress(cloudstackTestCase): cls.services = Services().services # Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, @@ -1190,6 +1194,7 @@ class TestSecurityGroup(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, diff --git a/test/integration/component/test_project_usage.py b/test/integration/component/test_project_usage.py index 9f0488d20ce..03c42fd196f 100644 --- a/test/integration/component/test_project_usage.py +++ b/test/integration/component/test_project_usage.py @@ -109,7 +109,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced' } @@ -125,6 +124,7 @@ class TestVmUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.cls.zone.networktype template = get_template( cls.api_client, @@ -319,6 +319,7 @@ class TestPublicIPUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, @@ -490,6 +491,7 @@ class TestVolumeUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"] @@ -674,6 +676,7 @@ class TestTemplateUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.services["server"]["zoneid"] = cls.zone.id template = get_template( cls.api_client, @@ -846,6 +849,7 @@ class TestISOUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.services["server"]["zoneid"] = cls.zone.id cls.services["iso"]["zoneid"] = cls.zone.id # Create Account, ISO image etc @@ -993,6 +997,7 @@ class TestLBRuleUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, @@ -1175,6 +1180,7 @@ class TestSnapshotUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -1352,6 +1358,7 @@ class TestNatRuleUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, @@ -1534,6 +1541,7 @@ class TestVpnUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, diff --git a/test/integration/component/test_projects.py b/test/integration/component/test_projects.py index 3e45cae6651..95df5bf8c30 100644 --- a/test/integration/component/test_projects.py +++ b/test/integration/component/test_projects.py @@ -96,7 +96,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced' } @@ -111,6 +110,7 @@ class TestMultipleProjectCreation(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype # Create domains, account etc. cls.domain = get_domain( @@ -323,6 +323,7 @@ class TestCrossDomainAccountAdd(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.domain = get_domain( cls.api_client, cls.services @@ -456,6 +457,7 @@ class TestDeleteAccountWithProject(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.domain = get_domain( cls.api_client, cls.services @@ -569,6 +571,7 @@ class TestDeleteDomainWithProject(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype configs = Configurations.list( cls.api_client, @@ -713,6 +716,7 @@ class TestProjectOwners(cloudstackTestCase): cls.services ) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype configs = Configurations.list( cls.api_client, @@ -1136,6 +1140,7 @@ class TestProjectResources(cloudstackTestCase): cls.services = Services().services # Get Zone cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.domain = get_domain( cls.api_client, cls.services @@ -1444,6 +1449,7 @@ class TestProjectSuspendActivate(cloudstackTestCase): cls.services = Services().services # Get Zone, domain, template etc cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.domain = get_domain( cls.api_client, cls.services diff --git a/test/integration/component/test_resource_limits.py b/test/integration/component/test_resource_limits.py index c20770ab24f..641825b4a0c 100644 --- a/test/integration/component/test_resource_limits.py +++ b/test/integration/component/test_resource_limits.py @@ -105,7 +105,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced', } @@ -118,6 +117,7 @@ class TestResourceLimitsAccount(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, @@ -881,6 +881,7 @@ class TestResourceLimitsDomain(cloudstackTestCase): cls.services = Services().services # Get Zone, Domain and templates cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, @@ -1338,6 +1339,7 @@ class TestMaxAccountNetworks(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, diff --git a/test/integration/component/test_routers.py b/test/integration/component/test_routers.py index 02a08dee91c..452c034d5eb 100644 --- a/test/integration/component/test_routers.py +++ b/test/integration/component/test_routers.py @@ -91,7 +91,6 @@ class Services: }, "ostype": 'CentOS 5.3 (64-bit)', # Used for Get_Template : CentOS 5.3 (64 bit) - "mode": 'advanced', # Networking mode: Advanced, basic } @@ -105,6 +104,7 @@ class TestRouterServices(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, cls.zone.id, @@ -592,6 +592,7 @@ class TestRouterStopCreatePF(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, @@ -803,6 +804,7 @@ class TestRouterStopCreateLB(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, @@ -1014,6 +1016,7 @@ class TestRouterStopCreateFW(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, diff --git a/test/integration/component/test_security_groups.py b/test/integration/component/test_security_groups.py index 39f6d6fcd26..7459d2a2913 100644 --- a/test/integration/component/test_security_groups.py +++ b/test/integration/component/test_security_groups.py @@ -94,8 +94,6 @@ class Services: # CentOS 5.3 (64-bit) "sleep": 60, "timeout": 10, - "mode": 'basic', - # Networking mode: Basic or Advanced } @@ -125,6 +123,7 @@ class TestDefaultSecurityGroup(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -397,6 +396,7 @@ class TestAuthorizeIngressRule(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -532,6 +532,7 @@ class TestRevokeIngressRule(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -690,6 +691,7 @@ class TestDhcpOnlyRouter(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -826,6 +828,7 @@ class TestdeployVMWithUserData(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -985,6 +988,7 @@ class TestDeleteSecurityGroup(cloudstackTestCase): # Get Zone, Domain and templates self.domain = get_domain(self.apiclient, self.services) self.zone = get_zone(self.apiclient, self.services) + self.services['mode'] = cls.zone.networktype template = get_template( self.apiclient, @@ -1230,6 +1234,7 @@ class TestIngressRule(cloudstackTestCase): # Get Zone, Domain and templates self.domain = get_domain(self.apiclient, self.services) self.zone = get_zone(self.apiclient, self.services) + self.services['mode'] = cls.zone.networktype template = get_template( self.apiclient, diff --git a/test/integration/component/test_snapshots.py b/test/integration/component/test_snapshots.py index 825b8c6877e..5567917371e 100644 --- a/test/integration/component/test_snapshots.py +++ b/test/integration/component/test_snapshots.py @@ -121,7 +121,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced', # Networking mode: Advanced, Basic } @@ -134,6 +133,7 @@ class TestSnapshotRootDisk(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -356,6 +356,7 @@ class TestSnapshots(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"] @@ -1190,6 +1191,7 @@ class TestCreateVMsnapshotTemplate(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.template = get_template( cls.api_client, @@ -1485,6 +1487,7 @@ class TestAccountSnapshotClean(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -1833,6 +1836,7 @@ class TestSnapshotDetachedDisk(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, @@ -2120,6 +2124,7 @@ class TestSnapshotLimit(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -2378,6 +2383,7 @@ class TestSnapshotEvents(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, diff --git a/test/integration/component/test_storage_motion.py b/test/integration/component/test_storage_motion.py new file mode 100644 index 00000000000..b893b8b7df4 --- /dev/null +++ b/test/integration/component/test_storage_motion.py @@ -0,0 +1,298 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +""" P1 tests for Storage motion +""" +#Import Local Modules +import marvin +from marvin.cloudstackTestCase import * +from marvin.cloudstackAPI import * +from marvin.remoteSSHClient import remoteSSHClient +from marvin.integration.lib.utils import * +from marvin.integration.lib.base import * +from marvin.integration.lib.common import * +from nose.plugins.attrib import attr +#Import System modules +import time + +_multiprocess_shared_ = True +class Services: + """Test VM Life Cycle Services + """ + + def __init__(self): + self.services = { + "disk_offering":{ + "displaytext": "Small", + "name": "Small", + "disksize": 1 + }, + "account": { + "email": "test@test.com", + "firstname": "Test", + "lastname": "User", + "username": "test", + # Random characters are appended in create account to + # ensure unique username generated each time + "password": "password", + }, + "small": + # Create a small virtual machine instance with disk offering + { + "displayname": "testserver", + "username": "root", # VM creds for SSH + "password": "password", + "ssh_port": 22, + "hypervisor": 'XenServer', + "privateport": 22, + "publicport": 22, + "protocol": 'TCP', + }, + "service_offerings": + { + "small": + { + # Small service offering ID to for change VM + # service offering from medium to small + "name": "Small Instance", + "displaytext": "Small Instance", + "cpunumber": 1, + "cpuspeed": 100, + "memory": 256, + } + }, + "template": { + "displaytext": "Cent OS Template", + "name": "Cent OS Template", + "passwordenabled": True, + }, + "diskdevice": '/dev/xvdd', + # Disk device where ISO is attached to instance + "mount_dir": "/mnt/tmp", + "sleep": 60, + "timeout": 10, + #Migrate VM to hostid + "ostype": 'CentOS 5.3 (64-bit)', + # CentOS 5.3 (64-bit) + } + +class TestStorageMotion(cloudstackTestCase): + + @classmethod + def setUpClass(cls): + cls.api_client = super(TestStorageMotion, cls).getClsTestClient().getApiClient() + cls.services = Services().services + + # Get Zone, Domain and templates + domain = get_domain(cls.api_client, cls.services) + zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype + + template = get_template( + cls.api_client, + zone.id, + cls.services["ostype"] + ) + # Set Zones and disk offerings + cls.services["small"]["zoneid"] = zone.id + cls.services["small"]["template"] = template.id + + # Create VMs, NAT Rules etc + cls.account = Account.create( + cls.api_client, + cls.services["account"], + domainid=domain.id + ) + + cls.small_offering = ServiceOffering.create( + cls.api_client, + cls.services["service_offerings"]["small"] + ) + + #create a virtual machine + cls.virtual_machine = VirtualMachine.create( + cls.api_client, + cls.services["small"], + accountid=cls.account.account.name, + domainid=cls.account.account.domainid, + serviceofferingid=cls.small_offering.id, + mode=cls.services["mode"] + ) + cls._cleanup = [ + cls.small_offering, + cls.account + ] + + @classmethod + def tearDownClass(cls): + cls.api_client = super(TestStorageMotion, cls).getClsTestClient().getApiClient() + cleanup_resources(cls.api_client, cls._cleanup) + return + + def setUp(self): + self.apiclient = self.testClient.getApiClient() + self.dbclient = self.testClient.getDbConnection() + self.cleanup = [] + + def tearDown(self): + #Clean up, terminate the created ISOs + cleanup_resources(self.apiclient, self.cleanup) + return + + @attr(tags = ["advanced", "basic", "multicluster", "storagemotion", "xenserver"]) + def test_01_migrate_vm_with_volume(self): + """Test migrate virtual machine with its volumes + """ + # Validate the following + # 1. List hosts for migration of a vm. Pick a host that + # requires storage motion too. + # 2. Migrate vm to a host. + # 3. listVM command should return this VM.State of this VM + # should be "Running" and the host should be the host + # to which the VM was migrated to in a different cluster + + hosts = Host.listForMigration( + self.apiclient, + virtualmachineid=self.virtual_machine.id + ) + + self.assertEqual( + isinstance(hosts, list), + True, + "Check the number of hosts in the zone" + ) + + # Migrate to a host that requires storage motion + hosts[:] = [host for host in hosts if host.requiresStorageMotion] + + host = hosts[0] + self.debug("Migrating VM-ID: %s to Host: %s" % ( + self.virtual_machine.id, + host.id + )) + + cmd = migrateVirtualMachineWithVolume.migrateVirtualMachineWithVolumeCmd() + cmd.hostid = host.id + cmd.virtualmachineid = self.virtual_machine.id + self.apiclient.migrateVirtualMachineWithVolume(cmd) + + list_vm_response = list_virtual_machines( + self.apiclient, + id=self.virtual_machine.id + ) + self.assertEqual( + isinstance(list_vm_response, list), + True, + "Check list response returns a valid list" + ) + + self.assertNotEqual( + list_vm_response, + None, + "Check virtual machine is listVirtualMachines" + ) + + vm_response = list_vm_response[0] + + self.assertEqual( + vm_response.id, + self.virtual_machine.id, + "Check virtual machine ID of migrated VM" + ) + + self.assertEqual( + vm_response.hostid, + host.id, + "Check destination hostID of migrated VM" + ) + + self.assertEqual( + vm_response.state, + 'Running', + "Check the state of VM" + ) + return + + @attr(tags = ["advanced", "basic", "multipool", "storagemotion", "xenserver"]) + def test_02_migrate_volume(self): + """Test migrate volume of a running vm + """ + # Validate the following + # 1. List all the volumes of a vm. For each volume do step 2 to 4. + # 2. List storage pools for migrating volume of a vm. Multiple + # storage pools should be present in the cluster. + # 3. Migrate volume of the vm to another pool. + # 4. Check volume is present in the new pool and is in Ready state. + + list_volumes_response = list_volumes( + self.apiclient, + virtualmachineid=self.virtual_machine.id, + listall=True + ) + self.assertEqual( + isinstance(list_volumes_response, list), + True, + "Check list volumes response for valid list" + ) + self.assertNotEqual( + list_volumes_response, + None, + "Check if volume exists in ListVolumes" + ) + + for volume in list_volumes_response: + pools = StoragePool.listForMigration( + self.apiclient, + id=volume.id + ) + pool = pools[0] + self.debug("Migrating Volume-ID: %s to Pool: %s" % ( + volume.id, + pool.id + )) + Volume.migrate( + self.apiclient, + volumeid=volume.id, + storageid=pool.id, + livemigrate='true' + ) + migrated_volume_response = list_volumes( + self.apiclient, + id=volume.id + ) + self.assertEqual( + isinstance(migrated_volume_response, list), + True, + "Check list volumes response for valid list" + ) + self.assertNotEqual( + migrated_volume_response, + None, + "Check if volume exists in ListVolumes" + ) + migrated_volume = migrated_volume_response[0] + self.assertEqual( + migrated_volume.state, + 'Ready', + "Check migrated volume is in Ready state" + ) + self.assertEqual( + migrated_volume.storage, + pool.name, + "Check volume is on migrated pool" + ) + + return diff --git a/test/integration/component/test_templates.py b/test/integration/component/test_templates.py index 65d9fe0a764..a743bf7e690 100644 --- a/test/integration/component/test_templates.py +++ b/test/integration/component/test_templates.py @@ -97,7 +97,6 @@ class Services: "ostype": 'CentOS 5.3 (64-bit)', "sleep": 60, "timeout": 10, - "mode": 'advanced', # Networking mode: Advanced, basic } @@ -128,6 +127,7 @@ class TestCreateTemplate(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.services["virtual_machine"]["zoneid"] = cls.zone.id cls.service_offering = ServiceOffering.create( @@ -283,6 +283,7 @@ class TestTemplates(cloudstackTestCase): # Get Zone, templates etc cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype #populate second zone id for iso copy cmd = listZones.listZonesCmd() zones = cls.api_client.listZones(cmd) diff --git a/test/integration/component/test_usage.py b/test/integration/component/test_usage.py index 82d13e5a9ff..39228ba3b7a 100644 --- a/test/integration/component/test_usage.py +++ b/test/integration/component/test_usage.py @@ -105,7 +105,6 @@ class Services: # Cent OS 5.3 (64 bit) "sleep": 60, "timeout": 10, - "mode": 'advanced' } @@ -118,6 +117,7 @@ class TestVmUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -301,6 +301,7 @@ class TestPublicIPUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -452,6 +453,7 @@ class TestVolumeUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"] @@ -625,6 +627,7 @@ class TestTemplateUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.services["server"]["zoneid"] = cls.zone.id template = get_template( cls.api_client, @@ -789,6 +792,7 @@ class TestISOUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.services["server"]["zoneid"] = cls.zone.id cls.services["iso"]["zoneid"] = cls.zone.id # Create Account, ISO image etc @@ -925,6 +929,7 @@ class TestLBRuleUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, @@ -1086,6 +1091,7 @@ class TestSnapshotUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, @@ -1252,6 +1258,7 @@ class TestNatRuleUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, @@ -1413,6 +1420,7 @@ class TestVpnUsage(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, diff --git a/test/integration/component/test_vm_passwdenabled.py b/test/integration/component/test_vm_passwdenabled.py index fb881708e2f..e3bcf678948 100644 --- a/test/integration/component/test_vm_passwdenabled.py +++ b/test/integration/component/test_vm_passwdenabled.py @@ -83,6 +83,7 @@ class TestVMPasswordEnabled(cloudstackTestCase): # Get Zone, Domain and templates domain = get_domain(cls.api_client, cls.services) zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, zone.id, diff --git a/test/integration/component/test_volumes.py b/test/integration/component/test_volumes.py index bedf6efd8b4..f50113b1532 100644 --- a/test/integration/component/test_volumes.py +++ b/test/integration/component/test_volumes.py @@ -87,7 +87,6 @@ class Services: }, "sleep": 50, "ostype": 'CentOS 5.3 (64-bit)', - "mode": 'advanced', } @@ -101,6 +100,7 @@ class TestAttachVolume(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"] @@ -371,6 +371,7 @@ class TestAttachDetachVolume(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"] @@ -616,6 +617,7 @@ class TestAttachVolumeISO(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"] @@ -807,6 +809,7 @@ class TestVolumes(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"] @@ -1046,6 +1049,7 @@ class TestDeployVmWithCustomDisk(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"], diff --git a/test/integration/smoke/test_affinity_groups.py b/test/integration/smoke/test_affinity_groups.py new file mode 100644 index 00000000000..3ed31152643 --- /dev/null +++ b/test/integration/smoke/test_affinity_groups.py @@ -0,0 +1,194 @@ +#!/usr/bin/env python +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from marvin.cloudstackTestCase import * +from marvin.cloudstackAPI import * +from marvin.integration.lib.utils import * +from marvin.integration.lib.base import * +from marvin.integration.lib.common import * +from marvin import remoteSSHClient +from nose.plugins.attrib import attr + +class Services: + """Test Account Services + """ + + def __init__(self): + self.services = { + "domain": { + "name": "Domain", + }, + "account": { + "email": "test@test.com", + "firstname": "Test", + "lastname": "User", + "username": "test", + # Random characters are appended for unique + # username + "password": "password", + }, + "service_offering": { + "name": "Tiny Instance", + "displaytext": "Tiny Instance", + "cpunumber": 1, + "cpuspeed": 100, + # in MHz + "memory": 64, + # In MBs + }, + "ostype": 'CentOS 5.3 (64-bit)', + "virtual_machine" : { + "affinity": { + "name": "webvms", + "type": "host anti-affinity", + }, + "hypervisor" : "XenServer", + } + } + + +class TestDeployVmWithAffinityGroup(cloudstackTestCase): + """ + This test deploys a virtual machine into a user account + using the small service offering and builtin template + """ + + @classmethod + def setUpClass(cls): + cls.api_client = super(TestDeployVmWithAffinityGroup, cls).getClsTestClient().getApiClient() + cls.services = Services().services + # Get Zone, Domain and templates + cls.domain = get_domain(cls.api_client, cls.services) + cls.zone = get_zone(cls.api_client, cls.services) + cls.template = get_template( + cls.api_client, + cls.zone.id, + cls.services["ostype"] + ) + cls.services["virtual_machine"]["zoneid"] = cls.zone.id + + cls.services["template"] = cls.template.id + cls.services["zoneid"] = cls.zone.id + + cls.account = Account.create( + cls.api_client, + cls.services["account"], + domainid=cls.domain.id + ) + + cls.services["account"] = cls.account.name + + cls.service_offering = ServiceOffering.create( + cls.api_client, + cls.services["service_offering"] + ) + + cls.ag = AffinityGroup.create(cls.api_client, cls.services["virtual_machine"]["affinity"], + account=cls.services["account"], domainid=cls.domain.id) + + cls._cleanup = [ + cls.service_offering, + cls.account, + ] + return + + @attr(tags=["simulator", "basic", "advanced", "multihost"]) + def test_DeployVmAntiAffinityGroup(self): + """ + test DeployVM in anti-affinity groups + + deploy VM1 and VM2 in the same host-anti-affinity groups + Verify that the vms are deployed on separate hosts + """ + #deploy VM1 in affinity group created in setUp + vm1 = VirtualMachine.create( + self.api_client, + self.services["virtual_machine"], + templateid=self.template.id, + accountid=self.account.name, + domainid=self.account.domainid, + serviceofferingid=self.service_offering.id, + affinitygroupnames=[self.ag.name] + ) + + list_vm1 = list_virtual_machines( + self.api_client, + id=vm1.id + ) + self.assertEqual( + isinstance(list_vm1, list), + True, + "Check list response returns a valid list" + ) + self.assertNotEqual( + len(list_vm1), + 0, + "Check VM available in List Virtual Machines" + ) + vm1_response = list_vm1[0] + self.assertEqual( + vm1_response.state, + 'Running', + msg="VM is not in Running state" + ) + host_of_vm1 = vm1_response.hostid + + #deploy VM2 in affinity group created in setUp + vm2 = VirtualMachine.create( + self.api_client, + self.services["virtual_machine"], + templateid=self.template.id, + accountid=self.account.name, + domainid=self.account.domainid, + serviceofferingid=self.service_offering.id, + affinitygroupnames=[self.ag.name] + ) + list_vm2 = list_virtual_machines( + self.api_client, + id=vm2.id + ) + self.assertEqual( + isinstance(list_vm2, list), + True, + "Check list response returns a valid list" + ) + self.assertNotEqual( + len(list_vm2), + 0, + "Check VM available in List Virtual Machines" + ) + vm2_response = list_vm2[0] + self.assertEqual( + vm2_response.state, + 'Running', + msg="VM is not in Running state" + ) + host_of_vm2 = vm2_response.hostid + + self.assertNotEqual(host_of_vm1, host_of_vm2, + msg="Both VMs of affinity group %s are on the same host" % self.ag.name) + + + @classmethod + def tearDown(cls): + try: + cls.api_client = super(TestDeployVmWithAffinityGroup, cls).getClsTestClient().getApiClient() + #Clean up, terminate the created templates + cleanup_resources(cls.api_client, cls.cleanup) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) diff --git a/test/integration/smoke/test_deploy_vm_with_userdata.py b/test/integration/smoke/test_deploy_vm_with_userdata.py new file mode 100644 index 00000000000..fd9e320addc --- /dev/null +++ b/test/integration/smoke/test_deploy_vm_with_userdata.py @@ -0,0 +1,144 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from marvin.cloudstackTestCase import cloudstackTestCase +from marvin.integration.lib.base import * +from marvin.integration.lib.common import get_template, get_zone, list_virtual_machines, cleanup_resources +from nose.plugins.attrib import attr + +import random +import string + +class Services: + def __init__(self): + self.services = { + "account": { + "email": "test@test.com", + "firstname": "Test", + "lastname": "User", + "username": "test", + "password": "password", + }, + "virtual_machine": { + "displayname": "Test VM", + "username": "root", + "password": "password", + "ssh_port": 22, + "hypervisor": 'XenServer', + "privateport": 22, + "publicport": 22, + "protocol": 'TCP', + }, + "ostype": 'CentOS 5.3 (64-bit)', + "service_offering": { + "name": "Tiny Instance", + "displaytext": "Tiny Instance", + "cpunumber": 1, + "cpuspeed": 100, + "memory": 256, + }, + } + + +class TestDeployVmWithUserData(cloudstackTestCase): + """Tests for UserData + """ + + @classmethod + def setUpClass(cls): + cls.apiClient = super(TestDeployVmWithUserData, cls).getClsTestClient().getApiClient() + cls.services = Services().services + cls.zone = get_zone(cls.apiClient, cls.services) + if cls.zone.localstorageenabled: + #For devcloud since localstroage is enabled + cls.services["service_offering"]["storagetype"] = "local" + cls.service_offering = ServiceOffering.create( + cls.apiClient, + cls.services["service_offering"] + ) + cls.account = Account.create(cls.apiClient, services=cls.services["account"]) + cls.template = get_template( + cls.apiClient, + cls.zone.id, + cls.services["ostype"] + ) + cls.debug("Successfully created account: %s, id: \ + %s" % (cls.account.name,\ + cls.account.id)) + cls.cleanup = [cls.account] + + # Generate userdata of 2500 bytes. This is larger than the 2048 bytes limit. + # CS however allows for upto 4K bytes in the code. So this must succeed. + # Overall, the query length must not exceed 4K, for then the json decoder + # will fail this operation at the marvin client side itcls. + user_data = ''.join(random.choice(string.ascii_uppercase + string.digits) for x in range(2500)) + cls.services["virtual_machine"]["userdata"] = user_data + + @attr(tags=["simulator", "devcloud", "basic", "advanced"]) + def test_deployvm_userdata_post(self): + """Test userdata as POST, size > 2k + """ + deployVmResponse = VirtualMachine.create( + self.apiClient, + services=self.services["virtual_machine"], + accountid=self.account.name, + domainid=self.account.domainid, + serviceofferingid=self.service_offering.id, + templateid=self.template.id, + zoneid=self.zone.id, + method='POST' + ) + vms = list_virtual_machines( + self.apiClient, + account=self.account.name, + domainid=self.account.domainid + ) + self.assert_(len(vms) > 0, "There are no Vms deployed in the account %s" % self.account.name) + vm = vms[0] + self.assert_(vm.id == str(deployVmResponse.id), "Vm deployed is different from the test") + self.assert_(vm.state == "Running", "VM is not in Running state") + + @attr(tags=["simulator", "devcloud", "basic", "advanced"]) + def test_deployvm_userdata(self): + """Test userdata as GET, size > 2k + """ + deployVmResponse = VirtualMachine.create( + self.apiClient, + services=self.services["virtual_machine"], + accountid=self.account.name, + domainid=self.account.domainid, + serviceofferingid=self.service_offering.id, + templateid=self.template.id, + zoneid=self.zone.id + ) + vms = list_virtual_machines( + self.apiClient, + account=self.account.name, + domainid=self.account.domainid + ) + self.assert_(len(vms) > 0, "There are no Vms deployed in the account %s" % self.account.name) + vm = vms[0] + self.assert_(vm.id == str(deployVmResponse.id), "Vm deployed is different from the test") + self.assert_(vm.state == "Running", "VM is not in Running state") + + @classmethod + def tearDownClass(cls): + try: + #Cleanup resources used + cleanup_resources(cls.apiClient, cls.cleanup) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) diff --git a/test/integration/smoke/test_global_settings.py b/test/integration/smoke/test_global_settings.py new file mode 100644 index 00000000000..12b35d774b7 --- /dev/null +++ b/test/integration/smoke/test_global_settings.py @@ -0,0 +1,72 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +""" P1 tests for updating the granular Configuration parameter with scope and resource id provided. +""" +#Import Local Modules +from marvin.cloudstackTestCase import * +from marvin.cloudstackAPI import * +from marvin.integration.lib.utils import * +from marvin.integration.lib.base import * +from marvin.integration.lib.common import * +#Import System modules + +class TestUpdateConfigWithScope(cloudstackTestCase): + """ + Test to update a configuration (global setting) at various scopes + """ + def setUp(self): + self.apiClient = self.testClient.getApiClient() + + def test_UpdateConfigParamWithScope(self): + """ + test update configuration setting at zone level scope + @return: + """ + updateConfigurationCmd = updateConfiguration.updateConfigurationCmd() + updateConfigurationCmd.name = "use.external.dns" + updateConfigurationCmd.value = "true" + updateConfigurationCmd.scope = "zone" + updateConfigurationCmd.id = 1 + + updateConfigurationResponse = self.apiClient.updateConfiguration(updateConfigurationCmd) + self.debug("updated the parameter %s with value %s"%(updateConfigurationResponse.name, updateConfigurationResponse.value)) + + listConfigurationsCmd = listConfigurations.listConfigurationsCmd() + listConfigurationsCmd.cfgName = updateConfigurationResponse.name + listConfigurationsCmd.scope = "zone" + listConfigurationsCmd.id = 1 + listConfigurationsResponse = self.apiClient.listConfigurations(listConfigurationsCmd) + + self.assertNotEqual(len(listConfigurationsResponse), 0, "Check if the list API \ + returns a non-empty response") + + configParam = listConfigurationsResponse[0] + self.assertEqual(configParam.value, updateConfigurationResponse.value, "Check if the update API returned \ + is the same as the one we got in the list API") + + + def tearDown(self): + """ + Reset the configuration back to false + @return: + """ + updateConfigurationCmd = updateConfiguration.updateConfigurationCmd() + updateConfigurationCmd.name = "use.external.dns" + updateConfigurationCmd.value = "false" + updateConfigurationCmd.scope = "zone" + updateConfigurationCmd.id = 1 + self.apiClient.updateConfiguration(updateConfigurationCmd) diff --git a/test/integration/smoke/test_iso.py b/test/integration/smoke/test_iso.py index 5bd7bb358be..0b7d2765775 100644 --- a/test/integration/smoke/test_iso.py +++ b/test/integration/smoke/test_iso.py @@ -79,8 +79,6 @@ class Services: "timeout": 10, "ostype": "CentOS 5.3 (64-bit)", # CentOS 5.3 (64 bit) - "mode": 'advanced' - # Networking mode: Basic or Advanced } @@ -93,6 +91,7 @@ class TestCreateIso(cloudstackTestCase): # Get Zone, Domain and templates self.domain = get_domain(self.apiclient, self.services) self.zone = get_zone(self.apiclient, self.services) + self.services['mode'] = self.zone.networktype self.services["domainid"] = self.domain.id self.services["iso_2"]["zoneid"] = self.zone.id diff --git a/test/integration/smoke/test_network.py b/test/integration/smoke/test_network.py index e78cc43fe33..df89eaaa695 100644 --- a/test/integration/smoke/test_network.py +++ b/test/integration/smoke/test_network.py @@ -38,8 +38,6 @@ class Services: self.services = { "ostype": "CentOS 5.3 (64-bit)", # Cent OS 5.3 (64 bit) - "mode": 'advanced', - # Networking mode: Basic or advanced "lb_switch_wait": 10, # Time interval after which LB switches the requests "sleep": 60, @@ -120,7 +118,7 @@ class TestPublicIP(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) - + cls.services['mode'] = cls.zone.networktype # Create Accounts & networks cls.account = Account.create( cls.api_client, diff --git a/test/integration/smoke/test_non_contigiousvlan.py b/test/integration/smoke/test_non_contigiousvlan.py new file mode 100644 index 00000000000..91b6325782c --- /dev/null +++ b/test/integration/smoke/test_non_contigiousvlan.py @@ -0,0 +1,86 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +from marvin import cloudstackTestCase +from marvin.cloudstackAPI import * +from marvin.cloudstackTestCase import cloudstackTestCase +from marvin.integration.lib.base import Account +from marvin.integration.lib.base import PhysicalNetwork +from nose.plugins.attrib import attr + +class Services(): + def __init__(self): + self.services = { + "vlan": { + "part": ["4090-4091", "4092-4096"], + "full": "4090-4096", + } + } + + +@attr(tags = ["simulator", "advanced"]) +class TestUpdatePhysicalNetwork(cloudstackTestCase): + """ + Test to extend physical network vlan range + """ + def setUp(self): + self.vlan = Services().services["vlan"] + self.apiClient = self.testClient.getApiClient() + + + def test_extendPhysicalNetworkVlan(self): + """ + Test to update a physical network and extend its vlan + """ + phy_networks = PhysicalNetwork.list(self.apiClient) + self.assertNotEqual(len(phy_networks), 0, + msg="There are no physical networks in the zone") + + self.network = phy_networks[0] + self.networkid = phy_networks[0].id + vlan1 = self.vlan["part"][0] + updatePhysicalNetworkResponse = self.network.update(self.apiClient, id = self.networkid, vlan = vlan1) + self.assert_(updatePhysicalNetworkResponse is not None, + msg="couldn't extend the physical network with vlan %s"%vlan1) + self.assert_(isinstance(self.network, PhysicalNetwork)) + + vlan2 = self.vlan["part"][1] + updatePhysicalNetworkResponse2 = self.network.update(self.apiClient, id = self.networkid, vlan = vlan2) + self.assert_(updatePhysicalNetworkResponse2 is not None, + msg="couldn't extend the physical network with vlan %s"%vlan2) + self.assert_(isinstance(self.network, PhysicalNetwork)) + + vlanranges= updatePhysicalNetworkResponse2.vlan + self.assert_(vlanranges is not None, + "No VLAN ranges found on the deployment") + self.assert_(vlanranges.find(self.vlan["full"]) > 0, "vlan ranges are not extended") + + + def tearDown(self): + """ + Teardown to update a physical network and shrink its vlan + @return: + """ + phy_networks = PhysicalNetwork.list(self.apiClient) + self.assertNotEqual(len(phy_networks), 0, + msg="There are no physical networks in the zone") + self.network = phy_networks[0] + self.networkid = phy_networks[0].id + updateResponse = self.network.update(self.apiClient, id = self.networkid, removevlan = self.vlan["full"]) + self.assert_(updateResponse.vlan.find(self.vlan["full"]) > 0, + "VLAN was not removed successfully") + diff --git a/test/integration/smoke/test_public_ip_range.py b/test/integration/smoke/test_public_ip_range.py new file mode 100644 index 00000000000..f2099ff432a --- /dev/null +++ b/test/integration/smoke/test_public_ip_range.py @@ -0,0 +1,173 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +""" P1 tests for Dedicating Public IP addresses +""" +#Import Local Modules +import marvin +from nose.plugins.attrib import attr +from marvin.cloudstackTestCase import * +from marvin.cloudstackAPI import * +from marvin.integration.lib.utils import * +from marvin.integration.lib.base import * +from marvin.integration.lib.common import * +import datetime + +class Services: + """Test Dedicating Public IP addresses + """ + + def __init__(self): + self.services = { + "domain": { + "name": "Domain", + }, + "account": { + "email": "test@test.com", + "firstname": "Test", + "lastname": "User", + "username": "test", + "password": "password", + }, + "gateway": "10.102.197.1", + "netmask": "255.255.255.0", + "forvirtualnetwork": "true", + "startip": "10.102.197.70", + "endip": "10.102.197.73", + "zoneid": "1", + "podid": "", + "vlan": "4444", + } + +class TesDedicatePublicIPRange(cloudstackTestCase): + + @classmethod + def setUpClass(cls): + cls.api_client = super(TesDedicatePublicIPRange, cls).getClsTestClient().getApiClient() + cls.services = Services().services + # Get Zone, Domain + cls.domain = get_domain(cls.api_client, cls.services) + cls.zone = get_zone(cls.api_client, cls.services) + + # Create Account + cls.account = Account.create( + cls.api_client, + cls.services["account"], + domainid=cls.domain.id + ) + cls._cleanup = [ + cls.account, + ] + return + + @classmethod + def tearDownClass(cls): + try: + # Cleanup resources used + cleanup_resources(cls.api_client, cls._cleanup) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + return + + def setUp(self): + self.apiclient = self.testClient.getApiClient() + self.dbclient = self.testClient.getDbConnection() + self.cleanup = [] + return + + def tearDown(self): + try: + # Clean up + cleanup_resources(self.apiclient, self.cleanup) + except Exception as e: + raise Exception("Warning: Exception during cleanup : %s" % e) + return + + @attr(tags = ["simulator", "publiciprange", "dedicate", "release"]) + def test_dedicatePublicIpRange(self): + """Test public IP range dedication + """ + + # Validate the following: + # 1. Create a Public IP range + # 2. Created IP range should be present, verify with listVlanIpRanges + # 3. Dedicate the created IP range to user account + # 4. Verify IP range is dedicated, verify with listVlanIpRanges + # 5. Release the dedicated Public IP range back to the system + # 6. Verify IP range has been released, verify with listVlanIpRanges + # 7. Delete the Public IP range + + self.debug("Creating Public IP range") + self.public_ip_range = PublicIpRange.create( + self.api_client, + self.services + ) + list_public_ip_range_response = PublicIpRange.list( + self.apiclient, + id=self.public_ip_range.vlan.id + ) + self.debug( + "Verify listPublicIpRanges response for public ip ranges: %s" \ + % self.public_ip_range.vlan.id + ) + self.assertEqual( + isinstance(list_public_ip_range_response, list), + True, + "Check for list Public IP range response" + ) + public_ip_response = list_public_ip_range_response[0] + self.assertEqual( + public_ip_response.id, + self.public_ip_range.vlan.id, + "Check public ip range response id is in listVlanIpRanges" + ) + + self.debug("Dedicating Public IP range"); + dedicate_public_ip_range_response = PublicIpRange.dedicate( + self.apiclient, + self.public_ip_range.vlan.id, + account=self.account.name, + domainid=self.account.domainid + ) + list_public_ip_range_response = PublicIpRange.list( + self.apiclient, + id=self.public_ip_range.vlan.id + ) + public_ip_response = list_public_ip_range_response[0] + self.assertEqual( + public_ip_response.account, + self.account.name, + "Check account name is in listVlanIpRanges as the account public ip range is dedicated to" + ) + + self.debug("Releasing Public IP range"); + self.public_ip_range.release(self.apiclient) + list_public_ip_range_response = PublicIpRange.list( + self.apiclient, + id=self.public_ip_range.vlan.id + ) + public_ip_response = list_public_ip_range_response[0] + self.assertEqual( + public_ip_response.account, + "system", + "Check account name is system account in listVlanIpRanges" + ) + + self.debug("Deleting Public IP range"); + self.public_ip_range.delete(self.apiclient) + + return + diff --git a/test/integration/smoke/test_routers.py b/test/integration/smoke/test_routers.py index 435c7e41a43..7785576423a 100644 --- a/test/integration/smoke/test_routers.py +++ b/test/integration/smoke/test_routers.py @@ -64,7 +64,6 @@ class Services: "ostype": "CentOS 5.3 (64-bit)", "sleep": 60, "timeout": 10, - "mode": 'advanced', #Networking mode: Basic, Advanced } @@ -81,6 +80,7 @@ class TestRouterServices(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype template = get_template( cls.api_client, cls.zone.id, diff --git a/test/integration/smoke/test_ScaleVm.py b/test/integration/smoke/test_scale_vm.py similarity index 98% rename from test/integration/smoke/test_ScaleVm.py rename to test/integration/smoke/test_scale_vm.py index 710d2add7b6..64fe4dc9aa4 100644 --- a/test/integration/smoke/test_ScaleVm.py +++ b/test/integration/smoke/test_scale_vm.py @@ -91,7 +91,7 @@ class Services: "sleep": 60, "timeout": 10, #Migrate VM to hostid - "ostype": 'CentOS 5.6 (64-bit)', + "ostype": 'CentOS 5.3 (64-bit)', # CentOS 5.3 (64-bit) } @@ -164,7 +164,7 @@ class TestScaleVm(cloudstackTestCase): cleanup_resources(self.apiclient, self.cleanup) return - @attr(tags = ["advanced", "basic", "multicluster", "storagemotion", "xenserver"]) + @attr(tags = ["xenserver", "advanced", "basic"]) def test_01_scale_vm(self): """Test scale virtual machine """ diff --git a/test/integration/smoke/test_templates.py b/test/integration/smoke/test_templates.py index 663b174ed78..a648098079f 100644 --- a/test/integration/smoke/test_templates.py +++ b/test/integration/smoke/test_templates.py @@ -93,8 +93,6 @@ class Services: "bootable": True, "passwordenabled": True, "ostype": "CentOS 5.3 (64-bit)", - "mode": 'advanced', - # Networking mode: Advanced, basic "sleep": 30, "timeout": 10, } @@ -126,6 +124,7 @@ class TestCreateTemplate(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"] diff --git a/test/integration/smoke/test_vm_life_cycle.py b/test/integration/smoke/test_vm_life_cycle.py index 564f6e854a5..ae36c648e0a 100644 --- a/test/integration/smoke/test_vm_life_cycle.py +++ b/test/integration/smoke/test_vm_life_cycle.py @@ -172,8 +172,8 @@ class TestDeployVM(cloudstackTestCase): cls.virtual_machine = VirtualMachine.create( cls.apiclient, cls.services["small"], - accountid=cls.account.account.name, - domainid=cls.account.account.domainid, + accountid=cls.account.name, + domainid=cls.account.domainid, serviceofferingid=cls.service_offering.id, mode=cls.services['mode'] ) @@ -250,12 +250,12 @@ class TestDeployVM(cloudstackTestCase): 3. Has a linklocalip, publicip and a guestip @return: """ - routers = list_routers(self.apiclient, account=self.account.account.name) + routers = list_routers(self.apiclient, account=self.account.name) self.assertTrue(len(routers) > 0, msg = "No virtual router found") router = routers[0] self.assertEqual(router.state, 'Running', msg="Router is not in running state") - self.assertEqual(router.account, self.account.account.name, msg="Router does not belong to the account") + self.assertEqual(router.account, self.account.name, msg="Router does not belong to the account") #Has linklocal, public and guest ips self.assertIsNotNone(router.linklocalip, msg="Router has no linklocal ip") @@ -271,12 +271,12 @@ class TestDeployVM(cloudstackTestCase): 2. is in the account the VM was deployed in @return: """ - routers = list_routers(self.apiclient, account=self.account.account.name) + routers = list_routers(self.apiclient, account=self.account.name) self.assertTrue(len(routers) > 0, msg = "No virtual router found") router = routers[0] self.assertEqual(router.state, 'Running', msg="Router is not in running state") - self.assertEqual(router.account, self.account.account.name, msg="Router does not belong to the account") + self.assertEqual(router.account, self.account.name, msg="Router does not belong to the account") def tearDown(self): pass @@ -334,24 +334,24 @@ class TestVMLifeCycle(cloudstackTestCase): cls.small_virtual_machine = VirtualMachine.create( cls.api_client, cls.services["small"], - accountid=cls.account.account.name, - domainid=cls.account.account.domainid, + accountid=cls.account.name, + domainid=cls.account.domainid, serviceofferingid=cls.small_offering.id, mode=cls.services["mode"] ) cls.medium_virtual_machine = VirtualMachine.create( cls.api_client, cls.services["medium"], - accountid=cls.account.account.name, - domainid=cls.account.account.domainid, + accountid=cls.account.name, + domainid=cls.account.domainid, serviceofferingid=cls.medium_offering.id, mode=cls.services["mode"] ) cls.virtual_machine = VirtualMachine.create( cls.api_client, cls.services["small"], - accountid=cls.account.account.name, - domainid=cls.account.account.domainid, + accountid=cls.account.name, + domainid=cls.account.domainid, serviceofferingid=cls.small_offering.id, mode=cls.services["mode"] ) @@ -939,8 +939,8 @@ class TestVMLifeCycle(cloudstackTestCase): iso = Iso.create( self.apiclient, self.services["iso"], - account=self.account.account.name, - domainid=self.account.account.domainid + account=self.account.name, + domainid=self.account.domainid ) self.debug("Successfully created ISO with ID: %s" % iso.id) @@ -1038,4 +1038,4 @@ class TestVMLifeCycle(cloudstackTestCase): False, "Check if ISO is detached from virtual machine" ) - return \ No newline at end of file + return diff --git a/test/integration/smoke/test_volumes.py b/test/integration/smoke/test_volumes.py index 36eb5ded263..750f9856b22 100644 --- a/test/integration/smoke/test_volumes.py +++ b/test/integration/smoke/test_volumes.py @@ -78,13 +78,12 @@ class Services: "password": "password", "ssh_port": 22, "diskname": "TestDiskServ", - "hypervisor": 'XenServer', + "hypervisor": 'KVM', "privateport": 22, "publicport": 22, "protocol": 'TCP', "diskdevice": "/dev/xvdb", - "ostype": 'CentOS 5.3 (64-bit)', - "mode": 'basic', + "ostype": 'CentOS 5.5 (64-bit)', "sleep": 10, "timeout": 600, } @@ -100,6 +99,7 @@ class TestCreateVolume(cloudstackTestCase): # Get Zone, Domain and templates cls.domain = get_domain(cls.api_client, cls.services) cls.zone = get_zone(cls.api_client, cls.services) + cls.services['mode'] = cls.zone.networktype cls.disk_offering = DiskOffering.create( cls.api_client, cls.services["disk_offering"] @@ -358,6 +358,12 @@ class TestVolumes(cloudstackTestCase): def setUp(self): self.apiClient = self.testClient.getApiClient() self.dbclient = self.testClient.getDbConnection() + self.cleanup = [] + + def tearDown(self): + #Clean up, terminate the created volumes + cleanup_resources(self.apiClient, self.cleanup) + return @attr(tags = ["advanced", "advancedns", "smoke"]) def test_02_attach_volume(self): @@ -535,9 +541,13 @@ class TestVolumes(cloudstackTestCase): try: response = self.apiClient.resizeVolume(cmd) except Exception as ex: - if str(ex) == "HTTP Error 431: 431": + #print str(ex) + if "HTTP Error 431:" in str(ex): success = True - self.assertEqual(success, True, "ResizeVolume - verify invalid id is handled appropriately") + self.assertEqual( + success, + True, + "ResizeVolume - verify invalid id is handled appropriately") # Next, we'll try an invalid disk offering id cmd.id = self.volume.id @@ -546,16 +556,29 @@ class TestVolumes(cloudstackTestCase): try: response = self.apiClient.resizeVolume(cmd) except Exception as ex: - if "need to specify a disk offering" in str(ex): + if "HTTP Error 431:" in str(ex): success = True - self.assertEqual(success, True, "ResizeVolume - verify disk offering is handled appropriately") - + self.assertEqual( + success, + True, + "ResizeVolume - verify disk offering is handled appropriately") # Ok, now let's try and resize a volume that is not custom. cmd.id = self.volume.id cmd.diskofferingid = self.services['diskofferingid'] cmd.size = 4 currentSize = self.volume.size + self.debug( + "Attaching volume (ID: %s) to VM (ID: %s)" % ( + self.volume.id, + self.virtual_machine.id) + ) + #attach the volume + self.virtual_machine.attach_volume(self.apiClient, self.volume) + #stop the vm if it is on xenserver + if self.services['hypervisor'].lower() == "xenserver": + self.virtual_machine.stop(self.apiClient) + self.apiClient.resizeVolume(cmd) count = 0 success = True @@ -566,7 +589,7 @@ class TestVolumes(cloudstackTestCase): type='DATADISK' ) for vol in list_volume_response: - if vol.id == self.volume.id and vol.size != currentSize: + if vol.id == self.volume.id and vol.size != currentSize and vol.state != "Resizing": success = False if success: break @@ -579,12 +602,21 @@ class TestVolumes(cloudstackTestCase): True, "Verify the volume did not resize" ) - + self.virtual_machine.detach_volume(self.apiClient, self.volume) + self.cleanup.append(self.volume) @attr(tags = ["advanced", "advancedns", "smoke"]) def test_08_resize_volume(self): """Resize a volume""" # Verify the size is the new size is what we wanted it to be. + self.debug( + "Attaching volume (ID: %s) to VM (ID: %s)" % ( + self.volume.id, + self.virtual_machine.id + )) + self.virtual_machine.attach_volume(self.apiClient, self.volume) + if self.services['hypervisor'].lower() == "xenserver": + self.virtual_machine.stop(self.apiClient) self.debug("Resize Volume ID: %s" % self.volume.id) cmd = resizeVolume.resizeVolumeCmd() @@ -616,6 +648,9 @@ class TestVolumes(cloudstackTestCase): "Check if the volume resized appropriately" ) + self.virtual_machine.detach_volume(self.apiClient, self.volume) + self.cleanup.append(self.volume) + @attr(tags = ["advanced", "advancedns", "smoke"]) def test_09_delete_detached_volume(self): """Delete a Volume unattached to an VM diff --git a/tools/apidoc/build-apidoc.sh b/tools/apidoc/build-apidoc.sh index 14d6459d0c6..d048a1b2d2a 100755 --- a/tools/apidoc/build-apidoc.sh +++ b/tools/apidoc/build-apidoc.sh @@ -19,7 +19,7 @@ # cloud-build-api-doc.sh -- builds api documentation. #set -x -set -u +#set -u TARGETJARDIR="$1" shift DEPSDIR="$1" diff --git a/tools/apidoc/gen_toc.py b/tools/apidoc/gen_toc.py index ab2456dd3eb..f8bdae281b2 100644 --- a/tools/apidoc/gen_toc.py +++ b/tools/apidoc/gen_toc.py @@ -1,4 +1,4 @@ -#!/usr/bin/python +#!/cygdrive/c/Python27 # Licensed to the Apache Software Foundation (ASF) under one # or more contributor license agreements. See the NOTICE file # distributed with this work for additional information @@ -56,6 +56,7 @@ dirname_to_dirname = { known_categories = { + 'Cisco' : 'External Device', 'SystemVm': 'System VM', 'VirtualMachine': 'Virtual Machine', 'VM': 'Virtual Machine', @@ -83,6 +84,7 @@ known_categories = { 'Configuration': 'Configuration', 'Capabilities': 'Configuration', 'Pod': 'Pod', + 'PublicIpRange': 'Network', 'Zone': 'Zone', 'NetworkOffering': 'Network Offering', 'NetworkACL': 'Network ACL', @@ -137,6 +139,7 @@ known_categories = { 'addIpToNic': 'Nic', 'removeIpFromNic': 'Nic', 'listNics':'Nic', + 'AffinityGroup': 'Affinity Group', } diff --git a/tools/apidoc/pom.xml b/tools/apidoc/pom.xml index b324ad4b567..f7570ba13ed 100644 --- a/tools/apidoc/pom.xml +++ b/tools/apidoc/pom.xml @@ -43,7 +43,6 @@ bash - -x ./build-apidoc.sh ${client.config.jars} ${client.config.jars} @@ -63,7 +62,7 @@ target tar - -cvjf + -cjf apidoc.tar.bz2 xmldoc diff --git a/tools/appliance/build.sh b/tools/appliance/build.sh index f1ee4a64b40..c39d38a4e76 100644 --- a/tools/appliance/build.sh +++ b/tools/appliance/build.sh @@ -81,7 +81,10 @@ rm raw.img bzip2 $appliance-$build_date-$branch-kvm.qcow2 echo "$appliance exported for KVM: dist/$appliance-$build_date-$branch-kvm.qcow2.bz2" -# Export for VMWare vSphere +# Export both ova and vmdk for VMWare +vboxmanage clonehd $hdd_uuid $appliance-$build_date-$branch-vmware.vmdk --format VMDK +bzip2 $appliance-$build_date-$branch-vmware.vmdk +echo "$appliance exported for VMWare: dist/$appliance-$build_date-$branch-vmware.vmdk.bz2" vboxmanage export $machine_uuid --output $appliance-$build_date-$branch-vmware.ova echo "$appliance exported for VMWare: dist/$appliance-$build_date-$branch-vmware.ova" diff --git a/tools/appliance/definitions/systemvmtemplate/cleanup.sh b/tools/appliance/definitions/systemvmtemplate/cleanup.sh index 9e98ab03531..701d8d84000 100644 --- a/tools/appliance/definitions/systemvmtemplate/cleanup.sh +++ b/tools/appliance/definitions/systemvmtemplate/cleanup.sh @@ -12,7 +12,6 @@ rm /var/lib/dhcp/* # Make sure Udev doesn't block our network echo "cleaning up udev rules" rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules rm -rf /dev/.udev/ rm /lib/udev/rules.d/75-persistent-net-generator.rules diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh b/tools/appliance/definitions/systemvmtemplate/postinstall.sh index 5d529de038a..ae8f1adfb9c 100644 --- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh +++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh @@ -50,8 +50,6 @@ install_packages() { echo "openswan openswan/install_x509_certificate seen true" | debconf-set-selections apt-get --no-install-recommends -q -y --force-yes install openswan - # vmware tools - apt-get --no-install-recommends -q -y --force-yes install open-vm-tools # xenstore utils apt-get --no-install-recommends -q -y --force-yes install xenstore-utils libxenstore3.0 # keepalived and conntrackd for redundant router @@ -64,6 +62,22 @@ install_packages() { echo "iptables-persistent iptables-persistent/autosave_v4 boolean true" | debconf-set-selections echo "iptables-persistent iptables-persistent/autosave_v6 boolean true" | debconf-set-selections apt-get --no-install-recommends -q -y --force-yes install iptables-persistent + + # vmware tools + apt-get --no-install-recommends -q -y --force-yes install open-vm-tools + # commented installaion of vmware-tools as we are using the opensource open-vm-tools: + # apt-get --no-install-recommends -q -y --force-yes install build-essential linux-headers-`uname -r` + # df -h + # PREVDIR=$PWD + # cd /opt + # wget http://people.apache.org/~bhaisaab/cloudstack/VMwareTools-9.2.1-818201.tar.gz + # tar xzf VMwareTools-9.2.1-818201.tar.gz + # rm VMwareTools-*.tar.gz + # cd vmware-tools-distrib + # ./vmware-install.pl -d + # cd $PREV + # rm -fr /opt/vmware-tools-distrib + # apt-get -q -y --force-yes purge build-essential } setup_accounts() { @@ -171,7 +185,7 @@ configure_services() { snapshot_url="https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=snapshot;h=HEAD;sf=tgz" snapshot_dir="/opt/cloudstack*" cd /opt - wget $snapshot_url -O cloudstack.tar.gz + wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz tar -zxvf cloudstack.tar.gz cp -rv $snapshot_dir/patches/systemvm/debian/config/* / cp -rv $snapshot_dir/patches/systemvm/debian/vpn/* / diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg b/tools/appliance/definitions/systemvmtemplate/preseed.cfg index ac9edd31213..6996565aaae 100644 --- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg +++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg @@ -130,23 +130,23 @@ d-i partman-auto/choose_recipe select atomic d-i partman-auto/expert_recipe string \ boot-root :: \ - 40 50 100 ext4 \ + 30 50 100 ext4 \ $primary{ } $bootable{ } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /boot } \ . \ - 400 40 500 ext4 \ + 300 40 400 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ / } \ . \ - 60 100 200 ext4 \ + 50 100 200 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /home } \ . \ - 500 30 1000 ext4 \ + 650 20 1100 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /usr } \ @@ -156,17 +156,17 @@ d-i partman-auto/expert_recipe string \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /opt } \ . \ - 500 60 1000 ext4 \ + 450 60 1000 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /var } \ . \ - 100 70 400 ext4 \ + 50 70 400 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /tmp } \ . \ - 64 512 300% linux-swap \ + 70 512 300% linux-swap \ method{ swap } format{ } \ . diff --git a/tools/appliance/definitions/systemvmtemplate64/cleanup.sh b/tools/appliance/definitions/systemvmtemplate64/cleanup.sh index 9e98ab03531..701d8d84000 100644 --- a/tools/appliance/definitions/systemvmtemplate64/cleanup.sh +++ b/tools/appliance/definitions/systemvmtemplate64/cleanup.sh @@ -12,7 +12,6 @@ rm /var/lib/dhcp/* # Make sure Udev doesn't block our network echo "cleaning up udev rules" rm /etc/udev/rules.d/70-persistent-net.rules -mkdir /etc/udev/rules.d/70-persistent-net.rules rm -rf /dev/.udev/ rm /lib/udev/rules.d/75-persistent-net-generator.rules diff --git a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh index 5d529de038a..ae8f1adfb9c 100644 --- a/tools/appliance/definitions/systemvmtemplate64/postinstall.sh +++ b/tools/appliance/definitions/systemvmtemplate64/postinstall.sh @@ -50,8 +50,6 @@ install_packages() { echo "openswan openswan/install_x509_certificate seen true" | debconf-set-selections apt-get --no-install-recommends -q -y --force-yes install openswan - # vmware tools - apt-get --no-install-recommends -q -y --force-yes install open-vm-tools # xenstore utils apt-get --no-install-recommends -q -y --force-yes install xenstore-utils libxenstore3.0 # keepalived and conntrackd for redundant router @@ -64,6 +62,22 @@ install_packages() { echo "iptables-persistent iptables-persistent/autosave_v4 boolean true" | debconf-set-selections echo "iptables-persistent iptables-persistent/autosave_v6 boolean true" | debconf-set-selections apt-get --no-install-recommends -q -y --force-yes install iptables-persistent + + # vmware tools + apt-get --no-install-recommends -q -y --force-yes install open-vm-tools + # commented installaion of vmware-tools as we are using the opensource open-vm-tools: + # apt-get --no-install-recommends -q -y --force-yes install build-essential linux-headers-`uname -r` + # df -h + # PREVDIR=$PWD + # cd /opt + # wget http://people.apache.org/~bhaisaab/cloudstack/VMwareTools-9.2.1-818201.tar.gz + # tar xzf VMwareTools-9.2.1-818201.tar.gz + # rm VMwareTools-*.tar.gz + # cd vmware-tools-distrib + # ./vmware-install.pl -d + # cd $PREV + # rm -fr /opt/vmware-tools-distrib + # apt-get -q -y --force-yes purge build-essential } setup_accounts() { @@ -171,7 +185,7 @@ configure_services() { snapshot_url="https://git-wip-us.apache.org/repos/asf?p=cloudstack.git;a=snapshot;h=HEAD;sf=tgz" snapshot_dir="/opt/cloudstack*" cd /opt - wget $snapshot_url -O cloudstack.tar.gz + wget --no-check-certificate $snapshot_url -O cloudstack.tar.gz tar -zxvf cloudstack.tar.gz cp -rv $snapshot_dir/patches/systemvm/debian/config/* / cp -rv $snapshot_dir/patches/systemvm/debian/vpn/* / diff --git a/tools/appliance/definitions/systemvmtemplate64/preseed.cfg b/tools/appliance/definitions/systemvmtemplate64/preseed.cfg index ac9edd31213..6996565aaae 100644 --- a/tools/appliance/definitions/systemvmtemplate64/preseed.cfg +++ b/tools/appliance/definitions/systemvmtemplate64/preseed.cfg @@ -130,23 +130,23 @@ d-i partman-auto/choose_recipe select atomic d-i partman-auto/expert_recipe string \ boot-root :: \ - 40 50 100 ext4 \ + 30 50 100 ext4 \ $primary{ } $bootable{ } \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /boot } \ . \ - 400 40 500 ext4 \ + 300 40 400 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ / } \ . \ - 60 100 200 ext4 \ + 50 100 200 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /home } \ . \ - 500 30 1000 ext4 \ + 650 20 1100 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /usr } \ @@ -156,17 +156,17 @@ d-i partman-auto/expert_recipe string \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /opt } \ . \ - 500 60 1000 ext4 \ + 450 60 1000 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /var } \ . \ - 100 70 400 ext4 \ + 50 70 400 ext4 \ method{ format } format{ } \ use_filesystem{ } filesystem{ ext4 } \ mountpoint{ /tmp } \ . \ - 64 512 300% linux-swap \ + 70 512 300% linux-swap \ method{ swap } format{ } \ . diff --git a/tools/build/build_asf.sh b/tools/build/build_asf.sh index c652a20bf42..a4a4706c6d0 100755 --- a/tools/build/build_asf.sh +++ b/tools/build/build_asf.sh @@ -17,34 +17,35 @@ # under the License. version='TESTBUILD' -sourcedir=~/incubator-cloudstack/ -outputdir=~/cs-asf-build/ +sourcedir=~/cloudstack/ +outputdir=/tmp/cloudstack-build/ branch='master' tag='no' certid='X' +committosvn='X' usage(){ - echo "usage: $0 -v version [-b branch] [-s source dir] [-o output dir] [-t [-u]] [-h]" + echo "usage: $0 -v version [-b branch] [-s source dir] [-o output dir] [-t] [-u] [-c] [-h]" echo " -v sets the version" echo " -b sets the branch (defaults to 'master')" echo " -s sets the source directory (defaults to $sourcedir)" echo " -o sets the output directory (defaults to $outputdir)" echo " -t tags the git repo with the version" - echo " -u sets the certificate ID to sign the tag with (if not provided, the default key is attempted)" - echo " -k sets the key to sign the tarball with" + echo " -u sets the certificate ID to sign with (if not provided, the default key is attempted)" + echo " -c commits build artifacts to cloudstack dev dist dir in svn" echo " -h" } -while getopts v:s:o:b:tu:k:h opt +while getopts v:s:o:b:u:tch opt do case "$opt" in v) version="$OPTARG";; s) sourcedir="$OPTARG";; o) outputdir="$OPTARG";; b) branch="$OPTARG";; - t) tag='yes';; + t) tag="yes";; u) certid="$OPTARG";; - k) keyid="--default-key $OPTARG";; + c) committosvn="yes";; h) usage exit 0;; /?) # unknown flag @@ -54,7 +55,7 @@ do done shift `expr $OPTIND - 1` -if [ $version == 'TESTBUILD' ]; then +if [ $version == "TESTBUILD" ]; then echo >&2 "A version must be specified with the -v option: build_asf.sh -v 4.0.0.RC1" exit 1 fi @@ -63,8 +64,8 @@ echo "Using version: $version" echo "Using source directory: $sourcedir" echo "Using output directory: $outputdir" echo "Using branch: $branch" -if [ $tag == 'yes' ]; then - if [ $certid == 'X' ]; then +if [ "$tag" == "yes" ]; then + if [ "$certid" == "X" ]; then echo "Tagging the branch with the version number, and signing the branch with your default certificate." else echo "Tagging the branch with the version number, and signing the branch with certificate ID $certid." @@ -80,29 +81,81 @@ else fi cd $sourcedir + +echo 'checking out correct branch' +git checkout $branch + +echo 'determining current mvn version' +export currentversion=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` +echo "found $currentversion" + +echo 'setting version numbers' +mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P simulator -P baremetal -P ucs -Dnonoss +mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml +perl -pi -e 's/$ENV{'currentversion'}/$ENV{'version'}/' deps/XenServerJava/pom.xml +perl -pi -e 's/$ENV{'currentversion'}/$ENV{'version'}/' tools/apidoc/pom.xml +git clean -f + +echo 'commit changes' +git commit -a -s -m "Updating pom.xml version numbers for release $version" +export commitsh=`git show HEAD | head -n 1 | cut -d ' ' -f 2` + +echo "committed as $commitsh" + echo 'archiving' -git archive --format=tar --prefix=apache-cloudstack-$version-incubating-src/ $branch > $outputdir/apache-cloudstack-$version-incubating-src.tar -bzip2 $outputdir/apache-cloudstack-$version-incubating-src.tar +git archive --format=tar --prefix=apache-cloudstack-$version-src/ $branch > $outputdir/apache-cloudstack-$version-src.tar +bzip2 $outputdir/apache-cloudstack-$version-src.tar cd $outputdir echo 'armor' -gpg -v $keyid --armor --output apache-cloudstack-$version-incubating-src.tar.bz2.asc --detach-sig apache-cloudstack-$version-incubating-src.tar.bz2 +if [ "$certid" == "X" ]; then + gpg -v --armor --output apache-cloudstack-$version-src.tar.bz2.asc --detach-sig apache-cloudstack-$version-src.tar.bz2 +else + gpg -v --default-key $certid --armor --output apache-cloudstack-$version-src.tar.bz2.asc --detach-sig apache-cloudstack-$version-src.tar.bz2 +fi echo 'md5' -gpg -v --print-md MD5 apache-cloudstack-$version-incubating-src.tar.bz2 > apache-cloudstack-$version-incubating-src.tar.bz2.md5 +gpg -v --print-md MD5 apache-cloudstack-$version-src.tar.bz2 > apache-cloudstack-$version-src.tar.bz2.md5 echo 'sha' -gpg -v --print-md SHA512 apache-cloudstack-$version-incubating-src.tar.bz2 > apache-cloudstack-$version-incubating-src.tar.bz2.sha +gpg -v --print-md SHA512 apache-cloudstack-$version-src.tar.bz2 > apache-cloudstack-$version-src.tar.bz2.sha echo 'verify' -gpg -v --verify apache-cloudstack-$version-incubating-src.tar.bz2.asc apache-cloudstack-$version-incubating-src.tar.bz2 +gpg -v --verify apache-cloudstack-$version-src.tar.bz2.asc apache-cloudstack-$version-src.tar.bz2 -if [ $tag == 'yes' ]; then +if [ "$tag" == "yes" ]; then echo 'tag' cd $sourcedir - if [ $certid == 'X' ]; then + if [ "$certid" == "X" ]; then git tag -s $version -m "Tagging release $version on branch $branch." else git tag -u $certid -s $version -m "Tagging release $version on branch $branch." fi fi + +if [ "$committosvn" == "yes" ]; then + echo 'committing artifacts to svn' + rm -Rf /tmp/cloudstack-dev-dist + cd /tmp + svn co https://dist.apache.org/repos/dist/dev/cloudstack/ cloudstack-dev-dist + cd cloudstack-dev-dist + if [ -d "$version" ]; then + cd $version + svn rm * + else + mkdir $version + svn add $version + cd $version + fi + cp $outputdir/apache-cloudstack-$version-src.tar.bz2 . + cp $outputdir/apache-cloudstack-$version-src.tar.bz2.asc . + cp $outputdir/apache-cloudstack-$version-src.tar.bz2.md5 . + cp $outputdir/apache-cloudstack-$version-src.tar.bz2.sha . + svn add apache-cloudstack-$version-src.tar.bz2 + svn add apache-cloudstack-$version-src.tar.bz2.asc + svn add apache-cloudstack-$version-src.tar.bz2.md5 + svn add apache-cloudstack-$version-src.tar.bz2.sha + svn commit -m "Committing release candidate artifacts for $version to dist/dev/cloudstack in preparation for release vote" +fi + +echo "completed. use commit-sh of $commitsh when starting the VOTE thread" diff --git a/tools/build/build_docs.sh b/tools/build/build_docs.sh index 8bb63e30e87..11b24141d95 100755 --- a/tools/build/build_docs.sh +++ b/tools/build/build_docs.sh @@ -19,22 +19,28 @@ sourcedir=~/incubator-cloudstack/ common_content_dir=/usr/share/publican/Common_Content publican_path=/usr/bin/publican +output_format="html,pdf" +config="publican-adminguide.cfg" usage(){ echo "usage: $0 [-s source dir] [-c publican common content] [-p path to publican]" echo " -s sets the source directory (defaults to $sourcedir)" echo " -c sets the public common content directory (defaults to $common_content_dir)" echo " -p sets the path to the publican binary (defaults to $publican_path)" - echo " -h" + echo " -f sets the output format (defaults to $output_format)" + echo " -g sets the publican config file (defaults to $config)" + echo " -h show this help" } -while getopts v:s:c:p:h opt +while getopts v:s:c:p:f:g:h opt do case "$opt" in v) version="$OPTARG";; s) sourcedir="$OPTARG";; c) common_content_dir="$OPTARG";; p) publican_path="$OPTARG";; + f) output_format="$OPTARG";; + g) config="$OPTARG";; h) usage exit 0;; \?) @@ -48,8 +54,13 @@ if [ ! -x "$publican_path" ]; then exit 1 fi +if [ ! -d "$sourcedir/docs" ]; then + echo "$sourcedir/docs doesn't seem to exist? Maybe set -s?" + exit 1 +fi + cd $sourcedir/docs cp -R /usr/share/publican/Common_Content . ln -s $sourcedir/docs/publican-cloudstack Common_Content/cloudstack -publican build --config=publican-installation.cfg --formats html,pdf --langs en-US --common_content=$sourcedir/docs/Common_Content -rm -r Common_Content \ No newline at end of file +publican build --config=$config --formats $output_format --langs en-US --common_content=$sourcedir/docs/Common_Content +rm -r Common_Content diff --git a/tools/build/setnextversion.sh b/tools/build/setnextversion.sh new file mode 100755 index 00000000000..71173a3a08c --- /dev/null +++ b/tools/build/setnextversion.sh @@ -0,0 +1,75 @@ +#!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +version='TESTBUILD' +sourcedir=~/cloudstack/ +branch='master' + +usage(){ + echo "usage: $0 -v version [-b branch] [-s source dir] [-h]" + echo " -v sets the version" + echo " -b sets the branch (defaults to 'master')" + echo " -s sets the source directory (defaults to $sourcedir)" + echo " -h" +} + +while getopts v:s:b:h opt +do + case "$opt" in + v) version="$OPTARG";; + s) sourcedir="$OPTARG";; + b) branch="$OPTARG";; + h) usage + exit 0;; + /?) # unknown flag + usage + exit 1;; + esac +done +shift `expr $OPTIND - 1` + +if [ $version == 'TESTBUILD' ]; then + echo >&2 "A version must be specified with the -v option: $0 -v 4.0.0.RC1" + exit 1 +fi + +echo "Using version: $version" +echo "Using source directory: $sourcedir" +echo "Using branch: $branch" + +cd $sourcedir + +echo 'checking out correct branch' +git checkout $branch + +echo 'determining current mvn version' +export currentversion=`mvn org.apache.maven.plugins:maven-help-plugin:2.1.1:evaluate -Dexpression=project.version | grep -v '\['` +echo "found $currentversion" + +echo 'setting version numbers' +mvn versions:set -DnewVersion=$version -P vmware -P developer -P systemvm -P simulator -P baremetal -P ucs -Dnonoss +mv deps/XenServerJava/pom.xml.versionsBackup deps/XenServerJava/pom.xml +perl -pi -e 's/$ENV{'currentversion'}/$ENV{'version'}/' deps/XenServerJava/pom.xml +perl -pi -e 's/$ENV{'currentversion'}/$ENV{'version'}/' tools/apidoc/pom.xml +git clean -f + +echo 'commit changes' +git commit -a -s -m "Updating pom.xml version numbers for release $version" +export commitsh=`git show HEAD | head -n 1 | cut -d ' ' -f 2` + +echo "committed as $commitsh" diff --git a/tools/cli/cloudmonkey/cloudmonkey.py b/tools/cli/cloudmonkey/cloudmonkey.py index 94006c9577a..13f54ada751 100644 --- a/tools/cli/cloudmonkey/cloudmonkey.py +++ b/tools/cli/cloudmonkey/cloudmonkey.py @@ -27,6 +27,7 @@ try: import shlex import sys import types + import copy from cachemaker import loadcache, savecache, monkeycache, splitverbsubject from config import __version__, __description__, __projecturl__ @@ -162,6 +163,40 @@ class CloudMonkeyShell(cmd.Cmd, object): self.monkeyprint(printer) return PrettyTable(toprow) + def print_result_json(result, result_filter=None): + tfilter = {} # temp var to hold a dict of the filters + tresult = copy.deepcopy(result) # dupe the result to filter + if result_filter is not None: + for res in result_filter: + tfilter[res] = 1 + myresults = {} + for okey, oval in result.iteritems(): + if isinstance(oval, dict): + for tkey in x: + if tkey not in tfilter: + try: + del(tresult[okey][x][tkey]) + except: + pass + elif isinstance(oval, list): + for x in range(len(oval)): + if isinstance(oval[x], dict): + for tkey in oval[x]: + if tkey not in tfilter: + try: + del(tresult[okey][x][tkey]) + except: + pass + else: + try: + del(tresult[okey][x]) + except: + pass + print json.dumps(tresult, + sort_keys=True, + indent=2, + separators=(',', ': ')) + def print_result_tabular(result, result_filter=None): toprow = None printer = None @@ -183,6 +218,10 @@ class CloudMonkeyShell(cmd.Cmd, object): self.monkeyprint(printer) def print_result_as_dict(result, result_filter=None): + if self.display == "json": + print_result_json(result, result_filter) + return + for key in sorted(result.keys(), key=lambda x: x not in ['id', 'count', 'name'] and x): if not (isinstance(result[key], list) or @@ -194,8 +233,7 @@ class CloudMonkeyShell(cmd.Cmd, object): def print_result_as_list(result, result_filter=None): for node in result: - # Tabular print if it's a list of dict and tabularize is true - if isinstance(node, dict) and self.tabularize == 'true': + if isinstance(node, dict) and self.display == 'table': print_result_tabular(result, result_filter) break self.print_result(node) @@ -318,7 +356,8 @@ class CloudMonkeyShell(cmd.Cmd, object): autocompletions = uuids search_string = value - if self.tabularize == "true" and subject != "": + if subject != "" and (self.display == "table" or + self.display == "json"): autocompletions.append("filter=") return [s for s in autocompletions if s.startswith(search_string)] diff --git a/tools/cli/cloudmonkey/config.py b/tools/cli/cloudmonkey/config.py index 75605df93b7..aaf97ebd25d 100644 --- a/tools/cli/cloudmonkey/config.py +++ b/tools/cli/cloudmonkey/config.py @@ -56,7 +56,7 @@ config_fields['core']['log_file'] = expanduser(config_dir + '/log') # ui config_fields['ui']['color'] = 'true' config_fields['ui']['prompt'] = '> ' -config_fields['ui']['tabularize'] = 'false' +config_fields['ui']['display'] = 'default' # server config_fields['server']['host'] = 'localhost' diff --git a/tools/cli/cloudmonkey/requester.py b/tools/cli/cloudmonkey/requester.py index 5c4cd1e36fa..d2dae6dfc3f 100644 --- a/tools/cli/cloudmonkey/requester.py +++ b/tools/cli/cloudmonkey/requester.py @@ -32,6 +32,7 @@ try: import types import urllib import urllib2 + from urllib2 import urlopen, HTTPError, URLError except ImportError, e: print "Import error in %s : %s" % (__name__, e) @@ -60,11 +61,11 @@ def make_request(command, args, logger, host, port, args["apiKey"] = apikey args["response"] = "json" request = zip(args.keys(), args.values()) - request.sort(key=lambda x: str.lower(x[0])) + request.sort(key=lambda x: x[0].lower()) request_url = "&".join(["=".join([r[0], urllib.quote_plus(str(r[1]))]) for r in request]) - hashStr = "&".join(["=".join([str.lower(r[0]), + hashStr = "&".join(["=".join([r[0].lower(), str.lower(urllib.quote_plus(str(r[1]))).replace("+", "%20")]) for r in request]) @@ -77,19 +78,21 @@ def make_request(command, args, logger, host, port, logger_debug(logger, "Request sent: %s" % request_url) connection = urllib2.urlopen(request_url) response = connection.read() - except Exception, e: - error = str(e) + except HTTPError, e: + error = "%s: %s" % (e.msg, e.info().getheader('X-Description')) + except URLError, e: + error = e.reason logger_debug(logger, "Response received: %s" % response) if error is not None: - logger_debug(logger, error) + logger_debug(logger, "Error: %s" % (error)) + return response, error return response, error def monkeyrequest(command, args, isasync, asyncblock, logger, host, port, apikey, secretkey, timeout, protocol, path): - response = None error = None logger_debug(logger, "======== START Request ========") @@ -106,7 +109,8 @@ def monkeyrequest(command, args, isasync, asyncblock, logger, host, port, response = json.loads(str(response)) except ValueError, e: error = "Error processing json response, %s" % e - logger_debug(logger, "Error processing json", e) + logger_debug(logger, "Error processing json: %s" % e) + return response response = process_json(response) @@ -125,29 +129,62 @@ def monkeyrequest(command, args, isasync, asyncblock, logger, host, port, progress = 1 while timeout > 0: print '\r' + '.' * progress, - time.sleep(pollperiod) - timeout = timeout - pollperiod + sys.stdout.flush() progress += 1 + timeout = timeout - pollperiod logger_debug(logger, "Job %s to timeout in %ds" % (jobid, timeout)) sys.stdout.flush() - response, error = monkeyrequest(command, request, isasync, - asyncblock, logger, - host, port, apikey, secretkey, - timeout, protocol, path) - response = process_json(response) + if re.match("queryAsyncJobResult", command): + time.sleep(pollperiod) + else: + response, error = monkeyrequest(command, request, isasync, + asyncblock, logger, + host, port, apikey, secretkey, + timeout, protocol, path) + responsekeys = filter(lambda x: 'response' in x, response.keys()) + if len(responsekeys) < 1: + time.sleep(pollperiod) continue + result = response[responsekeys[0]] jobstatus = result['jobstatus'] - if jobstatus == 2: + jobresultcode = result['jobresultcode'] + try: jobresult = result["jobresult"] + logger_debug(logger, "jobresult %s" % (jobresult)) + sys.stdout.flush() + return response, None + except KeyError: + logger_debug(logger, "No jobresult yet %s" % (result)) + sys.stdout.flush() + + if jobresultcode != 0: + error = "Error: resultcode %d for jobid %s" % (jobresultcode, + jobid) + logger_debug(logger, "%s" % (error)) + return response, error + else: + # if we get a valid respons resultcode give back results + response, error = monkeyrequest(command, request, isasync, + asyncblock, logger, + host, port, apikey, secretkey, + timeout, protocol, path) + logger_debug(logger, "Ok: %s" % (jobid)) + return response, error + + if jobstatus == 2: error = "\rAsync job %s failed\nError %s, %s" % (jobid, jobresult["errorcode"], jobresult["errortext"]) return response, error elif jobstatus == 1: print '\r', return response, error + else: + logger_debug(logger, "We should not arrive here!") + sys.stdout.flush() + error = "Error: Async query timeout occurred for jobid %s" % jobid return response, error diff --git a/tools/devcloud/devcloud.cfg b/tools/devcloud/devcloud.cfg index c41f8bcef58..e6ab71b5ebf 100644 --- a/tools/devcloud/devcloud.cfg +++ b/tools/devcloud/devcloud.cfg @@ -20,6 +20,7 @@ "zones": [ { "name": "DevCloud0", + "enabled" : "True", "physical_networks": [ { "broadcastdomainrange": "Zone", diff --git a/tools/devcloud/pom.xml b/tools/devcloud/pom.xml index d7b82c9d7fe..ba4cc464ccc 100644 --- a/tools/devcloud/pom.xml +++ b/tools/devcloud/pom.xml @@ -142,5 +142,38 @@ + + quickcloud + + + deployquick + + + + + + org.codehaus.mojo + exec-maven-plugin + 1.2.1 + + + integration-test + + exec + + + + + python + + ../marvin/marvin/deployDataCenter.py + -i + quickcloud.cfg + + + + + + diff --git a/tools/devcloud/quickcloud.cfg b/tools/devcloud/quickcloud.cfg new file mode 100644 index 00000000000..a2613d22bdb --- /dev/null +++ b/tools/devcloud/quickcloud.cfg @@ -0,0 +1,121 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# + +{ + "zones": [ + { + "name": "QuickCloud00", + "enabled" : "True", + "details" : [ + {"key" : "enable.secstorage.vm", "value": "False"}, + {"key" : "enable.consoleproxy.vm", "value": "False"} + ], + "physical_networks": [ + { + "broadcastdomainrange": "Zone", + "name": "test-network", + "traffictypes": [ + { + "typ": "Guest" + }, + { + "typ": "Management" + } + ], + "providers": [ + { + "broadcastdomainrange": "ZONE", + "name": "VirtualRouter" + }, + { + "broadcastdomainrange": "Pod", + "name": "SecurityGroupProvider" + } + ] + } + ], + "dns2": "4.4.4.4", + "dns1": "8.8.8.8", + "securitygroupenabled": "true", + "localstorageenabled": "true", + "networktype": "Basic", + "networkofferingname": "QuickCloudNoServices", + "pods": [ + { + "endip": "192.168.56.220", + "name": "test00", + "startip": "192.168.56.200", + "guestIpRanges": [ + { + "startip": "192.168.56.100", + "endip": "192.168.56.199", + "netmask": "255.255.255.0", + "gateway": "192.168.56.1" + } + ], + "netmask": "255.255.255.0", + "clusters": [ + { + "clustername": "test000", + "hypervisor": "XenServer", + "hosts": [ + { + "username": "root", + "url": "http://192.168.56.10/", + "password": "password" + } + ], + "clustertype": "CloudManaged" + } + ], + "gateway": "192.168.56.1" + } + ], + "internaldns1": "192.168.56.1", + "secondaryStorages": [ + { + "url": "nfs://192.168.56.10:/opt/storage/secondary" + } + ] + } + ], + "logger": [ + { + "name": "TestClient", + "file": "testclient.log" + }, + { + "name": "TestCase", + "file": "testcase.log" + } + ], + "mgtSvr": [ + { + "mgtSvrIp": "127.0.0.1", + "port": 8096 + } + ], + "dbSvr": + { + "dbSvr": "127.0.0.1", + "port": 3306, + "user": "cloud", + "passwd": "cloud", + "db": "cloud" + } +} diff --git a/tools/marvin/marvin/asyncJobMgr.py b/tools/marvin/marvin/asyncJobMgr.py index 935bebe4d7a..40304fa4141 100644 --- a/tools/marvin/marvin/asyncJobMgr.py +++ b/tools/marvin/marvin/asyncJobMgr.py @@ -54,7 +54,7 @@ class workThread(threading.Thread): try: self.lock.acquire() - result = self.connection.pollAsyncJob(job.jobId, job.responsecls).jobresult + result = self.connection.poll(job.jobId, job.responsecls).jobresult except cloudstackException.cloudstackAPIException, e: result = str(e) finally: diff --git a/tools/marvin/marvin/cloudstackConnection.py b/tools/marvin/marvin/cloudstackConnection.py index e8b861eedb2..5d30803d930 100644 --- a/tools/marvin/marvin/cloudstackConnection.py +++ b/tools/marvin/marvin/cloudstackConnection.py @@ -5,9 +5,9 @@ # to you under the Apache License, Version 2.0 (the # "License"); you may not use this file except in compliance # with the License. You may obtain a copy of the License at -# +# # http://www.apache.org/licenses/LICENSE-2.0 -# +# # Unless required by applicable law or agreed to in writing, # software distributed under the License is distributed on an # "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY @@ -15,141 +15,164 @@ # specific language governing permissions and limitations # under the License. -import urllib2 +import requests import urllib -import httplib import base64 import hmac import hashlib -import json -import xml.dom.minidom -import types import time -import inspect import cloudstackException -from cloudstackAPI import * +from cloudstackAPI import * import jsonHelper +from requests import ConnectionError +from requests import HTTPError +from requests import Timeout +from requests import RequestException + class cloudConnection(object): - def __init__(self, mgtSvr, port=8096, apiKey = None, securityKey = None, asyncTimeout=3600, logging=None, protocol='http', path='/client/api'): + """ Connections to make API calls to the cloudstack management server + """ + def __init__(self, mgtSvr, port=8096, apiKey=None, securityKey=None, + asyncTimeout=3600, logging=None, scheme='http', + path='client/api'): self.apiKey = apiKey self.securityKey = securityKey self.mgtSvr = mgtSvr self.port = port self.logging = logging - if protocol != 'http' and protocol != 'https': - raise ValueError("Protocol must be 'http' or 'https'.") - else: - self.protocol=protocol self.path = path - if port == 8096 or (self.apiKey == None and self.securityKey == None): - self.auth = False - else: - self.auth = True self.retries = 5 self.asyncTimeout = asyncTimeout - - def close(self): - try: - self.connection.close() - except: - pass - + self.auth = True + if port == 8096 or \ + (self.apiKey is None and self.securityKey is None): + self.auth = False + if scheme not in ['http', 'https']: + raise RequestException("Protocol must be HTTP") + self.protocol = scheme + self.baseurl = "%s://%s:%d/%s"\ + % (self.protocol, self.mgtSvr, self.port, self.path) + def __copy__(self): - return cloudConnection(self.mgtSvr, self.port, self.apiKey, self.securityKey, self.asyncTimeout, self.logging, self.protocol, self.path) - - def make_request_with_auth(self, command, requests={}): - requests["command"] = command - requests["apiKey"] = self.apiKey - requests["response"] = "json" - request = zip(requests.keys(), requests.values()) - request.sort(key=lambda x: str.lower(x[0])) - - requestUrl = "&".join(["=".join([r[0], urllib.quote_plus(str(r[1]))]) for r in request]) - hashStr = "&".join(["=".join([str.lower(r[0]), str.lower(urllib.quote_plus(str(r[1]))).replace("+", "%20")]) for r in request]) + return cloudConnection(self.mgtSvr, self.port, self.apiKey, + self.securityKey, self.asyncTimeout, + self.logging, self.protocol, self.path) - sig = urllib.quote_plus(base64.encodestring(hmac.new(self.securityKey, hashStr, hashlib.sha1).digest()).strip()) - requestUrl += "&signature=%s"%sig - - try: - self.connection = urllib2.urlopen("%s://%s:%d%s?%s"%(self.protocol, self.mgtSvr, self.port, self.path, requestUrl)) - if self.logging is not None: - self.logging.debug("sending GET request: %s"%requestUrl) - response = self.connection.read() - if self.logging is not None: - self.logging.info("got response: %s"%response) - except IOError, e: - if hasattr(e, 'reason'): - if self.logging is not None: - self.logging.critical("failed to reach %s because of %s"%(self.mgtSvr, e.reason)) - elif hasattr(e, 'code'): - if self.logging is not None: - self.logging.critical("server returned %d error code"%e.code) - raise e - except httplib.HTTPException, h: - if self.logging is not None: - self.logging.debug("encountered http Exception %s"%h.args) - if self.retries > 0: - self.retries = self.retries - 1 - self.make_request_with_auth(command, requests) - else: - self.retries = 5 - raise h - else: - return response - - def make_request_without_auth(self, command, requests={}): - requests["command"] = command - requests["response"] = "json" - requests = zip(requests.keys(), requests.values()) - requestUrl = "&".join(["=".join([request[0], urllib.quote_plus(str(request[1]))]) for request in requests]) - - self.connection = urllib2.urlopen("%s://%s:%d%s?%s"%(self.protocol, self.mgtSvr, self.port, self.path, requestUrl)) - if self.logging is not None: - self.logging.debug("sending GET request without auth: %s"%requestUrl) - response = self.connection.read() - if self.logging is not None: - self.logging.info("got response: %s"%response) - return response - - def pollAsyncJob(self, jobId, response): + def poll(self, jobid, response): + """ + polls the completion of a given jobid + @param jobid: + @param response: + @return: + """ cmd = queryAsyncJobResult.queryAsyncJobResultCmd() - cmd.jobid = jobId + cmd.jobid = jobid timeout = self.asyncTimeout - + while timeout > 0: - asyncResonse = self.make_request(cmd, response, True) - + asyncResonse = self.marvin_request(cmd, response_type=response) + if asyncResonse.jobstatus == 2: - raise cloudstackException.cloudstackAPIException("asyncquery", asyncResonse.jobresult) + raise cloudstackException.cloudstackAPIException( + "asyncquery", asyncResonse.jobresult) elif asyncResonse.jobstatus == 1: return asyncResonse - + time.sleep(5) if self.logging is not None: - self.logging.debug("job: %s still processing, will timeout in %ds"%(jobId, timeout)) + self.logging.debug("job: %s still processing," + " will timeout in %ds" % (jobid, timeout)) timeout = timeout - 5 - - raise cloudstackException.cloudstackAPIException("asyncquery", "Async job timeout %s"%jobId) - - def make_request(self, cmd, response = None, raw=False): - commandName = cmd.__class__.__name__.replace("Cmd", "") - isAsync = "false" + + raise cloudstackException.cloudstackAPIException( + "asyncquery", "Async job timeout %s" % jobid) + + def sign(self, payload): + """ + signs a given request URL when the apiKey and secretKey are known + + @param payload: dict of GET params to be signed + @return: the signature of the payload + """ + params = zip(payload.keys(), payload.values()) + params.sort(key=lambda k: str.lower(k[0])) + hashStr = "&".join( + ["=".join( + [str.lower(r[0]), + str.lower( + urllib.quote_plus(str(r[1])) + ).replace("+", "%20")] + ) for r in params] + ) + signature = base64.encodestring(hmac.new( + self.securityKey, hashStr, hashlib.sha1).digest()).strip() + self.logging.info("Computed Signature by Marvin: %s" % signature) + return signature + + def request(self, command, auth=True, payload={}, method='GET'): + """ + Makes requests using auth or over integration port + @param command: cloudstack API command name + eg: deployVirtualMachineCommand + @param auth: Authentication (apikey,secretKey) => True + else False for integration.api.port + @param payload: request data composed as a dictionary + @param method: GET/POST via HTTP + @return: + """ + payload["command"] = command + payload["response"] = "json" + + if auth: + payload["apiKey"] = self.apiKey + signature = self.sign(payload) + payload["signature"] = signature + + try: + if method == 'POST': + response = requests.post(self.baseurl, params=payload) + else: + response = requests.get(self.baseurl, params=payload) + except ConnectionError, c: + self.logging.debug("Connection refused. Reason: %s : %s" % + (self.baseurl, c)) + raise c + except HTTPError, h: + self.logging.debug("Server returned error code: %s" % h) + raise h + except Timeout, t: + self.logging.debug("Connection timed out with %s" % t) + raise t + except RequestException, r: + self.logging.debug("Error returned by server %s" % r) + raise r + else: + return response + + def sanitize_command(self, cmd): + """ + Removes None values, Validates all required params are present + @param cmd: Cmd object eg: createPhysicalNetwork + @return: + """ requests = {} required = [] for attribute in dir(cmd): - if attribute != "__doc__" and attribute != "__init__" and attribute != "__module__": + if attribute != "__doc__" and attribute != "__init__" and\ + attribute != "__module__": if attribute == "isAsync": isAsync = getattr(cmd, attribute) elif attribute == "required": required = getattr(cmd, attribute) else: requests[attribute] = getattr(cmd, attribute) - + + cmdname = cmd.__class__.__name__.replace("Cmd", "") for requiredPara in required: if requests[requiredPara] is None: - raise cloudstackException.cloudstackAPIException(commandName, "%s is required"%requiredPara) - '''remove none value''' + raise cloudstackException.cloudstackAPIException( + cmdname, "%s is required" % requiredPara) for param, value in requests.items(): if value is None: requests.pop(param) @@ -162,32 +185,31 @@ class cloudConnection(object): else: requests.pop(param) i = 0 - for v in value: - for key, val in v.iteritems(): - requests["%s[%d].%s"%(param,i,key)] = val + for val in value: + for k, v in val.iteritems(): + requests["%s[%d].%s" % (param, i, k)] = v i = i + 1 - - if self.logging is not None: - self.logging.info("sending command: %s %s"%(commandName, str(requests))) - result = None - if self.auth: - result = self.make_request_with_auth(commandName, requests) + return cmdname, isAsync, requests + + def marvin_request(self, cmd, response_type=None, method='GET'): + """ + Requester for marvin command objects + @param cmd: marvin's command from cloudstackAPI + @param response_type: response type of the command in cmd + @param method: HTTP GET/POST, defaults to GET + @return: + """ + cmdname, isAsync, payload = self.sanitize_command(cmd) + self.logging.debug("sending %s request: %s %s" % (method, cmdname, str(payload))) + response = self.request( + cmdname, self.auth, payload=payload, method=method) + self.logging.debug("Request: %s Response: %s" % + (response.url, response.text)) + response = jsonHelper.getResultObj(response.json(), response_type) + + if isAsync == "false": + return response else: - result = self.make_request_without_auth(commandName, requests) - - if result is None: - return None - - result = jsonHelper.getResultObj(result, response) - if raw or isAsync == "false": - return result - else: - asynJobId = result.jobid - result = self.pollAsyncJob(asynJobId, response) - return result.jobresult - -if __name__ == '__main__': - xml = '407i-1-407-RS3i-1-407-RS3system1ROOT2011-07-30T14:45:19-0700Runningfalse1CA13kvm-50-2054CentOS 5.5(64-bit) no GUI (KVM)CentOS 5.5(64-bit) no GUI (KVM)false1Small Instance15005121120NetworkFilesystem380203255.255.255.065.19.181.165.19.181.110vlan://65vlan://65GuestDirecttrue06:52:da:00:00:08KVM' - conn = cloudConnection(None) - - print conn.paraseReturnXML(xml, deployVirtualMachine.deployVirtualMachineResponse()) + asyncJobId = response.jobid + response = self.poll(asyncJobId, response_type) + return response.jobresult diff --git a/tools/marvin/marvin/cloudstackTestClient.py b/tools/marvin/marvin/cloudstackTestClient.py index e4735e453db..85552ed5523 100644 --- a/tools/marvin/marvin/cloudstackTestClient.py +++ b/tools/marvin/marvin/cloudstackTestClient.py @@ -111,7 +111,8 @@ class cloudstackTestClient(object): apiKey = registerUserRes.apikey securityKey = registerUserRes.secretkey - newUserConnection = cloudstackConnection.cloudConnection(self.connection.mgtSvr, self.connection.port, apiKey, securityKey, self.connection.asyncTimeout, self.connection.logging) + newUserConnection = cloudstackConnection.cloudConnection(self.connection.mgtSvr, self.connection.port, + apiKey, securityKey, self.connection.asyncTimeout, self.connection.logging) self.userApiClient = cloudstackAPIClient.CloudStackAPIClient(newUserConnection) self.userApiClient.connection = newUserConnection return self.userApiClient diff --git a/tools/marvin/marvin/codegenerator.py b/tools/marvin/marvin/codegenerator.py index 0622e5dbc9e..36ba1800081 100644 --- a/tools/marvin/marvin/codegenerator.py +++ b/tools/marvin/marvin/codegenerator.py @@ -184,9 +184,9 @@ class codeGenerator: body += "\n" for cmdName in self.cmdsName: - body += self.space + 'def %s(self,command):\n'%cmdName + body += self.space + 'def %s(self, command, method="GET"):\n'%cmdName body += self.space + self.space + 'response = %sResponse()\n'%cmdName - body += self.space + self.space + 'response = self.connection.make_request(command, response)\n' + body += self.space + self.space + 'response = self.connection.marvin_request(command, response_type=response, method=method)\n' body += self.space + self.space + 'return response\n' body += '\n' diff --git a/tools/marvin/marvin/deployDataCenter.py b/tools/marvin/marvin/deployDataCenter.py index cec920c5ff0..d358789d8da 100644 --- a/tools/marvin/marvin/deployDataCenter.py +++ b/tools/marvin/marvin/deployDataCenter.py @@ -270,6 +270,12 @@ class deployDataCenters(): zoneCmd.allocationstate = allocation_state return self.apiClient.updateZone(zoneCmd) + def updateZoneDetails(self, zoneid, details): + zoneCmd = updateZone.updateZoneCmd() + zoneCmd.id = zoneid + zoneCmd.details = details + return self.apiClient.updateZone(zoneCmd) + def createZones(self, zones): for zone in zones: createzone = createZone.createZoneCmd() @@ -293,10 +299,11 @@ class deployDataCenters(): if zone.networktype == "Basic": listnetworkoffering = listNetworkOfferings.listNetworkOfferingsCmd() - listnetworkoffering.name = "DefaultSharedNetscalerEIPandELBNetworkOffering" \ if len(filter(lambda x : x.typ == 'Public', zone.physical_networks[0].traffictypes)) > 0 \ else "DefaultSharedNetworkOfferingWithSGService" + if zone.networkofferingname is not None: + listnetworkoffering.name = zone.networkofferingname listnetworkofferingresponse = \ self.apiClient.listNetworkOfferings(listnetworkoffering) @@ -320,7 +327,15 @@ class deployDataCenters(): zoneId) self.createSecondaryStorages(zone.secondaryStorages, zoneId) - self.enableZone(zoneId, "Enabled") + + enabled = getattr(zone, 'enabled', 'True') + if enabled == 'True' or enabled is None: + self.enableZone(zoneId, "Enabled") + details = getattr(zone, 'details') + if details is not None: + det = [d.__dict__ for d in details] + self.updateZoneDetails(zoneId, det) + return def isEipElbZone(self, zone): @@ -392,7 +407,6 @@ class deployDataCenters(): logging=self.testClientLogger) if mgt.apiKey is None: apiKey, securityKey = self.registerApiKey() - self.testClient.close() self.testClient = \ cloudstackTestClient.cloudstackTestClient(mgt.mgtSvrIp, 8080, \ apiKey, securityKey, \ diff --git a/tools/marvin/marvin/integration/lib/base.py b/tools/marvin/marvin/integration/lib/base.py old mode 100644 new mode 100755 index f3370eb3190..6c285233a82 --- a/tools/marvin/marvin/integration/lib/base.py +++ b/tools/marvin/marvin/integration/lib/base.py @@ -90,10 +90,7 @@ class Account: cmd.firstname = services["firstname"] cmd.lastname = services["lastname"] - # Password Encoding - mdf = hashlib.md5() - mdf.update(services["password"]) - cmd.password = mdf.hexdigest() + cmd.password = services["password"] cmd.username = "-".join([services["username"], random_gen()]) if domainid: @@ -105,7 +102,7 @@ class Account: def delete(self, apiclient): """Delete an account""" cmd = deleteAccount.deleteAccountCmd() - cmd.id = self.account.id + cmd.id = self.id apiclient.deleteAccount(cmd) @classmethod @@ -223,7 +220,7 @@ class VirtualMachine: def create(cls, apiclient, services, templateid=None, accountid=None, domainid=None, zoneid=None, networkids=None, serviceofferingid=None, securitygroupids=None, projectid=None, startvm=None, - diskofferingid=None, hostid=None, mode='basic'): + diskofferingid=None, affinitygroupnames=None, hostid=None, mode='basic', method='GET'): """Create the instance""" cmd = deployVirtualMachine.deployVirtualMachineCmd() @@ -265,8 +262,11 @@ class VirtualMachine: if securitygroupids: cmd.securitygroupids = [str(sg_id) for sg_id in securitygroupids] - if "userdata" in services: - cmd.userdata = base64.b64encode(services["userdata"]) + + if "affinitygroupnames" in services: + cmd.affinitygroupnames = services["affinitygroupnames"] + elif affinitygroupnames: + cmd.affinitygroupnames = affinitygroupnames if projectid: cmd.projectid = projectid @@ -277,7 +277,10 @@ class VirtualMachine: if hostid: cmd.hostid = hostid - virtual_machine = apiclient.deployVirtualMachine(cmd) + if "userdata" in services: + cmd.userdata = base64.b64encode(services["userdata"]) + + virtual_machine = apiclient.deployVirtualMachine(cmd, method=method) # VM should be in Running state after deploy timeout = 10 @@ -537,6 +540,13 @@ class Volume: [setattr(cmd, k, v) for k, v in kwargs.items()] return(apiclient.resizeVolume(cmd)) + @classmethod + def migrate(cls, apiclient, **kwargs): + """Migrate a volume""" + cmd = migrateVolume.migrateVolumeCmd() + [setattr(cmd, k, v) for k, v in kwargs.items()] + return(apiclient.migrateVolume(cmd)) + class Snapshot: """Manage Snapshot Lifecycle """ @@ -1491,6 +1501,14 @@ class Host: [setattr(cmd, k, v) for k, v in kwargs.items()] return(apiclient.listHosts(cmd)) + @classmethod + def listForMigration(cls, apiclient, **kwargs): + """List all Hosts for migration matching criteria""" + + cmd = findHostsForMigration.findHostsForMigrationCmd() + [setattr(cmd, k, v) for k, v in kwargs.items()] + return(apiclient.findHostsForMigration(cmd)) + class StoragePool: """Manage Storage pools (Primary Storage)""" @@ -1552,6 +1570,13 @@ class StoragePool: [setattr(cmd, k, v) for k, v in kwargs.items()] return(apiclient.listStoragePools(cmd)) + @classmethod + def listForMigration(cls, apiclient, **kwargs): + """List all storage pools for migration matching criteria""" + + cmd = findStoragePoolsForMigration.findStoragePoolsForMigrationCmd() + [setattr(cmd, k, v) for k, v in kwargs.items()] + return(apiclient.findStoragePoolsForMigration(cmd)) class Network: """Manage Network pools""" @@ -1871,7 +1896,7 @@ class PublicIpRange: """Delete VlanIpRange""" cmd = deleteVlanIpRange.deleteVlanIpRangeCmd() - cmd.id = self.id + cmd.id = self.vlan.id apiclient.deleteVlanIpRange(cmd) @classmethod @@ -1882,6 +1907,23 @@ class PublicIpRange: [setattr(cmd, k, v) for k, v in kwargs.items()] return(apiclient.listVlanIpRanges(cmd)) + @classmethod + def dedicate(cls, apiclient, id, account=None, domainid=None, projectid=None): + """Dedicate VLAN IP range""" + + cmd = dedicatePublicIpRange.dedicatePublicIpRangeCmd() + cmd.id = id + cmd.account = account + cmd.domainid = domainid + cmd.projectid = projectid + return PublicIpRange(apiclient.dedicatePublicIpRange(cmd).__dict__) + + def release(self, apiclient): + """Release VLAN IP range""" + + cmd = releasePublicIpRange.releasePublicIpRangeCmd() + cmd.id = self.vlan.id + return apiclient.releasePublicIpRange(cmd) class SecondaryStorage: """Manage Secondary storage""" @@ -1953,7 +1995,7 @@ class PhysicalNetwork: cmd = listPhysicalNetworks.listPhysicalNetworksCmd() [setattr(cmd, k, v) for k, v in kwargs.items()] - return(apiclient.listPhysicalNetworks(cmd)) + return map(lambda pn : PhysicalNetwork(pn.__dict__), apiclient.listPhysicalNetworks(cmd)) class SecurityGroup: """Manage Security Groups""" @@ -2424,3 +2466,94 @@ class VPC: cmd = listVPCs.listVPCsCmd() [setattr(cmd, k, v) for k, v in kwargs.items()] return(apiclient.listVPCs(cmd)) + +class AffinityGroup: + def __init__(self, items): + self.__dict__.update(items) + + @classmethod + def create(cls, apiclient, services, account=None, domainid=None): + agCmd = createAffinityGroup.createAffinityGroupCmd() + agCmd.name = services['name'] + agCmd.displayText = services['displaytext'] if 'displaytext' in services else services['name'] + agCmd.type = services['type'] + agCmd.account = services['account'] if 'account' in services else account + agCmd.domainid = services['domainid'] if 'domainid' in services else domainid + return AffinityGroup(apiclient.createAffinityGroup(agCmd).__dict__) + + def update(self, apiclient): + pass + + def delete(self, apiclient): + cmd = deleteAffinityGroup.deleteAffinityGroupCmd() + cmd.id = self.id + return apiclient.deleteVPC(cmd) + + @classmethod + def list(cls, apiclient, **kwargs): + cmd = listAffinityGroups.listAffinityGroupsCmd() + [setattr(cmd, k, v) for k, v in kwargs.items()] + return(apiclient.listVPCs(cmd)) + +class VNMC: + """Manage VNMC lifecycle""" + + def __init__(self, items): + self.__dict__.update(items) + + def create(cls, apiclient, hostname, username, password, physicalnetworkid): + """Registers VNMC appliance""" + + cmd = addCiscoVnmcResource.addCiscoVnmcResourceCmd() + cmd.hostname = hostname + cmd.username = username + cmd.password = password + cmd.physicalnetworkid = physicalnetworkid + return VNMC(apiclient.addCiscoVnmcResource(cmd)) + + def delete(self, apiclient): + """Removes VNMC appliance""" + + cmd = deleteCiscoVnmcResource.deleteCiscoVnmcResourceCmd() + cmd.resourceid = self.resourceid + return apiclient.deleteCiscoVnmcResource(cmd) + + @classmethod + def list(cls, apiclient, **kwargs): + """List VNMC appliances""" + + cmd = listCiscoVnmcResources.listCiscoVnmcResourcesCmd() + [setattr(cmd, k, v) for k, v in kwargs.items()] + return(apiclient.listCiscoVnmcResources(cmd)) + +class ASA1000V: + """Manage ASA 1000v lifecycle""" + + def __init__(self, items): + self.__dict__.update(items) + + @classmethod + def create(cls, apiclient, hostname, insideportprofile, clusterid, physicalnetworkid): + """Registers ASA 1000v appliance""" + + cmd = addCiscoAsa1000vResource.addCiscoAsa1000vResourceCmd() + cmd.hostname = hostname + cmd.insideportprofile = insideportprofile + cmd.clusterid = clusterid + cmd.physicalnetworkid = physicalnetworkid + return ASA1000V(apiclient.addCiscoAsa1000vResource(cmd)) + + def delete(self, apiclient): + """Removes ASA 1000v appliance""" + + cmd = deleteCiscoAsa1000vResource.deleteCiscoAsa1000vResourceCmd() + cmd.resourceid = self.resourceid + return apiclient.deleteCiscoAsa1000vResource(cmd) + + @classmethod + def list(cls, apiclient, **kwargs): + """List ASA 1000v appliances""" + + cmd = listCiscoAsa1000vResources.listCiscoAsa1000vResourcesCmd() + [setattr(cmd, k, v) for k, v in kwargs.items()] + return(apiclient.listCiscoAsa1000vResources(cmd)) diff --git a/tools/marvin/marvin/integration/lib/common.py b/tools/marvin/marvin/integration/lib/common.py index 69aa733420e..e78f64a52de 100644 --- a/tools/marvin/marvin/integration/lib/common.py +++ b/tools/marvin/marvin/integration/lib/common.py @@ -134,6 +134,8 @@ def get_template(apiclient, zoneid, ostype, services=None): for template in list_templates: if template.ostypeid == ostypeid: return template + elif template.isready: + return template raise Exception("Exception: Failed to find template with OSTypeID: %s" % ostypeid) @@ -566,4 +568,4 @@ def list_vpc_offerings(apiclient, **kwargs): cmd = listVPCOfferings.listVPCOfferingsCmd() [setattr(cmd, k, v) for k, v in kwargs.items()] - return(apiclient.listVPCOfferings(cmd)) \ No newline at end of file + return(apiclient.listVPCOfferings(cmd)) diff --git a/tools/marvin/marvin/jsonHelper.py b/tools/marvin/marvin/jsonHelper.py index 652cce0bf9e..37363bc8c91 100644 --- a/tools/marvin/marvin/jsonHelper.py +++ b/tools/marvin/marvin/jsonHelper.py @@ -19,7 +19,6 @@ import cloudstackException import json import inspect from cloudstackAPI import * -import pdb class jsonLoader: '''The recursive class for building and representing objects with.''' @@ -113,12 +112,8 @@ def finalizeResultObj(result, responseName, responsecls): return result else: return result - - - + def getResultObj(returnObj, responsecls=None): - returnObj = json.loads(returnObj) - if len(returnObj) == 0: return None responseName = filter(lambda a: a!=u'cloudstack-version', returnObj.keys())[0] diff --git a/tools/marvin/pom.xml b/tools/marvin/pom.xml index ce6ce388125..c0505664486 100644 --- a/tools/marvin/pom.xml +++ b/tools/marvin/pom.xml @@ -157,12 +157,7 @@ marvin.setup ${user.dir}/setup/dev/advanced.cfg - - - - marvin.config - - + @@ -182,7 +177,7 @@ deployAndRun.py -c - ${marvin.config} + ${user.dir}/${marvin.config} -t /tmp/t.log -r @@ -200,15 +195,10 @@ marvin.test - ${user.dir}/setup/dev/advanced.cfg simulator test/integration/smoke + ${user.dir}/setup/dev/advanced.cfg - - - marvin.config - - @@ -228,7 +218,7 @@ --with-marvin --marvin-config - ${marvin.config} + ${user.dir}/${marvin.config} --load -a tags=${tag} diff --git a/tools/marvin/setup.py b/tools/marvin/setup.py index ab5eb6f7c24..da138ce162b 100644 --- a/tools/marvin/setup.py +++ b/tools/marvin/setup.py @@ -45,6 +45,7 @@ setup(name="Marvin", license="LICENSE.txt", install_requires=[ "mysql-connector-python", + "requests", "paramiko", "nose" ], diff --git a/tools/waf/javadir.py b/tools/waf/javadir.py deleted file mode 100644 index 7b0bb2b8927..00000000000 --- a/tools/waf/javadir.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -import Options, Utils -import os - -def detect(conf): - conf.check_message_1('Detecting JAVADIR') - javadir = getattr(Options.options, 'JAVADIR', '') - if javadir: - conf.env.JAVADIR = javadir - conf.check_message_2("%s (forced through --javadir)"%conf.env.JAVADIR,"GREEN") - else: - conf.env.JAVADIR = os.path.join(conf.env.DATADIR,'java') - conf.check_message_2("%s (using default ${DATADIR}/java directory)"%conf.env.JAVADIR,"GREEN") - -def set_options(opt): - inst_dir = opt.get_option_group('--datadir') # get the group that contains bindir - if not inst_dir: raise Utils.WafError, "DATADIR not set. Did you load the gnu_dirs tool options with opt.tool_options('gnu_dirs') before running opt.tool_options('javadir')?" - inst_dir.add_option('--javadir', # add javadir to the group that contains bindir - help = 'Java class and jar files [Default: ${DATADIR}/java]', - default = '', - dest = 'JAVADIR') diff --git a/tools/waf/mkisofs.py b/tools/waf/mkisofs.py deleted file mode 100644 index 334845f4b49..00000000000 --- a/tools/waf/mkisofs.py +++ /dev/null @@ -1,84 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -import Utils -from TaskGen import feature, before -from Configure import ConfigurationError -import Task -import os - -# fixme: this seems to hang waf with 100% CPU - -def detect(conf): - conf.find_program("mkisofs",var='MKISOFS') - if not conf.env.MKISOFS: conf.find_program("genisoimage",mandatory=True,var='MKISOFS') - -def iso_up(task): - tgt = task.outputs[0].bldpath(task.env) - if os.path.exists(tgt): os.unlink(tgt) - inps = [] - for inp in task.inputs: - if inp.id&3==Node.BUILD: - src = inp.bldpath(task.env) - srcname = src - srcname = sep.join(srcname.split(sep)[1:]) # chop off default/ - else: - src = inp.srcpath(task.env) - srcname = src - srcname = sep.join(srcname.split(sep)[1:]) # chop off ../ - if task.generator.rename: srcname = task.generator.rename(srcname) - inps.append(srcname+'='+src) - ret = Utils.exec_command( - [ - task.generator.env.MKISOFS, - "-quiet", - "-r", - "-graft-points", - "-o",tgt, - ] + inps, shell=False) - if ret != 0: return ret - -def apply_iso(self): - Utils.def_attrs(self,fun=iso_up) - self.default_install_path=0 - lst=self.to_list(self.source) - self.meths.remove('apply_core') - self.dict=getattr(self,'dict',{}) - out = self.path.find_or_declare(self.target) - ins = [] - for x in Utils.to_list(self.source): - node = self.path.find_resource(x) - if not node:raise Utils.WafError('cannot find input file %s for processing'%x) - ins.append(node) - if self.dict and not self.env['DICT_HASH']: - self.env=self.env.copy() - keys=list(self.dict.keys()) - keys.sort() - lst=[self.dict[x]for x in keys] - self.env['DICT_HASH']=str(Utils.h_list(lst)) - tsk=self.create_task('iso',ins,out) - tsk.fun=self.fun - tsk.dict=self.dict - tsk.dep_vars=['DICT_HASH'] - tsk.install_path=self.install_path - tsk.chmod=self.chmod - if not tsk.env: - tsk.debug() - raise Utils.WafError('task without an environment') - -Task.task_type_from_func('iso',func=iso_up) -feature('iso')(apply_iso) -before('apply_core')(apply_iso) diff --git a/tools/waf/tar.py b/tools/waf/tar.py deleted file mode 100644 index d2d6d5d1551..00000000000 --- a/tools/waf/tar.py +++ /dev/null @@ -1,79 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -import Utils -import Options -import tarfile -from TaskGen import feature, before -import Task -import os, sys - -# construct a tar file containing them -# for as long as the build node appears later than the source node (this is an implementation detail of waf we are relying on) -def tar_up(task): - tgt = task.outputs[0].bldpath(task.env) - if os.path.exists(tgt): os.unlink(tgt) - if tgt.lower().endswith(".bz2"): z = tarfile.open(tgt,"w:bz2") - elif tgt.lower().endswith(".gz"): z = tarfile.open(tgt,"w:gz") - elif tgt.lower().endswith(".tgz"): z = tarfile.open(tgt,"w:gz") - else: z = tarfile.open(tgt,"w") - fileset = {} - for inp in task.inputs: - src = inp.srcpath(task.env) - if src.startswith(".."): - srcname = Utils.relpath(src,os.path.join("..",".")) # file in source dir - else: - srcname = Utils.relpath(src,os.path.join(task.env.variant(),".")) # file in artifacts dir - srcname = srcname.split(os.path.sep,len(task.generator.root.split(os.path.sep)))[-1] - if task.generator.rename: srcname = task.generator.rename(srcname) - fileset[srcname] = src - for srcname,src in fileset.items(): - ti = tarfile.TarInfo(srcname) - ti.mode = 0755 - ti.size = os.path.getsize(src) - openmode = 'r' - if Options.platform == 'win32': openmode = openmode + 'b' - f = file(src,openmode) - z.addfile(ti,fileobj=f) - f.close() - z.close() - if task.chmod: os.chmod(tgt,task.chmod) - return 0 - -def apply_tar(self): - Utils.def_attrs(self,fun=tar_up) - self.default_install_path=0 - lst=self.to_list(self.source) - self.meths.remove('apply_core') - self.dict=getattr(self,'dict',{}) - out = self.path.find_or_declare(self.target) - ins = [] - for x in Utils.to_list(self.source): - node = self.path.find_resource(x) - if not node:raise Utils.WafError('cannot find input file %s for processing'%x) - ins.append(node) - tsk=self.create_task('tar',ins,out) - tsk.fun=self.fun - tsk.dict=self.dict - tsk.install_path=self.install_path - tsk.chmod=self.chmod - if not tsk.env: - tsk.debug() - raise Utils.WafError('task without an environment') - -Task.task_type_from_func('tar',func=tar_up) -feature('tar')(apply_tar) -before('apply_core')(apply_tar) diff --git a/tools/waf/tomcat.py b/tools/waf/tomcat.py deleted file mode 100644 index 8454b45f89c..00000000000 --- a/tools/waf/tomcat.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env python -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. - -import Options, Utils -import os - -def detect(conf): - if not conf.env.DATADIR: - conf.fatal("DATADIR not found in the environment. Did you run conf.check_tool('gnu_dirs') before running check_tool('tomcat')?") - conf.check_message_1('Detecting Tomcat') - conf.env.TOMCATHOME = '' - tomcathome = getattr(Options.options, 'TOMCATHOME', '') - if tomcathome: - conf.env.TOMCATHOME = tomcathome - method = "forced through --with-tomcat" - else: - if "TOMCAT_HOME" in conf.environ and conf.environ['TOMCAT_HOME'].strip(): - conf.env.TOMCATHOME = conf.environ["TOMCAT_HOME"] - method = 'got through environment variable %TOMCAT_HOME%' - elif "CATALINA_HOME" in conf.environ and conf.environ['CATALINA_HOME'].strip(): - conf.env.TOMCATHOME = conf.environ['CATALINA_HOME'] - method = 'got through environment variable %CATALINA_HOME%' - elif os.path.isdir(os.path.join(conf.env.DATADIR,"tomcat6")): - conf.env.TOMCATHOME = os.path.join(conf.env.DATADIR,"tomcat6") - method = 'detected existence of Tomcat directory under $DATADIR' - elif os.path.isdir("/usr/share/tomcat6"): - conf.env.TOMCATHOME = "/usr/share/tomcat6" - method = 'detected existence of standard Linux system directory' - if not conf.env.TOMCATHOME: - conf.fatal("Could not detect Tomcat") - elif not os.path.isdir(conf.env.TOMCATHOME): - conf.fatal("Tomcat cannot be found at %s"%conf.env.TOMCATHOME) - else: - conf.check_message_2("%s (%s)"%(conf.env.TOMCATHOME,method),"GREEN") - -def set_options(opt): - inst_dir = opt.get_option_group('--datadir') # get the group that contains bindir - if not inst_dir: raise Utils.WafError, "DATADIR not set. Did you load the gnu_dirs tool options with opt.tool_options('gnu_dirs') before running opt.tool_options('tomcat')?" - inst_dir.add_option('--with-tomcat', # add javadir to the group that contains bindir - help = 'Path to installed Tomcat 6 environment [Default: ${DATADIR}/tomcat6 (unless %%CATALINA_HOME%% is set)]', - default = '', - dest = 'TOMCATHOME') diff --git a/tools/waf/usermgmt.py b/tools/waf/usermgmt.py deleted file mode 100644 index a231e0a86a9..00000000000 --- a/tools/waf/usermgmt.py +++ /dev/null @@ -1,140 +0,0 @@ -# Licensed to the Apache Software Foundation (ASF) under one -# or more contributor license agreements. See the NOTICE file -# distributed with this work for additional information -# regarding copyright ownership. The ASF licenses this file -# to you under the Apache License, Version 2.0 (the -# "License"); you may not use this file except in compliance -# with the License. You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, -# software distributed under the License is distributed on an -# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY -# KIND, either express or implied. See the License for the -# specific language governing permissions and limitations -# under the License. -import Utils, Build -from TaskGen import feature, before -from Configure import ConfigurationError -import Options -import Task -import os - -def detect(conf): - if Options.platform == 'win32': raise Utils.WafError('the usermgmt tool only works on Linux') - if Options.platform == 'darwin': raise Utils.WafError('the usermgmt tool only works on Linux') - path_list = ["/usr/local/sbin","/usr/sbin","/sbin"] + os.environ.get('PATH','').split(os.pathsep) - conf.find_program("useradd",var='USERADD',mandatory=True,path_list=path_list) - conf.find_program("userdel",var='USERDEL',mandatory=True,path_list=path_list) - -def set_options(opt): - if Options.platform == 'win32': raise Utils.WafError('the usermgmt tool only works on Linux') - if Options.platform == 'darwin': raise Utils.WafError('the usermgmt tool only works on Linux') - og = opt.get_option_group('--force') - og.add_option('--nochown', - action = 'store_true', - help = 'do not create or remove user accounts or change file ownership on installed files', - default = False, - dest = 'NOUSERMGMT') - -def _subst_add_destdir(x,bld): - a = "${DESTDIR}" + x - a = a.replace("${DESTDIR}",Options.options.destdir) - a = Utils.subst_vars(a,bld.env) - if a.startswith("//"): a = a[1:] - return a -Build.BuildContext.subst_add_destdir = staticmethod(_subst_add_destdir) - -def _setownership(ctx,path,owner,group,mode=None): - if Options.platform == 'win32': return - if Options.platform == 'darwin': return - if not hasattr(os,"getuid"): return - if os.getuid() != 0: return - if Options.options.NOUSERMGMT: return - - import pwd - import grp - import stat - from os import chown as _chown, chmod as _chmod - - def f(bld,path,owner,group,mode): - - try: uid = pwd.getpwnam(owner).pw_uid - except KeyError,e: - raise Utils.WafError("Before using setownership() you have to create the user with bld.createuser(username...)") - try: gid = grp.getgrnam(group).gr_gid - except KeyError,e: - raise Utils.WafError("Before using setownership() you have to create the user with bld.createuser(username...)") - - path = bld.subst_add_destdir(path,bld) - current_uid,current_gid = os.stat(path).st_uid,os.stat(path).st_gid - if current_uid != uid: - Utils.pprint("GREEN","* setting owner of %s to UID %s"%(path,uid)) - _chown(path,uid,current_gid) - current_uid = uid - if current_gid != gid: - Utils.pprint("GREEN","* setting group of %s to GID %s"%(path,gid)) - _chown(path,current_uid,gid) - current_gid = gid - if mode is not None: - current_mode = stat.S_IMODE(os.stat(path).st_mode) - if current_mode != mode: - Utils.pprint("GREEN","* adjusting permissions on %s to mode %o"%(path,mode)) - _chmod(path,mode) - current_mode = mode - - if ctx.is_install > 0: - ctx.add_post_fun(lambda ctx: f(ctx,path,owner,group,mode)) -Build.BuildContext.setownership = _setownership - -def _createuser(ctx,user,homedir,shell): - if Options.platform == 'win32': return - if Options.platform == 'darwin': return - if not hasattr(os,"getuid"): return - if os.getuid() != 0: return - if Options.options.NOUSERMGMT: return - - def f(ctx,user,homedir,shell): - import pwd - try: - pwd.getpwnam(user).pw_uid - user_exists = True - except KeyError,e: - user_exists = False - if user_exists: return - - Utils.pprint("GREEN","* creating user %s"%user) - cmd = [ - ctx.env.USERADD, - '-M', - '-r', - '-s',shell, - '-d',homedir, - user, - ] - ret = Utils.exec_command(cmd) - if ret: raise Utils.WafError("Failed to run command %s"%cmd) - - def g(ctx,user,homedir,shell): - import pwd - try: - pwd.getpwnam(user).pw_uid - user_exists = True - except KeyError,e: - user_exists = False - if not user_exists: return - - Utils.pprint("GREEN","* removing user %s"%user) - cmd = [ - ctx.env.USERDEL, - user, - ] - ret = Utils.exec_command(cmd) - if ret: raise Utils.WafError("Failed to run command %s"%cmd) - - if ctx.is_install > 0: - ctx.add_pre_fun(lambda ctx: f(ctx,user,homedir,shell)) - elif ctx.is_install < 0: - ctx.add_pre_fun(lambda ctx: g(ctx,user,homedir,shell)) -Build.BuildContext.createuser = _createuser diff --git a/tools/whisker/LICENSE b/tools/whisker/LICENSE index 2e17633f464..299b53bb70b 100644 --- a/tools/whisker/LICENSE +++ b/tools/whisker/LICENSE @@ -180,70 +180,6 @@ Copyright (c) 2013 The Apache Software Foundation This distribution contains third party resources. -Within the . directory - licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - - Copyright (c) 2005-2010 Thomas Nagy - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - THE POSSIBILITY OF SUCH DAMAGE. - - from Thomas Nagy http://code.google.com/p/waf/ - waf - -Within the awsapi directory - licensed under the BSD (3-clause) http://www.opensource.org/licenses/BSD-3-Clause (as follows) - - Copyright (c) 2005-2010 Thomas Nagy - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - 3. Neither the name of the copyright holders nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" - AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE - IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE - ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE - LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR - CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF - THE POSSIBILITY OF SUCH DAMAGE. - - from Thomas Nagy http://code.google.com/p/waf/ - waf - Within the console-proxy/js directory licensed under the MIT License http://www.opensource.org/licenses/mit-license.php (as follows) diff --git a/tools/whisker/descriptor-for-packaging.xml b/tools/whisker/descriptor-for-packaging.xml index ed2c9360112..66099ae61a1 100644 --- a/tools/whisker/descriptor-for-packaging.xml +++ b/tools/whisker/descriptor-for-packaging.xml @@ -2275,10 +2275,6 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk). id='apache.org.2' name='The Apache Software Foundation' url='http://www.apache.org/'/> - - - - -Copyright (c) 2005-2010 Thomas Nagy - - - - - - @@ -2646,16 +2632,6 @@ Copyright (c) 2012 John Resig, Jörn Zaefferer - - - -Copyright (c) 2005-2010 Thomas Nagy - - - - - - diff --git a/tools/whisker/descriptor.xml b/tools/whisker/descriptor.xml index 0b3e508a124..0b8d20f83b2 100644 --- a/tools/whisker/descriptor.xml +++ b/tools/whisker/descriptor.xml @@ -2271,10 +2271,6 @@ Innovation Centre, 2006 (http://www.it-innovation.soton.ac.uk). id='apache.org.2' name='The Apache Software Foundation' url='http://www.apache.org/'/> - - - - -Copyright (c) 2005-2010 Thomas Nagy - - - - - - @@ -2630,16 +2616,6 @@ Copyright (c) 2012 John Resig, Jörn Zaefferer - - - -Copyright (c) 2005-2010 Thomas Nagy - - - - - - diff --git a/ui/css/cloudstack3.css b/ui/css/cloudstack3.css index 68050608cd7..bb45a647665 100644 --- a/ui/css/cloudstack3.css +++ b/ui/css/cloudstack3.css @@ -1502,7 +1502,6 @@ div.list-view td.state.off span { position: relative; left: 0px; float: left; - width: 460px; height: 22px; border-top: 1px solid #808080; /*+box-shadow:inset 0px 1px #FFFFFF;*/ @@ -1697,7 +1696,7 @@ div.list-view td.state.off span { } .detail-view .main-groups { - max-height: 455px; + max-height: 407px; overflow: auto; overflow-x: hidden; margin-right: 12px; @@ -1754,6 +1753,10 @@ div.list-view td.state.off span { width: 245px; } +.detail-group .main-groups table td.value > span select { + width: 100% !important; +} + .detail-group .main-groups table td.value .view-all { cursor: pointer; /*[empty]height:;*/ @@ -1913,7 +1916,7 @@ div.detail-group td.view-all a { background: url(../images/gradients.png) repeat-x 0px -529px; font-size: 11px; display: block; - height: 25px; + height: 27px; text-decoration: none; color: #4C5D6C; /*+text-shadow:0px 1px 2px #FFFFFF;*/ @@ -1922,7 +1925,7 @@ div.detail-group td.view-all a { -o-text-shadow: 0px 1px 2px #FFFFFF; text-shadow: 0px 1px 2px #FFFFFF; float: left; - padding: 0 8px 0 5px; + padding: 0 1px; border-left: 1px solid #9B9EA2; /*+border-radius:5px 0 0 5px;*/ -moz-border-radius: 5px 0 0 5px; @@ -1977,10 +1980,10 @@ div.details .main-groups label.error { } .detail-view td.view-all.multiple { - width: 123px !important; - height: 22px; - float: left; + max-width: 145px; + height: 17px; display: block; + float: left; margin: 8px 2px 8px 8px; border: none !important; /*+box-shadow:none;*/ @@ -2312,6 +2315,34 @@ div.detail-group.actions td { top: 13px; } +/** Zone filter (mixed zone management)*/ +#header .zone-filter { + float: left; + width: 111px; + margin: 9px 20px 0 2px; +} + +#header .zone-filter label { + position: absolute; + top: -3px; + color: #FFFFFF; + font-size: 11px; +} + +#header .zone-filter select { + width: 100%; + font-size: 12px; + border: 1px solid #000000; + border-bottom: #FFFFFF; + /*+border-radius:4px;*/ + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; + background: #ECECEC; + margin-top: 2px; +} + /*Navigation*/ #navigation, #browser { @@ -4406,6 +4437,17 @@ Dialogs*/ display: block; clear: both; font-size: 11px; + float: left; + height: 10px; + max-width: 287px; + margin-top: 1px; + overflow: hidden; + text-overflow: ellipsis; + white-space: nowrap; +} + +.dashboard.admin .dashboard-container.sub.alerts ul li p br { + display: none; } /*** User*/ @@ -5260,6 +5302,10 @@ label.error { position: relative; } +.multi-wizard.instance-wizard .progress ul li { + width: 109px; +} + .multi-wizard .progress ul li.first { /*+border-radius:5px 0 0 5px;*/ -moz-border-radius: 5px 0 0 5px; @@ -5301,6 +5347,10 @@ label.error { text-align: center; } +.multi-wizard.instance-wizard .progress ul li span { + left: 36px; +} + .multi-wizard .progress ul li span.multiline { width: 71px; top: 12px; @@ -5317,6 +5367,10 @@ label.error { z-index: 1000; } +.multi-wizard.instance-wizard .progress ul li span.arrow { + left: 27px; +} + .multi-wizard .progress ul li.active span.arrow { background-position: -1px -396px; } @@ -5337,6 +5391,15 @@ label.error { background: transparent; } +.multi-wizard.instance-wizard .progress ul li span.number { + left: 16px; +} + +.multi-wizard.instance-wizard .progress ul li span.multiline { + width: 79px; + left: 23px; +} + .multi-wizard .progress ul li.active span { /*+text-shadow:0px -1px 1px #004AFF;*/ -moz-text-shadow: 0px -1px 1px #004AFF; @@ -8877,6 +8940,7 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t left: 0px; top: -10px; margin-right: 9px; + display: none; } #header div.view-switcher.alt { @@ -8943,6 +9007,34 @@ div.ui-dialog div.multi-edit-add-list div.view div.data-table table.body tbody t padding: 3px 0 4px; } +/*** View switcher (drop-down)*/ +.project-switcher { + float: left; + width: 141px; + padding: 9px 17px 0 0; +} + +.project-switcher label { + position: absolute; + top: -2px; + color: #FFFFFF; + font-size: 11px; +} + +.project-switcher select { + width: 100%; + font-size: 12px; + border: 1px solid #000000; + border-bottom: #FFFFFF; + /*+border-radius:4px;*/ + -moz-border-radius: 4px; + -webkit-border-radius: 4px; + -khtml-border-radius: 4px; + border-radius: 4px; + background: #ECECEC; + margin-top: 2px; +} + /*** Select project*/ .project-selector { display: inline-block; @@ -11408,7 +11500,7 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it border-bottom: 1px solid #FFFFFF; height: 28px; float: left; - margin: 4px 13px 0 0; + margin: 5px 13px 0 0; cursor: pointer; /*+box-shadow:inset 0px 1px 1px #000000;*/ -moz-box-shadow: inset 0px 1px 1px #000000; @@ -11626,6 +11718,16 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it background-position: 0px -707px; } +.migrate .icon, +.migrateVolume .icon { + background-position: 0px -125px; +} + +.migrate:hover .icon, +.migrateVolume:hover .icon { + background-position: 0px -707px; +} + .attach .icon, .attachISO .icon, .attachDisk .icon { @@ -11800,6 +11902,22 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it background-position: -100px -614px; } +.addVlanRange .icon { + background-position: -37px -62px; +} + +.addVlanRange:hover .icon { + background-position: -37px -62px; +} + +.removeVlanRange .icon { + background-position: 1px -92px; +} + +.removeVlanRange:hover .icon { + background-position: 1px -92px; +} + .resize .icon, .updateResourceCount .icon { background-position: -167px -66px; @@ -11829,6 +11947,10 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it background-position: -168px -31px; } +.scaleUp .icon { + background-position: -167px -66px; +} + .restoreVM:hover .icon, .restore:hover .icon { background-position: -168px -613px; @@ -11958,6 +12080,30 @@ div.ui-dialog div.autoscaler div.field-group div.form-container form div.form-it background-position: -228px -646px; } +.changeAffinity .icon { + background-position: -264px -2px; +} + +.changeAffinity:hover .icon { + background-position: -263px -583px; +} + +.releaseFromAccount .icon { + background-position: -230px -123px; +} + +.releaseFromAccount:hover .icon { + background-position: -229px -704px; +} + +.addAccount .icon { + background-position: -231px -96px; +} + +.addAccount:hover .icon { + background-position: -230px -677px; +} + .label-hovered { cursor: pointer; color: #0000FF !important; diff --git a/ui/dictionary.jsp b/ui/dictionary.jsp index 11e98cf5024..1880be53e7e 100644 --- a/ui/dictionary.jsp +++ b/ui/dictionary.jsp @@ -25,6 +25,16 @@ under the License. <% long now = System.currentTimeMillis(); %> + + @@ -1678,11 +1694,14 @@ under the License. - + + + - - + + + diff --git a/ui/modules/modules.js b/ui/modules/modules.js new file mode 100644 index 00000000000..490749ff085 --- /dev/null +++ b/ui/modules/modules.js @@ -0,0 +1,20 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +(function($, cloudStack) { + cloudStack.modules = [ + ]; +}(jQuery, cloudStack)); diff --git a/ui/scripts/accounts.js b/ui/scripts/accounts.js index 8353d70536e..7e82c0fc163 100644 --- a/ui/scripts/accounts.js +++ b/ui/scripts/accounts.js @@ -1372,6 +1372,9 @@ if (jsonObj.state == 'Destroyed') return []; + if( isAdmin() && jsonObj.isdefault == false) + allowedActions.push("remove"); + if(isAdmin()) { allowedActions.push("edit"); //updating networkdomain is allowed on any account, including system-generated default admin account if(!(jsonObj.domain == "ROOT" && jsonObj.name == "admin" && jsonObj.accounttype == 1)) { //if not system-generated default admin account @@ -1393,6 +1396,10 @@ var userActionfilter = function(args) { var jsonObj = args.context.item; var allowedActions = []; + + if( isAdmin() && jsonObj.isdefault == false) + allowedActions.push("remove"); + if(isAdmin()) { allowedActions.push("edit"); allowedActions.push("changePassword"); diff --git a/ui/scripts/affinity.js b/ui/scripts/affinity.js new file mode 100644 index 00000000000..a9c66957ad5 --- /dev/null +++ b/ui/scripts/affinity.js @@ -0,0 +1,183 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +(function(cloudStack) { + cloudStack.sections.affinityGroups = { + title: 'label.affinity.groups', + listView: { + id: 'affinityGroups', + fields: { + name: { label: 'label.name' }, + type: { label: 'label.type' } + }, + dataProvider: function(args) { + var data = {}; + if (args.context != null) { + if ("instances" in args.context) { + $.extend(data, { + virtualmachineid: args.context.instances[0].id + }); + } + } + $.ajax({ + url: createURL('listAffinityGroups'), + data: data, + success: function(json) { + var items = json.listaffinitygroupsresponse.affinitygroup; + args.response.success({data: items}); + } + }); + }, + actions: { + add: { + label: 'label.add.affinity.group', + + messages: { + notification: function(args) { + return 'label.add.affinity.group'; + } + }, + + createForm: { + title: 'label.add.affinity.group', + fields: { + name: { + label: 'label.name', + validation: { required: true } + }, + description: { + label: 'label.description' + }, + type: { + label: 'label.type', + select: function(args) { + $.ajax({ + url: createURL('listAffinityGroupTypes'), + success: function(json) { + var types = []; + var items = json.listaffinitygrouptypesresponse.affinityGroupType; + if(items != null) { + for(var i = 0; i < items.length; i++) { + types.push({id: items[i].type, description: items[i].type}); + } + } + args.response.success({data: types}) + } + }); + } + } + } + }, + + action: function(args) { + var data = { + name: args.data.name, + type: args.data.type + }; + if(args.data.description != null && args.data.description.length > 0) + $.extend(data, {description: args.data.description}); + + $.ajax({ + url: createURL('createAffinityGroup'), + data: data, + success: function(json) { + var jid = json.createaffinitygroupresponse.jobid; + args.response.success( + {_custom: + {jobId: jid, + getUpdatedItem: function(json) { + return json.queryasyncjobresultresponse.jobresult.affinitygroup; + } + } + } + ); + } + }); + }, + + notification: { + poll: pollAsyncJobResult + } + } + }, + detailView: { + actions: { + remove: { + label: 'label.delete.affinity.group', + messages: { + confirm: function(args) { + return 'message.delete.affinity.group'; + }, + notification: function(args) { + return 'label.delete.affinity.group'; + } + }, + action: function(args) { + $.ajax({ + url: createURL('deleteAffinityGroup'), + data: { + id: args.context.affinityGroups[0].id + }, + success: function(json) { + var jid = json.deleteaffinitygroupresponse.jobid; + args.response.success({ + _custom:{ + jobId: jid + } + }); + } + }); + }, + notification: { + poll: pollAsyncJobResult + } + } + }, + + viewAll: { path: 'instances', label: 'label.instances' }, + + tabs: { + details: { + title: 'label.details', + fields: [ + { + name: { label: 'label.name' } + }, + { + description: { label: 'label.description' }, + type: { label: 'label.type' }, + id: { label: 'label.id' } + } + ], + + dataProvider: function(args) { + $.ajax({ + url: createURL('listAffinityGroups'), + data: { + id: args.context.affinityGroups[0].id + }, + success: function(json) { + var item = json.listaffinitygroupsresponse.affinitygroup[0]; + args.response.success({data: item}); + } + }); + } + } + } + } + } + }; +})(cloudStack); diff --git a/ui/scripts/cloud.core.callbacks.js b/ui/scripts/cloud.core.callbacks.js index 1a9e0456d0b..7fd1b4d1244 100644 --- a/ui/scripts/cloud.core.callbacks.js +++ b/ui/scripts/cloud.core.callbacks.js @@ -52,25 +52,31 @@ Below is a sample login attempt var clientApiUrl = "/client/api"; var clientConsoleUrl = "/client/console"; -$(document).ready(function() { - /* - condition 1: If window.location.href contains parameter 'loginUrl', save the parameter's value to a cookie, then reload the page without any URL parameter. - (After the page is reloaded without any URL parameter, it will fall in condition 2.) - */ - if ($.urlParam('loginUrl') != 0) { - $.cookie('loginUrl', $.urlParam('loginUrl'), { expires: 1}); - document.location.href = window.location.href.substring(0, window.location.href.indexOf('?')); - } +$(document).ready(function() { - /* - condition 2: If window.location.href does not contain parameter 'loginUrl' but cookie 'loginUrl' exists, - save the cookie's value to g_regionUrlParam (a global variable for switching regions), - then call login API to set g_loginResponse (a global variable for single-sign-on). - */ - else if($.cookie('loginUrl') != null) { - g_regionUrlParam = '?loginUrl=' + $.cookie('loginUrl'); + var url = $.urlParam("loginUrl"); + if (url != undefined && url != null && url.length > 0) { + url = unescape(clientApiUrl+"?"+url); $.ajax({ - url: unescape(clientApiUrl + "?" + $.cookie('loginUrl')), + url: url, + dataType: "json", + async: false, + success: function(json) { + g_loginResponse = json.loginresponse; + }, + error: function() { + onLogoutCallback(); + // This means the login failed. You should redirect to your login page. + }, + beforeSend: function(XMLHttpRequest) { + return true; + } + }); + } + else if(window.name != null && window.name.indexOf("&domain=") != -1) { //from region switching + g_loginCmdText = window.name; + $.ajax({ + url: clientApiUrl + "?command=login" + window.name + "&response=json", dataType: "json", async: false, success: function(json) { @@ -85,7 +91,6 @@ $(document).ready(function() { } }); } - }); diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js index 985627b824e..b943a946c8f 100644 --- a/ui/scripts/cloudStack.js +++ b/ui/scripts/cloudStack.js @@ -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"]; + 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"]; + sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "projects", "regions", "affinityGroups"]; } else { //normal user - sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events"]; + sections = ["dashboard", "instances", "storage", "network", "templates", "accounts", "events", "regions", "affinityGroups"]; } if (cloudStack.plugins.length) { @@ -46,6 +46,7 @@ */ dashboard: {}, instances: {}, + affinityGroups: {}, storage: {}, network: {}, templates: {}, @@ -115,6 +116,11 @@ // Use this for checking the session, to bypass login screen bypassLoginCheck: function(args) { //determine to show or bypass login screen if (g_loginResponse == null) { //show login screen + /* + but if this is a 2nd browser window (of the same domain), login screen still won't show because $.cookie('sessionKey') is valid for 2nd browser window (of the same domain) as well. + i.e. calling listCapabilities API with g_sessionKey from $.cookie('sessionKey') will succeed, + then userValid will be set to true, then an user object (instead of "false") will be returned, then login screen will be bypassed. + */ g_mySession = $.cookie('JSESSIONID'); g_sessionKey = $.cookie('sessionKey'); g_role = $.cookie('role'); @@ -176,8 +182,7 @@ userValid = true; }, - error: function(xmlHTTP) { - logout(false); + error: function(xmlHTTP) { //override default error handling, do nothing instead of showing error "unable to verify user credentials" on login screen }, beforeSend : function(XMLHttpResponse) { return true; @@ -250,13 +255,12 @@ else { array1.push("&domain=" + encodeURIComponent("/")); } - - g_regionUrlParam = '?loginUrl=' + escape("command=login" + array1.join("") + "&response=json"); - $.cookie('loginUrl', escape("command=login" + array1.join("") + "&response=json"), { expires: 1}); + + var loginCmdText = array1.join(""); $.ajax({ type: "POST", - data: "command=login" + array1.join("") + "&response=json", + data: "command=login" + loginCmdText + "&response=json", dataType: "json", async: false, success: function(json) { @@ -386,7 +390,8 @@ g_timezoneoffset = null; g_timezone = null; g_supportELB = null; - g_regionUrlParam = null; + g_loginCmdText = null; + window.name = ''; $.cookie('JSESSIONID', null); $.cookie('sessionKey', null); @@ -398,8 +403,7 @@ $.cookie('timezoneoffset', null); $.cookie('timezone', null); $.cookie('supportELB', null); - $.cookie('loginUrl', null); - + if(onLogoutCallback()) { //onLogoutCallback() will set g_loginResponse(single-sign-on variable) to null, then bypassLoginCheck() will show login screen. document.location.reload(); //when onLogoutCallback() returns true, reload the current document. } @@ -466,7 +470,8 @@ document.title = 'CloudStack'; - if ($.cookie('loginUrl') != null || $.urlParam('loginUrl') != 0) { + if ($.urlParam('loginUrl') != 0 + ||(window.name != null && window.name.indexOf("&domain=") != -1)) { // SSO loginArgs.hideLoginScreen = true; } diff --git a/ui/scripts/dashboard.js b/ui/scripts/dashboard.js index 845ae52259b..e8ab6c531f9 100644 --- a/ui/scripts/dashboard.js +++ b/ui/scripts/dashboard.js @@ -238,7 +238,7 @@ return { zoneID: capacity.zoneid, // Temporary fix for dashboard zoneName: capacity.zonename, - type: cloudStack.converters.toAlertType(capacity.type), + type: cloudStack.converters.toCapacityCountType(capacity.type), percent: parseInt(capacity.percentused), used: cloudStack.converters.convertByType(capacity.type, capacity.capacityused), total: cloudStack.converters.convertByType(capacity.type, capacity.capacitytotal) diff --git a/ui/scripts/events.js b/ui/scripts/events.js index 3b6874c6274..0e72eda5974 100644 --- a/ui/scripts/events.js +++ b/ui/scripts/events.js @@ -73,7 +73,7 @@ $.extend(data, { type:args.data.type }); if(args.data.date != "") - $.extend(data, {date:args.data.date }); + $.extend(data, {olderthan:args.data.date }); $.ajax({ @@ -118,7 +118,7 @@ $.extend(data, { type:args.data.type }); if(args.data.date != "") - $.extend(data, {date:args.data.date }); + $.extend(data, {olderthan:args.data.date }); $.ajax({ @@ -359,7 +359,7 @@ $.extend(data, { type:args.data.type }); if(args.data.date != "") - $.extend(data, {date:args.data.date }); + $.extend(data, {olderthan:args.data.date }); $.ajax({ @@ -404,7 +404,7 @@ $.extend(data, { type:args.data.type }); if(args.data.date != "") - $.extend(data, {date:args.data.date }); + $.extend(data, {olderthan:args.data.date }); $.ajax({ diff --git a/ui/scripts/instanceWizard.js b/ui/scripts/instanceWizard.js index e1aeafde67c..f3deb66d6ba 100644 --- a/ui/scripts/instanceWizard.js +++ b/ui/scripts/instanceWizard.js @@ -18,7 +18,7 @@ (function($, cloudStack) { var zoneObjs, hypervisorObjs, featuredTemplateObjs, communityTemplateObjs, myTemplateObjs, featuredIsoObjs, community, networkObjs; var selectedZoneObj, selectedTemplateObj, selectedHypervisor, selectedDiskOfferingObj; - var step5ContainerType = 'nothing-to-select'; //'nothing-to-select', 'select-network', 'select-security-group', 'select-advanced-sg'(advanced sg-enabled zone) + var step6ContainerType = 'nothing-to-select'; //'nothing-to-select', 'select-network', 'select-security-group', 'select-advanced-sg'(advanced sg-enabled zone) cloudStack.instanceWizard = { maxDiskOfferingSize: function() { @@ -68,475 +68,485 @@ // 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 - //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 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("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; - }); - } + // 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("listTemplates&templatefilter=community&zoneid="+args.currentData.zoneid), + url: createURL("listHypervisors&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; - }); - } + hypervisorObjs = json.listhypervisorsresponse.hypervisor; } }); - $.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; - } - } - }); - $.ajax({ - url: createURL("listIsos&isofilter=selfexecutable&zoneid=" + args.currentData.zoneid + "&bootable=true"), - dataType: "json", - async: false, - success: function(json) { - if(json.listisosresponse.iso == null) { - myIsoObjs = null; - } - else { - myIsoObjs = json.listisosresponse.iso; - } - } - }); - } - //***** get templates/ISOs (end) ***** + //***** 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); + }); - var templatesObj = {}; - if (selectedTemplate == 'select-template') { - templatesObj = { - featuredtemplates: featuredTemplateObjs, - communitytemplates: communityTemplateObjs, - mytemplates: myTemplateObjs - } - } else if (selectedTemplate == 'select-iso') { - templatesObj = { - featuredisos: featuredIsoObjs, - communityisos: communityIsoObjs, - myisos: myIsoObjs - } - } - args.response.success({ - hypervisor: { - idField: 'name', - nameField: 'name' - }, - data: { - templates: templatesObj, - hypervisors: hypervisorObjs - } - }); - }, - - // Step 3: Service offering - function(args) { - if(args.currentData["select-template"] == "select-template") { - if(featuredTemplateObjs != null && featuredTemplateObjs.length > 0) { - for(var i=0; i < featuredTemplateObjs.length; i++) { - if(featuredTemplateObjs[i].id == args.currentData.templateid) { - selectedTemplateObj = featuredTemplateObjs[i]; - break; + $.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; + } + } + }); + $.ajax({ + url: createURL("listIsos&isofilter=selfexecutable&zoneid=" + args.currentData.zoneid + "&bootable=true"), + dataType: "json", + async: false, + success: function(json) { + if(json.listisosresponse.iso == null) { + myIsoObjs = null; + } + else { + myIsoObjs = json.listisosresponse.iso; + } + } + }); + } + //***** get templates/ISOs (end) ***** + + + var templatesObj = {}; + if (selectedTemplate == 'select-template') { + templatesObj = { + featuredtemplates: featuredTemplateObjs, + communitytemplates: communityTemplateObjs, + mytemplates: myTemplateObjs + } + } else if (selectedTemplate == 'select-iso') { + templatesObj = { + featuredisos: featuredIsoObjs, + communityisos: communityIsoObjs, + myisos: myIsoObjs } } - if(selectedTemplateObj == null) { - if(communityTemplateObjs != null && communityTemplateObjs.length > 0) { - for(var i=0; i < communityTemplateObjs.length; i++) { - if(communityTemplateObjs[i].id == args.currentData.templateid) { - selectedTemplateObj = communityTemplateObjs[i]; + args.response.success({ + hypervisor: { + idField: 'name', + nameField: 'name' + }, + data: { + templates: templatesObj, + hypervisors: hypervisorObjs + } + }); + }, + + // Step 3: Service offering + function(args) { + if(args.currentData["select-template"] == "select-template") { + if(featuredTemplateObjs != null && featuredTemplateObjs.length > 0) { + for(var i=0; i < featuredTemplateObjs.length; i++) { + if(featuredTemplateObjs[i].id == args.currentData.templateid) { + selectedTemplateObj = featuredTemplateObjs[i]; break; } } } - } - if(selectedTemplateObj == null) { - if(myTemplateObjs != null && myTemplateObjs.length > 0) { - for(var i=0; i < myTemplateObjs.length; i++) { - if(myTemplateObjs[i].id == args.currentData.templateid) { - selectedTemplateObj = myTemplateObjs[i]; - break; - } - } - } - } - if(selectedTemplateObj == null) - alert("unable to find matched template object"); - else - selectedHypervisor = selectedTemplateObj.hypervisor; - } - else { //(args.currentData["select-template"] == "select-iso" - selectedHypervisor = args.currentData.hypervisorid; - } - - $.ajax({ - url: createURL("listServiceOfferings&issystem=false"), - dataType: "json", - async: true, - success: function(json) { - serviceOfferingObjs = json.listserviceofferingsresponse.serviceoffering; - args.response.success({ - data: {serviceOfferings: serviceOfferingObjs} - }); - } - }); - }, - - // Step 4: Data disk offering - function(args) { - var isRequred = (args.currentData["select-template"] == "select-iso"? true: false); - $.ajax({ - url: createURL("listDiskOfferings"), - dataType: "json", - async: true, - success: function(json) { - diskOfferingObjs = json.listdiskofferingsresponse.diskoffering; - args.response.success({ - required: isRequred, - customFlag: 'iscustomized', // Field determines if custom slider is shown - data: {diskOfferings: diskOfferingObjs} - }); - } - }); - }, - - // Step 5: Network - function(args) { - if(diskOfferingObjs != null && diskOfferingObjs.length > 0) { - for(var i=0; i < diskOfferingObjs.length; i++) { - if(diskOfferingObjs[i].id == args.currentData.diskofferingid) { - selectedDiskOfferingObj = diskOfferingObjs[i]; - break; - } - } - } - - if (selectedZoneObj.networktype == "Advanced") { //Advanced zone. Show network list. - var $networkStep = $(".step.network:visible .nothing-to-select"); - var $networkStepContainer = $('.step.network:visible'); - - if(args.initArgs.pluginForm != null && args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier chart - step5ContainerType = 'nothing-to-select'; - $networkStep.find("#from_instance_page_1").hide(); - $networkStep.find("#from_instance_page_2").hide(); - $networkStep.find("#from_vpc_tier").text("tier " + args.context.networks[0].name); - $networkStep.find("#from_vpc_tier").show(); - } else { //from Instance page - if(selectedZoneObj.securitygroupsenabled != true) { // Advanced SG-disabled zone - step5ContainerType = 'select-network'; - $networkStep.find("#from_instance_page_1").show(); - $networkStep.find("#from_instance_page_2").show(); - $networkStep.find("#from_vpc_tier").text(""); - $networkStep.find("#from_vpc_tier").hide(); - $networkStepContainer.removeClass('next-use-security-groups'); - } else { // Advanced SG-enabled zone - step5ContainerType = 'select-advanced-sg'; - } - - if ($networkStepContainer.hasClass('next-use-security-groups')) { - $networkStepContainer.removeClass('repeat next-use-security-groups loaded'); - step5ContainerType = 'select-security-group'; - } - } - } - else { //Basic zone. Show securigy group list or nothing(when no SecurityGroup service in guest network) - var includingSecurityGroupService = false; - $.ajax({ - url: createURL("listNetworks&trafficType=Guest&zoneId=" + selectedZoneObj.id), - dataType: "json", - async: false, - success: function(json) { - //basic zone should have only one guest network returned in this API call - var items = json.listnetworksresponse.network; - if(items != null && items.length > 0) { - var networkObj = items[0]; //basic zone has only one guest network - var serviceObjArray = networkObj.service; - for(var k = 0; k < serviceObjArray.length; k++) { - if(serviceObjArray[k].name == "SecurityGroup") { - includingSecurityGroupService = true; + if(selectedTemplateObj == null) { + if(communityTemplateObjs != null && communityTemplateObjs.length > 0) { + for(var i=0; i < communityTemplateObjs.length; i++) { + if(communityTemplateObjs[i].id == args.currentData.templateid) { + selectedTemplateObj = communityTemplateObjs[i]; break; } } } } - }); - - if(includingSecurityGroupService == false || selectedHypervisor == "VMware") { - step5ContainerType = 'nothing-to-select'; - } - else { - step5ContainerType = 'select-security-group'; - } - } - - //step5ContainerType = 'nothing-to-select'; //for testing only, comment it out before checking in - if(step5ContainerType == 'select-network' || step5ContainerType == 'select-advanced-sg') { - var defaultNetworkArray = [], optionalNetworkArray = []; - var networkData = { - zoneId: args.currentData.zoneid, - canusefordeploy: true - }; - - if(selectedZoneObj.networktype == 'Advanced' && selectedZoneObj.securitygroupsenabled == true) { - $.extend(networkData, { - type: 'Shared' - }); - } - - if (!(cloudStack.context.projects && cloudStack.context.projects[0])) { - networkData.domainid = g_domainid; - networkData.account = g_account; - } - - var vpcObjs; - - //listVPCs without account/domainid/listAll parameter will return only VPCs belonging to the current login. That's what should happen in Instances page's VM Wizard. - //i.e. If the current login is root-admin, do not show VPCs belonging to regular-user/domain-admin in Instances page's VM Wizard. - $.ajax({ - url: createURL('listVPCs'), - async: false, - success: function(json) { - vpcObjs = json.listvpcsresponse.vpc ? json.listvpcsresponse.vpc : []; - } - }); - - var networkObjsToPopulate = []; - $.ajax({ - url: createURL('listNetworks'), - data: networkData, - async: false, - success: function(json) { - networkObjs = json.listnetworksresponse.network ? json.listnetworksresponse.network : []; - if(networkObjs.length > 0) { - for(var i = 0; i < networkObjs.length; i++) { - var networkObj = networkObjs[i]; - var includingSecurityGroup = false; - var serviceObjArray = networkObj.service; - for(var k = 0; k < serviceObjArray.length; k++) { - if(serviceObjArray[k].name == "SecurityGroup") { - networkObjs[i].type = networkObjs[i].type + ' (sg)'; - includingSecurityGroup = true; - break; - } - } - - if (networkObj.vpcid) { - networkObj._singleSelect = true; + if(selectedTemplateObj == null) { + if(myTemplateObjs != null && myTemplateObjs.length > 0) { + for(var i=0; i < myTemplateObjs.length; i++) { + if(myTemplateObjs[i].id == args.currentData.templateid) { + selectedTemplateObj = myTemplateObjs[i]; + break; } - - //for Advanced SG-enabled zone, list only SG network offerings - if(selectedZoneObj.networktype == 'Advanced' && selectedZoneObj.securitygroupsenabled == true) { - if(includingSecurityGroup == false) - continue; //skip to next network offering - } - networkObjsToPopulate.push(networkObj); - } - } - } - }); - - $.ajax({ - url: createURL("listNetworkOfferings"), - dataType: "json", - data: { - forvpc: false, - zoneid: args.currentData.zoneid, - guestiptype: 'Isolated', - supportedServices: 'SourceNat', - specifyvlan: false, - state: 'Enabled' - }, - async: false, - success: function(json) { - networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering; - } - }); - //get network offerings (end) *** - - $networkStepContainer.removeClass('repeat next-use-security-groups'); - - if (step5ContainerType == 'select-advanced-sg') { - $networkStepContainer.addClass('repeat next-use-security-groups'); - - // Add guest network is disabled - $networkStepContainer.find('.select-network').addClass('no-add-network'); - } else { - $networkStepContainer.find('.select-network').removeClass('no-add-network'); - } - - args.response.success({ - type: 'select-network', - data: { - networkObjs: networkObjsToPopulate, - securityGroups: [], - networkOfferings: networkOfferingObjs, - vpcs: vpcObjs - } - }); - } - - else if(step5ContainerType == 'select-security-group') { - var securityGroupArray = []; - var data = { - domainid: g_domainid, - account: g_account - }; - - $.ajax({ - url: createURL("listSecurityGroups"), - dataType: "json", - async: false, - data: cloudStack.context.projects ? {} : data, - success: function(json) { - var items = json.listsecuritygroupsresponse.securitygroup; - if (items != null && items.length > 0) { - for (var i = 0; i < items.length; i++) { - securityGroupArray.push(items[i]); } } } - }); - args.response.success({ - type: 'select-security-group', - data: { - networkObjs: [], - securityGroups: securityGroupArray, - networkOfferings: [], - vpcs: [] + if(selectedTemplateObj == null) + alert("unable to find matched template object"); + else + selectedHypervisor = selectedTemplateObj.hypervisor; + } + else { //(args.currentData["select-template"] == "select-iso" + selectedHypervisor = args.currentData.hypervisorid; + } + + $.ajax({ + url: createURL("listServiceOfferings&issystem=false"), + dataType: "json", + async: true, + success: function(json) { + serviceOfferingObjs = json.listserviceofferingsresponse.serviceoffering; + args.response.success({ + data: {serviceOfferings: serviceOfferingObjs} + }); } }); - } + }, - else if(step5ContainerType == 'nothing-to-select') { - args.response.success({ - type: 'nothing-to-select', - data: { - networkObjs: [], - securityGroups: [], - networkOfferings: [], - vpcs: [] + // Step 4: Data disk offering + function(args) { + var isRequred = (args.currentData["select-template"] == "select-iso"? true: false); + $.ajax({ + url: createURL("listDiskOfferings"), + dataType: "json", + async: true, + success: function(json) { + diskOfferingObjs = json.listdiskofferingsresponse.diskoffering; + args.response.success({ + required: isRequred, + customFlag: 'iscustomized', // Field determines if custom slider is shown + data: {diskOfferings: diskOfferingObjs} + }); } }); + }, + + // Step 5: Affinity + function(args) { + $.ajax({ + url: createURL('listAffinityGroups'), + success: function(json) { + var items = json.listaffinitygroupsresponse.affinitygroup; + args.response.success({data: {affinityGroups: items}}); + } + }); + }, + + // Step 6: Network + function(args) { + if(diskOfferingObjs != null && diskOfferingObjs.length > 0) { + for(var i=0; i < diskOfferingObjs.length; i++) { + if(diskOfferingObjs[i].id == args.currentData.diskofferingid) { + selectedDiskOfferingObj = diskOfferingObjs[i]; + break; + } + } + } + + if (selectedZoneObj.networktype == "Advanced") { //Advanced zone. Show network list. + var $networkStep = $(".step.network:visible .nothing-to-select"); + var $networkStepContainer = $('.step.network:visible'); + + if(args.initArgs.pluginForm != null && args.initArgs.pluginForm.name == "vpcTierInstanceWizard") { //from VPC Tier chart + step6ContainerType = 'nothing-to-select'; + $networkStep.find("#from_instance_page_1").hide(); + $networkStep.find("#from_instance_page_2").hide(); + $networkStep.find("#from_vpc_tier").text("tier " + args.context.networks[0].name); + $networkStep.find("#from_vpc_tier").show(); + } else { //from Instance page + if(selectedZoneObj.securitygroupsenabled != true) { // Advanced SG-disabled zone + step6ContainerType = 'select-network'; + $networkStep.find("#from_instance_page_1").show(); + $networkStep.find("#from_instance_page_2").show(); + $networkStep.find("#from_vpc_tier").text(""); + $networkStep.find("#from_vpc_tier").hide(); + $networkStepContainer.removeClass('next-use-security-groups'); + } else { // Advanced SG-enabled zone + step6ContainerType = 'select-advanced-sg'; + } + + if ($networkStepContainer.hasClass('next-use-security-groups')) { + $networkStepContainer.removeClass('repeat next-use-security-groups loaded'); + step6ContainerType = 'select-security-group'; + } + } + } + else { //Basic zone. Show securigy group list or nothing(when no SecurityGroup service in guest network) + var includingSecurityGroupService = false; + $.ajax({ + url: createURL("listNetworks&trafficType=Guest&zoneId=" + selectedZoneObj.id), + dataType: "json", + async: false, + success: function(json) { + //basic zone should have only one guest network returned in this API call + var items = json.listnetworksresponse.network; + if(items != null && items.length > 0) { + var networkObj = items[0]; //basic zone has only one guest network + var serviceObjArray = networkObj.service; + for(var k = 0; k < serviceObjArray.length; k++) { + if(serviceObjArray[k].name == "SecurityGroup") { + includingSecurityGroupService = true; + break; + } + } + } + } + }); + + if(includingSecurityGroupService == false || selectedHypervisor == "VMware") { + step6ContainerType = 'nothing-to-select'; + } + else { + step6ContainerType = 'select-security-group'; + } + } + + //step6ContainerType = 'nothing-to-select'; //for testing only, comment it out before checking in + if(step6ContainerType == 'select-network' || step6ContainerType == 'select-advanced-sg') { + var defaultNetworkArray = [], optionalNetworkArray = []; + var networkData = { + zoneId: args.currentData.zoneid, + canusefordeploy: true + }; + + if(selectedZoneObj.networktype == 'Advanced' && selectedZoneObj.securitygroupsenabled == true) { + $.extend(networkData, { + type: 'Shared' + }); + } + + if (!(cloudStack.context.projects && cloudStack.context.projects[0])) { + networkData.domainid = g_domainid; + networkData.account = g_account; + } + + var vpcObjs; + + //listVPCs without account/domainid/listAll parameter will return only VPCs belonging to the current login. That's what should happen in Instances page's VM Wizard. + //i.e. If the current login is root-admin, do not show VPCs belonging to regular-user/domain-admin in Instances page's VM Wizard. + $.ajax({ + url: createURL('listVPCs'), + async: false, + success: function(json) { + vpcObjs = json.listvpcsresponse.vpc ? json.listvpcsresponse.vpc : []; + } + }); + + var networkObjsToPopulate = []; + $.ajax({ + url: createURL('listNetworks'), + data: networkData, + async: false, + success: function(json) { + networkObjs = json.listnetworksresponse.network ? json.listnetworksresponse.network : []; + if(networkObjs.length > 0) { + for(var i = 0; i < networkObjs.length; i++) { + var networkObj = networkObjs[i]; + var includingSecurityGroup = false; + var serviceObjArray = networkObj.service; + for(var k = 0; k < serviceObjArray.length; k++) { + if(serviceObjArray[k].name == "SecurityGroup") { + networkObjs[i].type = networkObjs[i].type + ' (sg)'; + includingSecurityGroup = true; + break; + } + } + + if (networkObj.vpcid) { + networkObj._singleSelect = true; + } + + //for Advanced SG-enabled zone, list only SG network offerings + if(selectedZoneObj.networktype == 'Advanced' && selectedZoneObj.securitygroupsenabled == true) { + if(includingSecurityGroup == false) + continue; //skip to next network offering + } + networkObjsToPopulate.push(networkObj); + } + } + } + }); + + $.ajax({ + url: createURL("listNetworkOfferings"), + dataType: "json", + data: { + forvpc: false, + zoneid: args.currentData.zoneid, + guestiptype: 'Isolated', + supportedServices: 'SourceNat', + specifyvlan: false, + state: 'Enabled' + }, + async: false, + success: function(json) { + networkOfferingObjs = json.listnetworkofferingsresponse.networkoffering; + } + }); + //get network offerings (end) *** + + $networkStepContainer.removeClass('repeat next-use-security-groups'); + + if (step6ContainerType == 'select-advanced-sg') { + $networkStepContainer.addClass('repeat next-use-security-groups'); + + // Add guest network is disabled + $networkStepContainer.find('.select-network').addClass('no-add-network'); + } else { + $networkStepContainer.find('.select-network').removeClass('no-add-network'); + } + + args.response.success({ + type: 'select-network', + data: { + networkObjs: networkObjsToPopulate, + securityGroups: [], + networkOfferings: networkOfferingObjs, + vpcs: vpcObjs + } + }); + } + + else if(step6ContainerType == 'select-security-group') { + var securityGroupArray = []; + var data = { + domainid: g_domainid, + account: g_account + }; + + $.ajax({ + url: createURL("listSecurityGroups"), + dataType: "json", + async: false, + data: cloudStack.context.projects ? {} : data, + success: function(json) { + var items = json.listsecuritygroupsresponse.securitygroup; + if (items != null && items.length > 0) { + for (var i = 0; i < items.length; i++) { + securityGroupArray.push(items[i]); + } + } + } + }); + args.response.success({ + type: 'select-security-group', + data: { + networkObjs: [], + securityGroups: securityGroupArray, + networkOfferings: [], + vpcs: [] + } + }); + } + + else if(step6ContainerType == 'nothing-to-select') { + args.response.success({ + type: 'nothing-to-select', + data: { + networkObjs: [], + securityGroups: [], + networkOfferings: [], + vpcs: [] + } + }); + } + + }, + + // Step 7: Review + function(args) { + return false; } - - }, - - // Step 6: Review - function(args) { - return false; - } ], action: function(args) { // Create a new VM!!!! @@ -558,9 +568,25 @@ if(selectedDiskOfferingObj.iscustomized == true) array1.push("&size=" + args.data.size); } + + //step 5: select an affinity group + var checkedAffinityGroupIdArray; + if(typeof(args.data["affinity-groups"]) == "object" && args.data["affinity-groups"].length != null) { //args.data["affinity-groups"] is an array of string, e.g. ["2375f8cc-8a73-4b8d-9b26-50885a25ffe0", "27c60d2a-de7f-4bb7-96e5-a602cec681df","c6301d77-99b5-4e8a-85e2-3ea2ab31c342"], + checkedAffinityGroupIdArray = args.data["affinity-groups"]; + } + else if(typeof(args.data["affinity-groups"]) == "string" && args.data["affinity-groups"].length > 0) { //args.data["affinity-groups"] is a string, e.g. "2375f8cc-8a73-4b8d-9b26-50885a25ffe0" + checkedAffinityGroupIdArray = []; + checkedAffinityGroupIdArray.push(args.data["affinity-groups"]); + } + else { // typeof(args.data["affinity-groups"]) == null + checkedAffinityGroupIdArray = []; + } - //step 5: select network - if (step5ContainerType == 'select-network' || step5ContainerType == 'select-advanced-sg') { + if(checkedAffinityGroupIdArray.length > 0) + array1.push("&affinitygroupids=" + checkedAffinityGroupIdArray.join(",")); + + //step 6: select network + if (step6ContainerType == 'select-network' || step6ContainerType == 'select-advanced-sg') { var array2 = []; var defaultNetworkId = args.data.defaultNetwork; //args.data.defaultNetwork might be equal to string "new-network" or a network ID @@ -623,7 +649,7 @@ array1.push("&networkIds=" + array2.join(",")); } - else if (step5ContainerType == 'select-security-group') { + else if (step6ContainerType == 'select-security-group') { var checkedSecurityGroupIdArray; if(typeof(args.data["security-groups"]) == "object" && args.data["security-groups"].length != null) { //args.data["security-groups"] is an array of string, e.g. ["2375f8cc-8a73-4b8d-9b26-50885a25ffe0", "27c60d2a-de7f-4bb7-96e5-a602cec681df","c6301d77-99b5-4e8a-85e2-3ea2ab31c342"], checkedSecurityGroupIdArray = args.data["security-groups"]; @@ -638,12 +664,12 @@ if(checkedSecurityGroupIdArray.length > 0) array1.push("&securitygroupids=" + checkedSecurityGroupIdArray.join(",")); - + if(selectedZoneObj.networktype == "Advanced" && selectedZoneObj.securitygroupsenabled == true) { // Advanced SG-enabled zone var array2 = []; var myNetworks = $('.multi-wizard:visible form').data('my-networks'); //widget limitation: If using an advanced security group zone, get the guest networks like this var defaultNetworkId = $('.multi-wizard:visible form').find('input[name=defaultNetwork]:checked').val(); - + var checkedNetworkIdArray; if(typeof(myNetworks) == "object" && myNetworks.length != null) { //myNetworks is an array of string, e.g. ["203", "202"], checkedNetworkIdArray = myNetworks; @@ -671,7 +697,7 @@ array1.push("&networkIds=" + array2.join(",")); } } - else if (step5ContainerType == 'nothing-to-select') { + else if (step6ContainerType == 'nothing-to-select') { if(args.context.networks != null) { //from VPC tier array1.push("&networkIds=" + args.context.networks[0].id); array1.push("&domainid=" + args.context.vpc[0].domainid); @@ -703,30 +729,30 @@ var vmid = json.deployvirtualmachineresponse.id; args.response.success( {_custom: - {jobId: jid, - getUpdatedItem: function(json) { - var item = json.queryasyncjobresultresponse.jobresult.virtualmachine; - if (item.password != null) - alert("Password of new VM " + item.displayname + " is " + item.password); - return item; - }, - getActionFilter: function() { - return cloudStack.actionFilter.vmActionFilter; - }, - getUpdatedItemWhenAsyncJobFails: function() { - var item; - $.ajax({ - url: createURL("listVirtualMachines&id="+vmid), - dataType: "json", - async: false, - success: function(json) { - item = json.listvirtualmachinesresponse.virtualmachine[0]; - } - }); - return item; - } - } - } + {jobId: jid, + getUpdatedItem: function(json) { + var item = json.queryasyncjobresultresponse.jobresult.virtualmachine; + if (item.password != null) + alert("Password of new VM " + item.displayname + " is " + item.password); + return item; + }, + getActionFilter: function() { + return cloudStack.actionFilter.vmActionFilter; + }, + getUpdatedItemWhenAsyncJobFails: function() { + var item; + $.ajax({ + url: createURL("listVirtualMachines&id="+vmid), + dataType: "json", + async: false, + success: function(json) { + item = json.listvirtualmachinesresponse.virtualmachine[0]; + } + }); + return item; + } + } + } ); }, error: function(XMLHttpResponse) { diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 3c9696da599..64f9fb2172e 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -15,6 +15,7 @@ // specific language governing permissions and limitations // under the License. (function($, cloudStack) { + var requiresStorageMotion = false; cloudStack.sections.instances = { title: 'label.instances', id: 'instances', @@ -197,34 +198,28 @@ hostid: args.context.hosts[0].id }); } + + if("affinityGroups" in args.context) { + $.extend(data, { + affinitygroupid: args.context.affinityGroups[0].id + }); + } + if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type + $.extend(data, { + zonetype: args.context.zoneType + }); + } + $.ajax({ url: createURL('listVirtualMachines'), data: data, success: function(json) { - var items = json.listvirtualmachinesresponse.virtualmachine; - // Code for hiding "Expunged VMs" - /* if(items != null) { - var i=0; - for( i=0;i< items.length;i++){ - if(items[i].state == 'Expunging') - args.response.success ({ - - }); - else { + var items = json.listvirtualmachinesresponse.virtualmachine; args.response.success({ - actionFilter: vmActionfilter, - data: items[i] - }); - } - } - } - else {*/ - args.response.success({ actionFilter: vmActionfilter, data: items - }); - + }); } }); }, @@ -234,6 +229,7 @@ viewAll: [ { path: 'storage.volumes', label: 'label.volumes' }, { path: 'vmsnapshots', label: 'label.snapshots' }, + { path: 'affinityGroups', label: 'label.affinity.groups' }, { path: '_zone.hosts', label: 'label.hosts', @@ -437,7 +433,6 @@ poll: pollAsyncJobResult } }, - snapshot: { messages: { notification: function(args) { @@ -500,7 +495,6 @@ pool: pollAsyncJobResult } }, - destroy: { label: 'label.action.destroy.instance', compactLabel: 'label.destroy', @@ -566,7 +560,6 @@ } } }, - reset: { label: 'Reset VM', messages:{ @@ -597,8 +590,128 @@ } } - }, + }, + changeAffinity: { + label: 'Change affinity', + + action: { + custom: cloudStack.uiCustom.affinity({ + tierSelect: function(args) { + if ('vpc' in args.context) { //from VPC section + args.$tierSelect.show(); //show tier dropdown + + $.ajax({ //populate tier dropdown + url: createURL("listNetworks"), + async: false, + data: { + vpcid: args.context.vpc[0].id, + //listAll: true, //do not pass listAll to listNetworks under VPC + domainid: args.context.vpc[0].domainid, + account: args.context.vpc[0].account, + supportedservices: 'StaticNat' + }, + success: function(json) { + var networks = json.listnetworksresponse.network; + var items = [{ id: -1, description: 'Please select a tier' }]; + $(networks).each(function(){ + items.push({id: this.id, description: this.displaytext}); + }); + args.response.success({ data: items }); + } + }); + } + else { //from Guest Network section + args.$tierSelect.hide(); + } + + args.$tierSelect.change(function() { + args.$tierSelect.closest('.list-view').listView('refresh'); + }); + args.$tierSelect.closest('.list-view').listView('refresh'); + }, + + listView: { + listView: { + id: 'affinityGroups', + fields: { + name: { label: 'label.name' }, + type: { label: 'label.type' } + }, + dataProvider: function(args) { + $.ajax({ + url: createURL('listAffinityGroups'), + async: false, //make it sync to avoid dataProvider() being called twice which produces duplicate data + success: function(json) { + var items = []; + var allAffinityGroups = json.listaffinitygroupsresponse.affinitygroup; + var previouslySelectedAffinityGroups = args.context.instances[0].affinitygroup; + if(allAffinityGroups != null) { + for(var i = 0; i < allAffinityGroups.length; i++) { + var isPreviouslySelected = false; + if(previouslySelectedAffinityGroups != null) { + for(var k = 0; k < previouslySelectedAffinityGroups.length; k++) { + if(previouslySelectedAffinityGroups[k].id == allAffinityGroups[i].id) { + isPreviouslySelected = true; + break; //break for loop + } + } + } + items.push($.extend(allAffinityGroups[i], { + _isSelected: isPreviouslySelected + })); + } + } + args.response.success({data: items}); + } + }); + } + } + }, + action: function(args) { + var affinityGroupIdArray = []; + if(args.context.affinityGroups != null) { + for(var i = 0; i < args.context.affinityGroups.length; i++) { + if(args.context.affinityGroups[i]._isSelected == true) { + affinityGroupIdArray.push(args.context.affinityGroups[i].id); + } + } + } + var data = { + id: args.context.instances[0].id, + affinitygroupids: affinityGroupIdArray.join(",") + }; + $.ajax({ + url: createURL('updateVMAffinityGroup'), + data: data, + success: function(json) { + var jid = json.updatevirtualmachineresponse.jobid; + args.response.success( + {_custom: + {jobId: jid, + getUpdatedItem: function(json) { + return json.queryasyncjobresultresponse.jobresult.virtualmachine; + }, + getActionFilter: function() { + return vmActionfilter; + } + } + } + ); + } + }); + } + }) + }, + messages: { + notification: function(args) { + return 'Change affinity'; + } + }, + notification: { + poll: pollAsyncJobResult + } + }, edit: { label: 'label.edit', @@ -608,7 +721,7 @@ group: args.data.group, ostypeid: args.data.guestosid }; - + if(args.data.displayname != args.context.instances[0].displayname) { $.extend(data, { displayName: args.data.displayname @@ -958,17 +1071,31 @@ validation: { required: true }, select: function(args) { $.ajax({ - url: createURL("listHosts&VirtualMachineId=" + args.context.instances[0].id), + url: createURL("findHostsForMigration&VirtualMachineId=" + args.context.instances[0].id), //url: createURL("listHosts"), //for testing only, comment it out before checking in. dataType: "json", async: true, success: function(json) { - var hosts = json.listhostsresponse.host; + if(json.findhostsformigrationresponse.host != undefined){ + var hosts = json.findhostsformigrationresponse.host; + requiresStorageMotion = json.findhostsformigrationresponse.host[0].requiresStorageMotion; var items = []; $(hosts).each(function() { - items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")}); - }); + if(this.requiresStorageMotion == true){ + items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable, ": "Not Suitable, ") + "Storage migration required)" )}); + + } + else { + + items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")" )}); + + } + }); args.response.success({data: items}); + } + else + cloudStack.dialog.notice({ message: _l('No Hosts are avaialble for Migration') }); //Only a single host in the set up + } }); } @@ -976,7 +1103,31 @@ } }, action: function(args) { + + if(requiresStorageMotion == true){ $.ajax({ + url: createURL("migrateVirtualMachineWithVolume&hostid=" + args.data.hostId + "&virtualmachineid=" + args.context.instances[0].id), + dataType: "json", + async: true, + success: function(json) { + var jid = json.migratevirtualmachinewithvolumeresponse.jobid; + args.response.success( + {_custom: + {jobId: jid, + getUpdatedItem: function(json) { + return json.queryasyncjobresultresponse.jobresult.virtualmachine; + }, + getActionFilter: function() { + return vmActionfilter; + } + } + } + ); + } + }); + } + else{ + $.ajax({ url: createURL("migrateVirtualMachine&hostid=" + args.data.hostId + "&virtualmachineid=" + args.context.instances[0].id), dataType: "json", async: true, @@ -987,21 +1138,6 @@ {jobId: jid, getUpdatedItem: function(json) { return json.queryasyncjobresultresponse.jobresult.virtualmachine; - /* - var vmObj; - $.ajax({ - url: createURL("listVirtualMachines&id=" + args.context.instances[0].id), - dataType: "json", - async: false, - success: function(json) { - var items = json.listvirtualmachinesresponse.virtualmachine; - if(items != null && items.length > 0) { - vmObj = items[0]; - } - } - }); - return vmObj; - */ }, getActionFilter: function() { return vmActionfilter; @@ -1011,6 +1147,8 @@ ); } }); + + } }, notification: { poll: pollAsyncJobResult @@ -1080,6 +1218,75 @@ } }, + scaleUp:{ + label:'scaleUp VM', + createForm:{ + title:'Scale UP Virtual Machine', + label:'Scale UP Virtual Machine', + fields:{ + serviceOffering: { + label: 'label.compute.offering', + select: function(args) { + $.ajax({ + url: createURL("listServiceOfferings&VirtualMachineId=" + args.context.instances[0].id), + dataType: "json", + async: true, + success: function(json) { + var serviceofferings = json.listserviceofferingsresponse.serviceoffering; + var items = []; + $(serviceofferings).each(function() { + items.push({id: this.id, description: this.displaytext}); + }); + args.response.success({data: items}); + } + }); + } + } + + + } + }, + + action: function(args) { + $.ajax({ + url: createURL("scaleVirtualMachine&id=" + args.context.instances[0].id + "&serviceofferingid=" + args.data.serviceOffering), + dataType: "json", + async: true, + success: function(json) { + var jid = json.scalevirtualmachineresponse.jobid; + args.response.success( + {_custom: + {jobId: jid, + getUpdatedItem: function(json) { + return json.queryasyncjobresultresponse.jobresult.virtualmachine; + }, + getActionFilter: function() { + return vmActionfilter; + } + } + } + ); + }, + error:function(json){ + args.response.error(parseXMLHttpResponse(json)); + } + + }); + }, + messages: { + confirm: function(args) { + return 'Do you really want to scale Up your instance ?'; + }, + notification: function(args) { + return 'Instance Scaled Up'; + } + }, + notification: { + poll: pollAsyncJobResult + } + + }, + viewConsole: { label: 'label.view.console', action: { @@ -1306,10 +1513,15 @@ { name: { label: 'label.name', header: true }, networkname: {label: 'Network Name' }, - ipaddress: { label: 'label.ip.address' }, type: { label: 'label.type' }, + ipaddress: { label: 'label.ip.address' }, gateway: { label: 'label.gateway' }, netmask: { label: 'label.netmask' }, + + ip6address: { label: 'IPv6 IP Address' }, + ip6gateway: { label: 'IPv6 Gateway' }, + ip6cidr: { label: 'IPv6 CIDR' }, + isdefault: { label: 'label.is.default', converter: function(data) { @@ -1367,7 +1579,7 @@ args.response.success({data: args.context.instances[0].securitygroup}); } }, - + /** * Statistics tab */ @@ -1412,6 +1624,7 @@ allowedActions.push("destroy"); allowedActions.push("changeService"); allowedActions.push("reset"); + allowedActions.push("scaleUp"); if (isAdmin()) allowedActions.push("migrate"); @@ -1435,6 +1648,9 @@ allowedActions.push("destroy"); allowedActions.push("reset"); allowedActions.push("snapshot"); + allowedActions.push("scaleUp"); + allowedActions.push("changeAffinity"); + if(isAdmin()) allowedActions.push("migrateToAnotherStorage"); diff --git a/ui/scripts/network.js b/ui/scripts/network.js index 65be302c0c9..9ba725a8574 100755 --- a/ui/scripts/network.js +++ b/ui/scripts/network.js @@ -281,29 +281,7 @@ id: 'network', sectionSelect: { preFilter: function(args) { - var havingSecurityGroupNetwork = false; - var havingBasicZones = false; - var havingAdvancedZones = true; - - // Get zone types - $.ajax({ - url: createURL('listZones'), - async: false, - success: function(json) { - var zones = json.listzonesresponse.zone ? - json.listzonesresponse.zone : []; - var basicZones = $.grep(zones, function(zone) { - return zone.networktype == 'Basic'; - }); - var advancedZones = $.grep(zones, function(zone) { - return zone.networktype == 'Advanced'; - }); - - - havingBasicZones = basicZones.length ? true : false; - havingAdvancedZones = advancedZones.length ? true : false; - } - }); + var havingSecurityGroupNetwork = false; $.ajax({ url: createURL('listNetworks', { ignoreProject: true }), @@ -322,11 +300,10 @@ var sectionsToShow = ['networks']; - if (havingAdvancedZones) { + if(args.context.zoneType != 'Basic') { //Advanced type or all types sectionsToShow.push('vpc'); sectionsToShow.push('vpnCustomerGateway'); } - if(havingSecurityGroupNetwork == true) sectionsToShow.push('securityGroups'); @@ -343,21 +320,14 @@ title: 'label.guest.networks', listView: { actions: { - add: { + add: { //add Isolated guest network (can't add Shared guest network here) label: 'label.add.guest.network', - preFilter: function(args) { - var advSgDisabledZones; - $.ajax({ - url: createURL('listZones'), - async: false, - success: function(json) { - advSgDisabledZones = $.grep(json.listzonesresponse.zone, function(zone) { - return (zone.networktype == 'Advanced' && zone.securitygroupsenabled != true); //Isolated networks can only be created in Advanced SG-disabled zone (but not in Basic zone nor Advanced SG-enabled zone) - }); - } - }); - return (advSgDisabledZones != null && advSgDisabledZones.length > 0); + preFilter: function(args) { //Isolated networks is only supported in Advanced (SG-disabled) zone + if(args.context.zoneType != 'Basic') + return true; + else + return false; }, createForm: { @@ -923,8 +893,8 @@ hiddenTabs.push("addloadBalancer"); } - if (isVPC || isAdvancedSGZone || hasSRXFirewall) { - hiddenTabs.push('egressRules'); + if (isVPC || isAdvancedSGZone ) { + hiddenTabs.push('egressRules'); } return hiddenTabs; @@ -1061,6 +1031,11 @@ networkcidr:{label:'Network CIDR'}, + ip6gateway: { label: 'IPv6 Gateway' }, + + ip6cidr: { label: 'IPv6 CIDR' }, + + reservediprange:{label:'Reserved IP Range'}, @@ -1108,6 +1083,401 @@ } }); } + }, + + egressRules: { + title: 'label.egress.rules', + custom: function(args) { + var context = args.context; + + return $('
').multiEdit({ + context: context, + noSelect: true, + noHeaderActionsColumn: true, + fields: { + 'cidrlist': { edit: true, label: 'label.cidr.list', isOptional: true }, + 'protocol': { + label: 'label.protocol', + select: function(args) { + args.$select.change(function() { + var $inputs = args.$form.find('th, td'); + var $icmpFields = $inputs.filter(function() { + var name = $(this).attr('rel'); + + return $.inArray(name, [ + 'icmptype', + 'icmpcode' + ]) > -1; + }); + var $otherFields = $inputs.filter(function() { + var name = $(this).attr('rel'); + + return name != 'cidrlist' && + name != 'icmptype' && + name != 'icmpcode' && + name != 'protocol' && + name != 'add-rule'; + }); + + if ($(this).val() == 'icmp') { + $icmpFields.show(); + $otherFields.hide(); + } else if ($(this).val() == 'all') { + $icmpFields.hide(); + $otherFields.hide(); + } else { + $icmpFields.hide(); + $otherFields.show(); + } + }); + + args.response.success({ + data: [ + { name: 'tcp', description: 'TCP' }, + { name: 'udp', description: 'UDP' }, + { name: 'icmp', description: 'ICMP' }, + { name: 'all', description: 'All' } + ] + }); + } + }, + 'startport': { edit: true, label: 'label.start.port', isOptional: true }, + 'endport': { edit: true, label: 'label.end.port', isOptional: true }, + 'icmptype': { edit: true, label: 'ICMP.type', isHidden: true, isOptional: true }, + 'icmpcode': { edit: true, label: 'ICMP.code', isHidden: true, isOptional: true }, + 'add-rule': { + label: 'label.add', + addButton: true + } + }, + add: { + label: 'label.add', + action: function(args) { + var data = { + protocol: args.data.protocol, + cidrlist: args.data.cidrlist, + networkid: args.context.networks[0].id + }; + + if (args.data.icmptype && args.data.icmpcode) { // ICMP + $.extend(data, { + icmptype: args.data.icmptype, + icmpcode: args.data.icmpcode + }); + } else { // TCP/UDP + $.extend(data, { + startport: args.data.startport, + endport: args.data.endport + }); + } + + $.ajax({ + url: createURL('createEgressFirewallRule'), + data: data, + dataType: 'json', + async: true, + success: function(json) { + var jobId = json.createegressfirewallruleresponse.jobid; + + args.response.success({ + _custom: { + jobId: jobId + }, + notification: { + label: 'label.add.egress.rule', + poll: pollAsyncJobResult + } + }); + }, + error: function(json) { + args.response.error(parseXMLHttpResponse(json)); + } + }); + } + }, + actions: { + destroy: { + label: 'label.remove.rule', + action: function(args) { + $.ajax({ + url: createURL('deleteEgressFirewallRule'), + data: { + id: args.context.multiRule[0].id + }, + dataType: 'json', + async: true, + success: function(data) { + var jobID = data.deleteegressfirewallruleresponse.jobid; + + args.response.success({ + _custom: { + jobId: jobID + }, + notification: { + label: 'label.remove.egress.rule', + poll: pollAsyncJobResult + } + }); + }, + error: function(json) { + args.response.error(parseXMLHttpResponse(json)); + } + }); + } + } + }, + ignoreEmptyFields: true, + dataProvider: function(args) { + $.ajax({ + url: createURL('listEgressFirewallRules'), + data: { + listAll: true, + networkid: args.context.networks[0].id + }, + dataType: 'json', + async: true, + success: function(json) { + var response = json.listegressfirewallrulesresponse.firewallrule ? + json.listegressfirewallrulesresponse.firewallrule : []; + + args.response.success({ + data: $.map(response, function(rule) { + if (rule.protocol == 'all') { + $.extend(rule, { + startport: 'All', + endport: 'All' + }); + } else if (rule.protocol == 'tcp' || rule.protocol == 'udp') { + if (!rule.startport) { + rule.startport = ' '; + } + + if (!rule.endport) { + rule.endport = ' '; + } + } + + return rule; + }) + }); + } + }); + } + }); + } + }, + + addloadBalancer: { // EIP/ELB Basic zone: Add Load Balancer tab in network detailView + title: 'label.add.load.balancer', + custom: function(args) { + var context = args.context; + + return $('
').addClass('loadBalancer').multiEdit( + { + context: context, + listView: $.extend(true, {}, cloudStack.sections.instances, { + listView: { + filters: false, + + dataProvider: function(args) { + var data = { + page: args.page, + pageSize: pageSize, + domainid: g_domainid, + account: g_account, + networkid: args.context.networks[0].id, + listAll: true + }; + + $.ajax({ + url: createURL('listVirtualMachines'), + data: data, + dataType: 'json', + async: true, + success: function(data) { + args.response.success({ + data: $.grep( + data.listvirtualmachinesresponse.virtualmachine ? + data.listvirtualmachinesresponse.virtualmachine : [], + function(instance) { + var nonAutoScale=0; + if(instance.displayname == null) + nonAutoScale = 1; + else{ + if( instance.displayname.match(/AutoScale-LB-/)==null) + nonAutoScale =1; + else { + if(instance.displayname.match(/AutoScale-LB-/).length) + nonAutoScale =0; + } + } + var isActiveState= $.inArray(instance.state, ['Destroyed','Expunging']) == -1; + return nonAutoScale && isActiveState; + } + ) + }); + }, + error: function(data) { + args.response.error(parseXMLHttpResponse(data)); + } + }); + } + } + }), + multipleAdd: true, + fields: { + 'name': { edit: true, label: 'label.name' }, + 'publicport': { edit: true, label: 'label.public.port' }, + 'privateport': { edit: true, label: 'label.private.port' }, + 'algorithm': { + label: 'label.algorithm', + select: function(args) { + args.response.success({ + data: [ + { name: 'roundrobin', description: _l('label.round.robin') }, + { name: 'leastconn', description: _l('label.least.connections') }, + { name: 'source', description: _l('label.source') } + ] + }); + } + }, + 'sticky': { + label: 'label.stickiness', + custom: { + buttonLabel: 'label.configure', + action: cloudStack.lbStickyPolicy.dialog() + } + }, + 'autoScale': { + label: 'AutoScale', + custom: { + requireValidation: true, + buttonLabel: 'label.configure', + action: cloudStack.uiCustom.autoscaler(cloudStack.autoscaler) + } + }, + 'add-vm': { + label: 'label.add.vms', + addButton: true + } + }, + + add: { //basic zone - elastic IP - Add Load Balancer tab - Add VMs button + label: 'label.add.vms', + action: function(args) { + var data = { + algorithm: args.data.algorithm, + name: args.data.name, + privateport: args.data.privateport, + publicport: args.data.publicport, + openfirewall: false, + domainid: g_domainid, + account: g_account + }; + + if('vpc' in args.context) { //from VPC section + if(args.data.tier == null) { + args.response.error('Tier is required'); + return; + } + $.extend(data, { + networkid: args.data.tier + }); + } + else { //from Guest Network section + $.extend(data, { + networkid: args.context.networks[0].id + }); + } + + var stickyData = $.extend(true, {}, args.data.sticky); + + $.ajax({ + url: createURL('createLoadBalancerRule'), + data: data, + dataType: 'json', + async: true, + success: function(data) { + var itemData = args.itemData; + //var jobID = data.createloadbalancerruleresponse.jobid; //CS-16964: use jobid from assignToLoadBalancerRule instead of createLoadBalancerRule + + $.ajax({ + url: createURL('assignToLoadBalancerRule'), + data: { + id: data.createloadbalancerruleresponse.id, + virtualmachineids: $.map(itemData, function(elem) { + return elem.id; + }).join(',') + }, + dataType: 'json', + async: true, + success: function(data) { + var jobID = data.assigntoloadbalancerruleresponse.jobid; //CS-16964: use jobid from assignToLoadBalancerRule instead of createLoadBalancerRule + var lbCreationComplete = false; + + args.response.success({ + _custom: { + jobId: jobID + }, + notification: { + label: 'label.add.load.balancer', + poll: function(args) { + var complete = args.complete; + var error = args.error; + + pollAsyncJobResult({ + _custom: args._custom, + complete: function(args) { + if (lbCreationComplete) { + return; + } + + lbCreationComplete = true; + cloudStack.dialog.notice({ + message: _l('message.add.load.balancer.under.ip') + + args.data.loadbalancer.publicip + }); + + if (stickyData && + stickyData.methodname && + stickyData.methodname != 'None') { + cloudStack.lbStickyPolicy.actions.add( + args.data.loadbalancer.id, + stickyData, + complete, // Complete + complete // Error + ); + } else { + complete(); + } + }, + error: error + }); + } + } + }); + }, + error: function(data) { + args.response.error(parseXMLHttpResponse(data)); + } + }); + }, + error: function(data) { + args.response.error(parseXMLHttpResponse(data)); + } + }); + } + }, + + + dataProvider: function(args) { + args.response.success({ //no LB listing in AddLoadBalancer tab + data: [] + }); + } + } + ); + } } } } @@ -1159,7 +1529,9 @@ data.queryasyncjobresultresponse.jobresult.nicsecondaryip, { zoneid: args.context.instances[0].zoneid, - virtualmachinedisplayname: args.context.instances[0].displayname + virtualmachinedisplayname: args.context.instances[0].displayname ? + args.context.instances[0].displayname : + args.context.instances[0].name } ); }, @@ -1186,13 +1558,15 @@ virtualmachineid: args.context.instances[0].id }, success: function(json) { - var ips = json.listnics.nic ? json.listnics.nic[0].secondaryip : []; + var ips = json.listnicsresponse.nic ? json.listnicsresponse.nic[0].secondaryip : []; args.response.success({ data: $(ips).map(function(index, ip) { return $.extend(ip, { zoneid: args.context.instances[0].zoneid, - virtualmachinedisplayname: args.context.instances[0].displayname + virtualmachinedisplayname: args.context.instances[0].displayname ? + args.context.instances[0].displayname : + args.context.instances[0].name }); }) }); @@ -1252,7 +1626,7 @@ virtualmachineid: args.context.instances[0].id }, success: function(json) { - var ips = json.listnics.nic[0].secondaryip + var ips = json.listnicsresponse.nic[0].secondaryip args.response.success({ data: $.grep($(ips).map(function(index, ip) { @@ -2783,6 +3157,7 @@ } } }, + itemActions: { add: { label: 'label.add.vms.to.lb', @@ -2943,7 +3318,7 @@ }); $.extend(item, { - _itemName: 'displayname', + _itemName: 'name', _itemData: lbInstances, _maxLength: { name: 7 diff --git a/ui/scripts/plugins.js b/ui/scripts/plugins.js index 5a33d56ef9f..122f4a03491 100644 --- a/ui/scripts/plugins.js +++ b/ui/scripts/plugins.js @@ -15,6 +15,10 @@ // specific language governing permissions and limitations // under the License. (function($, cloudStack, require) { + if (!cloudStack.pluginAPI) { + cloudStack.pluginAPI = {}; + } + var loadCSS = function(path) { var $link = $(''); @@ -27,50 +31,69 @@ $('head').append($link); }; - var pluginAPI = { - pollAsyncJob: pollAsyncJobResult, - apiCall: function(command, args) { - $.ajax({ - url: createURL(command), - data: args.data, - success: args.success, - error: function(json) { - args.error(parseXMLHttpResponse(json)); - } - }) - }, - addSection: function(section) { - cloudStack.sections[section.id] = $.extend(section, { - customIcon: 'plugins/' + section.id + '/icon.png' - }); - }, - extend: function(obj) { - $.extend(true, cloudStack, obj); + $.extend(cloudStack.pluginAPI, { + ui: { + pollAsyncJob: pollAsyncJobResult, + apiCall: function(command, args) { + $.ajax({ + url: createURL(command), + data: args.data, + success: args.success, + error: function(json) { + args.error(parseXMLHttpResponse(json)); + } + }); + }, + addSection: function(section) { + cloudStack.sections[section.id] = $.extend(section, { + customIcon: 'plugins/' + section.id + '/icon.png' + }); + }, + extend: function(obj) { + $.extend(true, cloudStack, obj); + } } - }; + }); cloudStack.sections.plugins = { title: 'label.plugins', - show: cloudStack.uiCustom.plugins + show: cloudStack.uiCustom.pluginListing }; - // Load plugins - $(cloudStack.plugins).map(function(index, pluginID) { - var basePath = 'plugins/' + pluginID + '/'; - var pluginJS = basePath + pluginID + '.js'; - var configJS = basePath + 'config.js'; - var pluginCSS = basePath + pluginID + '.css'; + // Load + $(['modules', 'plugins']).each(function() { + var type = this; + var paths = $(cloudStack[type]).map(function(index, id) { + return type + '/' + id + '/' + id; + }).toArray(); - require([pluginJS], function() { - require([configJS]); - loadCSS(pluginCSS); + // Load modules + require( + paths, + function() { + $(cloudStack[type]).map(function(index, id) { + var basePath = type + '/' + id + '/'; + var css = basePath + id + '.css'; + var configJS = type == 'plugins' ? basePath + 'config' : null; - // Execute plugin - cloudStack.plugins[pluginID]({ - ui: pluginAPI - }); - }); + if (configJS) { + // Load config metadata + require([configJS]); + } - // Load CSS + // Execute module + cloudStack[type][id]( + $.extend(true, {}, cloudStack.pluginAPI, { + pluginAPI: { + extend: function(api) { + cloudStack.pluginAPI[id] = api; + } + } + }) + ); + loadCSS(css); + }); + } + ); }); }(jQuery, cloudStack, require)); diff --git a/ui/scripts/regions.js b/ui/scripts/regions.js index 0aaece009f7..334eb267bd8 100644 --- a/ui/scripts/regions.js +++ b/ui/scripts/regions.js @@ -55,6 +55,12 @@ actions: { add: { label: 'label.add.region', + preFilter: function(args) { + if(isAdmin()) + return true; + else + return false; + }, messages: { notification: function() { return 'label.add.region'; } }, @@ -98,10 +104,9 @@ $.ajax({ url: createURL('listRegions&listAll=true'), success: function(json) { - var regions = json.listregionsresponse.region - - args.response.success({ - data: regions ? regions : [] + var items = json.listregionsresponse.region; + args.response.success({ + data: items }); }, error: function(json) { @@ -193,6 +198,7 @@ var region = json.listregionsresponse.region args.response.success({ + actionFilter: regionActionfilter, data: region ? region[0] : {} }); }, @@ -214,8 +220,143 @@ id: 'GSLB', label: 'GSLB', fields: { - name: { label: 'label.name' } + name: { label: 'label.name' }, + gslbdomainname: { label: 'GSLB Domain Name' }, + gslblbmethod: { label: 'Algorithm' } + }, + actions: { + add: { + label: 'Add GSLB', + + messages: { + confirm: function(args) { + return 'Add GSLB'; + }, + notification: function(args) { + return 'Add GSLB'; + } + }, + + createForm: { + title: 'Add GSLB', + fields: { + name: { + label: 'label.name', + validation: { required: true } + }, + description: { + label: 'label.description' + }, + gslbdomainname: { + label: 'GSLB Domain Name', + validation: { required: true } + }, + gslblbmethod: { + label: 'Algorithm', + select: function(args) { + var array1 = [{id: 'roundrobin', description: 'roundrobin'}, {id: 'leastconn', description: 'leastconn'}, {id: 'proximity', description: 'proximity'}]; + args.response.success({ + data: array1 + }); + } + }, + gslbservicetype: { + label: 'Service Type', + select: function(args) { + var array1 = [{id: 'tcp', description: 'tcp'}, {id: 'udp', description: 'udp'}]; + args.response.success({ + data: array1 + }); + }, + validation: { required: true } + }, + domainid: { + label: 'Domain', + select: function(args) { + if(isAdmin() || isDomainAdmin()) { + $.ajax({ + url: createURL('listDomains'), + data: { + listAll: true, + details: 'min' + }, + success: function(json) { + var array1 = [{id: '', description: ''}]; + var domains = json.listdomainsresponse.domain; + if(domains != null && domains.length > 0) { + for(var i = 0; i < domains.length; i++) { + array1.push({id: domains[i].id, description: domains[i].path}); + } + } + args.response.success({ + data: array1 + }); + } + }); + } + else { + args.response.success({ + data: null + }); + } + }, + isHidden: function(args) { + if(isAdmin() || isDomainAdmin()) + return false; + else + return true; + } + }, + account: { + label: 'Account', + isHidden: function(args) { + if(isAdmin() || isDomainAdmin()) + return false; + else + return true; + } + } + } + }, + action: function(args) { + var data = { + name: args.data.name, + regionid: args.context.regions[0].id, + gslblbmethod: args.data.gslblbmethod, + gslbstickysessionmethodname: 'sourceip', + gslbdomainname: args.data.gslbdomainname, + gslbservicetype: args.data.gslbservicetype + }; + if(args.data.description != null && args.data.description.length > 0) + $.extend(data, { description: args.data.description }); + if(args.data.domainid != null && args.data.domainid.length > 0) + $.extend(data, { domainid: args.data.domainid }); + if(args.data.account != null && args.data.account.length > 0) + $.extend(data, { account: args.data.account }); + + $.ajax({ + url: createURL('createGlobalLoadBalancerRule'), + data: data, + success: function(json) { + var jid = json.creategloballoadbalancerruleresponse.jobid; + args.response.success( + {_custom: + {jobId: jid, + getUpdatedItem: function(json) { + return json.queryasyncjobresultresponse.jobresult.globalloadbalancer; + } + } + } + ); + } + }); + }, + notification: { + poll: pollAsyncJobResult + } + } }, + dataProvider: function(args) { if('regions' in args.context) { var data = { @@ -224,8 +365,7 @@ $.ajax({ url: createURL('listGlobalLoadBalancerRules'), data: data, - success: function(json) { - debugger; + success: function(json) { var items = json.listgloballoadbalancerrulesresponse.globalloadbalancerrule; args.response.success({ data: items @@ -238,9 +378,261 @@ data: null }); } - } + }, + + detailView: { + name: 'GSLB details', + viewAll: { path: 'regions.lbUnderGSLB', label: 'assigned load balancing' }, + actions: { + remove: { + label: 'delete GSLB', + messages: { + confirm: function(args) { + return 'Please confirm you want to delete this GSLB'; + }, + notification: function(args) { + return 'delete GSLB'; + } + }, + action: function(args) { + var data = { + id: args.context.GSLB[0].id + }; + $.ajax({ + url: createURL("deleteGlobalLoadBalancerRule"), + data: data, + success: function(json) { + var jid = json.deletegloballoadbalancerruleresponse.jobid; + args.response.success({ + _custom: { + jobId: jid + } + }); + } + }); + }, + notification: { + poll: pollAsyncJobResult + } + } + }, + tabs: { + details: { + title: 'label.details', + fields: [ + { + name: { label: 'label.name' } + }, + { + description: { label: 'label.description' }, + gslbdomainname: { label: 'GSLB Domain Name' }, + gslblbmethod: { label: 'Algorithm' }, + gslbservicetype: { label: 'Service Type' }, + id: { label: 'ID' } + } + ], + dataProvider: function(args) { + var data = { + id: args.context.GSLB[0].id + }; + $.ajax({ + url: createURL('listGlobalLoadBalancerRules'), + data: data, + success: function(json) { + var item = json.listgloballoadbalancerrulesresponse.globalloadbalancerrule[0]; + args.response.success({ + data: item + }); + } + }); + } + } + } + } } - } + }, + + lbUnderGSLB: { + id: 'lbUnderGSLB', + type: 'select', + title: 'assigned load balancing', + listView: { + section: 'lbUnderGSLB', + id: 'lbUnderGSLB', + label: 'assigned load balancing', + fields: { + 'name': { label: 'label.name' }, + publicport: { label: 'label.public.port' }, + privateport: { label: 'label.private.port' }, + algorithm: { label: 'label.algorithm' } + }, + dataProvider: function(args) { + var items = args.context.GSLB[0].loadbalancerrule; + args.response.success({ + data: items + }); + }, + actions: { + add: { + label: 'assign more load balancing', + messages: { + notification: function(args) { + return 'assign more load balancing'; + } + }, + createForm: { + title: 'assign more load balancing', + fields: { + loadbalancerrule: { + label: 'load balancing rule', + select: function(args) { + var data = { + globalloadbalancerruleid: args.context.GSLB[0].id, + listAll: true + }; + $.ajax({ + url: createURL('listLoadBalancerRules'), + data: data, + success: function(json) { + var allLbRules = json.listloadbalancerrulesresponse.loadbalancerrule; + var assignedLbRules = args.context.GSLB[0].loadbalancerrule; + var items = []; + if(allLbRules != null) { + for(var i = 0; i < allLbRules.length; i++) { + var isAssigned = false; + if(assignedLbRules != null) { + for(var k = 0; k < assignedLbRules.length; k++) { + if(allLbRules[i].id == assignedLbRules[k].id) { + isAssigned = true; + break; + } + } + } + if(isAssigned == false) { + items.push(allLbRules[i]); + } + } + } + args.response.success({ + data: items, + descriptionField: 'name' + }); + } + }); + } + } + } + }, + action: function(args) { + var data = { + id: args.context.GSLB[0].id, + loadbalancerrulelist: args.data.loadbalancerrule + }; + $.ajax({ + url: createURL('assignToGlobalLoadBalancerRule'), + data: data, + success: function(json) { + var jid = json.assigntogloballoadbalancerruleresponse.jobid; + args.response.success( + {_custom: + {jobId: jid, + getUpdatedItem: function(json) { + return json.queryasyncjobresultresponse.jobresult.loadbalancerrule; + } + } + } + ); + } + }); + }, + notification: { + poll: pollAsyncJobResult + } + } + }, + + detailView: { + name: 'load balancing details', + actions: { + remove: { + label: 'remove load balancing from this GSLB', + messages: { + notification: function() { + return 'remove load balancing from GSLB'; + }, + confirm: function() { + return 'Please confirm you want to remove load balancing from GSLB'; + } + }, + action: function(args) { + $.ajax({ + url: createURL('removeFromGlobalLoadBalancerRule'), + data: { + id: args.context.lbUnderGSLB[0].id + }, + success: function(json) { + var jid = json.removefromloadbalancerruleresponse.jobid; + args.response.success({ + _custom: { + jobId: jid + } + }); + } + }); + }, + notification: { + poll: pollAsyncJobResult + } + } + }, + tabs: { + details: { + title: 'label.details', + fields: [ + { + name: { label: 'label.name' } + }, + { + publicport: { label: 'label.public.port' }, + privateport: { label: 'label.private.port' }, + algorithm: { label: 'label.algorithm' }, + publicip: { label: 'label.public.ip' }, + state: { label: 'label.state' }, + id: { label: 'label.id' }, + cidrlist: { label: 'label.cidr' }, + domain: { label: 'label.domain' }, + account: { label: 'label.account' } + } + ], + dataProvider: function(args) { + $.ajax({ + url: createURL('listLoadBalancerRules'), + data: { + id: args.context.lbUnderGSLB[0].id + }, + success: function(json) { + var item = json.listloadbalancerrulesresponse.loadbalancerrule[0]; + args.response.success({ + data: item + }); + } + }); + } + } + } + } + } + } } }; + + var regionActionfilter = function(args) { + var allowedActions = []; + if(isAdmin()) { + allowedActions.push("edit"); + allowedActions.push("remove"); + } + return allowedActions; + } + })(cloudStack); diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js index dbcb781a6fa..74675314040 100644 --- a/ui/scripts/sharedFunctions.js +++ b/ui/scripts/sharedFunctions.js @@ -20,7 +20,7 @@ var g_role = null; // roles - root, domain-admin, ro-admin, user var g_username = null; var g_account = null; var g_domainid = null; -var g_regionUrlParam = null; +var g_loginCmdText = null; var g_enableLogging = false; var g_timezoneoffset = null; var g_timezone = null; @@ -325,7 +325,8 @@ cloudStack.converters = { if(g_timezoneoffset != null) localDate = disconnected.getTimePlusTimezoneOffset(g_timezoneoffset); else - localDate = disconnected.getTimePlusTimezoneOffset(0); + localDate = disconnected.toUTCString(); + // localDate = disconnected.getTimePlusTimezoneOffset(0); } return localDate; }, @@ -425,6 +426,31 @@ cloudStack.converters = { case 26 : return "Resource Limit Exceeded"; } }, + + toCapacityCountType:function(capacityCode){ + switch(capacityCode){ + case 0 : return _l('label.memory'); + case 1 : return _l('label.cpu'); + case 2 : return _l('label.storage'); + case 3 : return _l('label.primary.storage'); + case 4 : return _l('label.public.ips'); + case 5 : return _l('label.management.ips'); + case 6 : return _l('label.secondary.storage'); + case 7 : return _l('label.vlan'); + case 8 : return _l('label.direct.ips'); + case 9 : return _l('label.local.storage'); + case 10 : return "Routing Host"; + case 11 : return "Storage"; + case 12 : return "Usage Server"; + case 13 : return "Management Server"; + case 14 : return "Domain Router"; + case 15 : return "Console Proxy"; + case 16 : return "User VM"; + case 17 : return "VLAN"; + case 18 : return "Secondary Storage VM"; + } + }, + convertByType: function(alertCode, value) { switch(alertCode) { case 0: return cloudStack.converters.convertBytes(value); diff --git a/ui/scripts/storage.js b/ui/scripts/storage.js index 54605e266ae..9b66083d4e6 100644 --- a/ui/scripts/storage.js +++ b/ui/scripts/storage.js @@ -88,9 +88,22 @@ url: createURL("listZones&available=true"), dataType: "json", async: true, - success: function(json) { - var items = json.listzonesresponse.zone; - args.response.success({descriptionField: 'name', data: items}); + success: function(json) { + var zoneObjs; + 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({descriptionField: 'name', data: zoneObjs}); } }); } @@ -208,16 +221,29 @@ availabilityZone: { label: 'label.availability.zone', docID: 'helpUploadVolumeZone', - select: function(args) { - $.ajax({ + select: function(args) { + $.ajax({ url: createURL("listZones&available=true"), dataType: "json", async: true, - success: function(json) { - var items = json.listzonesresponse.zone; - args.response.success({descriptionField: 'name', data: items}); + success: function(json) { + var zoneObjs; + 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({descriptionField: 'name', data: zoneObjs}); } - }); + }); } }, format: { @@ -372,12 +398,18 @@ if(args.context != null) { if("instances" in args.context) { - $.extend(data, { - virtualMachineId: args.context.instances[0].id - }); + $.extend(data, { + virtualMachineId: args.context.instances[0].id + }); } } + if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type + $.extend(data, { + zonetype: args.context.zoneType + }); + } + $.ajax({ url: createURL('listVolumes'), data: data, @@ -395,6 +427,69 @@ name: 'Volume details', viewAll: { path: 'storage.snapshots', label: 'label.snapshots' }, actions: { + + migrateVolume:{ + label:'Migrate Volume', + messages: { + confirm: function(args) { + return 'Do you want to migrate this volume ?' ; + }, + notification: function(args) { + return 'Volume migrated'; + } + }, + + createForm: { + title: 'Migrate Volume', + desc: '', + fields: { + storagePool: { + label: 'Storage Pool', + validation: { required: true }, + select: function(args) { + $.ajax({ + url: createURL("findStoragePoolsForMigration&id=" + args.context.volumes[0].id), + dataType: "json", + async: true, + success: function(json) { + var pools = json.findstoragepoolsformigrationresponse.storagepool; + var items = []; + $(pools).each(function() { + items.push({id: this.id, description: this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable")+")" }); + }); + args.response.success({data: items}); + + } + }); + } + } + } + + }, + + action: function(args) { + $.ajax({ + url: createURL("migrateVolume&livemigrate=true&storageid=" + args.data.storagePool + "&volumeid=" + args.context.volumes[0].id ), + dataType: "json", + async: true, + success: function(json) { + var jid = json.migratevolumeresponse.jobid; + args.response.success( + {_custom: + { + jobId: jid + } + } + ); + } + }); + }, + notification: { + poll: pollAsyncJobResult + } + + }, + takeSnapshot: { label: 'label.action.take.snapshot', messages: { @@ -1538,6 +1633,7 @@ var jsonObj = args.context.item; var allowedActions = []; + if (jsonObj.state == 'Destroyed' || jsonObj.state == 'Migrating' || jsonObj.state == 'Uploading') { return []; } @@ -1557,6 +1653,13 @@ allowedActions.push("downloadVolume"); } } + + if(jsonObj.type == "ROOT" || jsonObj.type =="DATADISK"){ + if(jsonObj.state == "Ready" && isAdmin() && jsonObj.virtualmachineid != null ){ + allowedActions.push("migrateVolume"); + } + } + if(jsonObj.state != "Creating") { if(jsonObj.type == "ROOT") { if (jsonObj.vmstate == "Stopped") { diff --git a/ui/scripts/system.js b/ui/scripts/system.js index 62b4c76932a..4692b61ad88 100644 --- a/ui/scripts/system.js +++ b/ui/scripts/system.js @@ -184,9 +184,16 @@ dashboard: { dataProvider: function(args) { var dataFns = { - zoneCount: function(data) { + zoneCount: function(data) { + var data = {}; + if(cloudStack.context.zoneType != null && cloudStack.context.zoneType.length > 0) { //Basic type or Advanced type + $.extend(data, { + networktype: cloudStack.context.zoneType + }); + } $.ajax({ url: createURL('listZones'), + data: data, success: function(json) { dataFns.podCount($.extend(data, { zoneCount: json.listzonesresponse.count ? @@ -258,24 +265,15 @@ primaryStorageCount: function(data) { $.ajax({ url: createURL('listStoragePools'), - data: { - page: 1, - pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property. - }, + data: { + page: 1, + pagesize: 1 //specifying pagesize as 1 because we don't need any embedded objects to be returned here. The only thing we need from API response is "count" property. + }, success: function(json) { - dataFns.secondaryStorageCount($.extend(data, { + dataFns.secondaryStorageCount($.extend(data, { primaryStorageCount: json.liststoragepoolsresponse.count ? json.liststoragepoolsresponse.count : 0 - })); - - //comment the 4 lines above and uncomment the following 4 lines if listHosts API still responds slowly. - - /* - dataFns.systemVmCount($.extend(data, { - primaryStorageCount: json.liststoragepoolsresponse.count ? - json.liststoragepoolsresponse.count : 0 - })); - */ + })); } }); }, @@ -565,6 +563,14 @@ }); } }, + actionPreFilter: function(args) { + var actionsToShow = ['destroy']; + if(args.context.multiRule[0].domain == 'ROOT' && args.context.multiRule[0].account.account == 'system') + actionsToShow.push('addAccount'); + else + actionsToShow.push('releaseFromAccount'); + return actionsToShow; + }, actions: { destroy: { label: 'label.remove.ip.range', @@ -588,7 +594,87 @@ } }); } - } + }, + + releaseFromAccount: { + label: 'Release from Account', + action: function(args) { + $.ajax({ + url: createURL('releasePublicIpRange'), + data: { + id: args.context.multiRule[0].id + }, + success: function(json) { + args.response.success({ + notification: { + label: 'release from account', + poll: function(args) { + args.complete(); + } + } + }); + }, + error: function(json) { + args.response.error(parseXMLHttpResponse(json)); + } + }); + } + }, + + addAccount: { + label: 'Add Account', + createForm: { + title: 'Add Account', + fields: { + account: { label: 'Account' }, + domainid: { + label: 'Domain', + select: function(args) { + $.ajax({ + url: createURL('listDomains'), + data: { listAll: true }, + success: function(json) { + args.response.success({ + data: $.map(json.listdomainsresponse.domain, function(domain) { + return { + id: domain.id, + description: domain.path + }; + }) + }); + } + }); + } + } + } + }, + action: function(args) { + var data = { + id: args.context.multiRule[0].id, + zoneid: args.context.multiRule[0].zoneid, + domainid: args.data.domainid, + account: args.data.account + }; + $.ajax({ + url: createURL('dedicatePublicIpRange'), + data: data, + success: function(json) { + args.response.success({ + notification: { + label: 'Add Account', + poll: function(args) { + args.complete(); + } + } + }); + }, + error: function(json) { + args.response.error(parseXMLHttpResponse(json)); + } + }); + } + } + }, dataProvider: function(args) { $.ajax({ @@ -898,7 +984,113 @@ }); }, notification: { poll: pollAsyncJobResult } - } + }, + + addVlanRange:{ + label:'Add VLAN Range', + title:'Add VLAN Range', + + messages: { + confirm: function(args) { + return 'Are you sure you want to add another VLAN Range to this guest network?'; + }, + notification: function(args) { + return 'VLAN Range added'; + } + }, + + createForm:{ + title:'Add VLAN Range', + fields:{ + startvlan: {label:'Vlan Start', validation:{required:true}}, + endvlan:{label:'Vlan End', validation:{required:true}} + } + + }, + + action:function(args){ + + var array1=[]; + if(args.data.startvlan != "" && args.data.endvlan != ""){ + array1.push("&vlan=" + todb(args.data.startvlan) + "-" + todb(args.data.endvlan)); + + } + $.ajax({ + url: createURL("updatePhysicalNetwork&id=" + selectedPhysicalNetworkObj.id + array1.join("")), + dataType: "json", + success: function(json) { + var jobId = json.updatephysicalnetworkresponse.jobid; + + var trafficType = getTrafficType(selectedPhysicalNetworkObj, 'Guest'); + + updateTrafficLabels(trafficType, args.data, function() { + args.response.success({ _custom: { jobId: jobId }}); + }); + }, + + error:function(json){ + args.response.error(parseXMLHttpResponse(json)); + + } + + }); + + + }, + notification:{poll:pollAsyncJobResult} + + + }, + + removeVlanRange:{ + label:'Remove VLAN Range', + messages: { + confirm: function(args) { + return 'Are you sure you want to remove an existing VLAN Range from this guest network?'; + }, + notification: function(args) { + return 'VLAN Range removed'; + } + }, + + createForm:{ + title:'Remove VLAN Range', + fields:{ + startvlan: {label:'Vlan Start', validation:{required:true}}, + endvlan:{label:'Vlan End', validation:{required:true}} + } + + }, + + action:function(args){ + + var array1=[]; + if(args.data.startvlan != "" && args.data.endvlan != ""){ + array1.push("&removevlan=" + args.data.startvlan + "-" + args.data.endvlan); + } + $.ajax({ + url: createURL("updatePhysicalNetwork&id=" + selectedPhysicalNetworkObj.id + array1.join("")), + dataType: "json", + success: function(json) { + var jobId = json.updatephysicalnetworkresponse.jobid; + var trafficType = getTrafficType(selectedPhysicalNetworkObj, 'Guest'); + updateTrafficLabels(trafficType, args.data, function() { + args.response.success({ _custom: { jobId: jobId }}); + }); + }, + + error:function(json){ + args.response.error(parseXMLHttpResponse(json)); + + } + + }); + + }, + notification:{poll:pollAsyncJobResult} + + } + }, tabFilter: function(args) { @@ -916,23 +1108,24 @@ preFilter: function(args) { var hiddenFields = []; if(selectedZoneObj.networktype == "Basic") { - hiddenFields.push("startVlan"); - hiddenFields.push("endVlan"); + hiddenFields.push("vlan"); + // hiddenFields.push("endVlan"); } return hiddenFields; }, fields: [ { //updatePhysicalNetwork API state: { label: 'label.state' }, - startVlan: { - label: 'label.start.vlan', + vlan: { + label: 'VLAN Range(s)', isEditable: true }, - endVlan: { + /* endVlan: { label: 'label.end.vlan', isEditable: true - }, - tags: { label: 'Tags', isEditable: true }, + },*/ + + tags: { label: 'Tags', isEditable: true }, broadcastdomainrange: { label: 'label.broadcast.domain.range' } }, { //updateTrafficType API @@ -954,9 +1147,9 @@ success: function(json) { selectedPhysicalNetworkObj = json.listphysicalnetworksresponse.physicalnetwork[0]; - var startVlan, endVlan; + // var startVlan, endVlan; var vlan = selectedPhysicalNetworkObj.vlan; - if(vlan != null && vlan.length > 0) { + /* if(vlan != null && vlan.length > 0) { if(vlan.indexOf("-") != -1) { var vlanArray = vlan.split("-"); startVlan = vlanArray[0]; @@ -967,7 +1160,7 @@ } selectedPhysicalNetworkObj["startVlan"] = startVlan; selectedPhysicalNetworkObj["endVlan"] = endVlan; - } + }*/ //traffic type var xentrafficlabel, kvmtrafficlabel, vmwaretrafficlabel; @@ -980,7 +1173,7 @@ args.response.success({ actionFilter: function() { - var allowedActions = ['edit']; + var allowedActions = ['edit' , 'addVlanRange','removeVlanRange']; return allowedActions; }, data: selectedPhysicalNetworkObj @@ -2270,15 +2463,13 @@ select: function(args) { $.ajax({ url: createURL("listHosts&VirtualMachineId=" + args.context.routers[0].id), - //url: createURL("listHosts"), //for testing only, comment it out before checking in. dataType: "json", async: true, success: function(json) { var hostObjs = json.listhostsresponse.host; var items = []; $(hostObjs).each(function() { - //items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); //listHosts API no longer returns hasEnoughCapacity proprety - items.push({id: this.id, description: this.name}); + items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")}); }); args.response.success({data: items}); } @@ -2846,15 +3037,13 @@ select: function(args) { $.ajax({ url: createURL("listHosts&VirtualMachineId=" + args.context.routers[0].id), - //url: createURL("listHosts"), //for testing only, comment it out before checking in. dataType: "json", async: true, success: function(json) { var hostObjs = json.listhostsresponse.host; var items = []; $(hostObjs).each(function() { - //items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); //listHosts API no longer returns hasEnoughCapacity proprety - items.push({id: this.id, description: this.name}); + items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")}); }); args.response.success({data: items}); } @@ -3124,6 +3313,19 @@ label: 'label.private.interface', docID: 'helpNetScalerPrivateInterface' }, + + gslbprovider: { + label: 'GSLB service', + isBoolean: true, + isChecked: true + }, + gslbproviderpublicip: { + label: 'GSLB service Public IP' + }, + gslbproviderprivateip: { + label: 'GSLB service Private IP' + }, + numretries: { label: 'label.numretries', defaultValue: '2', @@ -4470,6 +4672,10 @@ } } + if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type + array1.push("&networktype=" + args.context.zoneType); + } + $.ajax({ url: createURL("listZones&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), dataType: "json", @@ -4744,14 +4950,16 @@ var array1 = []; array1.push("&name=" +todb(args.data.name)); array1.push("&dns1=" + todb(args.data.dns1)); - array1.push("&dns2=" + todb(args.data.dns2)); //dns2 can be empty ("") when passed to API + array1.push("&dns2=" + todb(args.data.dns2)); //dns2 can be empty ("") when passed to API, so a user gets to update this field from an existing value to blank. + array1.push("&ip6dns1=" + todb(args.data.ip6dns1)); //p6dns1 can be empty ("") when passed to API, so a user gets to update this field from an existing value to blank. + array1.push("&ip6dns2=" + todb(args.data.ip6dns2)); //ip6dns2 can be empty ("") when passed to API, so a user gets to update this field from an existing value to blank. if (selectedZoneObj.networktype == "Advanced" && args.data.guestcidraddress) { array1.push("&guestcidraddress=" + todb(args.data.guestcidraddress)); } array1.push("&internaldns1=" + todb(args.data.internaldns1)); - array1.push("&internaldns2=" + todb(args.data.internaldns2)); //internaldns2 can be empty ("") when passed to API + array1.push("&internaldns2=" + todb(args.data.internaldns2)); //internaldns2 can be empty ("") when passed to API, so a user gets to update this field from an existing value to blank. array1.push("&domain=" + todb(args.data.domain)); array1.push("&localstorageenabled=" + (args.data.localstorageenabled == 'on')); $.ajax({ @@ -4789,6 +4997,8 @@ allocationstate: { label: 'label.allocation.state' }, dns1: { label: 'label.dns.1', isEditable: true, validation: { required: true } }, dns2: { label: 'label.dns.2', isEditable: true }, + ip6dns1: { label: 'IPv6 DNS1', isEditable: true }, + ip6dns2: { label: 'IPv6 DNS2', isEditable: true }, internaldns1: { label: 'label.internal.dns.1', isEditable: true, validation: { required: true } }, internaldns2: { label: 'label.internal.dns.2', isEditable: true }, domainname: { label: 'label.domain' }, @@ -4801,8 +5011,8 @@ localstorageenabled: { label: 'label.local.storage.enabled', isBoolean: true, - isEditable: true, - converter:cloudStack.converters.toBooleanText + isEditable: true, + converter:cloudStack.converters.toBooleanText } } ], @@ -5118,16 +5328,16 @@ validation: { required: true }, select: function(args) { $.ajax({ - url: createURL("listHosts&VirtualMachineId=" + args.context.systemVMs[0].id), - //url: createURL("listHosts"), //for testing only, comment it out before checking in. + url: createURL("findHostsForMigration&VirtualMachineId=" + args.context.systemVMs[0].id), dataType: "json", async: true, success: function(json) { var hostObjs = json.listhostsresponse.host; var items = []; $(hostObjs).each(function() { - //items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); //listHosts API no longer returns hasEnoughCapacity proprety - items.push({id: this.id, description: this.name}); + if(this.requiresStorageMotion == false){ + items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")}); + } }); args.response.success({data: items}); } @@ -5335,9 +5545,16 @@ var searchByArgs = args.filterBy.search.value.length ? '&name=' + args.filterBy.search.value : ''; + var data = { page: args.page, pageSize: pageSize, type: 'routing', listAll: true }; + if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type + $.extend(data, { + zonetype: args.context.zoneType + }); + } + $.ajax({ url: createURL('listHosts' + searchByArgs), - data: { page: args.page, pageSize: pageSize, type: 'routing', listAll: true }, + data: data, success: function (json) { args.response.success({ data: json.listhostsresponse.host }); }, @@ -5377,9 +5594,19 @@ var searchByArgs = args.filterBy.search.value.length ? '&name=' + args.filterBy.search.value : ''; + var data = { + page: args.page, + pageSize: pageSize, + listAll: true + }; + if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type + $.extend(data, { + zonetype: args.context.zoneType + }); + } $.ajax({ url: createURL('listStoragePools' + searchByArgs), - data: { page: args.page, pageSize: pageSize, listAll: true }, + data: data, success: function (json) { args.response.success({ data: json.liststoragepoolsresponse.storagepool }); }, @@ -5419,9 +5646,16 @@ var searchByArgs = args.filterBy.search.value.length ? '&name=' + args.filterBy.search.value : ''; + var data = { type: 'SecondaryStorage', page: args.page, pageSize: pageSize, listAll: true }; + if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type + $.extend(data, { + zonetype: args.context.zoneType + }); + } + $.ajax({ url: createURL('listHosts' + searchByArgs), - data: { type: 'SecondaryStorage', page: args.page, pageSize: pageSize, listAll: true }, + data: data, success: function (json) { args.response.success({ data: json.listhostsresponse.host }); }, @@ -5858,15 +6092,13 @@ select: function(args) { $.ajax({ url: createURL("listHosts&VirtualMachineId=" + args.context.routers[0].id), - //url: createURL("listHosts"), //for testing only, comment it out before checking in. dataType: "json", async: true, success: function(json) { var hostObjs = json.listhostsresponse.host; var items = []; $(hostObjs).each(function() { - //items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); //listHosts API no longer returns hasEnoughCapacity proprety - items.push({id: this.id, description: this.name}); + items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")}); }); args.response.success({data: items}); } @@ -6319,16 +6551,16 @@ validation: { required: true }, select: function(args) { $.ajax({ - url: createURL("listHosts&VirtualMachineId=" + args.context.systemVMs[0].id), - //url: createURL("listHosts"), //for testing only, comment it out before checking in. + url: createURL("findHostsForMigration&VirtualMachineId=" + args.context.systemVMs[0].id), dataType: "json", async: true, success: function(json) { var hostObjs = json.listhostsresponse.host; var items = []; $(hostObjs).each(function() { - //items.push({id: this.id, description: (this.name + ": " +(this.hasEnoughCapacity? "Available" : "Full"))}); //listHosts API no longer returns hasEnoughCapacity proprety - items.push({id: this.id, description: this.name}); + if(this.requiresStorageMotion == false){ + items.push({id: this.id, description: (this.name + " (" + (this.suitableformigration? "Suitable": "Not Suitable") + ")")}); + } }); args.response.success({data: items}); } @@ -6504,6 +6736,19 @@ privateinterface: { label: 'label.private.interface' }, + + gslbprovider: { + label: 'GSLB service', + isBoolean: true, + isChecked: true + }, + gslbproviderpublicip: { + label: 'GSLB service Public IP' + }, + gslbproviderprivateip: { + label: 'GSLB service Private IP' + }, + numretries: { label: 'label.numretries', defaultValue: '2' @@ -8689,6 +8934,10 @@ array1.push("&hostid=" + args.context.instances[0].hostid); } + if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type + array1.push("&zonetype=" + args.context.zoneType); + } + $.ajax({ url: createURL("listHosts&type=Routing" + array1.join("") + "&page=" + args.page + "&pagesize=" + pageSize), dataType: "json", @@ -10295,6 +10544,11 @@ } } array1.push("&zoneid=" + args.context.zones[0].id); + + if(args.context.zoneType != null && args.context.zoneType.length > 0) { //Basic type or Advanced type + array1.push("&zonetype=" + args.context.zoneType); + } + $.ajax({ url: createURL("listHosts&type=SecondaryStorage&page=" + args.page + "&pagesize=" + pageSize + array1.join("")), dataType: "json", @@ -10568,6 +10822,12 @@ array1.push("&username=" + todb(args.data.username)); array1.push("&password=" + todb(args.data.password)); array1.push("&networkdevicetype=" + todb(args.data.networkdevicetype)); + + if(apiCmd == "addNetscalerLoadBalancer") { + array1.push("&gslbprovider=" + (args.data.gslbprovider == "on")); + array1.push("&gslbproviderpublicip=" + todb(args.data.gslbproviderpublicip)); + array1.push("&gslbproviderprivateip=" + todb(args.data.gslbproviderprivateip)); + } //construct URL starts here var url = []; diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index 6268f6b29b5..52e1135c681 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -115,16 +115,32 @@ url: createURL("listZones&available=true"), dataType: "json", async: true, - success: function(json) { - var zoneObjs = json.listzonesresponse.zone; - var items = []; - if (isAdmin() && !(cloudStack.context.projects && - cloudStack.context.projects[0])) - items.push({id: -1, description: "All Zones"}); - $(zoneObjs).each(function() { - items.push({id: this.id, description: this.name}); - }); - args.response.success({data: items}); + success: function(json) { + var zoneObjs; + if(args.context.zoneType == null || args.context.zoneType == '') { //all types + zoneObjs = []; + var items = json.listzonesresponse.zone; + if(items != null) { + for(var i = 0; i < items.length; i++) { + zoneObjs.push({id: items[i].id, description: items[i].name}); + } + } + } + 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({id: items[i].id, description: items[i].name}); + } + } + } + } + if (isAdmin() && !(cloudStack.context.projects && cloudStack.context.projects[0])){ + zoneObjs.unshift({id: -1, description: "All Zones"}); + } + args.response.success({data: zoneObjs}); } }); } @@ -531,13 +547,29 @@ dataType: "json", async: true, success: function(json) { - var zoneObjs = json.listzonesresponse.zone; - var items = []; - $(zoneObjs).each(function() { - if(this.id != args.context.templates[0].zoneid) - items.push({id: this.id, description: this.name}); - }); - args.response.success({data: items}); + var zoneObjs = []; + var items = json.listzonesresponse.zone; + if(args.context.zoneType == null || args.context.zoneType == '') { //all types + if(items != null) { + for(var i = 0; i < items.length; i++) { + if(items[i].id != args.context.templates[0].zoneid) { //destination zone must be different from source zone + zoneObjs.push({id: items[i].id, description: items[i].name}); + } + } + } + } + else { //Basic type or Advanced type + if(items != null) { + for(var i = 0; i < items.length; i++) { + if(items[i].networktype == args.context.zoneType) { //type must be matched + if(items[i].id != args.context.templates[0].zoneid) { //destination zone must be different from source zone + zoneObjs.push({id: items[i].id, description: items[i].name}); + } + } + } + } + } + args.response.success({data: zoneObjs}); } }); } @@ -861,16 +893,32 @@ url: createURL("listZones&available=true"), dataType: "json", async: true, - success: function(json) { - var zoneObjs = json.listzonesresponse.zone; - var items = []; - if (isAdmin() && !(cloudStack.context.projects && - cloudStack.context.projects[0])) - items.push({id: -1, description: "All Zones"}); - $(zoneObjs).each(function() { - items.push({id: this.id, description: this.name}); - }); - args.response.success({data: items}); + success: function(json) { + var zoneObjs; + if(args.context.zoneType == null || args.context.zoneType == '') { //all types + zoneObjs = []; + var items = json.listzonesresponse.zone; + if(items != null) { + for(var i = 0; i < items.length; i++) { + zoneObjs.push({id: items[i].id, description: items[i].name}); + } + } + } + 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({id: items[i].id, description: items[i].name}); + } + } + } + } + if (isAdmin() && !(cloudStack.context.projects && cloudStack.context.projects[0])){ + zoneObjs.unshift({id: -1, description: "All Zones"}); + } + args.response.success({data: zoneObjs}); } }); } @@ -1174,14 +1222,30 @@ url: createURL("listZones&available=true"), dataType: "json", async: true, - success: function(json) { - var zoneObjs = json.listzonesresponse.zone; - var items = []; - $(zoneObjs).each(function() { - if(this.id != args.context.isos[0].zoneid) - items.push({id: this.id, description: this.name}); - }); - args.response.success({data: items}); + success: function(json) { + var zoneObjs = []; + var items = json.listzonesresponse.zone; + if(args.context.zoneType == null || args.context.zoneType == '') { //all types + if(items != null) { + for(var i = 0; i < items.length; i++) { + if(items[i].id != args.context.isos[0].zoneid) { //destination zone must be different from source zone + zoneObjs.push({id: items[i].id, description: items[i].name}); + } + } + } + } + else { //Basic type or Advanced type + if(items != null) { + for(var i = 0; i < items.length; i++) { + if(items[i].networktype == args.context.zoneType) { //type must be matched + if(items[i].id != args.context.isos[0].zoneid) { //destination zone must be different from source zone + zoneObjs.push({id: items[i].id, description: items[i].name}); + } + } + } + } + } + args.response.success({data: zoneObjs}); } }); } diff --git a/ui/scripts/ui-custom/affinity.js b/ui/scripts/ui-custom/affinity.js new file mode 100644 index 00000000000..1a23ff763ee --- /dev/null +++ b/ui/scripts/ui-custom/affinity.js @@ -0,0 +1,173 @@ +// Licensed to the Apache Software Foundation (ASF) under one +// or more contributor license agreements. See the NOTICE file +// distributed with this work for additional information +// regarding copyright ownership. The ASF licenses this file +// to you under the Apache License, Version 2.0 (the +// "License"); you may not use this file except in compliance +// with the License. You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, +// software distributed under the License is distributed on an +// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +// KIND, either express or implied. See the License for the +// specific language governing permissions and limitations +// under the License. +(function(cloudStack, $) { + cloudStack.uiCustom.affinity = function(args) { + var listView = args.listView; + var action = args.action; + var tierSelect = args.tierSelect; + + return function(args) { + var context = args.context; + var $instanceRow = args.$instanceRow; + + var vmList = function(args) { + // Create a listing of instances, based on limited information + // from main instances list view + var $listView; + var instances = $.extend(true, {}, args.listView, { + context: context, + uiCustom: true + }); + + instances.listView.actions = { + select: { + label: _l('label.select.instance'), + type: 'checkbox', + action: { + uiCustom: function(args) { + var $item = args.$item; + var $input = $item.find('td.actions input:visible'); + + if ($input.attr('type') == 'checkbox') { + if ($input.is(':checked')) + $item.addClass('multi-edit-selected'); + else + $item.removeClass('multi-edit-selected'); + } else { + $item.siblings().removeClass('multi-edit-selected'); + $item.addClass('multi-edit-selected'); + } + } + } + } + }; + + $listView = $('
').listView(instances); + + // Change action label + $listView.find('th.actions').html(_l('label.select')); + + return $listView; + }; + + var $dataList = vmList({ + listView: listView + }).dialog({ + dialogClass: 'multi-edit-add-list panel', + width: 825, + title: _l('label.affinity.groups'), + buttons: [ + { + text: _l('label.apply'), + 'class': 'ok', + click: function() { + if ($dataList.find('.tier-select select').val() == -1) { + cloudStack.dialog.notice({ message: ('Please select a tier')}); + return false; + } + + var complete = args.complete; + var start = args.start; + + start(); + $dataList.fadeOut(function() { + action({ + tierID: $dataList.find('.tier-select select').val(), + _subselect: $dataList.find('tr.multi-edit-selected .subselect select').val(), + context: $.extend(true, {}, context, { + affinityGroups: $dataList.find('tbody tr').map(function(index, elem) { + var itemData = $(elem).data('json-obj'); + itemData._isSelected = false; + + if ($(elem).hasClass('multi-edit-selected')) { + itemData._isSelected = true; + } + + return itemData; + }) + }), + response: { + success: function(args) { + complete({ + _custom: args._custom, + $item: $instanceRow + }); + }, + error: function(args) { + cloudStack.dialog.notice({ message: args }); + } + } + }); + $dataList.remove(); + }); + + $('div.overlay').fadeOut(function() { + $('div.overlay').remove(); + $(':ui-dialog').dialog('destroy'); + }); + } + }, + { + text: _l('label.cancel'), + 'class': 'cancel', + click: function() { + $dataList.fadeOut(function() { + $dataList.remove(); + }); + $('div.overlay').fadeOut(function() { + $('div.overlay').remove(); + $(':ui-dialog').dialog('destroy'); + }); + } + } + ] + }).parent('.ui-dialog').overlay(); + + // Add tier select dialog + if (tierSelect) { + var $toolbar = $dataList.find('.toolbar'); + var $tierSelect = $('
').addClass('filters tier-select').prependTo($toolbar); + var $tierSelectLabel = $('