From 2f682ea9049e6554a4f8cfc3bd2b504a0810ec79 Mon Sep 17 00:00:00 2001 From: Jessica Wang Date: Thu, 16 Feb 2012 17:23:25 -0800 Subject: [PATCH] cloudstack 3.0 new UI - add zone wizard - localize text in html code. --- .../classes/resources/messages.properties | 35 ++++ .../classes/resources/messages_ja.properties | 35 ++++ ui/index.jsp | 192 +++++++++--------- 3 files changed, 161 insertions(+), 101 deletions(-) diff --git a/client/WEB-INF/classes/resources/messages.properties b/client/WEB-INF/classes/resources/messages.properties index 108f50a776a..a7c4087c3ad 100644 --- a/client/WEB-INF/classes/resources/messages.properties +++ b/client/WEB-INF/classes/resources/messages.properties @@ -394,6 +394,41 @@ message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation message.please.add.at.lease.one.traffic.range=Please add at lease 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 management server. 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 lease 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 lease 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 lease 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... #new labels (end) ********************************************************************************************** diff --git a/client/WEB-INF/classes/resources/messages_ja.properties b/client/WEB-INF/classes/resources/messages_ja.properties index 2ff98a4be52..62809080d8d 100644 --- a/client/WEB-INF/classes/resources/messages_ja.properties +++ b/client/WEB-INF/classes/resources/messages_ja.properties @@ -395,6 +395,41 @@ message.zone.creation.complete.would.you.like.to.enable.this.zone=Zone creation message.please.add.at.lease.one.traffic.range=Please add at lease 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 management server. 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 lease 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 lease 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 lease 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... #new labels (end) ********************************************************************************************** diff --git a/ui/index.jsp b/ui/index.jsp index b3bc7fb1f99..0cca3f53f9b 100644 --- a/ui/index.jsp +++ b/ui/index.jsp @@ -153,16 +153,6 @@
- - @@ -430,18 +420,18 @@
    -
  • 1Zone Type
    • -
  • 2Setup Zone
    • -
  • 3Setup Network
    • +
  • 1
    • +
  • 2
    • +
  • 3
  • -
  • 4Add Resources
    • +
  • 4
  • -
  • 5Launch
    • +
  • 5
@@ -451,21 +441,21 @@
-

Set up zone type

-

Please select a configuration for your 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) +
- +
- 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. -
+ +
- +
@@ -476,8 +466,8 @@
- 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. -
+ +
@@ -488,20 +478,20 @@ zone-wizard-step-id="setupPhysicalNetwork" zone-wizard-prefilter="setupPhysicalNetwork">
- When adding an advanced zone, you need to set up one or more physical networks. Each network corresponds to a NIC on the management server. 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. +
-
 Add physical network
+
 
-
Traffic Types
+
    • @@ -510,8 +500,8 @@ class="traffic-type-draggable management">
    -
    Management
    -
    Set up the network for traffic between end-user VMs.
    +
    +
  • @@ -521,8 +511,8 @@ class="traffic-type-draggable public">
-
Public
-
Set up the network for traffic between end-user VMs.
+
+
  • @@ -532,8 +522,8 @@ class="traffic-type-draggable guest clone">
    • -
    Guest
    -
    Set up the network for traffic between end-user VMs.
    +
    +
  • @@ -543,8 +533,8 @@ class="traffic-type-draggable storage">
    • -
    Storage
    -
    Set up the network for traffic between end-user VMs.
    +
    +
    @@ -562,14 +552,14 @@ zone-wizard-form="basicPhysicalNetwork" zone-wizard-prefilter="addNetscalerDevice">
      -
    • Netscaler
      • -
    • Public traffic
      • -
    • Pod
      • -
    • Guest Traffic
      • -
    • Storage Traffic
      • +
      • +
      • +
      • +
      • +
    -
    Please specify Netscaler info
    +
    @@ -579,15 +569,15 @@
      -
    • Netscaler
      • -
    • Public traffic
      • -
    • Pod
      • -
    • Guest Traffic
      • -
    • Storage Traffic
      • +
      • +
      • +
      • +
      • +
    -
    - 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 lease one range of IP addresses for internet traffic. +
    +
    @@ -596,15 +586,15 @@
      -
    • Netscaler
      • -
    • Public traffic
      • -
    • Pod
      • -
    • Guest Traffic
      • -
    • Storage Traffic
      • +
      • +
      • +
      • +
      • +
    - 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. +
    @@ -617,15 +607,15 @@ zone-wizard-step-id="configureGuestTraffic" zone-wizard-prefilter="configureGuestTraffic">
      -
    • Netscaler
      • -
    • Public traffic
      • -
    • Pod
      • -
    • Guest Traffic
      • -
    • Storage Traffic
      • +
      • +
      • +
      • +
      • +
    -
    - Guest network traffic is communication between end-user virtual machines. +
    +
    @@ -636,15 +626,15 @@
      -
    • Netscaler
      • -
    • Public traffic
      • -
    • Pod
      • -
    • Guest Traffic
      • -
    • 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. +
    @@ -653,15 +643,15 @@
      -
    • Cluster
      • -
    • Host
      • -
    • Primary Storage
      • -
    • Secondary Storage
      • +
      • +
      • +
      • +
    - 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. -
    + +
    @@ -671,14 +661,14 @@
      -
    • Cluster
      • -
    • Host
      • -
    • Primary Storage
      • -
    • Secondary Storage
      • +
      • +
      • +
      • +
    - Each cluster must contain at lease 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. -
    + +
    @@ -688,14 +678,14 @@
      -
    • Cluster
      • -
    • Host
      • -
    • Primary Storage
      • -
    • Secondary 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. -
    + +
    @@ -705,14 +695,14 @@
      -
    • Cluster
      • -
    • Host
      • -
    • Primary Storage
      • -
    • Secondary Storage
      • +
      • +
      • +
      • +
    - Each zone must have at lease 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. -
    + +
    @@ -720,9 +710,9 @@
    -
    Launch zone
    +
    @@ -734,9 +724,9 @@
    - -
    Cancel
    - + +
    +