from:"rajani"

[15/40] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/usage.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/usage.po 
b/source/locale/zh_CN/LC_MESSAGES/usage.po
new file mode 100644
index 000..ae8f954
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/usage.po
@@ -0,0 +1,1656 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-24 18:31+\n"
+"Last-Translator: è¯æ³ç \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 0337566b79334160ac7120790c9d0ac7
+#: ../../usage.rst:18
+msgid "Working with Usage"
+msgstr "ä½¿ç¨æå¡"
+
+# ef6eee68a2ab4c3eb31cb3115bab6062
+#: ../../usage.rst:20
+msgid ""
+"The Usage Server is an optional, separately-installed part of CloudStack "
+"that provides aggregated usage records which you can use to create billing "
+"integration for CloudStack. 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."
+msgstr "ä½¿ç¨æå¡å¨æ¯CloudStackä¸ä¸ªå¯éé¡¹,åå«å®è£
äº§åçä¸é¨å,æä¾äºèåä½¿ç¨è®°å½æ¨å¯ä»¥ä½¿ç¨å®æ¥åå»ºè®¡è´¹éæäº§åãä½¿ç¨æå¡å¨éè¿ä½¿ç¨æ°æ®ä»äºä»¶æ¥å¿ååå»ºæ±æ»ä½¿ç¨è®°å½,æ¨å¯ä»¥è®¿é®ä½¿ç¨listUsageRecords
 APIè°ç¨ã"
+
+# 3f5a5a7bc4cc4528840d66c404992c64
+#: ../../usage.rst:26
+msgid ""
+"The usage records show the amount of resources, such as VM run time or "
+"template storage space, consumed by guest instances."
+msgstr 
"ä½¿ç¨è®°å½æ¾ç¤ºæ°éçèµæº,æ¯å¦èææºè¿è¡æ¶é´ææ¨¡æ¿åå¨ç©ºé´ï¼ä»¥è¢«å®¢äººæ¶èä¸ºä¾ã"
+
+# 7534ac8e2cf443e7801e747d7e156ec4
+#: ../../usage.rst:29
+msgid ""
+"The Usage Server runs at least once per day. It can be configured to run "
+"multiple times per day."
+msgstr "ä½¿ç¨æå¡å¨è¿è¡è³å°æ¯å¤©ä¸æ¬¡ãå®å¯ä»¥è¢«é
ç½®ä¸ºæ¯å¤©å¤æ¬¡è¿è¡ã"
+
+# ea7f343f907540088f49db087d846e0c
+#: ../../usage.rst:33
+msgid "Configuring the Usage Server"
+msgstr "éç½®ä½¿ç¨æå¡å¨"
+
+# 5aa6afef926b456384cf8fe5fef33e85
+#: ../../usage.rst:35
+msgid "To configure the usage server:"
+msgstr "éç½®ä½¿ç¨æå¡å¨"
+
+# 4a2672643b7e4281babb6fa1f2c8f5c6
+#: ../../usage.rst:39
+msgid ""
+"Be sure the Usage Server has been installed. This requires extra steps "
+"beyond just installing the CloudStack software. See Installing the Usage "
+"Server (Optional) in the Advanced Installation Guide."
+msgstr "ç¡®å®ä½¿ç¨æå¡å¨å·²ç»è¢«å®è£ãå®è¦æ±å®è£
é¢å¤çCloudStackè½¯ä»¶æ¥éª¤ãåè§é«çº§å®è£
æåä¸çä½¿ç¨æå¡å¨ï¼å¯éï¼ã"
+
+# b81ee209e7eb43f2b4440774ee120d74
+#: ../../usage.rst:45
+msgid "Log in to the CloudStack UI as administrator."
+msgstr "ä½ä¸ºç®¡çåç»å½å°CloudStackç¨æ·çé¢ã"
+
+# b71109d7bf9b4edd8cb8b8b3c62c7375
+#: ../../usage.rst:49
+msgid "Click Global Settings."
+msgstr "åå»å¨å±è®¾ç½®"
+
+# d97b663ae09745498728fffc03e2f754
+#: ../../usage.rst:53
+msgid ""
+"In Search, type usage. Find the configuration parameter that controls the "
+"behavior you want to set. See the table below for a description of the "
+"available parameters."
+msgstr "å¨æç´¢æ è¾å¥ usageãæ¾å°noéè¦æ¹åçé
ç½®åæ°ãä¸è¡¨æ¯è¿äºåæ°çè¯¦ç»æè¿°ã"
+
+# b0484803860b4b1a99bb5c37475c7246
+#: ../../usage.rst:59
+msgid "In Actions, click the Edit icon."
+msgstr "å¨æä½æ ç¹å»ç¼è¾å¾æ ã"
+
+# 704d9670a22a4b81b84bd8f2aa97bb9a
+#: ../../usage.rst:63
+msgid "Type the desired value and click the Save icon."
+msgstr "è¾å¥æ°å¼ç¹å»ä¿åå¾æ ã"
+
+# f01266ae6922418997f31eb79d697cab
+#: ../../usage.rst:67
+msgid ""
+"Restart the Management Server (as usual with any global configuration "
+"change) and also the Usage Server:"
+msgstr "éæ°å¯å¨ç®¡çæå¡å¨ï¼éå¸¸å¨æ¹åäºå¨å±é
ç½®ä¹åé½è¦è¿è¡è¿æ¥ï¼å¹¶éå¯ä½¿ç¨æå¡å¨ã"
+
+# 7b5da1780fc444d2b67d97b1a97eabb7
+#: ../../usage.rst:75
+msgid ""
+"The following table shows the global configuration settings that control the"
+" behavior of the Usage Server."
+msgstr "ä¸è¡¨ååºäºå¨å±éç½®ä¸æ§å¶ä½¿ç¨æå¡å¨çéç½®é¡¹ã"
+
+# 0ca8d699a2cd4e91b01369666cbcb2ca
+#: ../../usage.rst:78
+msgid "Parameter Name  Description"
+msgstr "åæ°åæè¿°"
+
+# a6789ec8fc34419ba8e0cc40f94d7f67
+#: ../../usage.rst:80
+msgid "enable

[28/40] git commit: Adding logo to 4.3 index page

2014-09-09 Thread rajani

Adding logo to 4.3 index page


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

Branch: refs/heads/4.4
Commit: a55b0dbcf3c56bb856bc3243ec36ef7025af2204
Parents: e54cd24
Author: Sebastien Goasguen 
Authored: Mon Jun 30 11:30:12 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 11:30:12 2014 +0200

--
 source/_static/images/acslogo.png | Bin 0 -> 135394 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a55b0dbc/source/_static/images/acslogo.png
--
diff --git a/source/_static/images/acslogo.png 
b/source/_static/images/acslogo.png
new file mode 100644
index 000..a938231
Binary files /dev/null and b/source/_static/images/acslogo.png differ

[12/40] git commit: Fixed formatting by Will stevens

2014-09-09 Thread rajani

Fixed formatting by Will stevens


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

Branch: refs/heads/4.4
Commit: 68c20df481a0bc13e1794a4a897686977139a17c
Parents: 72a3a7c
Author: Will Stevens 
Authored: Tue May 20 12:33:17 2014 -0400
Committer: Sebastien Goasguen 
Committed: Wed May 21 08:25:06 2014 +0200

--
 source/accounts.rst |  76 +-
 source/administration.rst   |  18 +-
 source/api.rst  |  34 +-
 source/events.rst   | 189 ++--
 source/hosts.rst| 245 ++---
 source/index.rst|  34 +
 source/management.rst   | 381 
 source/networking.rst   | 232 ++---
 .../networking/global_server_load_balancing.rst |  20 +-
 source/networking/portable_ips.rst  |   4 +-
 source/networking/security_groups.rst   |   3 +-
 source/projects.rst | 261 ++
 source/reliability.rst  |  65 +-
 source/service_offerings.rst| 311 ++-
 source/storage.rst  | 326 +++
 source/systemvm.rst | 381 +++-
 source/templates.rst| 908 +++
 source/troubleshooting.rst  | 231 ++---
 source/tuning.rst   |  39 +-
 source/ui.rst   |  76 +-
 source/usage.rst| 734 +--
 source/virtual_machines.rst | 781 ++--
 22 files changed, 1942 insertions(+), 3407 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 5367743..e5d4b6d 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -27,6 +27,7 @@ An account typically represents a customer of the service 
provider or a
 department in a large organization. Multiple users can exist in an
 account.
 
+
 Domains
 ~~~
 
@@ -40,6 +41,7 @@ For each account created, the Cloud installation creates 
three different
 types of user accounts: root administrator, domain administrator, and
 user.
 
+
 Users
 ~
 
@@ -59,6 +61,7 @@ may be multiple administrators in the system. Administrators 
can create
 or delete other administrators, and change the password for any user in
 the system.
 
+
 Domain Administrators
 ~
 
@@ -66,6 +69,7 @@ Domain administrators can perform administrative operations 
for users
 who belong to that domain. Domain administrators do not have visibility
 into physical servers or other domains.
 
+
 Root Administrator
 ~~
 
@@ -73,6 +77,7 @@ Root administrators have complete access to the system, 
including
 managing templates, service offerings, customer care administrators, and
 domains
 
+
 Resource Ownership
 ~~
 
@@ -86,6 +91,7 @@ account by using the assignVirtualMachine API. A domain or 
sub-domain
 administrator can do the same for VMs within the domain from one account
 to any other account in the domain or any of its sub-domains.
 
+
 Dedicating Resources to Accounts and Domains
 
 
@@ -99,26 +105,21 @@ that domain.
 
 There are several types of dedication available:
 
--
-
-   Explicit dedication. A zone, pod, cluster, or host is dedicated to an
+-  Explicit dedication. A zone, pod, cluster, or host is dedicated to an
account or domain by the root administrator during initial deployment
and configuration.
 
--
-
-   Strict implicit dedication. A host will not be shared across multiple
+-  Strict implicit dedication. A host will not be shared across multiple
accounts. For example, strict implicit dedication is useful for
deployment of certain types of applications, such as desktops, where
no host can be shared between different accounts without violating
the desktop software's terms of license.
 
--
-
-   Preferred implicit dedication. The VM will be deployed in dedicated
+-  Preferred implicit dedication. The VM will be deployed in dedicated
infrastructure if possible. Otherwise, the VM can be deployed in
shared infrastructure.
 
+
 How to Dedicate a Zone, Cluster, Pod, or Host to an Account or Domain
 --
 
@@ -138,6

[37/40] git commit: moved ldap.firstname.attribute to the correct section.

2014-09-09 Thread rajani

moved ldap.firstname.attribute to the correct section.

Signed-off-by: Rajani Karuturi 

closes #17


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

Branch: refs/heads/4.4
Commit: 3356677127398157ab265a98f08c1cf89b406bea
Parents: d92feaf
Author: Rajani Karuturi 
Authored: Wed Aug 27 10:00:36 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Aug 27 10:06:15 2014 +0530

--
 source/accounts.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/33566771/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 06a1660..83d7329 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -218,6 +218,9 @@ default values are for openldap)
 -  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
Default value for AD and openldap is **givenname**.
 
+-  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
+   Default value for AD and openldap is **sn**.
+
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
Default value is **SAMAccountName** for AD and **uid** for openldap.
 
@@ -232,9 +235,6 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~
 
--  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
-   Default value for AD and openldap is **sn**.
-
 -  ``ldap.truststore``, ``ldap.truststore.password``:  truststore, password
to use for LDAP SSL.

[32/40] git commit: add make.sh for lazy doc build

2014-09-09 Thread rajani

add make.sh for lazy doc build


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

Branch: refs/heads/4.4
Commit: 1732dae7bed038a4871003c927860e4926a00fa8
Parents: fce127e
Author: Pierre-Luc Dion 
Authored: Tue Aug 19 20:04:30 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:20:41 2014 -0400

--
 make.sh | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/1732dae7/make.sh
--
diff --git a/make.sh b/make.sh
new file mode 100755
index 000..d4e96fd
--- /dev/null
+++ b/make.sh
@@ -0,0 +1,3 @@
+rm -fr build
+mkdir build
+sphinx-build -b html source build

[01/40] git commit: CLOUDSTACK-5943: added doc for the Palo Alto Networks firewall integration: This closes #9

2014-09-09 Thread rajani

Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/4.4 00c90ec09 -> 6507638ec


CLOUDSTACK-5943: added doc for the Palo Alto Networks firewall integration: 
This closes #9

Signed-off-by: Sebastien Goasguen 


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

Branch: refs/heads/4.4
Commit: ba544d2ad6f075325d28e80049a4dc6b80082341
Parents: 8ba
Author: Will Stevens 
Authored: Mon May 12 12:56:36 2014 -0400
Committer: Sebastien Goasguen 
Committed: Thu May 15 16:56:41 2014 +0200

--
 source/networking2.rst  |   2 +
 source/palo_alto_config.rst | 282 +++
 2 files changed, 284 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/ba544d2a/source/networking2.rst
--
diff --git a/source/networking2.rst b/source/networking2.rst
index b020a19..b3743fc 100644
--- a/source/networking2.rst
+++ b/source/networking2.rst
@@ -6952,6 +6952,8 @@ To create a persistent network, perform the following:
 
Click OK.
 
+.. include:: palo_alto_config.rst
+
 .. |guest-traffic-setup.png| image:: _static/images/guest-traffic-setup.png
:alt: Depicts a guest traffic setup
 .. |networksinglepod.png| image:: _static/images/network-singlepod.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/ba544d2a/source/palo_alto_config.rst
--
diff --git a/source/palo_alto_config.rst b/source/palo_alto_config.rst
new file mode 100644
index 000..6c0aa46
--- /dev/null
+++ b/source/palo_alto_config.rst
@@ -0,0 +1,282 @@
+.. 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.
+
+
+
+Setup a Palo Alto Networks Firewall
+---
+
+
+Functionality Provided
+~~
+
+This implementation enable the orchestration of a Palo Alto Networks Firewall 
from within CloudStack UI and API.  
+
+**The following features are supported**:
+
+- List/Add/Delete Palo Alto Networks service provider
+- List/Add/Delete Palo Alto Networks network service offering
+- List/Add/Delete Palo Alto Networks network using the above service offering
+- Add an instance to a Palo Alto Networks network
+- Source NAT management on network create and delete
+- List/Add/Delete Ingress Firewall rule
+- List/Add/Delete Egress Firewall rule (both 'Allow' and 'Deny' default rules 
supported)
+- List/Add/Delete Port Forwarding rule
+- List/Add/Delete Static NAT rule
+- Apply a Threat Profile to all firewall rules (more details in the Additional 
Features section)
+- Apply a Log Forwarding profile to all firewall rules (more details in the 
Additional Features section)
+
+
+
+Initial Palo Alto Networks Firewall Configuration
+~
+
+Anatomy of the Palo Alto Networks Firewall
+^^
+
+- In **'Network > Interfaces'** there is a list of physical interfaces as well 
as aggregated physical interfaces which are used for managing traffic in and 
out of the Palo Alto Networks Firewall device.
+- In **'Network > Zones'** there is a list of the different configuration 
zones.  This implementation will use two zones; a public (defaults to 
'untrust') and private (defaults to 'trust') zone.
+- In **'Network > Virtual Routers'** there is a list of VRs which handle 
traffic routing for the Palo Alto Firewall.  We only use a single Virtual 
Router on the firewall and it is used to handle all the routing to the next 
network hop.
+- In **'Objects > Security Profile Groups'** there is a list of profiles which 
can be applied to firewall rules.  These profiles are used to better understand 
the types of traffic that is flowing through your network.  Configured when you 
add the firewall provider to C

[13/40] git commit: Fix conf.py for localization setup

2014-09-09 Thread rajani

Fix conf.py for localization setup


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

Branch: refs/heads/4.4
Commit: a209573e23085f013d41dec87d4147c05983f56c
Parents: 68c20df
Author: Sebastien Goasguen 
Authored: Tue May 27 10:56:03 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue May 27 10:56:03 2014 +0200

--
 source/conf.py | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a209573e/source/conf.py
--
diff --git a/source/conf.py b/source/conf.py
index d8ef428..517956a 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -35,6 +35,10 @@ extensions = []
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
+# Localization
+locale_dirs = ['./locale/']
+gettext_compact = False
+
 # The suffix of source filenames.
 source_suffix = '.rst'

[33/40] git commit: CLOUDSTACK-5879: Updated rabbitmq eventbus path

2014-09-09 Thread rajani

CLOUDSTACK-5879: Updated rabbitmq eventbus path

Signed-off-by: Pierre-Luc Dion 


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

Branch: refs/heads/4.4
Commit: e0bbecbec09357577ae3395f65d28e8148405138
Parents: 1732dae
Author: Erik Weber 
Authored: Tue Aug 19 19:57:13 2014 +0200
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:20:48 2014 -0400

--
 source/events.rst | 30 +-
 1 file changed, 21 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e0bbecbe/source/events.rst
--
diff --git a/source/events.rst b/source/events.rst
index cbba93b..d500a5c 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -95,7 +95,9 @@ As a CloudStack administrator, perform the following one-time
 configuration to enable event notification framework. At run time no
 changes can control the behaviour.
 
-#. Open ``'componentContext.xml``.
+#. Create the folder ``/etc/cloudstack/management/META-INF/cloudstack/core``
+
+#. Inside that folder, open ``spring-event-bus-context.xml``.
 
 #. Define a bean named ``eventNotificationBus`` as follows:
 
@@ -118,14 +120,24 @@ changes can control the behaviour.
 
   .. code:: bash
 
- 
-   
-   
-   
-   
-   
-   
- 
+ http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:aop="http://www.springframework.org/schema/aop";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
+
+   
+   
+   
+   
+   
+   
+
+ 
 
   The ``eventNotificationBus`` bean represents the
   ``org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus`` class.

[39/40] git commit: ignoring .po and .mo files during merge

2014-09-09 Thread rajani

ignoring .po and .mo files during merge


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

Branch: refs/heads/4.4
Commit: 5d59a37d0d2ca0f6ee6d5193fcdf4bb8a42e5e43
Parents: fe5b65d
Author: Rajani Karuturi 
Authored: Wed Sep 10 12:02:31 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 12:02:31 2014 +0530

--
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5d59a37d/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..a4cfe93
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.po merge=ours
+*.mo merge=ours

[36/43] git commit: fix ldap section typo

2014-09-09 Thread rajani

fix ldap section typo


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

Branch: refs/heads/master
Commit: 343b43d63e5480085702cccae43a3622ecbcbd73
Parents: 75828eb
Author: Pierre-Luc Dion 
Authored: Wed Aug 20 07:43:05 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Wed Aug 20 07:44:03 2014 -0400

--
 source/accounts.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/343b43d6/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index b555742..06a1660 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -219,7 +219,7 @@ default values are for openldap)
Default value for AD and openldap is **givenname**.
 
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
-  Default value is **SAMAccountName** for AD and **uid** for openldap.
+   Default value is **SAMAccountName** for AD and **uid** for openldap.
 
 
 Restricting LDAP users to a group:

[03/43] git commit: Fixing typo in creating affinity group

2014-09-09 Thread rajani

Fixing typo in creating affinity group


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

Branch: refs/heads/master
Commit: 5a4a44d23edd5b55768c0e4836a2dca0b8461b99
Parents: a49d204
Author: Sebastien Goasguen 
Authored: Fri May 16 22:18:59 2014 +0200
Committer: Sebastien Goasguen 
Committed: Fri May 16 22:18:59 2014 +0200

--
 source/virtual_machines.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5a4a44d2/source/virtual_machines.rst
--
diff --git a/source/virtual_machines.rst b/source/virtual_machines.rst
index 568735a..2c9e8a3 100644
--- a/source/virtual_machines.rst
+++ b/source/virtual_machines.rst
@@ -400,7 +400,7 @@ To add an affinity group:
 
   Type. The only supported type shipped with CloudStack is Host
   Anti-Affinity. This indicates that the VMs in this group should
-  avoid being placed on the same VM with each other. If you see
+  avoid being placed on the same host with each other. If you see
   other types in this list, it means that your installation of
   CloudStack has been extended with customized affinity group
   plugins.

[32/43] git commit: add make.sh for lazy doc build

2014-09-09 Thread rajani

add make.sh for lazy doc build


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

Branch: refs/heads/master
Commit: 1732dae7bed038a4871003c927860e4926a00fa8
Parents: fce127e
Author: Pierre-Luc Dion 
Authored: Tue Aug 19 20:04:30 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:20:41 2014 -0400

--
 make.sh | 3 +++
 1 file changed, 3 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/1732dae7/make.sh
--
diff --git a/make.sh b/make.sh
new file mode 100755
index 000..d4e96fd
--- /dev/null
+++ b/make.sh
@@ -0,0 +1,3 @@
+rm -fr build
+mkdir build
+sphinx-build -b html source build

[12/43] git commit: Fixed formatting by Will stevens

2014-09-09 Thread rajani

Fixed formatting by Will stevens


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

Branch: refs/heads/master
Commit: 68c20df481a0bc13e1794a4a897686977139a17c
Parents: 72a3a7c
Author: Will Stevens 
Authored: Tue May 20 12:33:17 2014 -0400
Committer: Sebastien Goasguen 
Committed: Wed May 21 08:25:06 2014 +0200

--
 source/accounts.rst |  76 +-
 source/administration.rst   |  18 +-
 source/api.rst  |  34 +-
 source/events.rst   | 189 ++--
 source/hosts.rst| 245 ++---
 source/index.rst|  34 +
 source/management.rst   | 381 
 source/networking.rst   | 232 ++---
 .../networking/global_server_load_balancing.rst |  20 +-
 source/networking/portable_ips.rst  |   4 +-
 source/networking/security_groups.rst   |   3 +-
 source/projects.rst | 261 ++
 source/reliability.rst  |  65 +-
 source/service_offerings.rst| 311 ++-
 source/storage.rst  | 326 +++
 source/systemvm.rst | 381 +++-
 source/templates.rst| 908 +++
 source/troubleshooting.rst  | 231 ++---
 source/tuning.rst   |  39 +-
 source/ui.rst   |  76 +-
 source/usage.rst| 734 +--
 source/virtual_machines.rst | 781 ++--
 22 files changed, 1942 insertions(+), 3407 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 5367743..e5d4b6d 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -27,6 +27,7 @@ An account typically represents a customer of the service 
provider or a
 department in a large organization. Multiple users can exist in an
 account.
 
+
 Domains
 ~~~
 
@@ -40,6 +41,7 @@ For each account created, the Cloud installation creates 
three different
 types of user accounts: root administrator, domain administrator, and
 user.
 
+
 Users
 ~
 
@@ -59,6 +61,7 @@ may be multiple administrators in the system. Administrators 
can create
 or delete other administrators, and change the password for any user in
 the system.
 
+
 Domain Administrators
 ~
 
@@ -66,6 +69,7 @@ Domain administrators can perform administrative operations 
for users
 who belong to that domain. Domain administrators do not have visibility
 into physical servers or other domains.
 
+
 Root Administrator
 ~~
 
@@ -73,6 +77,7 @@ Root administrators have complete access to the system, 
including
 managing templates, service offerings, customer care administrators, and
 domains
 
+
 Resource Ownership
 ~~
 
@@ -86,6 +91,7 @@ account by using the assignVirtualMachine API. A domain or 
sub-domain
 administrator can do the same for VMs within the domain from one account
 to any other account in the domain or any of its sub-domains.
 
+
 Dedicating Resources to Accounts and Domains
 
 
@@ -99,26 +105,21 @@ that domain.
 
 There are several types of dedication available:
 
--
-
-   Explicit dedication. A zone, pod, cluster, or host is dedicated to an
+-  Explicit dedication. A zone, pod, cluster, or host is dedicated to an
account or domain by the root administrator during initial deployment
and configuration.
 
--
-
-   Strict implicit dedication. A host will not be shared across multiple
+-  Strict implicit dedication. A host will not be shared across multiple
accounts. For example, strict implicit dedication is useful for
deployment of certain types of applications, such as desktops, where
no host can be shared between different accounts without violating
the desktop software's terms of license.
 
--
-
-   Preferred implicit dedication. The VM will be deployed in dedicated
+-  Preferred implicit dedication. The VM will be deployed in dedicated
infrastructure if possible. Otherwise, the VM can be deployed in
shared infrastructure.
 
+
 How to Dedicate a Zone, Cluster, Pod, or Host to an Account or Domain
 --
 
@@ -13

[29/43] git commit: Add local RTD theme default

2014-09-09 Thread rajani

Add local RTD theme default


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

Branch: refs/heads/master
Commit: 018c1ad50ccd31f25234ff1b1fec73dd3ee012e1
Parents: a55b0db
Author: Sebastien Goasguen 
Authored: Mon Jun 30 12:49:17 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 12:49:17 2014 +0200

--
 source/conf.py | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/018c1ad5/source/conf.py
--
diff --git a/source/conf.py b/source/conf.py
index 517956a..b181590 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -17,6 +17,8 @@
 import sys
 import os
 
+on_rtd = os.environ.get('READTHEDOCS', None) == 'True'
+
 # If extensions (or modules to document with autodoc) are in another directory,
 # add these directories to sys.path here. If the directory is relative to the
 # documentation root, use os.path.abspath to make it absolute, like shown here.
@@ -105,6 +107,13 @@ pygments_style = 'sphinx'
 # The theme to use for HTML and HTML Help pages.  See the documentation for
 # a list of builtin themes.
 html_theme = 'default'
+if not on_rtd:
+try:
+import sphinx_rtd_theme
+html_theme = 'sphinx_rtd_theme'
+html_theme_path = [sphinx_rtd_theme.get_html_theme_path()]
+except ImportError:
+pass
 
 # Theme options are theme-specific and customize the look and feel of a theme
 # further.  For a list of options available for each theme, see the

[06/43] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/remote_access_vpn.rst
--
diff --git a/source/networking/remote_access_vpn.rst 
b/source/networking/remote_access_vpn.rst
new file mode 100644
index 000..94e9733
--- /dev/null
+++ b/source/networking/remote_access_vpn.rst
@@ -0,0 +1,696 @@
+.. 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.
+   
+
+Remote Access VPN
+-
+
+CloudStack account owners can create virtual private networks (VPN) to
+access their virtual machines. If the guest network is instantiated from
+a network offering that offers the Remote Access VPN service, the
+virtual router (based on the System VM) is used to provide the service.
+CloudStack provides a L2TP-over-IPsec-based remote access VPN service to
+guest virtual networks. Since each network gets its own virtual router,
+VPNs are not shared across the networks. VPN clients native to Windows,
+Mac OS X and iOS can be used to connect to the guest networks. The
+account owner can create and manage users for their VPN. CloudStack does
+not use its account database for this purpose but uses a separate table.
+The VPN user database is shared across all the VPNs created by the
+account owner. All VPN users get access to all VPNs created by the
+account owner.
+
+.. note:: 
+   Make sure that not all traffic goes through the VPN. That is, the route
+   installed by the VPN should be only for the guest network and not for
+   all traffic.
+
+-  **Road Warrior / Remote Access**. Users want to be able to connect
+   securely from a home or office to a private network in the cloud.
+   Typically, the IP address of the connecting client is dynamic and
+   cannot be preconfigured on the VPN server.
+
+-  **Site to Site**. In this scenario, two private subnets are connected
+   over the public Internet with a secure VPN tunnel. The cloud user's
+   subnet (for example, an office network) is connected through a
+   gateway to the network in the cloud. The address of the user's
+   gateway must be preconfigured on the VPN server in the cloud. Note
+   that although L2TP-over-IPsec can be used to set up Site-to-Site
+   VPNs, this is not the primary intent of this feature. For more
+   information, see ":ref:`setting-s2s-vpn-conn`".
+
+
+Configuring Remote Access VPN
+~
+
+To set up VPN for the cloud:
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, click Global Settings.
+
+#. Set the following global configuration parameters.
+
+   -  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.
+
+To enable VPN for a particular network:
+
+#. Log in as a user or administrator to the CloudStack UI.
+
+#. In the left navigation, click Network.
+
+#. Click the name of the network you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click one of the displayed IP address names.
+
+#. Click the Enable VPN button. |vpn-icon.png|
+
+   The IPsec key is displayed in a popup window.
+
+
+Configuring Remote Access VPN in VPC
+
+
+On enabling Remote Access VPN on a VPC, any VPN client present outside
+the VPC can access VMs present in the VPC by using the Remote VPN
+connection. The VPN client can be present anywhere except inside the VPC
+on which the user enabled the Remote Access VPN service.
+
+To enable VPN for a VPC:
+
+#. Log in as a user or administrator to the CloudStack UI.
+
+#. In the left navigation, click Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC.
+
+   For each tier, the following options are displayed:
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  P

[24/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/hosts.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/hosts.po 
b/source/locale/zh_CN/LC_MESSAGES/hosts.po
new file mode 100644
index 000..4d900c2
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/hosts.po
@@ -0,0 +1,1059 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-10 06:42+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 592d97db5d074967b8037886828bbbf7
+#: ../../hosts.rst:18
+msgid "Working with Hosts"
+msgstr "ä½¿ç¨ä¸»æº"
+
+# eb6157eff5a24266a1934dce1cc5c38e
+#: ../../hosts.rst:21
+msgid "Adding Hosts"
+msgstr "æ·»å ä¸»æº"
+
+# 8278623233e349e2bbe063bea7e23268
+#: ../../hosts.rst:23
+msgid ""
+"Additional hosts can be added at any time to provide more capacity for guest"
+" VMs. For requirements and instructions, see `âAdding a Hostâ "
+"`_."
+msgstr "æ·»å 
ä¸»æºè½ä¸ºæ¥å®¾VMsæä¾æ´å¤çæ§è½ãæ´å¤éæ±ä¸è¯´æè¯·åé 
`âæ·»å ä¸»æºâ 
`_ã"
+
+# d13936e89f4e4d9ea480d52a5c693cab
+#: ../../hosts.rst:28
+msgid "Scheduled Maintenance and Maintenance Mode for Hosts"
+msgstr "ä¸»æºçç»´æ¤è®¡åä¸ç»´æ¤æ¨¡å¼"
+
+# c80faa4e959d4bf6a547b8898e582f71
+#: ../../hosts.rst:30
+msgid ""
+"You can place a host into maintenance mode. When maintenance mode is "
+"activated, the host becomes unavailable to receive new guest VMs, and the "
+"guest VMs already running on the host are seamlessly migrated to another "
+"host not in maintenance mode. This migration uses live migration technology "
+"and does not interrupt the execution of the guest."
+msgstr "ä½ å¯ä»¥ä½¿ä¸å°ä¸»æºè¿å
¥ç»´æ¤æ¨¡å¼ãå½æ¿æ´»ç»´æ¤æ¨¡å¼æ¶ï¼è¿å°ä¸»æºå°ä¸ä¼æ¥çº³æ°çæ¥å®¾VMsï¼åæ¶ä¸é¢çVMsä¼æ
 ç¼å°è¿ç§»å°å
¶ä»éç»´æ¤æ¨¡å¼çä¸»æºä¸ãè¿ä¸ªè¿ç§»ä½¿ç¨å¨çº¿è¿ç§»ææ¯å¹¶ä¸ä¸ä¼ä¸æç¨æ·çæä½ã"
+
+# 050155d6fe2d4fe9bfb03ae737991f51
+#: ../../hosts.rst:37
+msgid "vCenter and Maintenance Mode"
+msgstr "vCenterä¸ç»´æ¤æ¨¡å¼"
+
+# 6e6dd514ac534a609dbba7282dd7d14e
+#: ../../hosts.rst:39
+msgid ""
+"To enter maintenance mode on a vCenter host, both vCenter and CloudStack "
+"must be used in concert. CloudStack and vCenter have separate maintenance "
+"modes that work closely together."
+msgstr "è¦ä½¿vCenterä¸»æºè¿å¥ç»´æ¤æ¨¡å¼ï¼vCenteråCloudStackä¸é½å¿
é¡»è¿è¡æ¤æä½ãCloudStackåvCenteræåèªçç»´æ¤æ¨¡å¼ï¼ä»ä»¬éè¦ç´§å¯åä½ã"
+
+# 1e1a327f506545d588b5c2dac6a6be66
+#: ../../hosts.rst:45
+msgid ""
+"Place the host into CloudStack's \"scheduled maintenance\" mode. This does "
+"not invoke the vCenter maintenance mode, but only causes VMs to be migrated "
+"off the host"
+msgstr "å¨CloudStackä¸ï¼å°ä¸»æºè¿å
¥\"ç»´æ¤è®¡å\"æ¨¡å¼ãè¿ä¸ªæä½ä¸ä¼è°ç¨vCenterçç»´æ¤æ¨¡å¼ï¼ä½æ¯ä¼å°VMsè¿ç¦»è¯¥ä¸»æºã"
+
+# 10b6ab6a7f494f5e8df3db13ccfd3af8
+#: ../../hosts.rst:49
+msgid ""
+"When the CloudStack maintenance mode is requested, the host first moves into"
+" the Prepare for Maintenance state. In this state it cannot be the target of"
+" new guest VM starts. Then all VMs will be migrated off the server. Live "
+"migration will be used to move VMs off the host. This allows the guests to "
+"be migrated to other hosts with no disruption to the guests. After this "
+"migration is completed, the host will enter the Ready for Maintenance mode."
+msgstr "å½CloudStackç»´æ¤æ¨¡å¼å¯ç¨åï¼ä¸»æºé¦åä¼è¿å
¥åå¤ç»´æ¤ç¶æãå¨è¿ä¸ªé¶æ®µå®ä¸è½è¿è¡æ°çæ¥å®¾VMsãç¶åææçVMså°ä¼è¢«è¿ç¦»è¯¥ä¸»æºãä¸»æºä½¿ç¨å¨çº¿è¿ç§»æ¥è¿ç§»VMsãè¿ç§æ¹å¼è½å¤ä½¿æ¥å®¾VMså¨è¿ç§»å°å
¶ä»ä¸»æºçè¿ç¨ä¸ä¸ä¼ä¸æç¨æ·çæä½ã"
+
+# 1628c924f80a4f4e9f5becf74ad3f0ee
+#: ../../hosts.rst:59
+msgid "Wait for the \"Ready for Maintenance\" indicator to appear in the UI."
+msgstr "ç\"åå¤å¥½ç»´æ¤\"æç¤ºç¯åºç°å¨UIä¸ã"
+
+# 4adef7c4df77454e8bd00237cd21e93c
+#: ../../hosts.rst:63
+msgid ""
+"Now use vCenter to perform whatever actions are necessary to maintain the "
+"host.

[38/43] git commit: moved ldap.firstname.attribute to the correct section.

2014-09-09 Thread rajani

moved ldap.firstname.attribute to the correct section.

Signed-off-by: Rajani Karuturi 

closes #17


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

Branch: refs/heads/master
Commit: 3356677127398157ab265a98f08c1cf89b406bea
Parents: d92feaf
Author: Rajani Karuturi 
Authored: Wed Aug 27 10:00:36 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Aug 27 10:06:15 2014 +0530

--
 source/accounts.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/33566771/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 06a1660..83d7329 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -218,6 +218,9 @@ default values are for openldap)
 -  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
Default value for AD and openldap is **givenname**.
 
+-  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
+   Default value for AD and openldap is **sn**.
+
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
Default value is **SAMAccountName** for AD and **uid** for openldap.
 
@@ -232,9 +235,6 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~
 
--  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
-   Default value for AD and openldap is **sn**.
-
 -  ``ldap.truststore``, ``ldap.truststore.password``:  truststore, password
to use for LDAP SSL.

[30/43] git commit: CLOUDSTACK-6634

2014-09-09 Thread rajani

CLOUDSTACK-6634

updated the ldap section in admin guide

Signed-off-by: Pierre-Luc Dion 


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

Branch: refs/heads/master
Commit: 733b8665968f1b4b9d4efde58579b09260c89b7e
Parents: 018c1ad
Author: Rajani Karuturi 
Authored: Tue Aug 19 16:27:43 2014 +0530
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:14:37 2014 -0400

--
 .../_static/images/CloudStack-ldap-screen1.png  | Bin 0 -> 23243 bytes
 source/accounts.rst | 172 ---
 2 files changed, 33 insertions(+), 139 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/733b8665/source/_static/images/CloudStack-ldap-screen1.png
--
diff --git a/source/_static/images/CloudStack-ldap-screen1.png 
b/source/_static/images/CloudStack-ldap-screen1.png
new file mode 100644
index 000..46032a4
Binary files /dev/null and b/source/_static/images/CloudStack-ldap-screen1.png 
differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/733b8665/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index e5d4b6d..a4d95a2 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -186,160 +186,54 @@ Using an LDAP Server for User Authentication
 
 
 You can use an external LDAP server such as Microsoft Active Directory
-or ApacheDS to authenticate CloudStack end-users. Just map CloudStack
-accounts to the corresponding LDAP accounts using a query filter. The
-query filter is written using the query syntax of the particular LDAP
-server, and can include special wildcard characters provided by
-CloudStack for matching common values such as the userâs email address
-and name. CloudStack will search the external LDAP directory tree
-starting at a specified base directory and return the distinguished name
-(DN) and password of the matching user. This information along with the
-given password is used to authenticate the user..
+or ApacheDS to authenticate CloudStack end-users. 
+CloudStack will search the external LDAP directory tree
+starting at a specified base directory and gets user info such as first name, 
last name, email and username. 
 
-To set up LDAP authentication in CloudStack, call the CloudStack API
-command ldapConfig and provide the following:
-
--  Hostname or IP address and listening port of the LDAP server
-
--  Base directory and query filter
-
--  Search user DN credentials, which give CloudStack permission to
-   search on the LDAP server
-
--  SSL keystore and password, if SSL is used
-
-
-Example LDAP Configuration Commands
-~~~
-
-To understand the examples in this section, you need to know the basic
-concepts behind calling the CloudStack API, which are explained in the
-Developerâs Guide.
-
-The following shows an example invocation of ldapConfig with an ApacheDS
-LDAP server
-
-.. code:: bash
-
-   
http://127.0.0.1:8080/client/api?command=ldapConfig&hostname=127.0.0.1&searchbase=ou%3Dtesting%2Co%3Dproject&queryfilter=%28%26%28uid%3D%25u%29%29&binddn=cn%3DJohn+Singh%2Cou%3Dtesting%2Co%project&bindpass=secret&port=10389&ssl=true&truststore=C%3A%2Fcompany%2Finfo%2Ftrusted.ks&truststorepass=secret&response=json&apiKey=YourAPIKey&signature=YourSignatureHash
-
-The command must be URL-encoded. Here is the same example without the
-URL encoding:
-
-.. code:: bash
-   
-   http://127.0.0.1:8080/client/api?command=ldapConfig
-   &hostname=127.0.0.1
-   &searchbase=ou=testing,o=project
-   &queryfilter=(&(%uid=%u))
-   &binddn=cn=John+Singh,ou=testing,o=project
-   &bindpass=secret
-   &port=10389
-   &ssl=true
-   &truststore=C:/company/info/trusted.ks
-   &truststorepass=secret
-   &response=json
-   &apiKey=YourAPIKey&signature=YourSignatureHash
-
-The following shows a similar command for Active Directory. Here, the
-search base is the testing group within a company, and the users are
-matched up based on email address.
-
-.. code:: bash
+To authenticate, username and password entered by the user are used.
+Cloudstack does a search for a user with the given username. If it exists, it 
does a bind request with DN and password
 
-   
http://10.147.29.101:8080/client/api?command=ldapConfig&hostname=10.147.28.250&searchbase=OU%3Dtesting%2CDC%3Dcompany&queryfilter=%28%26%

[18/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/systemvm.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/systemvm.po 
b/source/locale/zh_CN/LC_MESSAGES/systemvm.po
new file mode 100644
index 000..eb4b95e
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/systemvm.po
@@ -0,0 +1,958 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# morgan wang , 2014
+# mushroom_rain , 2014
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 06:32+\n"
+"Last-Translator: è¯æ³ç \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 8be3f4aab5e948cf9ebc392ede63eb61
+#: ../../systemvm.rst:18
+msgid "Working with System Virtual Machines"
+msgstr "ä½¿ç¨ç³»ç»èææº"
+
+# 9b5d8dc94fe14b1188a4787951b5b7c1
+#: ../../systemvm.rst:20
+msgid ""
+"CloudStack uses several types of system virtual machines to perform tasks in"
+" the cloud. In general CloudStack manages these system VMs and creates, "
+"starts, and stops them as needed based on scale and immediate needs. "
+"However, the administrator should be aware of them and their roles to assist"
+" in debugging issues."
+msgstr "CloudStackä½¿ç¨å 
ç±»ç³»ç»èææºæ¥å®æäºä¸çä»»å¡ãæ»çæ¥è¯´ï¼CloudStackç®¡çè¿äºç³»ç»èææºï¼å¹¶æ
 ¹æ®æäºèå´å
æå¿«ééè¦åå»ºãå¯å¨ååæ¢å®ä»¬ãç¶èï¼ç®¡çåéè¦æè¯å°ä»ä»¬å¨è°è¯ä¸çä½ç¨ã"
+
+# e59d13f8791c445b80132078609fc486
+#: ../../systemvm.rst:27
+msgid "The System VM Template"
+msgstr "ç³»ç»VMæ¨¡æ¿"
+
+# 6f29f33ed8a249eba1387f295bc684c4
+#: ../../systemvm.rst:29
+msgid ""
+"The System VMs come from a single template. The System VM has the following "
+"characteristics:"
+msgstr "ç³»ç»VMæ¥èªäºä¸ä¸ªåç¬çæ¨¡æ¿ï¼ç³»ç»VMå·æä»¥ä¸ç¹æ§ï¼"
+
+# 9ce666c19d774839b1f8cb4590445c4c
+#: ../../systemvm.rst:34
+msgid ""
+"Debian 6.0 (\"Squeeze\"), 2.6.32 kernel with the latest security patches "
+"from the Debian security APT repository"
+msgstr "Debian 6.0(âSqueezeâ)ï¼2.6.32åæ ¸å
·æææ°çæ¥èªDebianå®å¨APTåå¨åºçå®å¨è¡¥ä¸"
+
+# 63fe9d9aeac34acdaa94ec25235705a7
+#: ../../systemvm.rst:39
+msgid ""
+"Has a minimal set of packages installed thereby reducing the attack surface"
+msgstr "å·æä¸ç³»åæå°åå®è£çåï¼å¯ä»¥éä½å®å
¨æ»å»é£é©ã"
+
+# 8180871802ba4e12bb9ad0c90bfcc6b4
+#: ../../systemvm.rst:44
+msgid "32-bit for enhanced performance on Xen/VMWare"
+msgstr "åºäº Xen/VMWare ç32ä½å¢å¼ºæ§è½"
+
+# efa0ecb7d9b340aa94a5b3d97c5df6e2
+#: ../../systemvm.rst:48
+msgid ""
+"pvops kernel with Xen PV drivers, KVM virtio drivers, and VMware tools for "
+"optimum performance on all hypervisors"
+msgstr "åå«Xen PV é©±å¨ï¼KVM virtio é©±å¨åVMware toolsçpvops åæ 
¸å¯ä»¥ä½¿ææhypervisorå¾å°æä½³æ§è½ã"
+
+# 94cc7872776443ce9c1e37cfda94a603
+#: ../../systemvm.rst:53
+msgid "Xen tools inclusion allows performance monitoring"
+msgstr "Xen tools åå«æ§è½çæ§"
+
+# 285ca06aefd5405aa00784ffa1cada94
+#: ../../systemvm.rst:57
+msgid ""
+"Latest versions of HAProxy, iptables, IPsec, and Apache from debian "
+"repository ensures improved security and speed"
+msgstr 
"ææ°çæ¬çHAProxy,ipè¡¨ï¼IPsecåæ¥èªdebianåºçApacheä¿è¯äºæé«å®å
¨æ§åéåº¦ã"
+
+# b0c807016df746d99783c98f27b847fd
+#: ../../systemvm.rst:62
+msgid ""
+"Latest version of JRE from Sun/Oracle ensures improved security and speed"
+msgstr "ä» Sun/Oracle å®è£ææ°çæ¬çJREå¯ä»¥ä¿è¯å®å
¨æ§ä¸éåº¦çæé«"
+
+# 980ff8d24ffa4282b0253bd5dced0af0
+#: ../../systemvm.rst:66
+msgid "Changing the Default System VM Template"
+msgstr "æ¹åé»è®¤ç³»ç»VMæ¨¡æ¿"
+
+# bfb28a5b9b2e40cd8ffe8f6283a4e11b
+#: ../../systemvm.rst:68
+msgid ""
+"CloudStack allows you to change the default 32-bit System VM template to "
+"64-bit one. Using the 64-bit template, upgrade the virtual router to manage "
+"larger number of connection in your network."
+msgstr "CloudStackåè®¸ä½ 
å°é»è®¤ç32ä½ç³»ç»æ¨¡æ¿åä¸º64ä½ï¼ä½¿ç¨64ä½æ¨¡æ¿ï¼å¯ä»¥åçº§èæè·¯ç±å¨ï¼ä½¿å¾ç½ç»æ¯ææ´å¤§çè¿æ¥æ°ã"
+
+# a3da003f69c948a283852316ca9ffa82
+#: ../../systemvm.rst:74
+msgid ""
+"Based on the hypervisor you use, download the 64-bit template from the "
+"following location:"
+msgstr "åºäºä½ æä½¿ç¨çhypervisorï¼ä»ä»¥ä¸å°åä¸è½½64ä½æ¨¡æ¿ï¼"
+
+# b74fdcb62bef47078

[13/43] git commit: Fix conf.py for localization setup

2014-09-09 Thread rajani

Fix conf.py for localization setup


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

Branch: refs/heads/master
Commit: a209573e23085f013d41dec87d4147c05983f56c
Parents: 68c20df
Author: Sebastien Goasguen 
Authored: Tue May 27 10:56:03 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue May 27 10:56:03 2014 +0200

--
 source/conf.py | 4 
 1 file changed, 4 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a209573e/source/conf.py
--
diff --git a/source/conf.py b/source/conf.py
index d8ef428..517956a 100644
--- a/source/conf.py
+++ b/source/conf.py
@@ -35,6 +35,10 @@ extensions = []
 # Add any paths that contain templates here, relative to this directory.
 templates_path = ['_templates']
 
+# Localization
+locale_dirs = ['./locale/']
+gettext_compact = False
+
 # The suffix of source filenames.
 source_suffix = '.rst'

[15/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/usage.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/usage.po 
b/source/locale/zh_CN/LC_MESSAGES/usage.po
new file mode 100644
index 000..ae8f954
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/usage.po
@@ -0,0 +1,1656 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-24 18:31+\n"
+"Last-Translator: è¯æ³ç \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 0337566b79334160ac7120790c9d0ac7
+#: ../../usage.rst:18
+msgid "Working with Usage"
+msgstr "ä½¿ç¨æå¡"
+
+# ef6eee68a2ab4c3eb31cb3115bab6062
+#: ../../usage.rst:20
+msgid ""
+"The Usage Server is an optional, separately-installed part of CloudStack "
+"that provides aggregated usage records which you can use to create billing "
+"integration for CloudStack. 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."
+msgstr "ä½¿ç¨æå¡å¨æ¯CloudStackä¸ä¸ªå¯éé¡¹,åå«å®è£
äº§åçä¸é¨å,æä¾äºèåä½¿ç¨è®°å½æ¨å¯ä»¥ä½¿ç¨å®æ¥åå»ºè®¡è´¹éæäº§åãä½¿ç¨æå¡å¨éè¿ä½¿ç¨æ°æ®ä»äºä»¶æ¥å¿ååå»ºæ±æ»ä½¿ç¨è®°å½,æ¨å¯ä»¥è®¿é®ä½¿ç¨listUsageRecords
 APIè°ç¨ã"
+
+# 3f5a5a7bc4cc4528840d66c404992c64
+#: ../../usage.rst:26
+msgid ""
+"The usage records show the amount of resources, such as VM run time or "
+"template storage space, consumed by guest instances."
+msgstr 
"ä½¿ç¨è®°å½æ¾ç¤ºæ°éçèµæº,æ¯å¦èææºè¿è¡æ¶é´ææ¨¡æ¿åå¨ç©ºé´ï¼ä»¥è¢«å®¢äººæ¶èä¸ºä¾ã"
+
+# 7534ac8e2cf443e7801e747d7e156ec4
+#: ../../usage.rst:29
+msgid ""
+"The Usage Server runs at least once per day. It can be configured to run "
+"multiple times per day."
+msgstr "ä½¿ç¨æå¡å¨è¿è¡è³å°æ¯å¤©ä¸æ¬¡ãå®å¯ä»¥è¢«é
ç½®ä¸ºæ¯å¤©å¤æ¬¡è¿è¡ã"
+
+# ea7f343f907540088f49db087d846e0c
+#: ../../usage.rst:33
+msgid "Configuring the Usage Server"
+msgstr "éç½®ä½¿ç¨æå¡å¨"
+
+# 5aa6afef926b456384cf8fe5fef33e85
+#: ../../usage.rst:35
+msgid "To configure the usage server:"
+msgstr "éç½®ä½¿ç¨æå¡å¨"
+
+# 4a2672643b7e4281babb6fa1f2c8f5c6
+#: ../../usage.rst:39
+msgid ""
+"Be sure the Usage Server has been installed. This requires extra steps "
+"beyond just installing the CloudStack software. See Installing the Usage "
+"Server (Optional) in the Advanced Installation Guide."
+msgstr "ç¡®å®ä½¿ç¨æå¡å¨å·²ç»è¢«å®è£ãå®è¦æ±å®è£
é¢å¤çCloudStackè½¯ä»¶æ¥éª¤ãåè§é«çº§å®è£
æåä¸çä½¿ç¨æå¡å¨ï¼å¯éï¼ã"
+
+# b81ee209e7eb43f2b4440774ee120d74
+#: ../../usage.rst:45
+msgid "Log in to the CloudStack UI as administrator."
+msgstr "ä½ä¸ºç®¡çåç»å½å°CloudStackç¨æ·çé¢ã"
+
+# b71109d7bf9b4edd8cb8b8b3c62c7375
+#: ../../usage.rst:49
+msgid "Click Global Settings."
+msgstr "åå»å¨å±è®¾ç½®"
+
+# d97b663ae09745498728fffc03e2f754
+#: ../../usage.rst:53
+msgid ""
+"In Search, type usage. Find the configuration parameter that controls the "
+"behavior you want to set. See the table below for a description of the "
+"available parameters."
+msgstr "å¨æç´¢æ è¾å¥ usageãæ¾å°noéè¦æ¹åçé
ç½®åæ°ãä¸è¡¨æ¯è¿äºåæ°çè¯¦ç»æè¿°ã"
+
+# b0484803860b4b1a99bb5c37475c7246
+#: ../../usage.rst:59
+msgid "In Actions, click the Edit icon."
+msgstr "å¨æä½æ ç¹å»ç¼è¾å¾æ ã"
+
+# 704d9670a22a4b81b84bd8f2aa97bb9a
+#: ../../usage.rst:63
+msgid "Type the desired value and click the Save icon."
+msgstr "è¾å¥æ°å¼ç¹å»ä¿åå¾æ ã"
+
+# f01266ae6922418997f31eb79d697cab
+#: ../../usage.rst:67
+msgid ""
+"Restart the Management Server (as usual with any global configuration "
+"change) and also the Usage Server:"
+msgstr "éæ°å¯å¨ç®¡çæå¡å¨ï¼éå¸¸å¨æ¹åäºå¨å±é
ç½®ä¹åé½è¦è¿è¡è¿æ¥ï¼å¹¶éå¯ä½¿ç¨æå¡å¨ã"
+
+# 7b5da1780fc444d2b67d97b1a97eabb7
+#: ../../usage.rst:75
+msgid ""
+"The following table shows the global configuration settings that control the"
+" behavior of the Usage Server."
+msgstr "ä¸è¡¨ååºäºå¨å±éç½®ä¸æ§å¶ä½¿ç¨æå¡å¨çéç½®é¡¹ã"
+
+# 0ca8d699a2cd4e91b01369666cbcb2ca
+#: ../../usage.rst:78
+msgid "Parameter Name  Description"
+msgstr "åæ°åæè¿°"
+
+# a6789ec8fc34419ba8e0cc40f94d7f67
+#: ../../usage.rst:80
+msgid "enable

[27/43] git commit: Adding mo files as the build seems to break otherwise

2014-09-09 Thread rajani

Adding mo files as the build seems to break otherwise


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

Branch: refs/heads/master
Commit: e54cd2489c1be37d43ef825fc1752e480eb4364f
Parents: 19e54c2
Author: Sebastien Goasguen 
Authored: Mon Jun 30 11:23:26 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 11:23:26 2014 +0200

--
 source/locale/zh_CN/LC_MESSAGES/accounts.mo   | Bin 0 -> 21351 bytes
 source/locale/zh_CN/LC_MESSAGES/administration.mo | Bin 0 -> 4620 bytes
 source/locale/zh_CN/LC_MESSAGES/api.mo| Bin 0 -> 5134 bytes
 source/locale/zh_CN/LC_MESSAGES/events.mo | Bin 0 -> 14137 bytes
 source/locale/zh_CN/LC_MESSAGES/hosts.mo  | Bin 0 -> 37120 bytes
 source/locale/zh_CN/LC_MESSAGES/index.mo  | Bin 0 -> 1581 bytes
 source/locale/zh_CN/LC_MESSAGES/management.mo | Bin 0 -> 21220 bytes
 source/locale/zh_CN/LC_MESSAGES/networking.mo | Bin 0 -> 28699 bytes
 source/locale/zh_CN/LC_MESSAGES/networking2.mo| Bin 0 -> 286127 bytes
 source/locale/zh_CN/LC_MESSAGES/projects.mo   | Bin 0 -> 26456 bytes
 source/locale/zh_CN/LC_MESSAGES/reliability.mo| Bin 0 -> 17965 bytes
 .../locale/zh_CN/LC_MESSAGES/service_offerings.mo | Bin 0 -> 40909 bytes
 source/locale/zh_CN/LC_MESSAGES/storage.mo| Bin 0 -> 54484 bytes
 source/locale/zh_CN/LC_MESSAGES/systemvm.mo   | Bin 0 -> 31949 bytes
 source/locale/zh_CN/LC_MESSAGES/templates.mo  | Bin 0 -> 53480 bytes
 .../locale/zh_CN/LC_MESSAGES/troubleshooting.mo   | Bin 0 -> 17278 bytes
 source/locale/zh_CN/LC_MESSAGES/tuning.mo | Bin 0 -> 6792 bytes
 source/locale/zh_CN/LC_MESSAGES/ui.mo | Bin 0 -> 17237 bytes
 source/locale/zh_CN/LC_MESSAGES/usage.mo  | Bin 0 -> 42805 bytes
 .../locale/zh_CN/LC_MESSAGES/virtual_machines.mo  | Bin 0 -> 65215 bytes
 20 files changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/accounts.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/accounts.mo 
b/source/locale/zh_CN/LC_MESSAGES/accounts.mo
new file mode 100644
index 000..8cb6d09
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/accounts.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/administration.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/administration.mo 
b/source/locale/zh_CN/LC_MESSAGES/administration.mo
new file mode 100644
index 000..aaf0abf
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/administration.mo 
differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/api.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/api.mo 
b/source/locale/zh_CN/LC_MESSAGES/api.mo
new file mode 100644
index 000..cbe1413
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/api.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/events.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/events.mo 
b/source/locale/zh_CN/LC_MESSAGES/events.mo
new file mode 100644
index 000..a461140
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/events.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/hosts.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/hosts.mo 
b/source/locale/zh_CN/LC_MESSAGES/hosts.mo
new file mode 100644
index 000..913f8c4
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/hosts.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/index.mo
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/index.mo 
b/source/locale/zh_CN/LC_MESSAGES/index.mo
new file mode 100644
index 000..6c034c7
Binary files /dev/null and b/source/locale/zh_CN/LC_MESSAGES/index.mo differ

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e54cd248/source/locale/zh_CN/LC_MESSAGES/management.mo
--
diff --git a/source/locale/zh_CN/

[10/43] Fixed formatting by Will stevens

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/templates.rst
--
diff --git a/source/templates.rst b/source/templates.rst
index c4d33b2..bc55aa2 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -12,7 +12,8 @@
KIND, either express or implied.  See the License for the
specific language governing permissions and limitations
under the License.
-   
+
+
 Working with Templates
 ==
 
@@ -30,6 +31,7 @@ CloudStack ships with a default template. In order to present 
more
 choices to users, CloudStack administrators and users can create
 templates and add them to CloudStack.
 
+
 Creating Templates: Overview
 
 
@@ -38,18 +40,12 @@ system. There are a variety of ways to add more templates.
 Administrators and end users can add templates. The typical sequence of
 events is:
 
-#. 
-
-   Launch a VM instance that has the operating system you want. Make any
+#. Launch a VM instance that has the operating system you want. Make any
other desired configuration changes to the VM.
 
-#. 
-
-   Stop the VM.
-
-#. 
+#. Stop the VM.
 
-   Convert the volume into a template.
+#. Convert the volume into a template.
 
 There are other ways to add templates to CloudStack. For example, you
 can take a snapshot of the VM's volume and create a template from the
@@ -58,19 +54,17 @@ snapshot, or import a VHD from another system into 
CloudStack.
 The various techniques for creating templates are described in the next
 few sections.
 
+
 Requirements for Templates
 --
 
--  
-
-   For XenServer, install PV drivers / Xen tools on each template that
+-  For XenServer, install PV drivers / Xen tools on each template that
you create. This will enable live migration and clean guest shutdown.
 
--  
-
-   For vSphere, install VMware Tools on each template that you create.
+-  For vSphere, install VMware Tools on each template that you create.
This will enable console view to work properly.
 
+
 Best Practices for Templates
 
 
@@ -78,6 +72,7 @@ If you plan to use large templates (100 GB or larger), be 
sure you have
 a 10-gigabit network to support the large templates. A slower network
 can lead to timeouts and other errors when large templates are used.
 
+
 The Default Template
 
 
@@ -98,30 +93,31 @@ block most access to the template excluding ssh.
 
 .. code:: bash
 
-# iptables --list
-Chain INPUT (policy ACCEPT)
-target prot opt source   destination
-RH-Firewall-1-INPUT  all  --  anywhere anywhere
-
-Chain FORWARD (policy ACCEPT)
-target prot opt source   destination
-RH-Firewall-1-INPUT  all  --  anywhere anywhere
-
-Chain OUTPUT (policy ACCEPT)
-target prot opt source   destination
-
-Chain RH-Firewall-1-INPUT (2 references)
-target prot opt source   destination
-ACCEPT all  --  anywhere anywhere
-ACCEPT icmp --  anywhereanywhere   icmp any
-ACCEPT esp  --  anywhereanywhere
-ACCEPT ah   --  anywhereanywhere
-ACCEPT udp  --  anywhere224.0.0.251udp dpt:mdns
-ACCEPT udp  --  anywhereanywhere   udp dpt:ipp
-ACCEPT tcp  --  anywhereanywhere   tcp dpt:ipp
-ACCEPT all  --  anywhereanywhere   state 
RELATED,ESTABLISHED
-ACCEPT tcp  --  anywhereanywhere   state NEW tcp dpt:ssh
-REJECT all  --  anywhereanywhere   reject-with icmp-host-
+   # iptables --list
+   Chain INPUT (policy ACCEPT)
+   target prot opt source   destination
+   RH-Firewall-1-INPUT  all  --  anywhere anywhere
+
+   Chain FORWARD (policy ACCEPT)
+   target prot opt source   destination
+   RH-Firewall-1-INPUT  all  --  anywhere anywhere
+
+   Chain OUTPUT (policy ACCEPT)
+   target prot opt source   destination
+
+   Chain RH-Firewall-1-INPUT (2 references)
+   target prot opt source   destination
+   ACCEPT all  --  anywhere anywhere
+   ACCEPT icmp --  anywhereanywhere   icmp any
+   ACCEPT esp  --  anywhereanywhere
+   ACCEPT ah   --  anywhereanywhere
+   ACCEPT udp  --  anywhere224.0.0.251udp dpt:mdns
+   ACCEPT udp  --  anywhereanywhere   udp dpt:ipp
+   ACCEPT tcp  --  anywhereanywhere   tcp dpt:ipp
+   ACCEPT all  --  anywhereanywhere   state RELATED,ESTABLISHED
+   ACCEPT tcp  --  anywhereanywhere   state NEW tcp dpt:ssh
+   REJECT all  --  anywhereanywhere   reject-with icmp-host-
+
 
 Private and Public Templates
 
@@ -141,92 +1

[05/43] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking2.rst
--
diff --git a/source/networking2.rst b/source/networking2.rst
deleted file mode 100644
index b3743fc..000
--- a/source/networking2.rst
+++ /dev/null
@@ -1,7033 +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.
-   
-
-Managing Networks and Traffic
-=
-
-In a CloudStack, guest VMs can communicate with each other using shared
-infrastructure with the security and user perception that the guests
-have a private LAN. The CloudStack virtual router is the main component
-providing networking features for guest traffic.
-
-Guest Traffic
--
-
-A network can carry guest traffic only between VMs within one zone.
-Virtual machines in different zones cannot communicate with each other
-using their IP addresses; they must communicate with each other by
-routing through a public IP address.
-
-See a typical guest traffic setup given below:
-
-|guest-traffic-setup.png| 
-
-Typically, the Management Server automatically creates a virtual router
-for each network. A virtual router is a special virtual machine that
-runs on the hosts. Each virtual router in an isolated network has three
-network interfaces. If multiple public VLAN is used, the router will
-have multiple public interfaces. Its eth0 interface serves as the
-gateway for the guest traffic and has the IP address of 10.1.1.1. Its
-eth1 interface is used by the system to configure the virtual router.
-Its eth2 interface is assigned a public IP address for public traffic.
-If multiple public VLAN is used, the router will have multiple public
-interfaces.
-
-The virtual router provides DHCP and will automatically assign an IP
-address for each guest VM within the IP range assigned for the network.
-The user can manually reconfigure guest VMs to assume different IP
-addresses.
-
-Source NAT is automatically configured in the virtual router to forward
-outbound traffic for all guest VMs
-
-Networking in a Pod

-
-The figure below illustrates network setup within a single pod. The
-hosts are connected to a pod-level switch. At a minimum, the hosts
-should have one physical uplink to each switch. Bonded NICs are
-supported as well. The pod-level switch is a pair of redundant gigabit
-switches with 10 G uplinks.
-
-|networksinglepod.png| 
-
-Servers are connected as follows:
-
--  
-
-   Storage devices are connected to only the network that carries
-   management traffic.
-
--  
-
-   Hosts are connected to networks for both management traffic and
-   public traffic.
-
--  
-
-   Hosts are also connected to one or more networks carrying guest
-   traffic.
-
-We recommend the use of multiple physical Ethernet cards to implement
-each network interface as well as redundant switch fabric in order to
-maximize throughput and improve reliability.
-
-Networking in a Zone
-
-
-The following figure illustrates the network setup within a single zone.
-
-|networksetupzone.png|
-
-A firewall for management traffic operates in the NAT mode. The network
-typically is assigned IP addresses in the 192.168.0.0/16 Class B private
-address space. Each pod is assigned IP addresses in the 192.168.\*.0/24
-Class C private address space.
-
-Each zone has its own set of public IP addresses. Public IP addresses
-from different zones do not overlap.
-
-Basic Zone Physical Network Configuration
--
-
-In a basic network, configuring the physical network is fairly
-straightforward. You only need to configure one guest network to carry
-traffic that is generated by guest VMs. When you first add a zone to
-CloudStack, you set up the guest network through the Add Zone screens.
-
-Advanced Zone Physical Network Configuration
-
-
-Within a zone that uses advanced networking, you need to tell the
-Management Server how the physical network is set up to carry different
-kinds of traffic in isolation.
-
-Configure Guest Traffic in an Advanced Zone
-~~~
-
-These steps assume you have al

[01/43] git commit: CLOUDSTACK-5943: added doc for the Palo Alto Networks firewall integration: This closes #9

2014-09-09 Thread rajani

Repository: cloudstack-docs-admin
Updated Branches:
  refs/heads/master 26cd1b738 -> 36e506009


CLOUDSTACK-5943: added doc for the Palo Alto Networks firewall integration: 
This closes #9

Signed-off-by: Sebastien Goasguen 


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

Branch: refs/heads/master
Commit: ba544d2ad6f075325d28e80049a4dc6b80082341
Parents: 8ba
Author: Will Stevens 
Authored: Mon May 12 12:56:36 2014 -0400
Committer: Sebastien Goasguen 
Committed: Thu May 15 16:56:41 2014 +0200

--
 source/networking2.rst  |   2 +
 source/palo_alto_config.rst | 282 +++
 2 files changed, 284 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/ba544d2a/source/networking2.rst
--
diff --git a/source/networking2.rst b/source/networking2.rst
index b020a19..b3743fc 100644
--- a/source/networking2.rst
+++ b/source/networking2.rst
@@ -6952,6 +6952,8 @@ To create a persistent network, perform the following:
 
Click OK.
 
+.. include:: palo_alto_config.rst
+
 .. |guest-traffic-setup.png| image:: _static/images/guest-traffic-setup.png
:alt: Depicts a guest traffic setup
 .. |networksinglepod.png| image:: _static/images/network-singlepod.png

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/ba544d2a/source/palo_alto_config.rst
--
diff --git a/source/palo_alto_config.rst b/source/palo_alto_config.rst
new file mode 100644
index 000..6c0aa46
--- /dev/null
+++ b/source/palo_alto_config.rst
@@ -0,0 +1,282 @@
+.. 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.
+
+
+
+Setup a Palo Alto Networks Firewall
+---
+
+
+Functionality Provided
+~~
+
+This implementation enable the orchestration of a Palo Alto Networks Firewall 
from within CloudStack UI and API.  
+
+**The following features are supported**:
+
+- List/Add/Delete Palo Alto Networks service provider
+- List/Add/Delete Palo Alto Networks network service offering
+- List/Add/Delete Palo Alto Networks network using the above service offering
+- Add an instance to a Palo Alto Networks network
+- Source NAT management on network create and delete
+- List/Add/Delete Ingress Firewall rule
+- List/Add/Delete Egress Firewall rule (both 'Allow' and 'Deny' default rules 
supported)
+- List/Add/Delete Port Forwarding rule
+- List/Add/Delete Static NAT rule
+- Apply a Threat Profile to all firewall rules (more details in the Additional 
Features section)
+- Apply a Log Forwarding profile to all firewall rules (more details in the 
Additional Features section)
+
+
+
+Initial Palo Alto Networks Firewall Configuration
+~
+
+Anatomy of the Palo Alto Networks Firewall
+^^
+
+- In **'Network > Interfaces'** there is a list of physical interfaces as well 
as aggregated physical interfaces which are used for managing traffic in and 
out of the Palo Alto Networks Firewall device.
+- In **'Network > Zones'** there is a list of the different configuration 
zones.  This implementation will use two zones; a public (defaults to 
'untrust') and private (defaults to 'trust') zone.
+- In **'Network > Virtual Routers'** there is a list of VRs which handle 
traffic routing for the Palo Alto Firewall.  We only use a single Virtual 
Router on the firewall and it is used to handle all the routing to the next 
network hop.
+- In **'Objects > Security Profile Groups'** there is a list of profiles which 
can be applied to firewall rules.  These profiles are used to better understand 
the types of traffic that is flowing through your network.  Configured when you 
add the firewall provide

[37/43] git commit: fix ldap section typo

2014-09-09 Thread rajani

fix ldap section typo


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

Branch: refs/heads/master
Commit: d92feaf0fdd5467734b3db654b0fa712045030b7
Parents: 6c77f69
Author: Pierre-Luc Dion 
Authored: Wed Aug 20 07:43:05 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Wed Aug 20 07:44:51 2014 -0400

--
 source/accounts.rst | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/d92feaf0/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index b555742..06a1660 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -219,7 +219,7 @@ default values are for openldap)
Default value for AD and openldap is **givenname**.
 
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
-  Default value is **SAMAccountName** for AD and **uid** for openldap.
+   Default value is **SAMAccountName** for AD and **uid** for openldap.
 
 
 Restricting LDAP users to a group:

[42/43] git commit: Merge branch '4.3' into 4.4

2014-09-09 Thread rajani

Merge branch '4.3' into 4.4

Conflicts:
source/accounts.rst
source/service_offerings.rst


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

Branch: refs/heads/master
Commit: 6507638eccd62faa27846031cda9948fff8899b4
Parents: 00c90ec 5d59a37
Author: Rajani Karuturi 
Authored: Wed Sep 10 12:08:26 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 12:08:26 2014 +0530

--
 .gitattributes |2 +
 source/accounts.rst|   10 +-
 source/locale/zh_CN/LC_MESSAGES/networking2.mo |  Bin 0 -> 286127 bytes
 source/locale/zh_CN/LC_MESSAGES/networking2.po | 8448 +++
 4 files changed, 8457 insertions(+), 3 deletions(-)
--

[23/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/networking.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/networking.po 
b/source/locale/zh_CN/LC_MESSAGES/networking.po
new file mode 100644
index 000..81430a8
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/networking.po
@@ -0,0 +1,901 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# aguncn , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-23 12:39+\n"
+"Last-Translator: aguncn \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 378fc355da2a4f7d8546a95fd9b3f5dc
+#: ../../networking.rst:18
+msgid "Setting Up Networking for Users"
+msgstr "ç¨æ·ç½ç»è®¾ç½®"
+
+# 17e4cb5cdf264aa19e3578731bf842c4
+#: ../../networking.rst:21
+msgid "Overview of Setting Up Networking for Users"
+msgstr "ç¨æ·ç½ç»è®¾ç½®æ¦è§"
+
+# 96d37a14970944b58909ecaace082018
+#: ../../networking.rst:23
+msgid ""
+"People using cloud infrastructure have a variety of needs and preferences "
+"when it comes to the networking services provided by the cloud. As a "
+"CloudStack administrator, you can do the following things to set up "
+"networking for your users:"
+msgstr "å½æ¶åå°äºè®¡ç®ææä¾çç½ç»æå¡, 
ä½¿ç¨äºåºç¡è®¾æ½çäººé½æåèªä¸åçéæ±ååå¥½. 
ä½ä¸ºCloudStackç®¡çå, ä½ å¯ä»¥ä¸ºä½ çç¨æ·åä¸é¢çäºæ
æ¥è®¾ç½®ç½ç»:"
+
+# 3db74da31e2046a8908c67bf3c665472
+#: ../../networking.rst:30
+msgid "Set up physical networks in zones"
+msgstr "å¨èµæºåéè®¾ç½®ç©çç½ç»"
+
+# 94e40111c3614cebb720933c53c016bb
+#: ../../networking.rst:34
+msgid ""
+"Set up several different providers for the same service on a single physical"
+" network (for example, both Cisco and Juniper firewalls)"
+msgstr "å¨åä¸ªç©çç½å¡ä¸ä¸ºåä¸æå¡è®¾ç½®ä¸åçæå¡æä¾è
(ä¾å¦, åæ¶è®¾ç½®CiscoåJuniperçé²ç«å¢)"
+
+# f7ee99dc067d4b129ec339cb1799e0cd
+#: ../../networking.rst:39
+msgid ""
+"Bundle different types of network services into network offerings, so users "
+"can choose the desired network services for any given virtual machine"
+msgstr "ç»å®ä¸åç±»åçç½ç»æå¡å°ç½ç»æ¹æ¡ä¸, è¿æ 
·ç¨æ·å¯ä»¥å¨ç»å®çèæºä¸ä½¿ç¨ææçç½ç»æå¡."
+
+# c5a8692df93942eca2c97aa1872928c6
+#: ../../networking.rst:45
+msgid ""
+"Add new network offerings as time goes on so end users can upgrade to a "
+"better class of service on their network"
+msgstr "éçæ¶é´çæ¨ç§», æ·»å 
æ°çç½ç»æ¹æ¡ä»¥ä¾¿æ¯æç»ç¨æ·åçº§ä»ä»¬çç½ç»æå¡."
+
+# f11d70f72e114c728425a80bf2c162c5
+#: ../../networking.rst:50
+msgid ""
+"Provide more ways for a network to be accessed by a user, such as through a "
+"project of which the user is a member"
+msgstr "æä¾æ´å¤çéå¾è®©ä¸ä¸ªç¨æ·è®¿é®ä¸ä¸ªç½ç», 
æ¯å¦éè¿ç¨æ·æå¨çä¸ä¸ªé¡¹ç®"
+
+# aa05ae98bb2a4229a3c0478a99a39fe6
+#: ../../networking.rst:54
+msgid "About Virtual Networks"
+msgstr "å³äºèæç½ç»"
+
+# a08bd43e29f54560ba910cb343eb5f53
+#: ../../networking.rst:56
+msgid ""
+"A virtual network is a logical construct that enables multi-tenancy on a "
+"single physical network. In CloudStack a virtual network can be shared or "
+"isolated."
+msgstr 
"èæç½ç»æ¯ä½¿å¤ç§æ·å¨ä¸ä¸ªç©çç½ç»ä¸çé»è¾ç»æãå¨CloudStackä¸ï¼èæç½ç»å¯ä»¥è¢«å
±äº«æéç¦»ã"
+
+# d1784c41349f444cbaaffea5119ee4bf
+#: ../../networking.rst:61
+msgid "Isolated Networks"
+msgstr "éç¦»çç½ç»"
+
+# db4418e95acd4fa69374025ca81020cb
+#: ../../networking.rst:63
+msgid ""
+"An isolated network can be accessed only by virtual machines of a single "
+"account. Isolated networks have the following properties."
+msgstr 
"ä¸ä¸ªéç¦»çç½ç»å¯ä»¥è®¿é®èææºçåä¸è´¦æ·ãéç¦»çç½ç»å
·æä¸åæ§è´¨ã"
+
+# 554e4288f8524114a4bcf6da37435d19
+#: ../../networking.rst:68
+msgid "Resources such as VLAN are allocated and garbage collected dynamically"
+msgstr "å¦VLANçèµæºè¢«å¨æåéååå¾æ¶é"
+
+# 55a8c8a3a194402a9e55453f2ec86253
+#: ../../networking.rst:73
+msgid "There is one network offering for the entire network"
+msgstr "æä¸ä¸ªç¨äºæ´ä¸ªç½ç»çç½ç»æ¹æ¡"
+
+# 6da623bb1302444ebd2054fdbf1743b7
+#: ../../networking.rst:77
+msgid ""
+"The network offering can be upgraded or downgraded but it is for the entire "
+"network"
+msgstr "ç½ç»æä¾å¯åçº§æéçº§ï¼ä½å

[39/43] git commit: moved ldap.firstname.attribute to the correct section.

2014-09-09 Thread rajani

moved ldap.firstname.attribute to the correct section.

Signed-off-by: Rajani Karuturi 

This closes #17


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

Branch: refs/heads/master
Commit: 00c90ec09adb557a5c3284b87098fc32c7801377
Parents: 343b43d
Author: Rajani Karuturi 
Authored: Wed Aug 27 10:00:36 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Aug 27 10:13:15 2014 +0530

--
 source/accounts.rst | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/00c90ec0/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 06a1660..83d7329 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -218,6 +218,9 @@ default values are for openldap)
 -  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
Default value for AD and openldap is **givenname**.
 
+-  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
+   Default value for AD and openldap is **sn**.
+
 -  ``ldap.username.attribute``: username attribute for a user within LDAP.
Default value is **SAMAccountName** for AD and **uid** for openldap.
 
@@ -232,9 +235,6 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~
 
--  ``ldap.lastname.attribute``: lastname attribute within ldap for a user.
-   Default value for AD and openldap is **sn**.
-
 -  ``ldap.truststore``, ``ldap.truststore.password``:  truststore, password
to use for LDAP SSL.

[19/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/storage.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/storage.po 
b/source/locale/zh_CN/LC_MESSAGES/storage.po
new file mode 100644
index 000..dfc19da
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/storage.po
@@ -0,0 +1,1461 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-15 02:30+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 6a202e4741994470b627a504dfaa0ec4
+#: ../../storage.rst:18
+msgid "Working with Storage"
+msgstr "ä½¿ç¨åå¨"
+
+# 162dc01704434bf39297420664b52155
+#: ../../storage.rst:21
+msgid "Storage Overview"
+msgstr "åå¨æ¦è¿°"
+
+# fb6cf279ed414191933888a05da50e30
+#: ../../storage.rst:23
+msgid ""
+"CloudStack defines two types of storage: primary and secondary. Primary "
+"storage can be accessed by either iSCSI or NFS. Additionally, direct "
+"attached storage may be used for primary storage. Secondary storage is "
+"always accessed using NFS."
+msgstr "CloudStackå®ä¹äºä¸¤ç§åå¨ï¼ä¸»åå¨åè¾
å©åå¨ãä¸»åå¨å¯ä»¥ä½¿ç¨iSCSIæNFSåè®®ãå¦å¤ï¼ç´æ¥éå 
åå¨å¯è¢«ç¨äºä¸»åå¨ãè¾å©åå¨éå¸¸ä½¿ç¨NFSåè®®ã"
+
+# 3e1682b1378e44d1b6277de404cef6c9
+#: ../../storage.rst:28
+msgid ""
+"There is no ephemeral storage in CloudStack. All volumes on all nodes are "
+"persistent."
+msgstr 
"CloudStackä¸æ¯æä¸´æ¶åå¨ãææèç¹ä¸çææå·é½æ¯æä¹
åå¨ã"
+
+# 3b158cf365224a128dce4c9bf414bc05
+#: ../../storage.rst:32
+msgid "Primary Storage"
+msgstr "ä¸»åå¨"
+
+# 0182a2b8079342b0b3ceb0b29b179646
+#: ../../storage.rst:34
+msgid ""
+"This section gives concepts and technical details about CloudStack primary "
+"storage. For information about how to install and configure primary storage "
+"through the CloudStack UI, see the Installation Guide."
+msgstr "æ¬ç« èè®²è¿°çæ¯å
³äºCloudStackçä¸»åå¨æ¦å¿µåææ¯ç»èãæ´å¤å
³äºå¦ä½éè¿CloudStack UIå®è£åéç½®ä¸»åå¨çä¿¡æ¯ï¼è¯·åéå®è£
åå¯¼ã"
+
+# 6050cb5647774b9191d87c9ac4c7db00
+#: ../../storage.rst:38
+msgid ""
+"`âAbout Primary Storageâ "
+"`_"
+msgstr "`âå³äºä¸»åå¨â 
`_"
+
+# 2d5f67decc454f279ad544d95f3a200c
+#: ../../storage.rst:41
+msgid "Best Practices for Primary Storage"
+msgstr "ä¸»åå¨çæä½³å®è·µ"
+
+# a8e6b6ee46a0407d89434124df4e5829
+#: ../../storage.rst:45
+msgid ""
+"The speed of primary storage will impact guest performance. If possible, "
+"choose smaller, higher RPM drives or SSDs for primary storage."
+msgstr 
"ä¸»åå¨çéåº¦ä¼ç´æ¥å½±åæ¥å®¾èæºçæ§è½ãå¦æå¯è½ï¼ä¸ºä¸»åå¨éæ©éæ©å®¹éå°ï¼è½¬éé«çç¡¬çæSSDsã"
+
+# 25a499cd8ec24c99bfc6f0391d203d7b
+#: ../../storage.rst:51
+msgid "There are two ways CloudStack can leverage primary storage:"
+msgstr "CloudStackç¨ä¸¤ç§æ¹å¼ä½¿ç¨ä¸»åå¨ï¼"
+
+# 8c344e1829c64653b8c2a3f7fd4340c6
+#: ../../storage.rst:53
+msgid ""
+"Static: This is CloudStack's traditional way of handling storage. In this "
+"model, a preallocated amount of storage (ex. a volume from a SAN) is given "
+"to CloudStack. CloudStack then permits many of its volumes to be created on "
+"this storage (can be root and/or data disks). If using this technique, "
+"ensure that nothing is stored on the storage. Adding the storage to "
+"CloudStack will destroy any existing data."
+msgstr "éæï¼CloudStackç®¡çåå¨çä¼ 
ç»æ¹å¼ãå¨è¿ä¸ªæ¨¡å¼ä¸ï¼è¦ç»CloudStacké¢ååéå 
ä¸ªåå¨(æ¯å¦ä¸ä¸ªSANä¸çå·)ãç¶åCloudStackå¨ä¸é¢åå»ºè¥å¹²ä¸ªå·(å¯ä»¥æ¯rootå/æè

æ°æ®ç)ãå¦æä½¿ç¨è¿ç§ææ¯ï¼ç¡®ä¿åå¨ä¸æ²¡ææ°æ®ãç»CloudStackæ·»å
 åå¨ä¼éæ¯å·²åå¨çæææ°æ®ã"
+
+# 72b1dbe1653c4bfbb6de406140cd47d5
+#: ../../storage.rst:61
+msgid ""
+"Dynamic: This is a newer way for CloudStack to manage storage. In this "
+"model, a storage system (rather than a preallocated amount of storage) is "
+"given to CloudStack. CloudStack, working in concert with a storage plug-in, "
+"dynamically creates volumes on the storage system and each volume on the "
+"storage syst

[40/43] git commit: CLOUDSTACK-6634: added more details for ldap ssl

2014-09-09 Thread rajani

CLOUDSTACK-6634: added more details for ldap ssl

This closes #20


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

Branch: refs/heads/master
Commit: fe5b65de1b0eaa7de7dd5ee0f0dcb0e23dc8a618
Parents: 3356677
Author: Rajani Karuturi 
Authored: Wed Sep 10 11:08:56 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 11:24:26 2014 +0530

--
 source/accounts.rst | 10 +++---
 1 file changed, 7 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fe5b65de/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index 83d7329..be8f457 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -235,9 +235,13 @@ Restricting LDAP users to a group:
 LDAP SSL:
 ~
 
--  ``ldap.truststore``, ``ldap.truststore.password``:  truststore, password
-   to use for LDAP SSL.
- 
+| If the LDAP server requires SSL, you need to enable the below configurations.
+Before enabling SSL for LDAP, you need to get the certificate which the LDAP 
server is using and add it to a trusted keystore.
+You will need to know the path to the keystore and the password.
+
+-  ``ldap.truststore`` : truststore path
+-  ``ldap.truststore.password`` : truststore password
+
 
 LDAP groups:

[21/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/projects.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/projects.po 
b/source/locale/zh_CN/LC_MESSAGES/projects.po
new file mode 100644
index 000..63db2ef
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/projects.po
@@ -0,0 +1,756 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# mushroom_rain , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-16 07:45+\n"
+"Last-Translator: mushroom_rain \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 67b9f51612cb496d9701fcd2c24d9cb5
+#: ../../projects.rst:18
+msgid "Using Projects to Organize Users and Resources"
+msgstr "ä½¿ç¨é¡¹ç®æ¥ç®¡çç¨æ·åèµæºã"
+
+# 1cb3a4ccdca349788ea29a615f989e93
+#: ../../projects.rst:21
+msgid "Overview of Projects"
+msgstr "é¡¹ç®æ¦è§"
+
+# f06b8f1572294f1c9e8567167df9a4c5
+#: ../../projects.rst:23
+msgid ""
+"Projects are used to organize people and resources. CloudStack users within "
+"a single domain can group themselves into project teams so they can "
+"collaborate and share virtual resources such as VMs, snapshots, templates, "
+"data disks, and IP addresses. CloudStack tracks resource usage per project "
+"as well as per user, so the usage can be billed to either a user account or "
+"a project. For example, a private cloud within a software company might have"
+" all members of the QA department assigned to one project, so the company "
+"can track the resources used in testing while the project members can more "
+"easily isolate their efforts from other users of the same cloud"
+msgstr 
"é¡¹ç®ç¨æ¥ç®¡çç¨æ·åèµæºãå¤äºåç¬åä¸çCloudStackç¨æ·å¯ä»¥èªç»ï¼ä»ä»¬å¯ä»¥éä¸å¹¶åäº«èæèµæºï¼å¦VMãå¿«ç
§ãæ¨¡æ¿ãç£çãIPå°åçãCloudStackå¯ä»¥åè·è¸ªæ¯ä¸ªç¨æ·ä¸æ 
·è·è¸ªæ¯ä¸ªé¡¹ç®çèµæºï¼æä»¥å¯ä»¥æç§ç¨æ·æè
é¡¹ç®å¯¹èµæºä½¿ç¨æ¶è´¹ãä¾å¦ï¼ä¸ä¸ªè½¯ä»¶å
¬å¸çç§æäºå¯è½å°ææQAé¨é¨çåå·¥åé
å°ä¸ä¸ªé¡¹ç®ï¼å½éè¦å¨æµè¯ä¸åºååä¸äºä¸è¯¥é¡¹ç®ç»åå·¥çè´¡ç®æ¶ï¼æµè¯ä¸çèµæºè·è¸ªå°åçå®¹æã"
+
+# 467cabcfe9c448b784ab2c2c52560838
+#: ../../projects.rst:34
+msgid ""
+"You can configure CloudStack to allow any user to create a new project, or "
+"you can restrict that ability to just CloudStack administrators. Once you "
+"have created a project, you become that projectâs administrator, and you 
can"
+" add others within your domain to the project. CloudStack can be set up "
+"either so that you can add people directly to a project, or so that you have"
+" to send an invitation which the recipient must accept. Project members can "
+"view and manage all virtual resources created by anyone in the project (for "
+"example, share VMs). A user can be a member of any number of projects and "
+"can switch views in the CloudStack UI to show only project-related "
+"information, such as project VMs, fellow project members, project-related "
+"alerts, and so on."
+msgstr "ä½ å¯ä»¥éç½® CloudStackåè®¸ä»»ä½ç¨æ·åå»ºé¡¹ç®ï¼æèä½ 
ä¹å¯ä»¥åªåè®¸CloudStackç®¡çåè¿è¡æ¤é¡¹æä½ãä¸æ¦ä½ 
åå»ºäºé¡¹ç®ï¼ä½ å°±æä¸ºé¡¹ç®ç®¡çåï¼ä½ å¯ä»¥å°åä¸çå
¶ä»ç¨æ·å å¥å°é¡¹ç®ãCloudStackå¯ä»¥è®¾ç½®æå°ç¨æ·ç´æ¥å å
¥é¡¹ç®æèåæ¥åè
åééè¯·ãé¡¹ç®ç»æåå¯ä»¥æµè§åç®¡çé¡¹ç®ä¸çææèæèµæºï¼ä¾å¦ï¼å

±äº«VMï¼ãä¸ä¸ªç¨æ·å¯ä»¥å±äºä»»ä½é¡¹ç®ç»ï¼å¹¶å¯å¨CloudStackçé¢ä¸åæ¢åªä¸é¡¹ç®ç¸å
³çä¿¡æ¯ï¼å¦é¡¹ç®VMï¼é¡¹ç®æåï¼é¡¹ç®ç¸å³è¦åçã"
+
+# 084d2df113554d86bc84fabe4777c76c
+#: ../../projects.rst:46
+msgid ""
+"The project administrator can pass on the role to another project member. "
+"The project administrator can also add more members, remove members from the"
+" project, set new resource limits (as long as they are below the global "
+"defaults set by the CloudStack administrator), and delete the project. When "
+"the administrator removes a member from the project, resources created by "
+"that user, such as VM instances, remain with the project. This brings us to "
+"the subject of resource ownership and which resources can be used by a "
+"project."
+msgstr "é¡¹ç®ç®¡çåå¯ä»¥å°è§è²ä¼ 
éç»é¡¹ç®å¦å¤çæåãé¡¹ç®ç®¡çåä¹å¯ä»¥æ·»å ãå 
é¤é¡¹ç®æåï¼è®¾ç½®æ°çèµæºé

[34/43] git commit: CLOUDSTACK-5879: added encrypted values

2014-09-09 Thread rajani

CLOUDSTACK-5879: added encrypted values

Signed-off-by: Pierre-Luc Dion 


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

Branch: refs/heads/master
Commit: 0c75dcc044873f4c1fee604670616b82d7aff001
Parents: e0bbecb
Author: Erik Weber 
Authored: Tue Aug 19 20:32:11 2014 +0200
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:20:57 2014 -0400

--
 source/events.rst | 53 ++
 1 file changed, 53 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/0c75dcc0/source/events.rst
--
diff --git a/source/events.rst b/source/events.rst
index d500a5c..273435e 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -141,6 +141,59 @@ changes can control the behaviour.
 
   The ``eventNotificationBus`` bean represents the
   ``org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus`` class.
+  
+  If you want to use encrypted values for the username and password, you 
have to include a bean to pass those
+  as variables from a credentials file.
+  
+  A sample is given below
+  
+  .. code:: bash
+  
+ http://www.springframework.org/schema/beans";
+xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+xmlns:context="http://www.springframework.org/schema/context";
+xmlns:aop="http://www.springframework.org/schema/aop";
+xsi:schemaLocation="http://www.springframework.org/schema/beans
+ 
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ 
http://www.springframework.org/schema/context/spring-context-3.0.xsd";
+ >
+
+
+   
+   
+   
+   
+   
+   
+
+
+
+   
+   
+
+
+
+   
+
+
+
+   
+   
+
+ 
+
+
+  Create a new file in the same folder called ``cred.properties`` and the 
specify the values for username and password as jascrypt encrypted strings
+
+  Sample, with ``guest`` as values for both fields:
+ 
+  .. code:: bash
+ 
+ username=nh2XrM7jWHMG4VQK18iiBQ==
+ password=nh2XrM7jWHMG4VQK18iiBQ==
+ 
 
 #. Restart the Management Server.

[04/43] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking_and_traffic.rst
--
diff --git a/source/networking_and_traffic.rst 
b/source/networking_and_traffic.rst
new file mode 100644
index 000..f29ed3b
--- /dev/null
+++ b/source/networking_and_traffic.rst
@@ -0,0 +1,82 @@
+.. 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.
+   
+
+Managing Networks and Traffic
+=
+
+In a CloudStack, guest VMs can communicate with each other using shared
+infrastructure with the security and user perception that the guests
+have a private LAN. The CloudStack virtual router is the main component
+providing networking features for guest traffic.
+
+.. include:: networking/guest_traffic.rst
+
+.. include:: networking/networking_in_pod.rst
+
+.. include:: networking/networking_in_zone.rst
+
+.. include:: networking/basic_zone_config.rst
+
+.. include:: networking/advanced_zone_config.rst
+
+.. include:: networking/multiple_guest_networks.rst
+
+.. include:: networking/ip_reservation_in_guest_networks.rst
+
+.. include:: networking/public_ips_and_vlans_for_accounts.rst
+
+.. include:: networking/multiple_ips_on_single_nic.rst
+
+.. include:: networking/multiple_ip_ranges.rst
+
+.. include:: networking/elastic_ips.rst
+
+.. include:: networking/portable_ips.rst
+
+.. include:: networking/multiple_subnets_in_shared_network.rst
+
+.. include:: networking/isolation_in_advanced_zone_with_vlan.rst
+
+.. include:: networking/security_groups.rst
+
+.. include:: networking/external_firewalls_and_load_balancers.rst
+
+.. include:: networking/global_server_load_balancing.rst
+
+.. include:: networking/guest_ip_ranges.rst
+
+.. include:: networking/acquiring_an_ip_address.rst
+
+.. include:: networking/releasing_an_ip_address.rst
+
+.. include:: networking/static_nat.rst
+
+.. include:: networking/ip_forwarding_and_firewalling.rst
+
+.. include:: networking/ip_load_balancing.rst
+
+.. include:: networking/dns_and_dhcp.rst
+
+.. include:: networking/remote_access_vpn.rst
+
+.. include:: networking/inter_vlan_routing.rst
+
+.. include:: networking/virtual_private_cloud_config.rst
+
+.. include:: networking/persistent_networks.rst
+
+.. include:: networking/palo_alto_config.rst
+

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/palo_alto_config.rst
--
diff --git a/source/palo_alto_config.rst b/source/palo_alto_config.rst
deleted file mode 100644
index 6c0aa46..000
--- a/source/palo_alto_config.rst
+++ /dev/null
@@ -1,282 +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.
-
-
-
-Setup a Palo Alto Networks Firewall

-
-
-Functionality Provided
-~~
-
-This implementation enable the orchestration of a Palo Alto Networks Firewall 
from within CloudStack UI and API.  
-
-**The following features are supported**:
-
-- List/Add/Delete Palo Alto Networks service provider
-- List/Add/Delete Palo Alto Networks network service offering
-- List/Add/Delete Palo Alto Networks network using the above service offering
-- Add an instance to a Palo Alto Networks network
-- Source NAT management on network create and delete
-- List/Add/Delete Ingress Firewall rule
-- List/Add/Delete Egress Firewall rule (both 'Allow' and 'Deny' default rules 
supported)
-- List/Add/Delete Port Forw

[16/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po 
b/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
new file mode 100644
index 000..1433054
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/troubleshooting.po
@@ -0,0 +1,499 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# aguncn , 2014
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-26 14:32+\n"
+"Last-Translator: è¯æ³ç \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# e8bd92e93dac45f788464ab1963b20e7
+#: ../../troubleshooting.rst:17
+msgid "TroubleShooting"
+msgstr "æéææ¥"
+
+# 55d6cf3cc73d4ef5a617636942890a97
+#: ../../troubleshooting.rst:20
+msgid "Working with Server Logs"
+msgstr "ä½¿ç¨æå¡å¨æ¥å¿"
+
+# 493b26a59c724cb0b4753cf2de7729c6
+#: ../../troubleshooting.rst:22
+msgid ""
+"The CloudStack Management Server logs all web site, middle tier, and "
+"database activities for diagnostics purposes in "
+"`/var/log/cloudstack/management/`. The CloudStack logs a variety of error "
+"messages. We recommend this command to find the problematic output in the "
+"Management Server log:."
+msgstr "ä¸ºäºæ¹ä¾¿è¯æç³»ç»ï¼CloudStack 
ç®¡çæå¡å¨å¨ç®å½/var/log/cloud/management/ä¸è®°å½äºææç½ç«ãä¸é´å±åæ°æ®åºçæ´»å¨ãCloudStack
 
ä¼è®°å½åç§åºéä¿¡æ¯ãæä»¬æ¨èä½¿ç¨ä¸è¿°å½ä»¤ä»ç®¡çæå¡å¨æ¥å¿ä¸å¯»æ¾æé®é¢çè¾åºæ¥å¿ï¼"
+
+# e9110df374044f87990151358476d4c4
+#: ../../troubleshooting.rst:29
+msgid ""
+"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."
+msgstr "å½ä½ 
å¨æ·è´åç²è´´è¿ä¸ªå½ä»¤æ¶ï¼è¯·ç¡®ä¿ææçå½ä»¤é½å¨åä¸è¡éãæçææ¡£æ·è´å·¥å
·ä¼å°è¿ä¸ªå½ä»¤åå²ä¸ºå¤è¡ã"
+
+# 0650dd8f9e3042b6a0023c284e9700af
+#: ../../troubleshooting.rst:37
+msgid ""
+"The CloudStack 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:"
+msgstr 
"CloudStackå¤çè¯·æ±æ¶ä¼çæä¸ä¸ªä»»å¡IDãå¦ææ¨åç°äºæ¥å¿ä¸çæä¸ªéè¯¯ï¼ç¶åæ³è°è¯è¯¥é®é¢ï¼æ¨å¯ä»¥å¨ç®¡çæå¡å¨æ¥å¿ä¸grepè¿ä¸ªä»»å¡IDãä¾å¦ï¼åè®¾æ¨åç°äºä»¥ä¸çERRORä¿¡æ¯ï¼"
+
+# 8311990224b84dd0b3faf4084d527b4f
+#: ../../troubleshooting.rst:46
+msgid ""
+"Note that the job ID is 1076. You can track back the events relating to job "
+"1076 with the following grep:"
+msgstr "æ³¨æå°ä»»å¡IDæ¯1076ãä½ 
å¯ä»¥è¿½è¸ªè¿åäºä»¶çç¸è¿ä»»å¡1076æç§ä»¥ä¸grep:"
+
+# e3ffc3e9a91f4bbd92acf9a582aa4f09
+#: ../../troubleshooting.rst:53
+msgid ""
+"The CloudStack Agent Server logs its activities in "
+"`/var/log/cloudstack/agent/`."
+msgstr "CloudStackä»£çæå¡å¨å¨ 
`/var/log/cloudstack/agent/`è®°å½äºå®çæ´»å¨ã"
+
+# 2e3bac54e6a44e7a916a10b1a72ae7b8
+#: ../../troubleshooting.rst:57
+msgid "Data Loss on Exported Primary Storage"
+msgstr "å¨å¯¼åºä¸»åå¨æ¶çæ°æ®ä¸¢å¤±"
+
+# 17772f3eaf854986935381edba6a08f4
+# a36bc3bf835b43ceb89eb0502f49427f
+# 5b32c5e122f34a7390b04dc584d7d8b1
+# 8c990e9835c843e0ba8e6389024c9da7
+# c07d93b58e73413caee9927f2f377a4c
+# 0210bf5ba6124daab904e885ec47d2c3
+#: ../../troubleshooting.rst:60 ../../troubleshooting.rst:94
+#: ../../troubleshooting.rst:138 ../../troubleshooting.rst:158
+#: ../../troubleshooting.rst:178 ../../troubleshooting.rst:215
+msgid "Symptom"
+msgstr "çç¶"
+
+# b8c4b40af3fd4552bdc54740a5a0fd39
+#: ../../troubleshooting.rst:62
+msgid ""
+"Loss of existing data on primary storage which has been exposed as a Linux "
+"NFS server export on an iSCSI volume."
+msgstr 
"ä¸»åå¨çå·²ææ°æ®ä¸¢å¤±ãè¯¥ä¸»åå¨æ¯ç¨iSCSIå·å¯¼åºçä¸ä¸ªLinux
 NFSæå¡å¨è¾åºã"
+
+# c0c2bc4870e74609a67d1aed2af2b411
+# 989912d8a32b45e8a4bd2c54b5a97647
+# 1b80c032e2184fad85a5b5d2321b104a
+# b3c2f63d649b4d4dbb78fe05f3e2f087
+# aa3a404aa32c48bbb850fca268ee4ac9
+# 57820682c7c44dc0b9429c160629a1eb
+#: ../../troubleshooting.rst:66 ../../troubleshooting.rst:100
+#: ../../troubleshooting.rst:143 ../../troubleshooting.rst:163
+#: ../../troubleshooting.

[28/43] git commit: Adding logo to 4.3 index page

2014-09-09 Thread rajani

Adding logo to 4.3 index page


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

Branch: refs/heads/master
Commit: a55b0dbcf3c56bb856bc3243ec36ef7025af2204
Parents: e54cd24
Author: Sebastien Goasguen 
Authored: Mon Jun 30 11:30:12 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 11:30:12 2014 +0200

--
 source/_static/images/acslogo.png | Bin 0 -> 135394 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a55b0dbc/source/_static/images/acslogo.png
--
diff --git a/source/_static/images/acslogo.png 
b/source/_static/images/acslogo.png
new file mode 100644
index 000..a938231
Binary files /dev/null and b/source/_static/images/acslogo.png differ

[41/43] git commit: ignoring .po and .mo files during merge

2014-09-09 Thread rajani

ignoring .po and .mo files during merge


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

Branch: refs/heads/master
Commit: 5d59a37d0d2ca0f6ee6d5193fcdf4bb8a42e5e43
Parents: fe5b65d
Author: Rajani Karuturi 
Authored: Wed Sep 10 12:02:31 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 12:02:31 2014 +0530

--
 .gitattributes | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/5d59a37d/.gitattributes
--
diff --git a/.gitattributes b/.gitattributes
new file mode 100644
index 000..a4cfe93
--- /dev/null
+++ b/.gitattributes
@@ -0,0 +1,2 @@
+*.po merge=ours
+*.mo merge=ours

[31/43] git commit: accounts.rst: remove trailing spaces, add highlight

2014-09-09 Thread rajani

accounts.rst: remove trailing spaces, add highlight


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

Branch: refs/heads/master
Commit: fce127ef8e6669ea72e5c9b9051f5720172125cb
Parents: 733b866
Author: Pierre-Luc Dion 
Authored: Tue Aug 19 20:04:07 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:15:02 2014 -0400

--
 source/accounts.rst | 81 
 1 file changed, 54 insertions(+), 27 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fce127ef/source/accounts.rst
--
diff --git a/source/accounts.rst b/source/accounts.rst
index a4d95a2..b555742 100644
--- a/source/accounts.rst
+++ b/source/accounts.rst
@@ -186,53 +186,80 @@ Using an LDAP Server for User Authentication
 
 
 You can use an external LDAP server such as Microsoft Active Directory
-or ApacheDS to authenticate CloudStack end-users. 
-CloudStack will search the external LDAP directory tree
-starting at a specified base directory and gets user info such as first name, 
last name, email and username. 
+or ApacheDS to authenticate CloudStack end-users. CloudStack will search
+the external LDAP directory tree starting at a specified base directory
+and gets user info such as first name, last name, email and username.
 
 To authenticate, username and password entered by the user are used.
-Cloudstack does a search for a user with the given username. If it exists, it 
does a bind request with DN and password
+Cloudstack does a search for a user with the given username. If it
+exists, it does a bind request with DN and password.
 
 To set up LDAP authentication in CloudStack, call the CloudStack API
-command addLdapConfiguration and provide Hostname or IP address and listening 
port of the LDAP server.
-You could configure multiple servers as well. These are expected to be 
replicas. If one fails, the next one is used.
+command ``addLdapConfiguration`` and provide Hostname or IP address
+and listening port of the LDAP server. You could configure multiple
+servers as well. These are expected to be replicas. If one fails,
+the next one is used.
 
+The following global configurations should also be configured (the
+default values are for openldap)
 
-The following global configurations should also be configured (the default 
values are for openldap)
+-  ``ldap.basedn``:Sets the basedn for LDAP. Ex: 
**OU=APAC,DC=company,DC=com**
 
+-  ``ldap.bind.principal``, ``ldap.bind.password``: DN and password for a user
+   who can list all the users in the above basedn. Ex:
+   **CN=Administrator, OU=APAC, DC=company, DC=com**
+
+-  ``ldap.user.object``: object type of users within LDAP. Defaults value is
+   **user** for AD and **interorgperson** for openldap.
+
+-  ``ldap.email.attribute``: email attribute within ldap for a user. Default
+   value for AD and openldap is **mail**.
+
+-  ``ldap.firstname.attribute``: firstname attribute within ldap for a user.
+   Default value for AD and openldap is **givenname**.
+
+-  ``ldap.username.attribute``: username attribute for a user within LDAP.
+  Default value is **SAMAccountName** for AD and **uid** for openldap.
 
-- ldap.basedn: Sets the basedn for LDAP. Ex: OU=APAC,DC=company,DC=com
-- ldap.bind.principal,ldap.bind.password: DN and password for a user who can 
list all the users in the above basedn. Ex: CN=Administrator, OU=APAC, 
DC=company, DC=com
-- ldap.user.object: object type of users within LDAP. Defaults value is user 
for AD and interorgperson for openldap.
-- ldap.email.attribute: email attribute within ldap for a user. Default value 
for AD and openldap is mail.
-- ldap.firstname.attribute: firstname attribute within ldap for a user. 
Default value for AD and openldap is givenname.
-- ldap.username.attribute: username attribute for a user within LDAP. Default 
value is SAMAccountNAme  for AD and uid for openldap.
 
 Restricting LDAP users to a group:
-~
-- ldap.search.group.principle: this is optional and if set only users from 
this group are listed.  
+~~
+
+-  ``ldap.search.group.principle``: this is optional and if set only users from
+   this group are listed.
+
 
 LDAP SSL:
-~
-- ldap.lastname.attribute: lsatname attribute within ldap for a user. Default 
value for AD and openldap is sn.
-- ldap.truststore, ldap.truststore.password:   truststore,password to use for 
LDAP SSL.
- 
-LDAP groups:  
-~
-- ldap

[08/43] git commit: split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

split the networking2 file into multiple includes and renamed it to 
'networking_and_traffic': This closes #11


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

Branch: refs/heads/master
Commit: 72a3a7c109c7ef198dc1fe99d91a4dd2ff6791a7
Parents: 5a4a44d
Author: Will Stevens 
Authored: Fri May 16 17:35:52 2014 -0400
Committer: Sebastien Goasguen 
Committed: Sat May 17 09:35:01 2014 +0200

--
 source/index.rst|2 +-
 source/networking/acquiring_an_ip_address.rst   |   42 +
 source/networking/advanced_zone_config.rst  |  152 +
 source/networking/basic_zone_config.rst |   24 +
 source/networking/dns_and_dhcp.rst  |   22 +
 source/networking/elastic_ips.rst   |  104 +
 .../external_firewalls_and_load_balancers.rst   |  661 ++
 .../networking/global_server_load_balancing.rst |  453 ++
 source/networking/guest_ip_ranges.rst   |   29 +
 source/networking/guest_traffic.rst |   50 +
 source/networking/inter_vlan_routing.rst|   96 +
 .../ip_forwarding_and_firewalling.rst   |  280 +
 source/networking/ip_load_balancing.rst |   31 +
 .../ip_reservation_in_guest_networks.rst|  125 +
 .../isolation_in_advanced_zone_with_vlan.rst|  202 +
 source/networking/multiple_guest_networks.rst   |  207 +
 source/networking/multiple_ip_ranges.rst|   43 +
 .../networking/multiple_ips_on_single_nic.rst   |   98 +
 .../multiple_subnets_in_shared_network.rst  |   99 +
 source/networking/networking_in_pod.rst |   45 +
 source/networking/networking_in_zone.rst|   34 +
 source/networking/palo_alto_config.rst  |  475 ++
 source/networking/persistent_networks.rst   |   94 +
 source/networking/portable_ips.rst  |  131 +
 .../public_ips_and_vlans_for_accounts.rst   |  154 +
 source/networking/releasing_an_ip_address.rst   |   38 +
 source/networking/remote_access_vpn.rst |  696 ++
 source/networking/security_groups.rst   |  214 +
 source/networking/static_nat.rst|   56 +
 .../networking/virtual_private_cloud_config.rst | 1438 
 source/networking2.rst  | 7033 --
 source/networking_and_traffic.rst   |   82 +
 source/palo_alto_config.rst |  282 -
 source/systemvm.rst |8 +-
 34 files changed, 6180 insertions(+), 7320 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/index.rst
--
diff --git a/source/index.rst b/source/index.rst
index ddfa3bb..cc25dd4 100644
--- a/source/index.rst
+++ b/source/index.rst
@@ -114,7 +114,7 @@ Managing Networks and Traffic
 .. toctree::
:maxdepth: 2
 
-   networking2
+   networking_and_traffic
 
 Managing the Cloud
 --

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/acquiring_an_ip_address.rst
--
diff --git a/source/networking/acquiring_an_ip_address.rst 
b/source/networking/acquiring_an_ip_address.rst
new file mode 100644
index 000..b6556db
--- /dev/null
+++ b/source/networking/acquiring_an_ip_address.rst
@@ -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.
+   
+
+Acquiring a New IP Address
+--
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, choose Network.
+
+#. Click the name of the network where you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click Acquire New IP.
+
+   The Acquire New IP window is displayed.
+
+#. Specify whether you want cross-zone IP or not.
+
+   If you want Portable IP click Yes in

[11/43] Fixed formatting by Will stevens

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/projects.rst
--
diff --git a/source/projects.rst b/source/projects.rst
index 7d8d766..8cdefee 100644
--- a/source/projects.rst
+++ b/source/projects.rst
@@ -68,6 +68,7 @@ project can use any service offering or disk offering 
available in its
 domain; however, you can not create private service and disk offerings
 at the project level..
 
+
 Configuring Projects
 
 
@@ -76,6 +77,7 @@ administrator must set up various systems to support them, 
including
 membership invitations, limits on project resources, and controls on who
 can create projects.
 
+
 Setting Up Invitations
 ~~
 
@@ -86,22 +88,14 @@ by email or through the userâs CloudStack account. If you 
want
 administrators to use invitations to add members to projects, turn on
 and set up the invitations feature in CloudStack.
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
-
-#. 
-
-   In the left navigation, click Global Settings.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Global Settings.
 
-   In the search box, type project and click the search button.
+#. In the search box, type project and click the search button.
|Searches projects|
 
-#. 
-
-   In the search results, you can see a few other parameters you need to
+#. In the search results, you can see a few other parameters you need to
set to control how invitations behave. The table below shows global
configuration parameters related to project invitations. Click the
edit button to set each parameter.
@@ -126,13 +120,11 @@ and set up the invitations feature in CloudStack.
| project.smtp.username  | (Optional) User name required by the SMTP 
server for authentication. You must also set project.smtp.password and set 
project.smtp.useAuth to true..   |

++---+
 
-#. 
-
-   Restart the Management Server:
+#. Restart the Management Server:
 
.. code:: bash
 
-   service cloudstack-management restart
+  service cloudstack-management restart
 
 Setting Resource Limits for Projects
 
@@ -163,53 +155,32 @@ new maximum, the resources are not affected; however, the 
project can
 not add any new resources of that type until the total drops below the
 new limit.
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
-
-#. 
+#. Log in as administrator to the CloudStack UI.
 
-   In the left navigation, click Projects.
+#. In the left navigation, click Projects.
 
-#. 
+#. In Select View, choose Projects.
 
-   In Select View, choose Projects.
+#. Click the name of the project you want to work with.
 
-#. 
-
-   Click the name of the project you want to work with.
-
-#. 
-
-   Click the Resources tab. This tab lists the current maximum amount
+#. Click the Resources tab. This tab lists the current maximum amount
that the project is allowed to own for each type of resource.
 
-#. 
+#. Type new values for one or more resources.
 
-   Type new values for one or more resources.
+#. Click Apply.
 
-#. 
-
-   Click Apply.
 
 Setting the Global Project Resource Limits
 ^^
 
-#. 
-
-   Log in as administrator to the CloudStack UI.
+#. Log in as administrator to the CloudStack UI.
 
-#. 
+#. In the left navigation, click Global Settings.
 
-   In the left navigation, click Global Settings.
+#. In the search box, type max.projects and click the search button.
 
-#. 
-
-   In the search box, type max.projects and click the search button.
-
-#. 
-
-   In the search results, you will see the parameters you can use to set
+#. In the search results, you will see the parameters you can use to set
per-project maximum resource amounts that apply to all projects in
the cloud. No project can have more resources, but an individual
project can have lower limits. Click the edit button to set each
@@ -228,13 +199,11 @@ Setting the Global Project Resource Limits

+--+--+
 
 
-#. 
-
-   Restart the Management Server.
+#. Restart the Management Server.
 
.. code:: bash
 
-   # service cloudstack-management restart
+  # service cloudstack-management restart
 
 Setting Project Creator Permissions
 ~~~
@@ -242,21 +211,13 @@ Setting Project Creator Permissions
 You can configure CloudStack to allow any user to create a new project,
 or you can restrict that ability to just CloudStack administrators.
 
-#. 
+#. Log in as administrator to the CloudStack UI.
 
-   Log in as administrator to the

[14/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po 
b/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
new file mode 100644
index 000..64d9faa
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/virtual_machines.po
@@ -0,0 +1,1860 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# darrentang , 2014
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-11 12:02+\n"
+"Last-Translator: darrentang \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 2170d7c1a0e145718f15a48fdfd6376c
+#: ../../virtual_machines.rst:18
+msgid "Working with Virtual Machines"
+msgstr "ä½¿ç¨èææº"
+
+# 7b1c6837d7294d04b64fdefe3b860527
+#: ../../virtual_machines.rst:21
+msgid "About Working with Virtual Machines"
+msgstr "å³äºèææºçä½¿ç¨"
+
+# a8fcaad6e74c48de85dda47b508896ff
+#: ../../virtual_machines.rst:23
+msgid ""
+"CloudStack provides administrators with complete control over the lifecycle "
+"of all guest VMs executing in the cloud. CloudStack provides several guest "
+"management operations for end users and administrators. VMs may be stopped, "
+"started, rebooted, and destroyed."
+msgstr 
"CloudStackå¨äºä¸ä¸ºç®¡çåæä¾äºå®æ´çç®¡çæææ¥å®¾VMsæ´ä¸ªçå½å¨æçåè½ãCloudStackä¸ºç»ç«¯ç¨æ·åç®¡çåæä¾äºè®¸å¤æ¥å®¾èæºç®¡çæä½ãVMsè½è¢«å
³æºãå¼æºãéå¯åéæ¯ã"
+
+# 76072107bbd74ed58ef5e488bbc45361
+#: ../../virtual_machines.rst:28
+msgid ""
+"Guest VMs have a name and group. VM names and groups are opaque to "
+"CloudStack 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:"
+msgstr 
"æ¥å®¾VMsæåç§°åç»ãVMçåç§°åç»å¯¹äºCloudStackæ¯ä¸éæçï¼å¯¹ç»ç«¯ç¨æ·æ´çä»ä»¬çVMså¯ç¨ãæ¯ä¸ªVMå¯ä»¥æä¸ä¸ªç¨äºä¸åç¯å¢çåç§°ãå
¶ä¸æä¸¤ä¸ªåååç¨æ·æ§å¶ï¼"
+
+# fdf35c82059748b09618dc1b96c32958
+#: ../../virtual_machines.rst:35
+msgid ""
+"Instance name â a unique, immutable ID that is generated by CloudStack and "
+"can not be modified by the user. This name conforms to the requirements in "
+"IETF RFC 1123."
+msgstr "å®ä¾åç§° â 
ä¸ä¸ªå¯ä¸çï¼ä¸å¯åçç±CloudStackçæçIDï¼æ¤IDä¸è½è¢«ç¨æ·ä¿®æ¹ãæ¤åç§°ç¬¦å
 IETF RFC 1123ä¸çè¦æ±ã"
+
+# 35bab809b50548b78006bcf7edfd8375
+#: ../../virtual_machines.rst:41
+msgid ""
+"Display name â the name displayed in the CloudStack web UI. Can be set by "
+"the user. Defaults to instance name."
+msgstr "æ¾ç¤ºåç§° â å¨CloudStack 
UIä¸æ¾ç¤ºçåç§°ãå¯ä»¥ç±ç¨æ·è®¾ç½®ãé»è®¤è·å®ä¾åç§°ä¸è´ã"
+
+# fc95d564a6b74400bdf7cbc43166b900
+#: ../../virtual_machines.rst:46
+msgid ""
+"Name â host name that the DHCP server assigns to the VM. Can be set by the "
+"user. Defaults to instance name"
+msgstr "åç§° â ç±DHCPæå¡å¨åé
ç»VMçä¸»æºåãå¯ä»¥ç±ç¨æ·è®¾ç½®ãé»è®¤è·å®ä¾åç§°ä¸è´ã"
+
+# 29b7bc970aec4088a82cb82eac51acf2
+#: ../../virtual_machines.rst:50
+msgid ""
+"You can append the display name of a guest VM to its internal name. For more"
+" information, see `âAppending a Display Name to the Guest VMâs Internal "
+"Nameâ <#appending-a-display-name-to-the-guest-vms-internal-name>`_."
+msgstr "ä½ è½ææ¥å®¾VMçæ¾ç¤ºåéå å°å®çå
é¨åç§°ä¸ãæ´å¤ä¿¡æ¯ï¼è¯·åè `âå°æ¾ç¤ºåéå å°VMçå
é¨åç§°â <#appending-a-display-name-to-the-guest-vms-internal-name>`_."
+
+# 7776a17a323a4f91a6a4286428927bdf
+#: ../../virtual_machines.rst:52
+msgid ""
+"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"
+msgstr "æ¥å®¾VMså¯ä»¥é
ç½®æé«å¯ç¨ï¼HAï¼ãå¯ç¨äºHAçVMç±ç³»ç»çæ§ãå¦æç³»ç»æ£æµå°æ¤VMå®æºï¼å®å¯è½å°å°è¯å¨ä¸åçä¸»æºä¸éå¯VMãæ´å¤ä¿¡æ¯ï¼è¯·åèå¨èææºä¸å¯ç¨HA"
+
+# 89d81c5e76a047d0b049cbfcc9437d7d
+#: ../../virtual_machines.rst:57
+msgid ""
+"Each new VM is allocated one public IP address. When the VM is started, "
+"CloudStack auto

[43/43] git commit: Merge branch '4.4'

2014-09-09 Thread rajani

Merge branch '4.4'

Conflicts:
source/accounts.rst


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

Branch: refs/heads/master
Commit: 36e506009660e61eb6f1a704d3380889164e1c59
Parents: 26cd1b7 6507638
Author: Rajani Karuturi 
Authored: Wed Sep 10 12:11:20 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Sep 10 12:11:20 2014 +0530

--
 .gitattributes |2 +
 source/accounts.rst|   10 +-
 source/locale/zh_CN/LC_MESSAGES/networking2.mo |  Bin 0 -> 286127 bytes
 source/locale/zh_CN/LC_MESSAGES/networking2.po | 8448 +++
 4 files changed, 8457 insertions(+), 3 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/36e50600/source/accounts.rst
--

[17/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/templates.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/templates.po 
b/source/locale/zh_CN/LC_MESSAGES/templates.po
new file mode 100644
index 000..958ffe8
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/templates.po
@@ -0,0 +1,1557 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# morgan wang , 2014
+# renoshen , 2014
+# è¯æ³ç , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-23 11:44+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# b97982f6c7534586be38178d1c1fdcd8
+#: ../../templates.rst:17
+msgid "Working with Templates"
+msgstr "ä½¿ç¨æ¨¡æ¿"
+
+# e9dce9aaa8b14b9b8163fc28465cbca2
+#: ../../templates.rst:19
+msgid ""
+"A template is a reusable configuration for virtual machines. When users "
+"launch VMs, they can choose from a list of templates in CloudStack."
+msgstr "æ¨¡æ¿ç¸å½äºèææºçéç¨é
ç½®ãå½ç¨æ·åå»ºèææºæ¶è½ä»CloudStackçæ¨¡æ¿åè¡¨ä¸éæ©ä¸ä¸ªã"
+
+# d0a82a53c7814d2bad8709d6ea8d8243
+#: ../../templates.rst:22
+msgid ""
+"Specifically, a template is a virtual disk image that includes one of a "
+"variety of operating systems, optional additional software such as office "
+"applications, and settings such as access control to determine who can use "
+"the template. Each template is associated with a particular type of "
+"hypervisor, which is specified when the template is added to CloudStack."
+msgstr "ç¹æ®æåµä¸ï¼æ¨¡æ¿å¯ä»¥æ¯ä¸ä¸ªå
å«ä¸ä¸ªæå¤ä¸ªæä½ç³»ç»çèæç£çéåï¼ä½ 
å¯ä»¥éæ©æ§çå®è£
å¦å¤çè½¯ä»¶ï¼æ¯å¦officeåºç¨å¹¶è®¾ç½®è®¿é®æ§å¶æ¥å³å®è°è½ä½¿ç¨è¿ä¸ªæ¨¡æ¿ãæ¯ä¸ªæ¨¡æ¿å¯¹åºä¸ä¸ªç¹æ®ç±»åçèææºï¼æ¤ç±»èææºå¨å°æ¨¡æ¿æ·»å
 å¥CloudStackæ¶æå®ã"
+
+# 3cea19812ae7412c873921f3b112df2d
+#: ../../templates.rst:29
+msgid ""
+"CloudStack ships with a default template. In order to present more choices "
+"to users, CloudStack administrators and users can create templates and add "
+"them to CloudStack."
+msgstr 
"CloudStackéå¸¦ä¸ä¸ªé»è®¤æ¨¡æ¿ãä¸ºäºåç¨æ·åç°åºæ´å¤éæ©ï¼CloudStackçç®¡çååç¨æ·è½åå»ºæ¨¡æ¿å¹¶æ·»å
 å°CloudStackä¸ã"
+
+# cdd1318db7514de09ddba24875b24795
+#: ../../templates.rst:34
+msgid "Creating Templates: Overview"
+msgstr "åå»ºæ¨¡æ¿æ¦è§"
+
+# 6604bbcbda1146a8947cec849b8aacfc
+#: ../../templates.rst:36
+msgid ""
+"CloudStack ships with a default template for the CentOS operating system. "
+"There are a variety of ways to add more templates. Administrators and end "
+"users can add templates. The typical sequence of events is:"
+msgstr 
"CloudStacké»è®¤å·²ç»æäºä¸ä¸ªå¸¦CentOSç³»ç»çé»è®¤æ¨¡æ¿ãæè®¸å¤æ·»å
 æ´å¤æ¨¡æ¿çæ¹æ³ï¼ç®¡çååæ®éç¨æ·åè½æ·»å ãä¸è¬æ¯è¿æ 
·çé¡ºåºï¼"
+
+# f34378876e0d44ff800666b2d65fc180
+#: ../../templates.rst:43
+msgid ""
+"Launch a VM instance that has the operating system you want. Make any other "
+"desired configuration changes to the VM."
+msgstr "è¿è¡ä¸ä¸ªå¸¦æä½ 
éè¦çæä½ç³»ç»çèææºå®ä¾ï¼å¹¶è¿è¡ä¸äºä½ ææçè®¾ç½®ã"
+
+# 24b37b205a73458c8aa1fb8a40a568e0
+#: ../../templates.rst:48
+msgid "Stop the VM."
+msgstr "åæ¢VMã"
+
+# c64df33a7a6842908b88d0747e1af601
+#: ../../templates.rst:52
+msgid "Convert the volume into a template."
+msgstr "å°å·è½¬æ¢ä¸ºæ¨¡æ¿ã"
+
+# 59a9ab57227c474ab160737b378627a2
+#: ../../templates.rst:54
+msgid ""
+"There are other ways to add templates to CloudStack. For example, you can "
+"take a snapshot of the VM's volume and create a template from the snapshot, "
+"or import a VHD from another system into CloudStack."
+msgstr "è¿æå¶ä»æ¹æ³åCloudStackä¸æ·»å æ¨¡æ¿ãæ¯å¦ä½ 
å¯ä»¥å¯¹èæºç£çå·åä¸ªå¿«ç§ç¶åéè¿è¿ä¸ªå¿«ç
§åå»ºæ¨¡æ¿ï¼æèä»å¦ä¸ä¸ªç³»ç»å¯¼å¥ä¸ä¸ªVHDå°CloudStackã"
+
+# ed480ef0b4464b7f8970f7eab786dc96
+#: ../../templates.rst:58
+msgid ""
+"The various techniques for creating templates are described in the next few "
+"sections."
+msgstr "æ¥ä¸æ¥çå èä¸å°ç»§ç»è®²è¿°åç§åå»ºæ¨¡æ¿çææ¯ã"
+
+# af2d0bd506da45ac8de738d250325f24
+#: ../../templates.rst:62
+msgid "Requirements for Templates"
+msgstr "æ¨¡æ¿çéæ±"
+
+# fc604d7ce79041b2897e66c4616fd723
+#: ../../templates.rst:66
+msgid ""
+"For

[26/43] git commit: Fix formatting issues in README

2014-09-09 Thread rajani

Fix formatting issues in README


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

Branch: refs/heads/master
Commit: 19e54c228eac857ee6322170ce95714255b66cb1
Parents: fff40fc
Author: Sebastien Goasguen 
Authored: Mon Jun 30 11:10:51 2014 +0200
Committer: Sebastien Goasguen 
Committed: Mon Jun 30 11:10:51 2014 +0200

--
 README.rst | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/19e54c22/README.rst
--
diff --git a/README.rst b/README.rst
index 227a6c8..a866fbb 100644
--- a/README.rst
+++ b/README.rst
@@ -30,31 +30,37 @@ Translation
 Clean the build
 
 ::
+
make clean
 
 Generate the .pot files
 
 ::
+
make gettext
 
 Generate the .tx/config files with:
 
 ::
+
sphinx-intl update-txconfig-resources --pot-dir source/locale/pot 
--transifex-project-name apache-cloudstack-administration-rtd --locale-dir 
source/locale
 
 Push the .pot files to transifex with:
 
 ::
+
tx push -s
 
 Download the translated strings, for example Japanese (ja):
 
 ::
+
tx pull -l ja
 
 Build the translated docs:
 
 ::
+
sphinx-intl build --locale-dir source/locale
make -e SPHINXOPTS="-D language='ja'" html

[25/43] git commit: Add po files for zh_CN

2014-09-09 Thread rajani

Add po files for zh_CN


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

Branch: refs/heads/master
Commit: fff40fc1966522f4355121299607f858f90a4032
Parents: a209573
Author: Sebastien Goasguen 
Authored: Tue May 27 10:59:48 2014 +0200
Committer: Sebastien Goasguen 
Committed: Tue May 27 10:59:48 2014 +0200

--
 source/locale/zh_CN/LC_MESSAGES/accounts.po |  553 ++
 .../locale/zh_CN/LC_MESSAGES/administration.po  |   96 +
 source/locale/zh_CN/LC_MESSAGES/api.po  |  155 +
 source/locale/zh_CN/LC_MESSAGES/events.po   |  414 +
 source/locale/zh_CN/LC_MESSAGES/hosts.po| 1059 +++
 source/locale/zh_CN/LC_MESSAGES/index.po|  104 +
 source/locale/zh_CN/LC_MESSAGES/management.po   |  605 ++
 source/locale/zh_CN/LC_MESSAGES/networking.po   |  901 ++
 source/locale/zh_CN/LC_MESSAGES/networking2.po  | 8448 ++
 source/locale/zh_CN/LC_MESSAGES/projects.po |  756 ++
 source/locale/zh_CN/LC_MESSAGES/reliability.po  |  486 +
 .../zh_CN/LC_MESSAGES/service_offerings.po  | 1080 +++
 source/locale/zh_CN/LC_MESSAGES/storage.po  | 1461 +++
 source/locale/zh_CN/LC_MESSAGES/systemvm.po |  958 ++
 source/locale/zh_CN/LC_MESSAGES/templates.po| 1557 
 .../locale/zh_CN/LC_MESSAGES/troubleshooting.po |  499 ++
 source/locale/zh_CN/LC_MESSAGES/tuning.po   |  166 +
 source/locale/zh_CN/LC_MESSAGES/ui.po   |  457 +
 source/locale/zh_CN/LC_MESSAGES/usage.po| 1656 
 .../zh_CN/LC_MESSAGES/virtual_machines.po   | 1860 
 20 files changed, 23271 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/accounts.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/accounts.po 
b/source/locale/zh_CN/LC_MESSAGES/accounts.po
new file mode 100644
index 000..c7f84c9
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/accounts.po
@@ -0,0 +1,553 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# darrentang , 2014
+# morgan wang , 2014
+# renoshen , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 07:52+\n"
+"Last-Translator: renoshen \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 90951daa147540dab10f9d0c78d8c73b
+#: ../../accounts.rst:18
+msgid "Managing Accounts, Users and Domains"
+msgstr "ç®¡çè´¦æ·ï¼ç¨æ·åå"
+
+# 661635f04f94452db5ca9e4dd563cef7
+#: ../../accounts.rst:21
+msgid "Accounts, Users, and Domains"
+msgstr "è´¦æ·ï¼ç¨æ·ï¼å"
+
+# a7494e04f72d469a86f3c67e958ed65f
+#: ../../accounts.rst:24
+msgid "Accounts"
+msgstr "è´¦æ·"
+
+# 457dea8dff534d9aa75e2270c1e1ac6d
+#: ../../accounts.rst:26
+msgid ""
+"An account typically represents a customer of the service provider or a "
+"department in a large organization. Multiple users can exist in an account."
+msgstr "ä¸ä¸ªè´¦æ·éå¸¸ä»£è¡¨ä¸ä¸ªå®¢æ·çæå¡æä¾è
æä¸ä¸ªå¤§ç»ç»ä¸çä¸ä¸ªé¨é¨ãä¸ä¸ªè´¦æ·å¯åå¨å¤ä¸ªç¨æ·ã"
+
+# b45cd9ee7d3e478cbb3c129943ce53d5
+#: ../../accounts.rst:31
+msgid "Domains"
+msgstr "å"
+
+# 10ebf41c7dbf4e65b1be24934d043965
+#: ../../accounts.rst:33
+msgid ""
+"Accounts are grouped by domains. Domains usually contain multiple accounts "
+"that have some logical relationship to each other and a set of delegated "
+"administrators with some authority over the domain and its subdomains. For "
+"example, a service provider with several resellers could create a domain for"
+" each reseller."
+msgstr "å¸æ·éå¸¸æåè¿è¡åç»ãåä¸ç»å¸¸å
å«å¤ä¸ªè´¦æ·ï¼è¿äºè´¦æ·é´åå¨ä¸äºé»è¾ä¸å
³ç³»åä¸ç³»åè¯¥ååå
¶ååä¸çå§æ´¾çç®¡çåï¼è¿æ®µçææå°±æ¯è¯´å¨é»è¾ä¸åä¸å¯ä»¥æç®¡çåï¼ååä¸ä¹å¯ä»¥æç®¡çåï¼ãæ¯å¦ï¼ä¸ä¸ªæå¡æä¾åå¯æå¤ä¸ªåéåè¿æ
 ·çæå¡æä¾åå°±è½ä¸ºæ¯ä¸ä¸ªåéååå»ºä¸ä¸ªå"
+
+# 403c3bff584f41c6b9ee1d4ba5bc6241
+#: ../../accounts.rst:39
+msgid ""
+"For each account created, the Cloud installation creates three different "
+"types of user accounts: root administrato

[20/43] Add po files for zh_CN

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/fff40fc1/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
--
diff --git a/source/locale/zh_CN/LC_MESSAGES/service_offerings.po 
b/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
new file mode 100644
index 000..c64d6a6
--- /dev/null
+++ b/source/locale/zh_CN/LC_MESSAGES/service_offerings.po
@@ -0,0 +1,1080 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C)
+# This file is distributed under the same license as the Apache CloudStack 
Administration Documentation package.
+# 
+# Translators:
+# typuc , 2014
+msgid ""
+msgstr ""
+"Project-Id-Version: Apache CloudStack Administration RTD\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2014-03-31 14:08-0400\n"
+"PO-Revision-Date: 2014-05-27 02:21+\n"
+"Last-Translator: typuc \n"
+"Language-Team: Chinese (China) 
(http://www.transifex.com/projects/p/apache-cloudstack-administration-rtd/language/zh_CN/)\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: zh_CN\n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+
+# 620304e9ac5340aea4af6b894b131b3a
+#: ../../service_offerings.rst:18
+msgid "Service Offerings"
+msgstr "æå¡æ¹æ¡"
+
+# 748817ca8ea841e7bb071e3fd4e9b1b8
+#: ../../service_offerings.rst:20
+msgid ""
+"In addition to the physical and logical infrastructure of your cloud and the"
+" CloudStack software and servers, you also need a layer of user services so "
+"that people can actually make use of the cloud. This means not just a user "
+"UI, but a set of options and resources that users can choose from, such as "
+"templates for creating virtual machines, disk storage, and more. If you are "
+"running a commercial service, you will be keeping track of what services and"
+" resources users are consuming and charging them for that usage. Even if you"
+" do not charge anything for people to use your cloud â say, if the users 
are"
+" strictly internal to your organization, or just friends who are sharing "
+"your cloud â you can still keep track of what services they use and how 
much"
+" of them."
+msgstr "é¤äºäºä¸çç©çåé»è¾åºç¡è®¾æ½ä»¥å CloudStack 
è½¯ä»¶åæå¡å¨ï¼ä½ 
è¿éè¦ä¸ä¸ªç¨æ·æå¡å±ä»¥ä¾¿è®©äººä»¬è½å¤çæ£å©ç¨äºãè¿ä¸ä»
ä»
æå³è¿ä¸ä¸ªç¨æ·çé¢ï¼èæ¯ä¸ç»ç¨æ·å¯éæ©çéé¡¹åèµæºï¼å¦éè¿æ¨¡çåå»ºèææºï¼ç£çåå¨ççãå¦ææ¨æ£å¨è¿è¡ä¸ä¸ªåä¸æå¡ï¼æ¨å°å¯ä»¥è·è¸ªæå¡åç¨æ·èµæºçä½¿ç¨ä»¥åä½¿ç¨è®¡è´¹æ
åµãå³ä½¿ä½ ä¸å¯¹ä½¿ç¨äºçäººæ¶è´¹ï¼-æ¯å¦è¯´ï¼ç¨æ·æ¯ä½ çå
é¨ç»ç»ï¼æåªæ¯ä½ çæåå±äº«ä½ çäº - ä½ 
ä»ç¶å¯ä»¥è·è¸ªä»ä»¬æä½¿ç¨çæå¡ä»¥åæå¤å°äººã"
+
+# 89ec6965888c4194969da68934867e8f
+#: ../../service_offerings.rst:33
+msgid "Service Offerings, Disk Offerings, Network Offerings, and Templates"
+msgstr "æå¡æ¹æ¡ï¼ç£çæ¹æ¡ï¼ç½ç»æ¹æ¡åæ¨¡ç"
+
+# 39b9fb81cc4a452f932a9becc1c08318
+#: ../../service_offerings.rst:35
+msgid ""
+"A user creating a new instance can make a variety of choices about its "
+"characteristics and capabilities. CloudStack provides several ways to "
+"present users with choices when creating a new instance:"
+msgstr "ç¨æ·å¯ä»¥æ 
¹æ®ä¸åçåè½åç¹æ§æ¥åå»ºæ°çå®ä¾ï¼CloudStackæä¾äºå 
ç§æ¹æ³ä¾ç¨æ·éæ©ä»¥ä¾¿åå»ºä¸ä¸ªæ°çå®ä¾:"
+
+# a080b00346eb4c6191b4a6b1b6ede2bd
+#: ../../service_offerings.rst:39
+msgid ""
+"Service Offerings, defined by the CloudStack administrator, provide a choice"
+" of CPU speed, number of CPUs, RAM size, tags on the root disk, and other "
+"choices. See Creating a New Compute Offering."
+msgstr 
"æå¡æ¹æ¡ï¼ç±CloudStackç®¡çåå®ä¹ï¼æä¾äºå¤ç§éé¡¹ä¾éæ©ï¼CPUéçï¼CPUæ
 ¸æ°ï¼ååå¤§å°ï¼æ ¹ç£çæ ç¾çãå¯åé
åå»ºæ°çè®¡ç®æ¹æ¡ã"
+
+# 87390738e5c6421e8cb6428fd0efd434
+#: ../../service_offerings.rst:43
+msgid ""
+"Disk Offerings, defined by the CloudStack administrator, provide a choice of"
+" disk size and IOPS (Quality of Service) for primary data storage. See "
+"Creating a New Disk Offering."
+msgstr 
"ç£çæ¹æ¡ï¼ç±CloudStackç®¡çåå®ä¹ï¼éå¯¹ä¸»æ°æ®åå¨æä¾ç£çå¤§å°åIOPS(QOS)çéé¡¹ä¾éæ©ãå¯åé
åå»ºæ°çç£çæ¹æ¡ã"
+
+# 3416adb53bd2464c93a0a7de7341aa8c
+#: ../../service_offerings.rst:47
+msgid ""
+"Network Offerings, defined by the CloudStack administrator, describe the "
+"feature set that is available to end users from the virtual router or "
+"external networking devices on a given guest network. See Network Offerings."
+msgstr "ç½ç»æ¹æ¡ï¼ç± CloudStack 
ç®¡çåå®ä¹ï¼çº¦å®æ¥å®¾ç½ç»ä¸èæè·¯ç±å¨æå¤é¨ç½ç»è®¾å¤æä¾ç»ç»ç«¯ç¨æ·å¯ç¨çåè½æè¿°éã"
+
+# 7be016c225ca4b45a449e6d718fbba3e
+#: ../../service_offerings.rst:52
+msgid ""
+"Templates, defined by the CloudStack admi

[07/43] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/ip_load_balancing.rst
--
diff --git a/source/networking/ip_load_balancing.rst 
b/source/networking/ip_load_balancing.rst
new file mode 100644
index 000..6d2edd9
--- /dev/null
+++ b/source/networking/ip_load_balancing.rst
@@ -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.
+   
+
+IP Load Balancing
+-
+
+The user may choose to associate the same public IP for multiple guests.
+CloudStack implements a TCP-level load balancer with the following
+policies.
+
+-  Round-robin
+
+-  Least connection
+
+-  Source IP
+
+This is similar to port forwarding but the destination may be multiple
+IP addresses.

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/ip_reservation_in_guest_networks.rst
--
diff --git a/source/networking/ip_reservation_in_guest_networks.rst 
b/source/networking/ip_reservation_in_guest_networks.rst
new file mode 100644
index 000..c8b8f38
--- /dev/null
+++ b/source/networking/ip_reservation_in_guest_networks.rst
@@ -0,0 +1,125 @@
+.. 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.
+
+
+IP Reservation in Isolated Guest Networks
+-
+
+In isolated guest networks, a part of the guest IP address space can be
+reserved for non-CloudStack VMs or physical servers. To do so, you
+configure a range of Reserved IP addresses by specifying the CIDR when a
+guest network is in Implemented state. If your customers wish to have
+non-CloudStack controlled VMs or physical servers on the same network,
+they can share a part of the IP address space that is primarily provided
+to the guest network.
+
+In an Advanced zone, an IP address range or a CIDR is assigned to a
+network when the network is defined. The CloudStack virtual router acts
+as the DHCP server and uses CIDR for assigning IP addresses to the guest
+VMs. If you decide to reserve CIDR for non-CloudStack purposes, you can
+specify a part of the IP address range or the CIDR that should only be
+allocated by the DHCP service of the virtual router to the guest VMs
+created in CloudStack. The remaining IPs in that network are called
+Reserved IP Range. When IP reservation is configured, the administrator
+can add additional VMs or physical servers that are not part of
+CloudStack to the same network and assign them the Reserved IP
+addresses. CloudStack guest VMs cannot acquire IPs from the Reserved IP
+Range.
+
+
+IP Reservation Considerations
+~
+
+Consider the following before you reserve an IP range for non-CloudStack
+machines:
+
+-  IP Reservation is supported only in Isolated networks.
+
+-  IP Reservation can be applied only when the network is in Implemented
+   state.
+
+-  No IP Reservation is done by default.
+
+-  Guest VM CIDR you specify must be a subset of the network CIDR.
+
+-  Specify a valid Guest VM CIDR. IP Reservation is applied only if no
+   active IPs exist outside the Guest VM CIDR.
+
+   You cannot apply IP Reservation if any VM is alloted with an IP
+   address that is outside the Guest VM CIDR.
+
+-  To reset an existing IP Reservation, apply IP reservation by
+   specifying the value of network CIDR in the CIDR field.
+
+   For example, the following table descr

[33/43] git commit: CLOUDSTACK-5879: Updated rabbitmq eventbus path

2014-09-09 Thread rajani

CLOUDSTACK-5879: Updated rabbitmq eventbus path

Signed-off-by: Pierre-Luc Dion 


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

Branch: refs/heads/master
Commit: e0bbecbec09357577ae3395f65d28e8148405138
Parents: 1732dae
Author: Erik Weber 
Authored: Tue Aug 19 19:57:13 2014 +0200
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:20:48 2014 -0400

--
 source/events.rst | 30 +-
 1 file changed, 21 insertions(+), 9 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/e0bbecbe/source/events.rst
--
diff --git a/source/events.rst b/source/events.rst
index cbba93b..d500a5c 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -95,7 +95,9 @@ As a CloudStack administrator, perform the following one-time
 configuration to enable event notification framework. At run time no
 changes can control the behaviour.
 
-#. Open ``'componentContext.xml``.
+#. Create the folder ``/etc/cloudstack/management/META-INF/cloudstack/core``
+
+#. Inside that folder, open ``spring-event-bus-context.xml``.
 
 #. Define a bean named ``eventNotificationBus`` as follows:
 
@@ -118,14 +120,24 @@ changes can control the behaviour.
 
   .. code:: bash
 
- 
-   
-   
-   
-   
-   
-   
- 
+ http://www.springframework.org/schema/beans";
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
+ xmlns:context="http://www.springframework.org/schema/context";
+ xmlns:aop="http://www.springframework.org/schema/aop";
+ xsi:schemaLocation="http://www.springframework.org/schema/beans
+ http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://www.springframework.org/schema/aop 
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd
+ http://www.springframework.org/schema/context
+ http://www.springframework.org/schema/context/spring-context-3.0.xsd";>
+
+   
+   
+   
+   
+   
+   
+
+ 
 
   The ``eventNotificationBus`` bean represents the
   ``org.apache.cloudstack.mom.rabbitmq.RabbitMQEventBus`` class.

[02/43] git commit: Update templates.rst: This closes #10

2014-09-09 Thread rajani

Update templates.rst: This closes #10

The right command is dpkg-reconfigure and not dpkg-reconfig.

Signed-off-by: Sebastien Goasguen 


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

Branch: refs/heads/master
Commit: a49d204cf217b5f5d78c816b30e3de33f587a1d3
Parents: ba544d2
Author: w00binda 
Authored: Thu May 15 17:58:24 2014 +0200
Committer: Sebastien Goasguen 
Committed: Fri May 16 22:08:56 2014 +0200

--
 source/templates.rst | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/a49d204c/source/templates.rst
--
diff --git a/source/templates.rst b/source/templates.rst
index 5480279..c4d33b2 100644
--- a/source/templates.rst
+++ b/source/templates.rst
@@ -485,7 +485,8 @@ templating.
 echo $hostname > /etc/hostname
 hostname $hostname
 # Recreate SSH2
-dpkg-reconfig openssh-server
+export DEBIAN_FRONTEND=noninteractive
+dpkg-reconfigure openssh-server
 fi
 ### End of Script ###

[35/43] git commit: remove whitespaces

2014-09-09 Thread rajani

remove whitespaces


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

Branch: refs/heads/master
Commit: 6c77f6970635aa39796ec17904f16137ec156271
Parents: 0c75dcc
Author: Pierre-Luc Dion 
Authored: Tue Aug 19 20:19:38 2014 -0400
Committer: Pierre-Luc Dion 
Committed: Tue Aug 19 20:21:04 2014 -0400

--
 source/events.rst | 12 ++--
 1 file changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/6c77f697/source/events.rst
--
diff --git a/source/events.rst b/source/events.rst
index 273435e..f25f9e0 100644
--- a/source/events.rst
+++ b/source/events.rst
@@ -144,11 +144,11 @@ changes can control the behaviour.
   
   If you want to use encrypted values for the username and password, you 
have to include a bean to pass those
   as variables from a credentials file.
-  
+
   A sample is given below
-  
+
   .. code:: bash
-  
+
  http://www.springframework.org/schema/beans";
 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
 xmlns:context="http://www.springframework.org/schema/context";
@@ -188,12 +188,12 @@ changes can control the behaviour.
   Create a new file in the same folder called ``cred.properties`` and the 
specify the values for username and password as jascrypt encrypted strings
 
   Sample, with ``guest`` as values for both fields:
- 
+
   .. code:: bash
- 
+
  username=nh2XrM7jWHMG4VQK18iiBQ==
  password=nh2XrM7jWHMG4VQK18iiBQ==
- 
+
 
 #. Restart the Management Server.

[09/40] Fixed formatting by Will stevens

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/usage.rst
--
diff --git a/source/usage.rst b/source/usage.rst
index 16d6e9c..6324bbb 100644
--- a/source/usage.rst
+++ b/source/usage.rst
@@ -29,48 +29,35 @@ 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.
 
+
 Configuring the Usage Server
 
 
 To configure the usage server:
 
-#. 
-
-   Be sure the Usage Server has been installed. This requires extra
+#. Be sure the Usage Server has been installed. This requires extra
steps beyond just installing the CloudStack software. See Installing
the Usage Server (Optional) in the Advanced Installation Guide.
 
-#. 
-
-   Log in to the CloudStack UI as administrator.
-
-#. 
-
-   Click Global Settings.
+#. Log in to the CloudStack UI as administrator.
 
-#. 
+#. Click Global Settings.
 
-   In Search, type usage. Find the configuration parameter that controls
+#. In Search, type usage. Find the configuration parameter that controls
the behavior you want to set. See the table below for a description
of the available parameters.
 
-#. 
+#. In Actions, click the Edit icon.
 
-   In Actions, click the Edit icon.
+#. Type the desired value and click the Save icon.
 
-#. 
-
-   Type the desired value and click the Save icon.
-
-#. 
-
-   Restart the Management Server (as usual with any global configuration
+#. Restart the Management Server (as usual with any global configuration
change) and also the Usage Server:
 
.. code:: bash
 
-   # service cloudstack-management restart
-   # service cloudstack-usage restart
+  # service cloudstack-management restart
+  # service cloudstack-usage restart
 
 The following table shows the global configuration settings that control
 the behavior of the Usage Server.
@@ -88,18 +75,20 @@ for the 24 hours from 00:00:00 GMT to 23:59:59 GMT:
 
 .. code:: bash
 
-usage.stats.job.exec.time = 00:15   
-usage.execution.timezone = PST
-usage.aggregation.timezone = GMT
+   usage.stats.job.exec.time = 00:15   
+   usage.execution.timezone = PST
+   usage.aggregation.timezone = GMT
 
-Valid values for the time zone are specified in `AppendixÂ A, *Time Zones* 
`_
+Valid values for the time zone are specified in `AppendixÂ A, *Time Zones* 
+`_
 
 Default: GMT
 
 usage.execution.timezone
 
 The time zone of usage.stats.job.exec.time. Valid values for the time
-zone are specified in `AppendixÂ A, *Time Zones* 
`_
+zone are specified in `AppendixÂ A, *Time Zones* 
+`_
 
 Default: The time zone of the management server.
 
@@ -150,33 +139,26 @@ predominantly in the East Coast of the United States, and 
you would like
 to process usage records every night at 2 AM local (EST) time. Choose
 these settings:
 
--  
-
-   enable.usage.server = true
-
--  
+-  enable.usage.server = true
 
-   usage.execution.timezone = America/New\_York
+-  usage.execution.timezone = America/New\_York
 
--  
-
-   usage.stats.job.exec.time = 07:00. This will run the Usage job at
+-  usage.stats.job.exec.time = 07:00. This will run the Usage job at
2:00 AM EST. Note that this will shift by an hour as the East Coast
of the U.S. enters and exits Daylight Savings Time.
 
--  
-
-   usage.stats.job.aggregation.range = 1440
+-  usage.stats.job.aggregation.range = 1440
 
 With this configuration, the Usage job will run every night at 2 AM EST
 and will process records for the previous dayâs midnight-midnight as
 defined by the EST (America/New\_York) time zone.
 
 .. note:: 
-Because the special value 1440 has been used for
-usage.stats.job.aggregation.range, the Usage Server will ignore the data
-between midnight and 2 AM. That data will be included in the next day's
-run.
+   Because the special value 1440 has been used for
+   usage.stats.job.aggregation.range, the Usage Server will ignore the data
+   between midnight and 2 AM. That data will be included in the next day's
+   run.
+
 
 Setting Usage Limits
 
@@ -186,6 +168,7 @@ resource usage by users. Some of these limits are global 
configuration
 parameters. Others are applied at the ROOT domain and may be overridden
 on a per-account basis.
 
+
 Globally Configured Limits
 ~~
 
@@ -241,21 +224,13 @@ 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 Accou

[09/43] Fixed formatting by Will stevens

2014-09-09 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/68c20df4/source/usage.rst
--
diff --git a/source/usage.rst b/source/usage.rst
index 16d6e9c..6324bbb 100644
--- a/source/usage.rst
+++ b/source/usage.rst
@@ -29,48 +29,35 @@ 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.
 
+
 Configuring the Usage Server
 
 
 To configure the usage server:
 
-#. 
-
-   Be sure the Usage Server has been installed. This requires extra
+#. Be sure the Usage Server has been installed. This requires extra
steps beyond just installing the CloudStack software. See Installing
the Usage Server (Optional) in the Advanced Installation Guide.
 
-#. 
-
-   Log in to the CloudStack UI as administrator.
-
-#. 
-
-   Click Global Settings.
+#. Log in to the CloudStack UI as administrator.
 
-#. 
+#. Click Global Settings.
 
-   In Search, type usage. Find the configuration parameter that controls
+#. In Search, type usage. Find the configuration parameter that controls
the behavior you want to set. See the table below for a description
of the available parameters.
 
-#. 
+#. In Actions, click the Edit icon.
 
-   In Actions, click the Edit icon.
+#. Type the desired value and click the Save icon.
 
-#. 
-
-   Type the desired value and click the Save icon.
-
-#. 
-
-   Restart the Management Server (as usual with any global configuration
+#. Restart the Management Server (as usual with any global configuration
change) and also the Usage Server:
 
.. code:: bash
 
-   # service cloudstack-management restart
-   # service cloudstack-usage restart
+  # service cloudstack-management restart
+  # service cloudstack-usage restart
 
 The following table shows the global configuration settings that control
 the behavior of the Usage Server.
@@ -88,18 +75,20 @@ for the 24 hours from 00:00:00 GMT to 23:59:59 GMT:
 
 .. code:: bash
 
-usage.stats.job.exec.time = 00:15   
-usage.execution.timezone = PST
-usage.aggregation.timezone = GMT
+   usage.stats.job.exec.time = 00:15   
+   usage.execution.timezone = PST
+   usage.aggregation.timezone = GMT
 
-Valid values for the time zone are specified in `AppendixÂ A, *Time Zones* 
`_
+Valid values for the time zone are specified in `AppendixÂ A, *Time Zones* 
+`_
 
 Default: GMT
 
 usage.execution.timezone
 
 The time zone of usage.stats.job.exec.time. Valid values for the time
-zone are specified in `AppendixÂ A, *Time Zones* 
`_
+zone are specified in `AppendixÂ A, *Time Zones* 
+`_
 
 Default: The time zone of the management server.
 
@@ -150,33 +139,26 @@ predominantly in the East Coast of the United States, and 
you would like
 to process usage records every night at 2 AM local (EST) time. Choose
 these settings:
 
--  
-
-   enable.usage.server = true
-
--  
+-  enable.usage.server = true
 
-   usage.execution.timezone = America/New\_York
+-  usage.execution.timezone = America/New\_York
 
--  
-
-   usage.stats.job.exec.time = 07:00. This will run the Usage job at
+-  usage.stats.job.exec.time = 07:00. This will run the Usage job at
2:00 AM EST. Note that this will shift by an hour as the East Coast
of the U.S. enters and exits Daylight Savings Time.
 
--  
-
-   usage.stats.job.aggregation.range = 1440
+-  usage.stats.job.aggregation.range = 1440
 
 With this configuration, the Usage job will run every night at 2 AM EST
 and will process records for the previous dayâs midnight-midnight as
 defined by the EST (America/New\_York) time zone.
 
 .. note:: 
-Because the special value 1440 has been used for
-usage.stats.job.aggregation.range, the Usage Server will ignore the data
-between midnight and 2 AM. That data will be included in the next day's
-run.
+   Because the special value 1440 has been used for
+   usage.stats.job.aggregation.range, the Usage Server will ignore the data
+   between midnight and 2 AM. That data will be included in the next day's
+   run.
+
 
 Setting Usage Limits
 
@@ -186,6 +168,7 @@ resource usage by users. Some of these limits are global 
configuration
 parameters. Others are applied at the ROOT domain and may be overridden
 on a per-account basis.
 
+
 Globally Configured Limits
 ~~
 
@@ -241,21 +224,13 @@ 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 Accou

[06/40] split the networking2 file into multiple includes and renamed it to 'networking_and_traffic': This closes #11

2014-09-10 Thread rajani

http://git-wip-us.apache.org/repos/asf/cloudstack-docs-admin/blob/72a3a7c1/source/networking/remote_access_vpn.rst
--
diff --git a/source/networking/remote_access_vpn.rst 
b/source/networking/remote_access_vpn.rst
new file mode 100644
index 000..94e9733
--- /dev/null
+++ b/source/networking/remote_access_vpn.rst
@@ -0,0 +1,696 @@
+.. 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.
+   
+
+Remote Access VPN
+-
+
+CloudStack account owners can create virtual private networks (VPN) to
+access their virtual machines. If the guest network is instantiated from
+a network offering that offers the Remote Access VPN service, the
+virtual router (based on the System VM) is used to provide the service.
+CloudStack provides a L2TP-over-IPsec-based remote access VPN service to
+guest virtual networks. Since each network gets its own virtual router,
+VPNs are not shared across the networks. VPN clients native to Windows,
+Mac OS X and iOS can be used to connect to the guest networks. The
+account owner can create and manage users for their VPN. CloudStack does
+not use its account database for this purpose but uses a separate table.
+The VPN user database is shared across all the VPNs created by the
+account owner. All VPN users get access to all VPNs created by the
+account owner.
+
+.. note:: 
+   Make sure that not all traffic goes through the VPN. That is, the route
+   installed by the VPN should be only for the guest network and not for
+   all traffic.
+
+-  **Road Warrior / Remote Access**. Users want to be able to connect
+   securely from a home or office to a private network in the cloud.
+   Typically, the IP address of the connecting client is dynamic and
+   cannot be preconfigured on the VPN server.
+
+-  **Site to Site**. In this scenario, two private subnets are connected
+   over the public Internet with a secure VPN tunnel. The cloud user's
+   subnet (for example, an office network) is connected through a
+   gateway to the network in the cloud. The address of the user's
+   gateway must be preconfigured on the VPN server in the cloud. Note
+   that although L2TP-over-IPsec can be used to set up Site-to-Site
+   VPNs, this is not the primary intent of this feature. For more
+   information, see ":ref:`setting-s2s-vpn-conn`".
+
+
+Configuring Remote Access VPN
+~
+
+To set up VPN for the cloud:
+
+#. Log in to the CloudStack UI as an administrator or end user.
+
+#. In the left navigation, click Global Settings.
+
+#. Set the following global configuration parameters.
+
+   -  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.
+
+To enable VPN for a particular network:
+
+#. Log in as a user or administrator to the CloudStack UI.
+
+#. In the left navigation, click Network.
+
+#. Click the name of the network you want to work with.
+
+#. Click View IP Addresses.
+
+#. Click one of the displayed IP address names.
+
+#. Click the Enable VPN button. |vpn-icon.png|
+
+   The IPsec key is displayed in a popup window.
+
+
+Configuring Remote Access VPN in VPC
+
+
+On enabling Remote Access VPN on a VPC, any VPN client present outside
+the VPC can access VMs present in the VPC by using the Remote VPN
+connection. The VPN client can be present anywhere except inside the VPC
+on which the user enabled the Remote Access VPN service.
+
+To enable VPN for a VPC:
+
+#. Log in as a user or administrator to the CloudStack UI.
+
+#. In the left navigation, click Network.
+
+#. In the Select view, select VPC.
+
+   All the VPCs that you have created for the account is listed in the
+   page.
+
+#. Click the Configure button of the VPC.
+
+   For each tier, the following options are displayed:
+
+   -  Internal LB
+
+   -  Public LB IP
+
+   -  Static NAT
+
+   -  Virtual Machines
+
+   -  CIDR
+
+   The following router information is displayed:
+
+   -  P

git commit: updated refs/heads/master to 75cd79a

2014-09-10 Thread rajani

Repository: cloudstack
Updated Branches:
  refs/heads/master 91fd8d7cd -> 75cd79a23


CLOUDSTACK-7520: [UI] keep advanced search parameters visible after search has 
been run.

- Preserve the advanced search parameters, so that when the advanced search box 
is shown again,
it is populated with the values selected/entered previously, unless they have 
navigated away from the search results page,
or applied any additional filters/search parameters.

Signed-off-by: Mihaela Stoica 
Signed-off-by: Rajani Karuturi 


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

Branch: refs/heads/master
Commit: 75cd79a2382486385b5ae901c5b5c45cbd1505fc
Parents: 91fd8d7
Author: Mihaela Stoica 
Authored: Tue Sep 9 14:44:31 2014 +0100
Committer: Rajani Karuturi 
Committed: Wed Sep 10 15:37:35 2014 +0530

--
 ui/scripts/ui/widgets/listView.js | 9 +
 1 file changed, 9 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/75cd79a2/ui/scripts/ui/widgets/listView.js
--
diff --git a/ui/scripts/ui/widgets/listView.js 
b/ui/scripts/ui/widgets/listView.js
index 22182c1..c7b4a4d 100644
--- a/ui/scripts/ui/widgets/listView.js
+++ b/ui/scripts/ui/widgets/listView.js
@@ -1854,6 +1854,7 @@
 //basic search
 var basicSearch = function() {
 $listView.removeData('advSearch');
+advancedSearchData = {};
 
 $listView.data('page', 1);
 loadBody(
@@ -1930,6 +1931,8 @@
 );
 };
 
+var advancedSearchData = {};
+
 var closeAdvancedSearch = function() {
 $listView.find('.advanced-search 
.form-container:visible').remove();
 };
@@ -1941,6 +1944,11 @@
 return false;
 }
 
+// Setup advanced search default values, when existing data is 
present
+$.each(listViewData.advSearchFields, function(fieldID, field) {
+field.defaultValue = advancedSearchData[fieldID];
+});
+
 var form = cloudStack.dialog.createForm({
 noDialog: true,
 form: {
@@ -1949,6 +1957,7 @@
 },
 after: function(args) {
 advancedSearch(args);
+advancedSearchData = args.data;
 
$listView.find('.button.search#basic_search').siblings('.search-bar').find('input').val('');
 //clear basic search input field to avoid confusion of search result
 closeAdvancedSearch();
 }

git commit: updated refs/heads/master to fa11560

2014-09-12 Thread rajani

Repository: cloudstack
Updated Branches:
  refs/heads/master 283666b03 -> fa1156092


CLOUDSTACK-6926 setting java_home from installed java

changed the order of preference to check for java first.

Usage server rpm installs JRE 1.7. In the case where JDK 1.6 is already
installed, java version would be 1.7 but, javac would be 1.6
If javac is given preference, usage server fails to start in this case.


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

Branch: refs/heads/master
Commit: fa1156092eb341850c207742d4ac5a3677c97d00
Parents: 283666b
Author: Rajani Karuturi 
Authored: Fri Sep 12 14:56:48 2014 +0530
Committer: Rajani Karuturi 
Committed: Fri Sep 12 15:17:10 2014 +0530

--
 packaging/centos63/cloud-usage.rc | 8 
 packaging/debian/init/cloud-usage | 8 
 2 files changed, 8 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa115609/packaging/centos63/cloud-usage.rc
--
diff --git a/packaging/centos63/cloud-usage.rc 
b/packaging/centos63/cloud-usage.rc
index a03df5b..9e3d6d6 100755
--- a/packaging/centos63/cloud-usage.rc
+++ b/packaging/centos63/cloud-usage.rc
@@ -52,12 +52,12 @@ setJavaHome() {
 return
   fi
 
-  # try javac first
-  java=$(which javac 2>/dev/null || :)
+  # try java first
+  java=$(which java 2>/dev/null || :)
 
-  # try java if javac is not found
+  # try javac if java is not found
   if [ -z "$java" ] ; then
-java=$(which java 2>/dev/null || :)
+java=$(which javac 2>/dev/null || :)
   fi
 
   if [ -n "$java" ] ; then

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fa115609/packaging/debian/init/cloud-usage
--
diff --git a/packaging/debian/init/cloud-usage 
b/packaging/debian/init/cloud-usage
index fcede4f..d193918 100755
--- a/packaging/debian/init/cloud-usage
+++ b/packaging/debian/init/cloud-usage
@@ -48,12 +48,12 @@ setJavaHome() {
 return
   fi
 
-  # try javac first
-  java=$(which javac 2>/dev/null || :)
+  # try java first
+  java=$(which java 2>/dev/null || :)
 
-  # try java if javac is not found
+  # try javac if java is not found
   if [ -z "$java" ] ; then
-java=$(which java 2>/dev/null || :)
+java=$(which javac 2>/dev/null || :)
   fi
 
   if [ -n "$java" ] ; then

git commit: updated refs/heads/4.5 to c3e5964

2014-11-04 Thread rajani

Repository: cloudstack
Updated Branches:
  refs/heads/4.5 c15ed74f6 -> c3e5964dc


Fixed CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work

In ConfigurationVo, changed the setter to do the encryption if required
like the getter. Called the setter in constructor as well.

Removed references of encryption check in different places.

Reviewed-by: Santhosh Edukulla

This closes #35


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

Branch: refs/heads/4.5
Commit: c3e5964dcbbd3b3ff34562aeeb9f8daa154ee7d1
Parents: c15ed74
Author: Rajani Karuturi 
Authored: Tue Nov 4 18:16:50 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Nov 5 11:49:38 2014 +0530

--
 .../config/dao/ConfigurationDaoImpl.java  |  3 ---
 .../framework/config/impl/ConfigurationVO.java| 18 +++---
 .../com/cloud/server/ConfigurationServerImpl.java |  3 +--
 3 files changed, 16 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3e5964d/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
--
diff --git 
a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
 
b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
index 2934b01..f3f0495 100644
--- 
a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
+++ 
b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
@@ -210,9 +210,6 @@ public class ConfigurationDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3e5964d/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
--
diff --git 
a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
 
b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
index cda96c9..b317ea2 100644
--- 
a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
+++ 
b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
@@ -73,8 +73,8 @@ public class ConfigurationVO implements Configuration {
 this.instance = instance;
 this.component = component;
 this.name = name;
-this.value = value;
 this.description = description;
+setValue(value);
 }
 
 public ConfigurationVO(String component, ConfigKey key) {
@@ -122,11 +122,23 @@ public class ConfigurationVO implements Configuration {
 
 @Override
 public String getValue() {
-return (("Hidden".equals(getCategory()) || 
"Secure".equals(getCategory())) ? DBEncryptionUtil.decrypt(value) : value);
+if(isEncryptedConfig()) {
+return DBEncryptionUtil.decrypt(value);
+} else {
+return value;
+}
 }
 
 public void setValue(String value) {
-this.value = value;
+if(isEncryptedConfig()) {
+this.value = DBEncryptionUtil.encrypt(value);
+} else {
+this.value = value;
+}
+}
+
+private boolean isEncryptedConfig() {
+return "Hidden".equals(getCategory()) || 
"Secure".equals(getCategory());
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3e5964d/server/src/com/cloud/server/ConfigurationServerImpl.java
--
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java 
b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 990f2ff..7b0d898 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -203,7 +203,6 @@ public class ConfigurationServerImpl extends ManagerBase 
implements Configuratio
 String instance = "DEFAULT";
 String component = c.getComponent();
 String value = c.getDefaultValue();
-value = ("Hidden".equals(category) || 
"Secure".equals(category)) ? DBEncryptionUtil.encrypt(value) : value;
 String description = c.getDescription();
 ConfigurationVO configVO = new ConfigurationVO(category, 
instance, component, name, value, description);
 configVO.setDefaultValue(value);
@@ -635,7 +634,

[11/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7802: test_vpc_network.py - Increasing polling period for network 
state check

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: af510eb656eac08eb7f299ad970d49d9f3d96eb3
Parents: a4174d3
Author: Gaurav Aradhye 
Authored: Tue Oct 28 13:38:10 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 15:06:46 2014 +0530

--
 test/integration/component/test_vpc_network.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/af510eb6/test/integration/component/test_vpc_network.py
--
diff --git a/test/integration/component/test_vpc_network.py 
b/test/integration/component/test_vpc_network.py
index 096315c..f4c0a2f 100644
--- a/test/integration/component/test_vpc_network.py
+++ b/test/integration/component/test_vpc_network.py
@@ -1934,7 +1934,7 @@ class TestVPCNetworkUpgrade(cloudstackTestCase):
 # When all Vms ain network are stopped, network state changes from 
Implemented --> Shutdown --> Allocated
 # We can't update the network when it is in Shutodown state, hence we 
should wait for the state to change to
 # Allocated and then update the network
-retriesCount = 10
+retriesCount = 20
 while True:
 networks = list_networks(self.apiclient, id=network_1.id)
 self.assertEqual(validateList(networks)[0], PASS, "networks list 
validation failed, list id %s" % networks)

[06/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7800: VMware - Hot plug/unplug NIC to/from VM only when vmware tools 
are installed, else assert for exception

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: 070e689c4f4622f6a923cce61d4de2c20c2c28fe
Parents: 0d6a277
Author: Gaurav Aradhye 
Authored: Tue Oct 28 11:05:20 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Wed Oct 29 15:06:08 2014 +0530

--
 test/integration/smoke/test_nic.py | 352 ++--
 1 file changed, 200 insertions(+), 152 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/070e689c/test/integration/smoke/test_nic.py
--
diff --git a/test/integration/smoke/test_nic.py 
b/test/integration/smoke/test_nic.py
index 488ed0a..f130bbe 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -15,24 +15,27 @@
 # specific language governing permissions and limitations
 # under the License.
 """ NIC tests for VM """
-import marvin
-from marvin.codes import FAILED
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.sshClient import SshClient
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
+from marvin.cloudstackTestCase import cloudstackTestCase, unittest
+from marvin.lib.base import (Account,
+ ServiceOffering,
+ Network,
+ VirtualMachine,
+ NetworkOffering)
+from marvin.lib.common import (get_zone,
+   get_template,
+   get_domain)
 from nose.plugins.attrib import attr
 
 import signal
 import sys
 import time
 
+
 class TestNic(cloudstackTestCase):
 
 def setUp(self):
 self.cleanup = []
+
 def signal_handler(signal, frame):
 self.tearDown()
 sys.exit(0)
@@ -40,171 +43,217 @@ class TestNic(cloudstackTestCase):
 # assign the signal handler immediately
 signal.signal(signal.SIGINT, signal_handler)
 
-hypervisor = self.testClient.getHypervisorInfo()
-if hypervisor.lower() == "hyperv":
+self.hypervisor = self.testClient.getHypervisorInfo()
+if self.hypervisor.lower() == "hyperv":
 raise unittest.SkipTest("Not supported on Hyper-V")
 
 try:
 self.apiclient = self.testClient.getApiClient()
-self.dbclient  = self.testClient.getDbConnection()
-self.services  = self.testClient.getParsedTestDataConfig()
+self.dbclient = self.testClient.getDbConnection()
+self.services = self.testClient.getParsedTestDataConfig()
 
 # Get Zone, Domain and templates
 domain = get_domain(self.apiclient)
-zone = get_zone(self.apiclient, self.testClient.getZoneForTests())
-self.services['mode'] = zone.networktype
+self.zone = get_zone(
+self.apiclient,
+self.testClient.getZoneForTests()
+)
 
-#if local storage is enabled, alter the offerings to use 
localstorage
-#this step is needed for devcloud
-if zone.localstorageenabled == True:
-self.services["service_offerings"]["tiny"]["storagetype"] = 
'local'
+# if local storage is enabled, alter the offerings to use
+# localstorage
+# this step is needed for devcloud
+if self.zone.localstorageenabled:
+self.services["service_offerings"][
+"tiny"]["storagetype"] = 'local'
 
 template = get_template(
-self.apiclient,
-zone.id,
-self.services["ostype"]
-)
+self.apiclient,
+self.zone.id,
+self.services["ostype"]
+)
 # Set Zones and disk offerings
-self.services["small"]["zoneid"] = zone.id
+self.services["small"]["zoneid"] = self.zone.id
 self.services["small"]["template"] = template.id
 
-self.services["iso1"]["zoneid"] = zone.id
-self.services["network"]["zoneid"] = zone.id
+self.services["iso1"]["zoneid"] = self.zone.id
+self.services["network"]["zoneid"] = self.zone.id
 
 # Create Account, VMs, NAT Rules etc
 self

[04/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7814: Fix default passphrase for keystores

In upgrade case, the db.properties file is not changed, but the following commit
would require passphrase for keystore in it, thus result in error(NPE in fact
due to there is no such properity).

commit 918c320438980f070150f872e3a3ba907572af83
Author: Upendra Moturi 
Date: Fri Jun 20 11:41:58 2014 +0530
CLOUDSTACK-6847.Link.java and console proxy files have hardcoded value

This commit fix it by put default value for passphrases, also set correct
passphrase if fail-safe keystore is used.


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

Branch: refs/heads/master
Commit: 865b2e6791a37371fff4c43c974c90f44d24c418
Parents: 4929625
Author: Sheng Yang 
Authored: Mon Oct 27 18:59:55 2014 -0700
Committer: Sheng Yang 
Committed: Tue Oct 28 16:29:29 2014 -0700

--
 .../ConsoleProxySecureServerFactoryImpl.java| 32 ++--
 utils/src/com/cloud/utils/nio/Link.java |  9 --
 2 files changed, 22 insertions(+), 19 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/865b2e67/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
--
diff --git 
a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
 
b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
index 7af4c7b..75d23b1 100644
--- 
a/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
+++ 
b/services/console-proxy/server/src/com/cloud/consoleproxy/ConsoleProxySecureServerFactoryImpl.java
@@ -16,12 +16,12 @@
 // under the License.
 package com.cloud.consoleproxy;
 
-import java.io.ByteArrayInputStream;
-import java.io.FileInputStream;
-import java.io.IOException;
-import java.net.InetSocketAddress;
-import java.security.KeyStore;
-import java.util.Properties;
+import com.cloud.utils.db.DbProperties;
+import com.sun.net.httpserver.HttpServer;
+import com.sun.net.httpserver.HttpsConfigurator;
+import com.sun.net.httpserver.HttpsParameters;
+import com.sun.net.httpserver.HttpsServer;
+import org.apache.log4j.Logger;
 
 import javax.net.ssl.KeyManagerFactory;
 import javax.net.ssl.SSLContext;
@@ -29,14 +29,11 @@ import javax.net.ssl.SSLParameters;
 import javax.net.ssl.SSLServerSocket;
 import javax.net.ssl.SSLServerSocketFactory;
 import javax.net.ssl.TrustManagerFactory;
-
-import org.apache.log4j.Logger;
-
-import com.cloud.utils.db.DbProperties;
-import com.sun.net.httpserver.HttpServer;
-import com.sun.net.httpserver.HttpsConfigurator;
-import com.sun.net.httpserver.HttpsParameters;
-import com.sun.net.httpserver.HttpsServer;
+import java.io.ByteArrayInputStream;
+import java.io.FileInputStream;
+import java.io.IOException;
+import java.net.InetSocketAddress;
+import java.security.KeyStore;
 
 public class ConsoleProxySecureServerFactoryImpl implements 
ConsoleProxyServerFactory {
 private static final Logger s_logger = 
Logger.getLogger(ConsoleProxySecureServerFactoryImpl.class);
@@ -54,8 +51,11 @@ public class ConsoleProxySecureServerFactoryImpl implements 
ConsoleProxyServerFa
 try {
 s_logger.info("Initializing SSL from built-in default 
certificate");
 
-final Properties dbProps = DbProperties.getDbProperties();
-char[] passphrase = 
dbProps.getProperty("db.cloud.keyStorePassphrase").toCharArray();
+final String pass = 
DbProperties.getDbProperties().getProperty("db.cloud.keyStorePassphrase");
+char[] passphrase = "vmops.com".toCharArray();
+if (pass != null) {
+passphrase = pass.toCharArray();
+}
 KeyStore ks = KeyStore.getInstance("JKS");
 
 ks.load(new FileInputStream("certs/realhostip.keystore"), 
passphrase);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/865b2e67/utils/src/com/cloud/utils/nio/Link.java
--
diff --git a/utils/src/com/cloud/utils/nio/Link.java 
b/utils/src/com/cloud/utils/nio/Link.java
index c295caf..a15b8a4 100755
--- a/utils/src/com/cloud/utils/nio/Link.java
+++ b/utils/src/com/cloud/utils/nio/Link.java
@@ -33,7 +33,6 @@ import java.nio.channels.SelectionKey;
 import java.nio.channels.SocketChannel;
 import java.security.GeneralSecurityException;
 import java.security.KeyStore;
-import java.util.Properties;
 import java.util.concurrent.ConcurrentLinkedQueue;
 
 import javax.net.ssl.Ke

[07/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7809: UI > remove usage of g_mySession which is unnecessary.


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

Branch: refs/heads/master
Commit: 58455c08c4ff40f7aaa632e5014700444cb7aa9a
Parents: 070e689
Author: Jessica Wang 
Authored: Wed Oct 29 11:14:58 2014 -0700
Committer: Jessica Wang 
Committed: Wed Oct 29 11:14:58 2014 -0700

--
 ui/scripts/cloudStack.js  | 31 +++
 ui/scripts/sharedFunctions.js |  2 +-
 2 files changed, 4 insertions(+), 29 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58455c08/ui/scripts/cloudStack.js
--
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 49af7f7..c5aa89c 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -93,26 +93,6 @@
 message: parseXMLHttpResponse(data),
 clickAction: clickAction
 });
-},
-beforeSend: function(XMLHttpRequest) {
-if (g_mySession == $.cookie("JSESSIONID")) {
-return true;
-} else {
-var clickAction = function() {
-$('#user-options a').eq(0).trigger('click');
-};
-
-if ($('.notification-box:visible').size()) {
-$('.notification-box, div.overlay:first').remove();
-}
-
-cloudStack.dialog.notice({
-message: _l('label.session.expired'),
-clickAction: clickAction
-}).closest('.ui-dialog').overlay();
-
-return false;
-}
 }
 });
 
@@ -137,7 +117,6 @@
 }
 return cookieValue;
 };
-g_mySession = $.cookie('JSESSIONID');
 g_sessionKey = unBoxCookieValue('sessionKey');
 g_role = unBoxCookieValue('role');
 g_userid = unBoxCookieValue('userid');
@@ -147,7 +126,6 @@
 g_userfullname = unBoxCookieValue('userfullname');
 g_timezone = unBoxCookieValue('timezone'); 
   
 } else { //single-sign-on  (bypass login screen)
-g_mySession = $.cookie('JSESSIONID');
 g_sessionKey = 
encodeURIComponent(g_loginResponse.sessionkey);
 g_role = g_loginResponse.type;
 g_username = g_loginResponse.username;
@@ -238,8 +216,7 @@
 async: false,
 success: function(json) {
 var loginresponse = json.loginresponse;
-
-g_mySession = $.cookie('JSESSIONID');
+
 g_sessionKey = 
encodeURIComponent(loginresponse.sessionkey);
 g_role = loginresponse.type;
 g_username = loginresponse.username;
@@ -335,8 +312,7 @@
 $.ajax({
 url: createURL('logout'),
 async: false,
-success: function() {
-g_mySession = null;
+success: function() {
 g_sessionKey = null;
 g_username = null;
 g_account = null;
@@ -347,8 +323,7 @@
 g_kvmsnapshotenabled = null;
 g_regionsecondaryenabled = null;
 g_loginCmdText = null;
-
-$.cookie('JSESSIONID', null);
+
 $.cookie('sessionKey', null);
 $.cookie('username', null);
 $.cookie('account', null);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/58455c08/ui/scripts/sharedFunctions.js
--
diff --git a/ui/scripts/sharedFunctions.js b/ui/scripts/sharedFunctions.js
index 8ec88b3..cba6fc6 100644
--- a/ui/scripts/sharedFunctions.js
+++ b/ui/scripts/sharedFunctions.js
@@ -14,7 +14,7 @@
 // KIND, either express or implied.  See the License for the
 // specific language governing permissions and limitations
 // under the License.
-var g_mySession = null;
+
 var g_sessionKey = null;
 var g_role = null; // roles - root, domain-admin, ro-admin, user
 var g_username = null;

[05/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7809: UI > remove unnecessary cookie 'timezoneoffset'.


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

Branch: refs/heads/master
Commit: 0d6a277a0051c191cc34645a0a70bf8e3515865e
Parents: 865b2e6
Author: Jessica Wang 
Authored: Tue Oct 28 16:35:36 2014 -0700
Committer: Jessica Wang 
Committed: Tue Oct 28 16:35:36 2014 -0700

--
 ui/scripts/cloudStack.js | 23 +--
 1 file changed, 5 insertions(+), 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0d6a277a/ui/scripts/cloudStack.js
--
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 0e63522..49af7f7 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -145,11 +145,7 @@
 g_account = unBoxCookieValue('account');
 g_username = unBoxCookieValue('username');
 g_userfullname = unBoxCookieValue('userfullname');
-g_timezone = unBoxCookieValue('timezone');
-if ($.cookie('timezoneoffset') != null)
-g_timezoneoffset = 
isNaN(unBoxCookieValue('timezoneoffset')) ? null : 
parseFloat(unBoxCookieValue('timezoneoffset'));
-else
-g_timezoneoffset = null;
+g_timezone = unBoxCookieValue('timezone'); 
   
 } else { //single-sign-on  (bypass login screen)
 g_mySession = $.cookie('JSESSIONID');
 g_sessionKey = 
encodeURIComponent(g_loginResponse.sessionkey);
@@ -159,11 +155,7 @@
 g_account = g_loginResponse.account;
 g_domainid = g_loginResponse.domainid;
 g_userfullname = g_loginResponse.firstname + ' ' + 
g_loginResponse.lastname;
-g_timezone = g_loginResponse.timezone;
-if (g_loginResponse.timezoneoffset != null)
-g_timezoneoffset = 
isNaN(g_loginResponse.timezoneoffset) ? null : 
parseFloat(g_loginResponse.timezoneoffset);
-else
-g_timezoneoffset = null;
+g_timezone = g_loginResponse.timezone;
 }
 
 var userValid = false;
@@ -254,8 +246,7 @@
 g_userid = loginresponse.userid;
 g_account = loginresponse.account;
 g_domainid = loginresponse.domainid;
-g_timezone = loginresponse.timezone;
-g_timezoneoffset = loginresponse.timezoneoffset;
+g_timezone = loginresponse.timezone;   
 
 g_userfullname = loginresponse.firstname + ' ' + 
loginresponse.lastname;
 
 $.cookie('sessionKey', g_sessionKey, {
@@ -272,10 +263,7 @@
 });
 $.cookie('role', g_role, {
 expires: 1
-});
-$.cookie('timezoneoffset', g_timezoneoffset, {
-expires: 1
-});
+});
 $.cookie('timezone', g_timezone, {
 expires: 1
 });
@@ -365,8 +353,7 @@
 $.cookie('username', null);
 $.cookie('account', null);
 $.cookie('domainid', null);
-$.cookie('role', null);
-$.cookie('timezoneoffset', null);
+$.cookie('role', null);  
 $.cookie('timezone', null);
 
 if (onLogoutCallback()) { //onLogoutCallback() will 
set g_loginResponse(single-sign-on variable) to null, then bypassLoginCheck() 
will show login screen.

[09/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

Revert "CLOUDSTACK-7408: Fixed - Private key of the ssh keypair was getting 
corrupted"

This reverts commit e921ec6ec79c50096d58264d60c15091969ff888.

CLOUDSTACK-7408: sshClient.py - removing function load_host_keys(). This 
function is used to load host keys from local host keys file and to save back 
the host key. It is not needed while running test cases because we are 
connecting to unknown host anyway and don't want to use any local host key 
file. We have the AutoAddPolicy for missing host key file, hence whenever ssh 
connects to a new host, it will save the host key in memory temporarily.

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: e87da186f3b094e76a174713d6933f83d1c00854
Parents: 591f468
Author: Gaurrav Aradhye 
Authored: Thu Oct 30 12:23:49 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 14:51:54 2014 +0530

--
 tools/marvin/marvin/lib/base.py  |  8 +++-
 tools/marvin/marvin/lib/utils.py |  7 ++-
 tools/marvin/marvin/sshClient.py | 17 +
 3 files changed, 6 insertions(+), 26 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e87da186/tools/marvin/marvin/lib/base.py
--
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index 77faeeb..7f53328 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -552,7 +552,7 @@ class VirtualMachine:
 
 def get_ssh_client(
 self, ipaddress=None, reconnect=False, port=None,
-keyPairFileLocation=None, knownHostsFilePath=None):
+keyPairFileLocation=None):
 """Get SSH object of VM"""
 
 # If NAT Rules are not created while VM deployment in Advanced mode
@@ -571,16 +571,14 @@ class VirtualMachine:
 self.ssh_port,
 self.username,
 self.password,
-keyPairFileLocation=keyPairFileLocation,
-knownHostsFilePath=knownHostsFilePath
+keyPairFileLocation=keyPairFileLocation
 )
 self.ssh_client = self.ssh_client or is_server_ssh_ready(
 self.ssh_ip,
 self.ssh_port,
 self.username,
 self.password,
-keyPairFileLocation=keyPairFileLocation,
-knownHostsFilePath=knownHostsFilePath
+keyPairFileLocation=keyPairFileLocation
 )
 return self.ssh_client
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e87da186/tools/marvin/marvin/lib/utils.py
--
diff --git a/tools/marvin/marvin/lib/utils.py b/tools/marvin/marvin/lib/utils.py
index b58b59d..8788b3b 100644
--- a/tools/marvin/marvin/lib/utils.py
+++ b/tools/marvin/marvin/lib/utils.py
@@ -121,9 +121,7 @@ def cleanup_resources(api_client, resources):
 obj.delete(api_client)
 
 
-def is_server_ssh_ready(ipaddress, port, username, password, retries=20,
-retryinterv=30, timeout=10.0, keyPairFileLocation=None,
-knownHostsFilePath=None):
+def is_server_ssh_ready(ipaddress, port, username, password, retries=20, 
retryinterv=30, timeout=10.0, keyPairFileLocation=None):
 '''
 @Name: is_server_ssh_ready
 @Input: timeout: tcp connection timeout flag,
@@ -142,8 +140,7 @@ def is_server_ssh_ready(ipaddress, port, username, 
password, retries=20,
 keyPairFiles=keyPairFileLocation,
 retries=retries,
 delay=retryinterv,
-timeout=timeout,
-knownHostsFilePath=knownHostsFilePath)
+timeout=timeout)
 except Exception, e:
 raise Exception("SSH connection has Failed. Waited %ss. Error is %s" % 
(retries * retryinterv, str(e)))
 else:

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e87da186/tools/marvin/marvin/sshClient.py
--
diff --git a/tools/marvin/marvin/sshClient.py b/tools/marvin/marvin/sshClient.py
index f027890..e481109 100644
--- a/tools/marvin/marvin/sshClient.py
+++ b/tools/marvin/marvin/sshClient.py
@@ -24,7 +24,6 @@ from paramiko import (BadHostKeyException,
   SFTPClient)
 import socket
 import time
-import os
 from marvin.cloudstackException import (
 internalError,
 GetDetailExceptionInfo
@@ -50,8 +49,7 @@ class SshClient(object):
 '''
 
 def __init__(self, host, port, user, passwd, retries=60, delay=10,
- log_lvl=logging.DEBUG, key

[02/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7809: UI > remove unnecessary cookie 'capabilities', 'supportELB', 
'kvmsnapshotenabled', 'regionsecondaryenabled', 'userpublictemplateenabled', 
'userProjectsEnabled'.


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

Branch: refs/heads/master
Commit: 1ea6f7dd584b8817d025088431845949f8ed1825
Parents: 429ea8b
Author: Jessica Wang 
Authored: Tue Oct 28 15:02:05 2014 -0700
Committer: Jessica Wang 
Committed: Tue Oct 28 15:02:05 2014 -0700

--
 ui/scripts/cloudStack.js | 69 ---
 1 file changed, 12 insertions(+), 57 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/1ea6f7dd/ui/scripts/cloudStack.js
--
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index ea6fc16..6b4e15a 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -172,37 +172,15 @@
 dataType: "json",
 async: false,
 success: function(json) {
-g_capabilities = 
json.listcapabilitiesresponse.capability;
-$.cookie('capabilities', g_capabilities, {
-expires: 1
-});
-
-g_supportELB = 
json.listcapabilitiesresponse.capability.supportELB.toString(); //convert 
boolean to string if it's boolean
-$.cookie('supportELB', g_supportELB, {
-expires: 1
-});
-
-g_kvmsnapshotenabled = 
json.listcapabilitiesresponse.capability.kvmsnapshotenabled; //boolean
-$.cookie('kvmsnapshotenabled', g_kvmsnapshotenabled, {
-expires: 1
-});
-   
-g_regionsecondaryenabled = 
json.listcapabilitiesresponse.capability.regionsecondaryenabled; //boolean
-$.cookie('regionsecondaryenabled', 
g_regionsecondaryenabled, {
-expires: 1
-}); 
-  
+g_capabilities = 
json.listcapabilitiesresponse.capability;
+g_supportELB = 
json.listcapabilitiesresponse.capability.supportELB.toString(); //convert 
boolean to string if it's boolean   
+g_kvmsnapshotenabled = 
json.listcapabilitiesresponse.capability.kvmsnapshotenabled; //boolean  
+g_regionsecondaryenabled = 
json.listcapabilitiesresponse.capability.regionsecondaryenabled; //boolean
 if 
(json.listcapabilitiesresponse.capability.userpublictemplateenabled != null) {
-g_userPublicTemplateEnabled = 
json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); 
//convert boolean to string if it's boolean
-$.cookie('userpublictemplateenabled', 
g_userPublicTemplateEnabled, {
-expires: 1
-});
+g_userPublicTemplateEnabled = 
json.listcapabilitiesresponse.capability.userpublictemplateenabled.toString(); 
//convert boolean to string if it's boolean
 }
-
 g_userProjectsEnabled = 
json.listcapabilitiesresponse.capability.allowusercreateprojects;
-$.cookie('userProjectsEnabled', g_userProjectsEnabled, 
{
-expires: 1
-});
+   
 
 g_cloudstackversion = 
json.listcapabilitiesresponse.capability.cloudstackversion;
 
@@ -314,36 +292,14 @@
 async: false,
 success: function(json) {
 g_capabilities = 
json.listcapabilitiesresponse.capability;
-$.cookie('capabilities', g_capabilities, {
-expires: 1
-});
-
-g_supportELB = 
json.listcapabilitiesresponse.capability.supportELB.toString(); //convert 
boolean to string if it's boolean
-$.cookie('supportELB', g_supportELB, {
-expires: 1
-});
-
-g_kvmsnapshotenabled = 
json.listca

[03/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7809: UI > remove unnecessary cookie 'networktype'.


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

Branch: refs/heads/master
Commit: 492962520ec0fdf018b18e195efe7478133a3dab
Parents: 1ea6f7d
Author: Jessica Wang 
Authored: Tue Oct 28 15:29:39 2014 -0700
Committer: Jessica Wang 
Committed: Tue Oct 28 15:29:39 2014 -0700

--
 ui/scripts/cloudStack.js | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/49296252/ui/scripts/cloudStack.js
--
diff --git a/ui/scripts/cloudStack.js b/ui/scripts/cloudStack.js
index 6b4e15a..0e63522 100644
--- a/ui/scripts/cloudStack.js
+++ b/ui/scripts/cloudStack.js
@@ -365,8 +365,7 @@
 $.cookie('username', null);
 $.cookie('account', null);
 $.cookie('domainid', null);
-$.cookie('role', null);
-$.cookie('networktype', null);
+$.cookie('role', null);
 $.cookie('timezoneoffset', null);
 $.cookie('timezone', null);

[39/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7834
Web UI shows all DHCP/PXE providers in cloud when admin click DHCP/PXE IP for A 
zone

Conflicts:

plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java


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

Branch: refs/heads/master
Commit: c8f72780ead91837e998a14459019183081a0556
Parents: 207ec25
Author: Frank Zhang 
Authored: Mon Nov 3 16:43:09 2014 -0800
Committer: Frank Zhang 
Committed: Mon Nov 3 16:44:53 2014 -0800

--
 .../BaremetalDhcpManagerImpl.java   | 28 +--
 .../BaremetalKickStartServiceImpl.java  | 22 +--
 .../cloudstack/api/ListBaremetalDhcpCmd.java| 29 ++--
 .../api/ListBaremetalPxeServersCmd.java | 25 +++--
 4 files changed, 71 insertions(+), 33 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8f72780/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
--
diff --git 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
index 3299268..2b67abe 100755
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalDhcpManagerImpl.java
@@ -22,21 +22,6 @@
 // Automatically generated by addcopyright.py at 04/03/2012
 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 javax.naming.ConfigurationException;
-
-import org.apache.log4j.Logger;
-
-import org.apache.cloudstack.api.AddBaremetalDhcpCmd;
-import org.apache.cloudstack.api.ListBaremetalDhcpCmd;
-
 import com.cloud.agent.AgentManager;
 import com.cloud.agent.api.Answer;
 import com.cloud.agent.api.StartupCommand;
@@ -75,6 +60,18 @@ import com.cloud.vm.ReservationContext;
 import com.cloud.vm.VirtualMachineProfile;
 import com.cloud.vm.dao.NicDao;
 import com.cloud.vm.dao.UserVmDao;
+import org.apache.cloudstack.api.AddBaremetalDhcpCmd;
+import org.apache.cloudstack.api.ListBaremetalDhcpCmd;
+import org.apache.log4j.Logger;
+
+import javax.ejb.Local;
+import javax.inject.Inject;
+import javax.naming.ConfigurationException;
+import java.net.URI;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
 
 @Local(value = {BaremetalDhcpManager.class})
 public class BaremetalDhcpManagerImpl extends ManagerBase implements 
BaremetalDhcpManager, ResourceStateAdapter {
@@ -310,6 +307,7 @@ public class BaremetalDhcpManagerImpl extends ManagerBase 
implements BaremetalDh
 sc.and(sc.entity().getDeviceType(), Op.EQ, cmd.getDeviceType());
 }
 
+sc.and(sc.entity().getPhysicalNetworkId(), Op.EQ, 
cmd.getPhysicalNetworkId());
 List vos = sc.list();
 for (BaremetalDhcpVO vo : vos) {
 responses.add(generateApiResponse(vo));

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c8f72780/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
--
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 2786e13..ef37294 100755
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
@@ -35,7 +35,6 @@ import org.apache.cloudstack.api.AddBaremetalPxeCmd;
 import org.apache.cloudstack.api.ListBaremetalPxeServersCmd;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 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;
@@ -43,6 +42,7 @@ import 
com.cloud.agent.api.baremetal.PrepareKickstartPxeServerCommand;
 import com.cloud.baremetal.database.BaremetalPxeDao;
 import com.cloud.baremetal.database.BaremetalPxeVO;
 import com.cloud.baremetal.networkservi

[29/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7825: Report both virtual size and physical size for the snaphost 
usage event.


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

Branch: refs/heads/master
Commit: 2652195010c86fa399493a041afff3eac17b1538
Parents: aaa561a
Author: Nitin Mehta 
Authored: Fri Oct 31 15:24:32 2014 -0700
Committer: Nitin Mehta 
Committed: Fri Oct 31 15:24:32 2014 -0700

--
 .../src/com/cloud/storage/snapshot/SnapshotManagerImpl.java  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/26521950/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
--
diff --git a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java 
b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
index 76ab370..6d74636 100755
--- a/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
+++ b/server/src/com/cloud/storage/snapshot/SnapshotManagerImpl.java
@@ -971,11 +971,11 @@ public class SnapshotManagerImpl extends ManagerBase 
implements SnapshotManager,
 snapshotStrategy.takeSnapshot(snapshot);
 
 try {
-postCreateSnapshot(volume.getId(), snapshotId, 
payload.getSnapshotPolicyId());
-
-
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_CREATE, 
snapshot.getAccountId(), snapshot.getDataCenterId(), snapshotId, 
snapshot.getName(),
-null, null, volume.getSize(), 
snapshot.getClass().getName(), snapshot.getUuid());
+postCreateSnapshot(volume.getId(), snapshotId, 
payload.getSnapshotPolicyId());
 SnapshotDataStoreVO snapshotStoreRef = 
_snapshotStoreDao.findBySnapshot(snapshotId, DataStoreRole.Image);
+// FIXME - snapshotStoreRef.getSize() refers to physical size, 
correct that
+
UsageEventUtils.publishUsageEvent(EventTypes.EVENT_SNAPSHOT_CREATE, 
snapshot.getAccountId(), snapshot.getDataCenterId(), snapshotId, 
snapshot.getName(),
+null, null, snapshotStoreRef.getSize(), volume.getSize(), 
snapshot.getClass().getName(), snapshot.getUuid());
 // Correct the resource count of snapshot in case of delta 
snapshots.
 
_resourceLimitMgr.decrementResourceCount(snapshotOwner.getId(), 
ResourceType.secondary_storage, new Long(volume.getSize() - 
snapshotStoreRef.getSize()));
 } catch (Exception e) {

[14/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7682: Fixed usage event issue. Used api client of account for which 
we are checking the usage

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: b9fed951ef6498c828f07ab120a242fcf15e14f6
Parents: a1e7fee
Author: Gaurav Aradhye 
Authored: Wed Oct 8 11:25:15 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 15:28:39 2014 +0530

--
 test/integration/component/test_usage.py | 7 +--
 1 file changed, 5 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b9fed951/test/integration/component/test_usage.py
--
diff --git a/test/integration/component/test_usage.py 
b/test/integration/component/test_usage.py
index 81cce48..58cfbed 100644
--- a/test/integration/component/test_usage.py
+++ b/test/integration/component/test_usage.py
@@ -669,6 +669,9 @@ class TestTemplateUsage(cloudstackTestCase):
 domainid=cls.domain.id
 )
 cls._cleanup.append(cls.account)
+cls.userapiclient = cls.testClient.getUserApiClient(
+UserName=cls.account.name,
+DomainName=cls.account.domain)
 cls.services["account"] = cls.account.name
 
 cls.service_offering = ServiceOffering.create(
@@ -742,7 +745,7 @@ class TestTemplateUsage(cloudstackTestCase):
 
 #Create template from Virtual machine and Volume ID
 self.template = Template.create(
-self.apiclient,
+self.userapiclient,
 self.services["templates"],
 self.volume.id,
 TestTemplateUsage.account.name,
@@ -750,7 +753,7 @@ class TestTemplateUsage(cloudstackTestCase):
 )
 self.debug("Created template with ID: %s" % self.template.id)
 # Delete template
-self.template.delete(self.apiclient)
+self.template.delete(self.userapiclient)
 self.debug("Deleted template with ID: %s" % self.template.id)
 
 # Fetch account ID from account_uuid

[32/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7826: UI - dialog widget - dependent dropdown field (dependsOn 
property specified) - fix a bug that default opton in dependent dropdown field 
didn't trigger change event handler until another option in dependent dropdown 
field was selected.


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

Branch: refs/heads/master
Commit: 3760fdeeb4a278600f30102dfa3f9e64752b724a
Parents: 6df396c
Author: Jessica Wang 
Authored: Fri Oct 31 15:31:24 2014 -0700
Committer: Jessica Wang 
Committed: Fri Oct 31 15:31:24 2014 -0700

--
 ui/scripts/ui/dialog.js | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/3760fdee/ui/scripts/ui/dialog.js
--
diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js
index f7946dc..332b78f 100644
--- a/ui/scripts/ui/dialog.js
+++ b/ui/scripts/ui/dialog.js
@@ -237,7 +237,10 @@
 
 if (($target.is(':checked') && !isReverse) ||
 ($target.is(':unchecked') && isReverse)) {
-$dependent.css('display', 'inline-block');
+
+   $dependent.css('display', 'inline-block'); 
//show dependent dropdown field
+$dependent.change(); //trigger event handler 
for default option in dependent dropdown field (CLOUDSTACK-7826)
+
 $dependent.each(function() {
 if ($(this).data('dialog-select-fn')) {
 $(this).data('dialog-select-fn')();

[17/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7692: Fixed template register issue in test_project_usage.py

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: 4f297efef5627f04348a6b9ac550bef2364cb661
Parents: e2ba1b6
Author: Gaurav Aradhye 
Authored: Thu Oct 9 15:14:30 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 15:33:37 2014 +0530

--
 test/integration/component/test_project_usage.py | 5 -
 1 file changed, 4 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/4f297efe/test/integration/component/test_project_usage.py
--
diff --git a/test/integration/component/test_project_usage.py 
b/test/integration/component/test_project_usage.py
index 3262e40..2627504 100644
--- a/test/integration/component/test_project_usage.py
+++ b/test/integration/component/test_project_usage.py
@@ -712,6 +712,9 @@ class TestTemplateUsage(cloudstackTestCase):
 domainid=cls.domain.id
 )
 cls._cleanup.append(cls.account)
+cls.userapiclient = cls.testClient.getUserApiClient(
+UserName=cls.account.name,
+DomainName=cls.account.domain)
 cls.services["account"] = cls.account.name
 
 cls.project = Project.create(
@@ -789,7 +792,7 @@ class TestTemplateUsage(cloudstackTestCase):
 
 #Create template from Virtual machine and Volume ID
 self.template = Template.create(
-self.apiclient,
+self.userapiclient,
 self.services["templates"],
 self.volume.id,
 projectid=self.project.id

[28/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

Revert "CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests"

This reverts commit 0d1fa9102d7a87863a9f91f88af05e9f38fe6b91.


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

Branch: refs/heads/master
Commit: aaa561a283ecf7df15a610511dc150fec73402e9
Parents: 5b1cbc4
Author: pdion891 
Authored: Fri Oct 31 17:14:59 2014 -0400
Committer: pdion891 
Committed: Fri Oct 31 17:14:59 2014 -0400

--
 .../cloudstack/network/lb/CertServiceTest.java  | 16 +++
 server/test/resources/certs/rsa_ca_signed.crt   | 36 +++-
 server/test/resources/certs/rsa_ca_signed.key   | 45 +++-
 server/test/resources/certs/rsa_self_signed.crt | 33 +++---
 server/test/resources/certs/rsa_self_signed.key | 38 ++---
 .../certs/rsa_self_signed_with_pwd.crt  | 33 +++---
 .../certs/rsa_self_signed_with_pwd.key  | 41 ++
 7 files changed, 94 insertions(+), 148 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aaa561a2/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
--
diff --git a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java 
b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
index 276bf8f..1292ce1 100755
--- a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
+++ b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
@@ -242,7 +242,7 @@ public class CertServiceTest {
 certService.uploadSslCert(uploadCmd);
 }
 
-
+/*
 @Test
 public void runUploadSslCertBadChain() throws IOException, 
IllegalAccessException, NoSuchFieldException {
 Assume.assumeTrue(isOpenJdk() || isJCEInstalled());
@@ -297,9 +297,9 @@ public class CertServiceTest {
 assertTrue(e.getMessage().contains("Invalid certificate chain"));
 }
 }
+*/
 
-
-
+/*
 @Test
 public void runUploadSslCertNoRootCert() throws IOException, 
IllegalAccessException, NoSuchFieldException {
 
@@ -356,9 +356,9 @@ public class CertServiceTest {
 }
 
 }
+*/
 
-
-
+/*
 @Test
 public void runUploadSslCertNoChain() throws IOException, 
IllegalAccessException, NoSuchFieldException {
 
@@ -409,9 +409,9 @@ public class CertServiceTest {
 }
 
 }
+*/
 
-
-
+/*
 @Test
 public void runUploadSslCertBadPassword() throws IOException, 
IllegalAccessException, NoSuchFieldException {
 
@@ -460,7 +460,7 @@ public class CertServiceTest {
 }
 
 }
-
+*/
 
 @Test
 public void runUploadSslCertBadkeyPair() throws IOException, 
IllegalAccessException, NoSuchFieldException {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aaa561a2/server/test/resources/certs/rsa_ca_signed.crt
--
diff --git a/server/test/resources/certs/rsa_ca_signed.crt 
b/server/test/resources/certs/rsa_ca_signed.crt
index fb74f17..0b540aa 100644
--- a/server/test/resources/certs/rsa_ca_signed.crt
+++ b/server/test/resources/certs/rsa_ca_signed.crt
@@ -1,23 +1,17 @@
 -BEGIN CERTIFICATE-
-MIID1TCCAr2gAwIBAgIJALXV1B5/vewhMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV
-BAYTAkFVMQ0wCwYDVQQIDARTb21lMQwwCgYDVQQKDANPcmcxDDAKBgNVBAsMA0Rl
-djENMAsGA1UEAwwETmFtZTEcMBoGCSqGSIb3DQEJARYNdGVzdEBtYWlsLmNvbTAe
-Fw0xMzEwMjExNjE4MjJaFw0xNDEwMjExNjE4MjJaMHIxCzAJBgNVBAYTAkFVMRMw
-EQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0
-eSBMdGQxDTALBgNVBAMMBFN5ZWQxHDAaBgkqhkiG9w0BCQEWDXN5ZWRAdGVzdC5j
-b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpkHkV6ZHhkYc3Y92i
-YllHGbSnXIzwnbaYcfIB5NRldbxyts2Hp8HttxG0rH5DgEMdqfOowqYITe2/hAop
-ZqLuAuwEj0tlPJ/hoVnZeHlCuBps+/nWkanA0DgkwiVksm7UoWM736dkmhLf03FI
-A0/pOsUYranCJAGO26BmNQnocjuoWHZRZINKFNVwgNLrCGkhIu4Dk4o6Rnto0oew
-kwUUVogpUJ6hPFU+8eIV0BAxertuiv6bQC/dG4MhVLl9nRB+XSnf+UAMgH3ay1em
-t8CL4pAlBmctt08LcaLeJBVWH0tsdx/QUuo/5iL61I/eQi4thLureM+bhzDq3/JN
-DYzfAgMBAAGjezB5MAkGA1UdEwQCMAAwLAYJYIZIAYb4QgENBB8WHU9wZW5TU0wg
-R2VuZXJhdGVkIENlcnRpZmljYXRlMB0GA1UdDgQWBBR2LIRfVveDgQB3dC7TOYhX
-BEv71DAfBgNVHSMEGDAWgBSMUs4ge7LDahb4VdjEn9RmLxh0GDANBgkqhkiG9w0B
-AQUFAAOCAQEAPjN/sdLcPfMh5ep29vp/7JTh6dUYnBNATYaXxx8j2XdnMCKeRfgP
-WOJur8HDPSayWWKKlztiQbJV5jDS5vyuMWI1a5/KIAQlOJep+anpR1QnQaX4/M4Z
-YUJo1fPs6tg47dXRpZZaJ+Hqwh0ZftCQoUq/sBxawXf6sbxsjoUmzxQLBqzYo1LJ
-jwxBs6C9aM8LDHFz4TVlyclSFQXiLMosj1jLBQ+TqzCxS6qOfJeMM9STXI9W3F2k
-duXeceqOwEkh8aeSUIztYFpX34d4SA4DDX5GUEaOeOR/abnXjH52vE6tM/m7NOve
-5+I/BrlT3heRqiD6Z2ofSsFhG86YeF9Q3w==
+MIICszCCAhwCCQCaE4goZabzDTANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
+VVMxCzAJBgNVBAgMAk

[45/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7383: UI > Instances > detailView > snapshot option > hide this 
option when hypervisor is LXC.


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

Branch: refs/heads/master
Commit: a43fba64dacb55da6dedf6140beb5f692a486e61
Parents: 25e514a
Author: Jessica Wang 
Authored: Tue Nov 4 14:42:29 2014 -0800
Committer: Jessica Wang 
Committed: Tue Nov 4 14:42:29 2014 -0800

--
 ui/scripts/instances.js | 12 ++--
 1 file changed, 10 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a43fba64/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 3cf5dd6..b46c343 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2248,8 +2248,12 @@
 } else if (jsonObj.state == 'Running') {
 allowedActions.push("stop");
 allowedActions.push("restart");
-if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
+
+if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true) 
+   || (jsonObj.hypervisor != 'LXC')) {
 allowedActions.push("snapshot");
+}
+
 allowedActions.push("destroy");
 allowedActions.push("reinstall");
  
@@ -2278,8 +2282,12 @@
 allowedActions.push("start");
 allowedActions.push("destroy");
 allowedActions.push("reinstall");
-if (jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true)
+
+if ((jsonObj.hypervisor != 'KVM' || g_kvmsnapshotenabled == true) 
+   || (jsonObj.hypervisor != 'LXC')) {
 allowedActions.push("snapshot");
+}
+
 allowedActions.push("scaleUp");  //when vm is stopped, scaleUp is 
supported for all hypervisors 
 allowedActions.push("changeAffinity");

[38/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-3212: ui > infrastructure > zones > zone > physical network > guest 
> network > guest ip range - listview: add gateway, netmask field.


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

Branch: refs/heads/master
Commit: 207ec2574c0a8a11fab2562dca241ab27a98dad1
Parents: ddfd74d
Author: Jessica Wang 
Authored: Mon Nov 3 15:55:06 2014 -0800
Committer: Jessica Wang 
Committed: Mon Nov 3 15:55:06 2014 -0800

--
 ui/scripts/system.js | 6 ++
 1 file changed, 6 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/207ec257/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index fd4df48..7b25c81 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -19318,6 +19318,12 @@
 },
 endipv6: {
 label: 'label.ipv6.end.ip'
+},
+gateway: {
+   label: 'label.gateway'
+},
+netmask: {
+   label: 'label.netmask'
 }
 },

[26/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7824: using debian 7.7.0 for systemvm template

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: e463d6d21c346b71b3d810f8dfb9dbe5f1a931fd
Parents: e1c788c
Author: SrikanteswaraRao Talluri 
Authored: Thu Oct 30 17:31:47 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Fri Oct 31 19:06:07 2014 +0530

--
 tools/appliance/definitions/systemvm64template/definition.rb | 6 +++---
 tools/appliance/definitions/systemvmtemplate/definition.rb   | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e463d6d2/tools/appliance/definitions/systemvm64template/definition.rb
--
diff --git a/tools/appliance/definitions/systemvm64template/definition.rb 
b/tools/appliance/definitions/systemvm64template/definition.rb
index 4186742..8dbf724 100644
--- a/tools/appliance/definitions/systemvm64template/definition.rb
+++ b/tools/appliance/definitions/systemvm64template/definition.rb
@@ -10,9 +10,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian_64',
-  :iso_file => "debian-7.5.0-amd64-netinst.iso",
-  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/amd64/iso-cd/debian-7.5.0-amd64-netinst.iso";,
-  :iso_md5 => "8fdb6715228ea90faba58cb84644d296",
+  :iso_file => "debian-7.7.0-amd64-netinst.iso",
+  :iso_src => 
"http://ftp.acc.umu.se/debian-cd/7.7.0/amd64/iso-cd/debian-7.7.0-amd64-netinst.iso";,
+  :iso_md5 => "0b31bb048d20b551f70830bb7ad0",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
  '',

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e463d6d2/tools/appliance/definitions/systemvmtemplate/definition.rb
--
diff --git a/tools/appliance/definitions/systemvmtemplate/definition.rb 
b/tools/appliance/definitions/systemvmtemplate/definition.rb
index d29efcd..91514bf 100644
--- a/tools/appliance/definitions/systemvmtemplate/definition.rb
+++ b/tools/appliance/definitions/systemvmtemplate/definition.rb
@@ -10,9 +10,9 @@ Veewee::Definition.declare({
   :memory_size=> '256',
   :disk_size => '2500', :disk_format => 'VDI', :hostiocache => 'off',
   :os_type_id => 'Debian',
-  :iso_file => "debian-7.5.0-i386-netinst.iso",
-  :iso_src => 
"http://cdimage.debian.org/mirror/cdimage/archive/7.5.0/i386/iso-cd/debian-7.5.0-i386-netinst.iso";,
-  :iso_md5 => "0e6eaacb5a5828473afe90f6df9c8f16",
+  :iso_file => "debian-7.7.0-i386-netinst.iso",
+  :iso_src => 
"http://ftp.acc.umu.se/debian-cd/7.7.0/i386/iso-cd/debian-7.7.0-i386-netinst.iso";,
+  :iso_md5 => "76d512c44a9b7eca53ea2812ad5ac36f",
   :iso_download_timeout => "1000",
   :boot_wait => "10", :boot_cmd_sequence => [
  '',

[24/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7820: Don't consider disabled hosts for calculating disable 
threshold.


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

Branch: refs/heads/master
Commit: c30d4ed1c27303aa20b2aa891a58aae906dc9ab0
Parents: 6df0b9f
Author: Nitin Mehta 
Authored: Thu Oct 30 16:54:00 2014 -0700
Committer: Nitin Mehta 
Committed: Thu Oct 30 16:54:00 2014 -0700

--
 engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c30d4ed1/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
--
diff --git a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java 
b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
index 9cae045..cea18bd 100755
--- a/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
+++ b/engine/schema/src/com/cloud/capacity/dao/CapacityDaoImpl.java
@@ -177,7 +177,7 @@ public class CapacityDaoImpl extends 
GenericDaoBase implements
 "ELSE (SELECT config.value FROM `cloud`.`configuration` config WHERE 
config.name = ?) " +
 "END configValue " +
 "FROM `cloud`.`op_host_capacity` capacity INNER JOIN 
`cloud`.`cluster_details` overcommit ON overcommit.cluster_id = 
capacity.cluster_id " +
-"WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND 
capacity.total_capacity > 0 AND overcommit.name = ?) cluster " +
+"WHERE capacity.data_center_id = ? AND capacity.capacity_type = ? AND 
capacity.total_capacity > 0 AND overcommit.name = ? AND 
capacity.capacity_state='Enabled') cluster " +
 
 "GROUP BY cluster.cluster_id)  clusterList " +
 "WHERE clusterList.ratio > clusterList.value; ";

[37/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-3608 removing duplicate entries, IDs not saved anywhere else hence 
safe to remove


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

Branch: refs/heads/master
Commit: ddfd74dba1d3f458c98c5074c79b2ab0199da682
Parents: 84e44a4
Author: amoghvk 
Authored: Mon Nov 3 15:28:11 2014 -0800
Committer: amoghvk 
Committed: Mon Nov 3 15:28:11 2014 -0800

--
 setup/db/db/schema-441to450.sql | 2 ++
 1 file changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/ddfd74db/setup/db/db/schema-441to450.sql
--
diff --git a/setup/db/db/schema-441to450.sql b/setup/db/db/schema-441to450.sql
index c899289..5caaa9f 100644
--- a/setup/db/db/schema-441to450.sql
+++ b/setup/db/db/schema-441to450.sql
@@ -749,3 +749,5 @@ INSERT IGNORE INTO `cloud`.`guest_os_hypervisor` 
(uuid,hypervisor_type, hypervis
 
 INSERT IGNORE INTO `cloud`.`hypervisor_capabilities`(uuid, hypervisor_type, 
hypervisor_version, max_guests_limit, security_group_enabled, 
max_data_volumes_limit, storage_motion_supported) VALUES (UUID(), 'XenServer', 
'6.5.0', 500, 1, 13, 1);
 
+--Remove duplicates from guest_os_hypervisor table
+DELETE t1 FROM guest_os_hypervisor t1, guest_os_hypervisor t2 WHERE 
(t1.hypervisor_type = t2.hypervisor_type AND t1.hypervisor_version = 
t2.hypervisor_version AND t1.guest_os_id = t2.guest_os_id AND t1.id > t2.id AND 
t1.is_user_defined=0);

[43/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7835: Deleted volumes with null UUID and no removed timestamp in 
database still appear.
Also removed CREATING -> DESTROY via DESTROYREQUESTED, which was causing the 
volume to get stuck in expunging
state.


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

Branch: refs/heads/master
Commit: a53d39c1b687df22768613d556637c34354cb96b
Parents: 9168d82
Author: Sanjay Tripathi 
Authored: Tue Nov 4 13:27:17 2014 +0530
Committer: Sanjay Tripathi 
Committed: Tue Nov 4 17:57:31 2014 +0530

--
 api/src/com/cloud/storage/Volume.java|  1 -
 .../storage/volume/VolumeServiceImpl.java| 19 ++-
 2 files changed, 14 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a53d39c1/api/src/com/cloud/storage/Volume.java
--
diff --git a/api/src/com/cloud/storage/Volume.java 
b/api/src/com/cloud/storage/Volume.java
index b67a395..91ad955 100755
--- a/api/src/com/cloud/storage/Volume.java
+++ b/api/src/com/cloud/storage/Volume.java
@@ -69,7 +69,6 @@ public interface Volume extends ControlledEntity, Identity, 
InternalIdentity, Ba
 s_fsm.addTransition(Creating, Event.OperationRetry, Creating);
 s_fsm.addTransition(Creating, Event.OperationFailed, Allocated);
 s_fsm.addTransition(Creating, Event.OperationSucceeded, Ready);
-s_fsm.addTransition(Creating, Event.DestroyRequested, Destroy);
 s_fsm.addTransition(Creating, Event.CreateRequested, Creating);
 s_fsm.addTransition(Ready, Event.ResizeRequested, Resizing);
 s_fsm.addTransition(Resizing, Event.OperationSucceeded, Ready);

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a53d39c1/engine/storage/volume/src/org/apache/cloudstack/storage/volume/VolumeServiceImpl.java
--
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 d97ad60..1297da9 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
@@ -1021,11 +1021,20 @@ public class VolumeServiceImpl implements VolumeService 
{
 srcVolume.processEvent(Event.OperationSuccessed);
 destVolume.processEvent(Event.OperationSuccessed, 
result.getAnswer());
 _volumeDao.updateUuid(srcVolume.getId(), destVolume.getId());
-destroyVolume(srcVolume.getId());
-srcVolume = volFactory.getVolume(srcVolume.getId());
-AsyncCallFuture destroyFuture = 
expungeVolumeAsync(srcVolume);
-destroyFuture.get();
-future.complete(res);
+try {
+destroyVolume(srcVolume.getId());
+srcVolume = volFactory.getVolume(srcVolume.getId());
+AsyncCallFuture destroyFuture = 
expungeVolumeAsync(srcVolume);
+// If volume destroy fails, this could be because of vdi is 
still in use state, so wait and retry.
+if (destroyFuture.get().isFailed()) {
+Thread.sleep(5 * 1000);
+destroyFuture = expungeVolumeAsync(srcVolume);
+destroyFuture.get();
+}
+future.complete(res);
+} catch (Exception e) {
+s_logger.debug("failed to clean up volume on storage", e);
+}
 return null;
 } catch (Exception e) {
 s_logger.debug("Failed to process copy volume callback", e);

[21/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7816: UI > Global Settings > add "Baremetal Rack Configuration" 
section.


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

Branch: refs/heads/master
Commit: b70106158c2c0e3315704a8843c7ed455282f023
Parents: 1681b02
Author: Jessica Wang 
Authored: Thu Oct 30 11:27:38 2014 -0700
Committer: Jessica Wang 
Committed: Thu Oct 30 11:27:38 2014 -0700

--
 ui/scripts/globalSettings.js | 135 +-
 1 file changed, 134 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b7010615/ui/scripts/globalSettings.js
--
diff --git a/ui/scripts/globalSettings.js b/ui/scripts/globalSettings.js
index 4cbfd07..34d65a2 100644
--- a/ui/scripts/globalSettings.js
+++ b/ui/scripts/globalSettings.js
@@ -234,7 +234,140 @@
 }
 }
 }
-},
+},  
+baremetalRct: {
+type: 'select',
+title: 'Baremetal Rack Configuration',
+listView: {
+id: 'baremetalRct',
+label: 'Baremetal Rack Configuration',
+fields: {   
+   id: {
+   label: 'label.id'
+   },
+url: {
+label: 'label.url'
+}
+},
+dataProvider: function(args) {
+var data = {};
+listViewDataProvider(args, data);
+
+$.ajax({
+   url: createURL("listBaremetalRct"),
+   data: data,
+   success: function(json) {   

+   args.response.success({ data: 
json.listbaremetalrctresponse.baremetalrct });
+   }
+});   
+},
+actions: {
+add: {
+label: 'Add Baremetal Rack Configuration',
+messages: {
+notification: function(args) {
+return 'Add Baremetal Rack Configuration';
+}
+},
+createForm: {
+title: 'Add Baremetal Rack Configuration',
+fields: {
+url: {
+label: 'label.url',
+validation: {
+required: true
+}
+}
+}
+},
+action: function(args) {   
 
+$.ajax({
+   url: createURL("addBaremetalRct"),
+   data: {
+   baremetalrcturl: args.data.url
+   },
+   success: function(json) {   

+   var jid = 
json.addbaremetalrctresponse.jobid
+   args.response.success({
+_custom: {
+jobId: jid,
+getUpdatedItem: function(json) 
{   
+return 
json.queryasyncjobresultresponse.jobresult.baremetalrct;
+}
+}
+});
+   }
+});
+},
+notification: {
+poll: pollAsyncJobResult
+}
+}
+},
+
+detailView: {
+   name: "d

[10/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7805: test_vpc_vms_deployment.py - Removing invalid steps from test 
case

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: a4174d3e91fd4b090de2f9d1688a862fe46f99e5
Parents: e87da18
Author: Gaurav Aradhye 
Authored: Tue Oct 28 14:38:05 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 15:01:31 2014 +0530

--
 .../component/test_vpc_vms_deployment.py| 20 
 1 file changed, 20 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a4174d3e/test/integration/component/test_vpc_vms_deployment.py
--
diff --git a/test/integration/component/test_vpc_vms_deployment.py 
b/test/integration/component/test_vpc_vms_deployment.py
index 54586d0..e61b2f8 100644
--- a/test/integration/component/test_vpc_vms_deployment.py
+++ b/test/integration/component/test_vpc_vms_deployment.py
@@ -2087,26 +2087,6 @@ class TestVMDeployVPC(cloudstackTestCase):
 self.fail("Failed to enable static NAT on IP: %s - %s" % (
 public_ip_4.ipaddress.ipaddress, e))
 
-public_ips = PublicIPAddress.list(
-self.apiclient,
-networkid=network_2.id,
-listall=True,
-isstaticnat=True,
-account=self.account.name,
-domainid=self.account.domainid
-  )
-self.assertEqual(
- isinstance(public_ips, list),
- True,
- "List public Ip for network should list the Ip addr"
- )
-self.assertEqual(
- public_ips[0].ipaddress,
- public_ip_4.ipaddress.ipaddress,
- "List public Ips %s for network should list the Ip 
addr %s"
- % (public_ips[0].ipaddress, 
public_ip_4.ipaddress.ipaddress)
- )
-
 self.debug("Adding NetwrokACl rules to make NAT rule accessible with 
network %s" % network_1.id)
 NetworkACL.create(
  self.apiclient,

[01/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

Repository: cloudstack
Updated Branches:
  refs/heads/master fce9f9639 -> 4c5f792ca


CLOUDSTACK-7796: UI > Infrastructure > zones > zone > details tab > 
dataProvider > remove unnecessary module check.


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

Branch: refs/heads/master
Commit: 429ea8bc957ed6ed238ccf6f77be718d7ba0ff81
Parents: 11c53f0
Author: Jessica Wang 
Authored: Tue Oct 28 11:28:30 2014 -0700
Committer: Jessica Wang 
Committed: Tue Oct 28 11:28:30 2014 -0700

--
 ui/scripts/system.js | 6 +-
 1 file changed, 1 insertion(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/429ea8bc/ui/scripts/system.js
--
diff --git a/ui/scripts/system.js b/ui/scripts/system.js
index 4ec23c7..fd4df48 100644
--- a/ui/scripts/system.js
+++ b/ui/scripts/system.js
@@ -8237,11 +8237,7 @@
 }
 //override default 
error handling: cloudStack.dialog.notice({ message: 
parseXMLHttpResponse(XMLHttpResponse)});
 });
-
-if 
(isModuleIncluded("dr")) {
-
cloudStack.dr.sharedFunctions.addExtraProperties(selectedZoneObj, "Zone");
-}
-
+   
 args.response.success({
 actionFilter: 
zoneActionfilter,
 data: selectedZoneObj

[23/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

SAMLUtils: SAML user id should fit within the UUID VARCHAR(40) column

Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/master
Commit: 6df0b9f677984a85cc50fa964c4ead461f0a3063
Parents: cd52bed
Author: Rohit Yadav 
Authored: Fri Oct 31 00:30:39 2014 +0530
Committer: Rohit Yadav 
Committed: Fri Oct 31 00:39:20 2014 +0530

--
 utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6df0b9f6/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
--
diff --git a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java 
b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
index 36c4d0f..d129309 100644
--- a/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
+++ b/utils/src/org/apache/cloudstack/utils/auth/SAMLUtils.java
@@ -102,7 +102,8 @@ public class SAMLUtils {
 public static final String CERTIFICATE_NAME = "SAMLSP_CERTIFICATE";
 
 public static String createSAMLId(String uid) {
-return SAML_NS + uid;
+String samlUuid = SAML_NS + uid;
+return samlUuid.length() > 40 ? samlUuid.substring(0, 40) : samlUuid;
 }
 
 public static Boolean checkSAMLUserId(String uuid) {

[33/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7832: Move some job db update and item purge to
completeAsyncJob transaction to avoid MySQL deadlock.


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

Branch: refs/heads/master
Commit: 6830cbc15ae70d51c555f7f19348f6d87d0b5391
Parents: 3760fde
Author: Min Chen 
Authored: Mon Nov 3 10:41:36 2014 -0800
Committer: Min Chen 
Committed: Mon Nov 3 11:18:52 2014 -0800

--
 .../db/src/com/cloud/utils/db/Transaction.java|  8 
 framework/ipc/pom.xml | 18 ++
 .../framework/messagebus/MessageBusBase.java  | 14 +-
 .../framework/jobs/impl/AsyncJobManagerImpl.java  | 11 ++-
 4 files changed, 45 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6830cbc1/framework/db/src/com/cloud/utils/db/Transaction.java
--
diff --git a/framework/db/src/com/cloud/utils/db/Transaction.java 
b/framework/db/src/com/cloud/utils/db/Transaction.java
index 471e0cf..dd91a96 100755
--- a/framework/db/src/com/cloud/utils/db/Transaction.java
+++ b/framework/db/src/com/cloud/utils/db/Transaction.java
@@ -18,11 +18,15 @@ package com.cloud.utils.db;
 
 import java.util.concurrent.atomic.AtomicLong;
 
+import org.apache.log4j.Logger;
+
 public class Transaction {
 private final static AtomicLong counter = new AtomicLong(0);
 private final static TransactionStatus STATUS = new TransactionStatus() {
 };
 
+private static final Logger s_logger = Logger.getLogger(Transaction.class);
+
 @SuppressWarnings("deprecation")
 public static  T 
execute(TransactionCallbackWithException callback) throws E {
 String name = "tx-" + counter.incrementAndGet();
@@ -33,6 +37,10 @@ public class Transaction {
 }
 TransactionLegacy txn = TransactionLegacy.open(name, databaseId, 
false);
 try {
+//if (txn.dbTxnStarted()){
+//String warnMsg = "Potential Wrong Usage: TRANSACTION.EXECUTE 
IS WRAPPED INSIDE ANOTHER DB TRANSACTION!";
+//s_logger.warn(warnMsg, new CloudRuntimeException(warnMsg));
+//}
 txn.start();
 T result = callback.doInTransaction(STATUS);
 txn.commit();

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6830cbc1/framework/ipc/pom.xml
--
diff --git a/framework/ipc/pom.xml b/framework/ipc/pom.xml
index 12b4a3d..09b0c41 100644
--- a/framework/ipc/pom.xml
+++ b/framework/ipc/pom.xml
@@ -39,4 +39,22 @@
   ${project.version}
 
   
+  
+
+  
+maven-surefire-plugin
+
+  true
+
+
+  
+integration-test
+
+  test
+
+  
+
+  
+
+
 

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/6830cbc1/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
--
diff --git 
a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
 
b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
index e8f9bce..e3eeb7b 100644
--- 
a/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
+++ 
b/framework/ipc/src/org/apache/cloudstack/framework/messagebus/MessageBusBase.java
@@ -30,6 +30,9 @@ import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.framework.serializer.MessageSerializer;
 
+import com.cloud.utils.db.TransactionLegacy;
+import com.cloud.utils.exception.CloudRuntimeException;
+
 public class MessageBusBase implements MessageBus {
 
 private final Gate _gate;
@@ -158,7 +161,11 @@ public class MessageBusBase implements MessageBus {
 
 @Override
 public void publish(String senderAddress, String subject, PublishScope 
scope, Object args) {
-
+// publish cannot be in DB transaction, which may hold DB lock too 
long, and we are guarding this here
+if (!noDbTxn()){
+String errMsg = "NO EVENT PUBLISH CAN BE WRAPPED WITHIN DB 
TRANSACTION!";
+s_logger.error(errMsg, new CloudRuntimeException(errMsg));
+}
 if (_gate.enter(true)) {
 if (s_logger.isTraceEnabled()) {
 s_logger.trace("Enter gate in message bus publish");
@@ -256,6 +263,11 @@ public class MessageBusBase implements MessageBus {
 }
 }
 
+private boolean noDbTxn() {
+TransactionLegacy txn = TransactionLegacy.currentTxn

[40/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

remove duplicate import


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

Branch: refs/heads/master
Commit: 28d5b9827a021d3c1739f18a5e972f8851602da7
Parents: c8f7278
Author: Frank Zhang 
Authored: Mon Nov 3 17:04:30 2014 -0800
Committer: Frank Zhang 
Committed: Mon Nov 3 17:04:30 2014 -0800

--
 .../BaremetalKickStartServiceImpl.java| 18 --
 1 file changed, 18 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/28d5b982/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
--
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 ef37294..a3ac0b8 100755
--- 
a/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
+++ 
b/plugins/hypervisors/baremetal/src/com/cloud/baremetal/networkservice/BaremetalKickStartServiceImpl.java
@@ -18,23 +18,6 @@
 // Automatically generated by addcopyright.py at 01/29/2013
 package com.cloud.baremetal.networkservice;
 
-import java.io.File;
-import java.net.URI;
-import java.net.URL;
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.HashMap;
-import java.util.List;
-import java.util.Map;
-
-import javax.ejb.Local;
-import javax.inject.Inject;
-
-import org.apache.cloudstack.api.AddBaremetalKickStartPxeCmd;
-import org.apache.cloudstack.api.AddBaremetalPxeCmd;
-import org.apache.cloudstack.api.ListBaremetalPxeServersCmd;
-import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
-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;
@@ -42,7 +25,6 @@ import 
com.cloud.agent.api.baremetal.PrepareKickstartPxeServerCommand;
 import com.cloud.baremetal.database.BaremetalPxeDao;
 import com.cloud.baremetal.database.BaremetalPxeVO;
 import com.cloud.baremetal.networkservice.BaremetalPxeManager.BaremetalPxeType;
-import com.cloud.configuration.Config;
 import com.cloud.dc.DataCenter;
 import com.cloud.deploy.DeployDestination;
 import com.cloud.exception.AgentUnavailableException;

[30/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK:6915 search including removed


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

Branch: refs/heads/master
Commit: 0c153966e6269249fa38ab7859ab8352747e73f4
Parents: aaa561a
Author: amoghvk 
Authored: Fri Oct 31 15:29:07 2014 -0700
Committer: amoghvk 
Committed: Fri Oct 31 15:29:07 2014 -0700

--
 .../vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java | 4 ++--
 .../xenserver/src/com/cloud/hypervisor/XenServerGuru.java| 2 +-
 server/src/com/cloud/hypervisor/KVMGuru.java | 2 +-
 server/src/com/cloud/hypervisor/LXCGuru.java | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c153966/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
--
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 63ee707..7c23699 100644
--- a/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
+++ b/plugins/hypervisors/vmware/src/com/cloud/hypervisor/guru/VMwareGuru.java
@@ -27,7 +27,6 @@ import java.util.UUID;
 import javax.ejb.Local;
 import javax.inject.Inject;
 
-import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
 import org.apache.log4j.Logger;
 
 import org.apache.cloudstack.engine.subsystem.api.storage.PrimaryDataStore;
@@ -38,6 +37,7 @@ import org.apache.cloudstack.framework.config.Configurable;
 import org.apache.cloudstack.framework.config.dao.ConfigurationDao;
 import org.apache.cloudstack.storage.command.CopyCommand;
 import org.apache.cloudstack.storage.command.DeleteCommand;
+import org.apache.cloudstack.storage.command.StorageSubSystemCommand;
 import org.apache.cloudstack.storage.datastore.db.PrimaryDataStoreDao;
 import org.apache.cloudstack.storage.datastore.db.StoragePoolVO;
 import org.apache.cloudstack.storage.to.VolumeObjectTO;
@@ -311,7 +311,7 @@ public class VMwareGuru extends HypervisorGuruBase 
implements HypervisorGuru, Co
 }
 }
 // Determine the VM's OS description
-GuestOSVO guestOS = 
_guestOsDao.findById(vm.getVirtualMachine().getGuestOSId());
+GuestOSVO guestOS = 
_guestOsDao.findByIdIncludingRemoved(vm.getVirtualMachine().getGuestOSId());
 to.setOs(guestOS.getDisplayName());
 to.setHostName(vm.getHostName());
 HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId());

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c153966/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
--
diff --git 
a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java 
b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
index 4019edc..89c2046 100644
--- a/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
+++ b/plugins/hypervisors/xenserver/src/com/cloud/hypervisor/XenServerGuru.java
@@ -90,7 +90,7 @@ public class XenServerGuru extends HypervisorGuruBase 
implements HypervisorGuru
 to.setBootloader(bt);
 
 // Determine the VM's OS description
-GuestOSVO guestOS = 
_guestOsDao.findById(vm.getVirtualMachine().getGuestOSId());
+GuestOSVO guestOS = 
_guestOsDao.findByIdIncludingRemoved(vm.getVirtualMachine().getGuestOSId());
 to.setOs(guestOS.getDisplayName());
 HostVO host = hostDao.findById(vm.getVirtualMachine().getHostId());
 GuestOSHypervisorVO guestOsMapping = null;

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/0c153966/server/src/com/cloud/hypervisor/KVMGuru.java
--
diff --git a/server/src/com/cloud/hypervisor/KVMGuru.java 
b/server/src/com/cloud/hypervisor/KVMGuru.java
index 492342c..b6a7651 100644
--- a/server/src/com/cloud/hypervisor/KVMGuru.java
+++ b/server/src/com/cloud/hypervisor/KVMGuru.java
@@ -57,7 +57,7 @@ public class KVMGuru extends HypervisorGuruBase implements 
HypervisorGuru {
 VirtualMachineTO to = toVirtualMachineTO(vm);
 
 // Determine the VM's OS description
-GuestOSVO guestOS = 
_guestOsDao.findById(vm.getVirtualMachine().getGuestOSId());
+GuestOSVO guestOS = 
_guestOsDao.findByIdIncludingRemoved(vm.getVirtualMachine().getGuestOSId());
 to.setOs(guestOS.getDisplayName());
 HostVO host = _hostDao.findById(vm.getVirtualMachine().getHostId());
 Gues

[13/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7685: Fixed copy template method call in 
test_escalations_template.py. Removed unbound method of the same name as bound 
method from base library and changed method call accordingly

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: a1e7feead91b22350f96114add4bf8d75a74b8b1
Parents: b1ab888
Author: Gaurav Aradhye 
Authored: Wed Oct 8 16:08:44 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 15:15:52 2014 +0530

--
 test/integration/component/test_escalations_templates.py |  3 +--
 tools/marvin/marvin/lib/base.py  | 11 ---
 2 files changed, 1 insertion(+), 13 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1e7feea/test/integration/component/test_escalations_templates.py
--
diff --git a/test/integration/component/test_escalations_templates.py 
b/test/integration/component/test_escalations_templates.py
index 78028bc..3dc24c1 100644
--- a/test/integration/component/test_escalations_templates.py
+++ b/test/integration/component/test_escalations_templates.py
@@ -839,9 +839,8 @@ class TestTemplates(cloudstackTestCase):
 count = count + 1
 
 # Copying the Template from Zone1 to Zone2
-copied_template = Template.copy(
+copied_template = template_created.copy(
 self.userapiclient,
-template_created.id,
 
sourcezoneid=template_created.zoneid,
 destzoneid=zones_list[1].id
 )

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a1e7feea/tools/marvin/marvin/lib/base.py
--
diff --git a/tools/marvin/marvin/lib/base.py b/tools/marvin/marvin/lib/base.py
index 7f53328..580d0ab 100755
--- a/tools/marvin/marvin/lib/base.py
+++ b/tools/marvin/marvin/lib/base.py
@@ -1255,17 +1255,6 @@ class Template:
 [setattr(cmd, k, v) for k, v in kwargs.items()]
 return(apiclient.updateTemplate(cmd))
 
-@classmethod
-def copy(cls, apiclient, id, sourcezoneid, destzoneid):
-"Copy Template from source Zone to Destination Zone"
-
-cmd = copyTemplate.copyTemplateCmd()
-cmd.id = id
-cmd.sourcezoneid = sourcezoneid
-cmd.destzoneid = destzoneid
-
-return apiclient.copyTemplate(cmd)
-
 def copy(self, apiclient, sourcezoneid, destzoneid):
 "Copy Template from source Zone to Destination Zone"

[44/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7384: UI > Instances > detailView > change service offering option > 
hide it when VM state is Running and hyperviror is LXC.


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

Branch: refs/heads/master
Commit: 25e514a28e94ab32d452da45d8e6b42ab39ccffb
Parents: a53d39c1
Author: Jessica Wang 
Authored: Tue Nov 4 11:33:15 2014 -0800
Committer: Jessica Wang 
Committed: Tue Nov 4 11:33:15 2014 -0800

--
 ui/scripts/instances.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/25e514a2/ui/scripts/instances.js
--
diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js
index 838e4d5..3cf5dd6 100644
--- a/ui/scripts/instances.js
+++ b/ui/scripts/instances.js
@@ -2253,8 +2253,8 @@
 allowedActions.push("destroy");
 allowedActions.push("reinstall");
  
-//when userVm is running, scaleUp is not supported for KVM
-if (jsonObj.hypervisor != 'KVM') {
+//when userVm is running, scaleUp is not supported for KVM, LXC
+if (jsonObj.hypervisor != 'KVM' && jsonObj.hypervisor != 'LXC') {
allowedActions.push("scaleUp");
 }

[42/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7372: [vGPU] When a host is put in maintenance mode, vGPU enabled VMs
failed to migrate to the other host in the cluster.

Migration for vGPU VMs is not supported in XS, so instead of migrating them to
new server, stopping them.


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

Branch: refs/heads/master
Commit: 9168d826dad42b73f03aaa1170d5387f7c19b07d
Parents: 2d58bb6
Author: Sanjay Tripathi 
Authored: Mon Nov 3 13:09:53 2014 +0530
Committer: Sanjay Tripathi 
Committed: Tue Nov 4 17:28:22 2014 +0530

--
 server/src/com/cloud/resource/ResourceManagerImpl.java | 8 +++-
 1 file changed, 7 insertions(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9168d826/server/src/com/cloud/resource/ResourceManagerImpl.java
--
diff --git a/server/src/com/cloud/resource/ResourceManagerImpl.java 
b/server/src/com/cloud/resource/ResourceManagerImpl.java
index a0a3adf..fcc4ddb 100755
--- a/server/src/com/cloud/resource/ResourceManagerImpl.java
+++ b/server/src/com/cloud/resource/ResourceManagerImpl.java
@@ -99,6 +99,7 @@ import com.cloud.exception.DiscoveryException;
 import com.cloud.exception.InvalidParameterValueException;
 import com.cloud.exception.PermissionDeniedException;
 import com.cloud.exception.ResourceInUseException;
+import com.cloud.gpu.GPU;
 import com.cloud.gpu.HostGpuGroupsVO;
 import com.cloud.gpu.VGPUTypesVO;
 import com.cloud.gpu.dao.HostGpuGroupsDao;
@@ -125,6 +126,7 @@ import com.cloud.org.Grouping;
 import com.cloud.org.Grouping.AllocationState;
 import com.cloud.org.Managed;
 import com.cloud.serializer.GsonHelper;
+import com.cloud.service.dao.ServiceOfferingDetailsDao;
 import com.cloud.storage.GuestOSCategoryVO;
 import com.cloud.storage.StorageManager;
 import com.cloud.storage.StoragePool;
@@ -223,6 +225,8 @@ public class ResourceManagerImpl extends ManagerBase 
implements ResourceManager,
 PlannerHostReservationDao _plannerHostReserveDao;
 @Inject
 private DedicatedResourceDao _dedicatedDao;
+@Inject
+private ServiceOfferingDetailsDao _serviceOfferingDetailsDao;
 
 private List _discoverers;
 
@@ -1193,7 +1197,9 @@ public class ResourceManagerImpl extends ManagerBase 
implements ResourceManager,
 
 List hosts = listAllUpAndEnabledHosts(Host.Type.Routing, 
host.getClusterId(), host.getPodId(), host.getDataCenterId());
 for (final VMInstanceVO vm : vms) {
-if (hosts == null || hosts.isEmpty() || !answer.getMigrate()) {
+if (hosts == null || hosts.isEmpty() || !answer.getMigrate()
+|| 
_serviceOfferingDetailsDao.findDetail(vm.getServiceOfferingId(), 
GPU.Keys.vgpuType.toString()) != null) {
+// Migration is not supported for VGPU Vms so stop them.
 // for the last host in this cluster, stop all the VMs
 _haMgr.scheduleStop(vm, hostId, WorkType.ForceStop);
 } else if (HypervisorType.LXC.equals(host.getHypervisorType()) 
&& VirtualMachine.Type.User.equals(vm.getType())){

[12/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7801: test_volumes.py - Fixed import and pep8 issues

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: b1ab888bf0ae1c5f63e515de28be482d18bb884c
Parents: af510eb
Author: Gaurav Aradhye 
Authored: Tue Oct 28 12:30:22 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 15:07:52 2014 +0530

--
 test/integration/component/test_volumes.py | 1131 ---
 1 file changed, 593 insertions(+), 538 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b1ab888b/test/integration/component/test_volumes.py
--
diff --git a/test/integration/component/test_volumes.py 
b/test/integration/component/test_volumes.py
index 36a910b..77cad54 100644
--- a/test/integration/component/test_volumes.py
+++ b/test/integration/component/test_volumes.py
@@ -16,13 +16,13 @@
 # under the License.
 """ P1 tests for Volumes
 """
-#Import Local Modules
+# Import Local Modules
 from nose.plugins.attrib import attr
 from marvin.cloudstackTestCase import cloudstackTestCase
 from marvin.cloudstackAPI import (listHypervisorCapabilities,
   attachIso,
   deleteVolume)
-from marvin.lib.utils import cleanup_resources
+from marvin.lib.utils import cleanup_resources, validateList
 from marvin.lib.base import (Account,
  ServiceOffering,
  VirtualMachine,
@@ -31,70 +31,73 @@ from marvin.lib.base import (Account,
  Iso,
  Configurations,
  DiskOffering,
- Domain)
+ Domain,
+ StoragePool)
 from marvin.lib.common import (get_domain,
get_zone,
get_template,
get_pod)
-#Import System modules
+from marvin.codes import PASS
+# Import System modules
 import time
 
 
 class Services:
+
 """Test Volume Services
 """
 
 def __init__(self):
 self.services = {
- "account": {
-"email": "t...@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
+"account": {
+"email": "t...@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": 128,   # In MBs
-},
-"disk_offering": {
-"displaytext": "Small",
-"name": "Small",
-"disksize": 1
-},
-"volume": {
-"diskname": "TestDiskServ",
-},
- "virtual_machine": {
-"displayname": "testVM",
-"hypervisor": 'XenServer',
-"protocol": 'TCP',
-"ssh_port": 22,
-"username": "root",
-"password": "password",
-"privateport": 22,
-"publicport": 22,
- },
- "iso":  # ISO settings for Attach/Detach ISO tes

[49/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

Merge branch '4.5'


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

Branch: refs/heads/master
Commit: 2b1ca20b9be21a5ec0faf381dd275f2448217314
Parents: fce9f96 c15ed74
Author: Rajani Karuturi 
Authored: Wed Nov 5 15:19:46 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Nov 5 15:19:46 2014 +0530

--

--

[27/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7822: updated ssl cert(exp:2096), reactivate tests


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

Branch: refs/heads/master
Commit: 5b1cbc442abd381879d70847047f91a5892808bc
Parents: e463d6d
Author: pdion891 
Authored: Fri Oct 31 16:42:31 2014 -0400
Committer: pdion891 
Committed: Fri Oct 31 16:43:57 2014 -0400

--
 .../cloudstack/network/lb/CertServiceTest.java  | 16 +++
 server/test/resources/certs/rsa_ca_signed.crt   | 36 +---
 server/test/resources/certs/rsa_ca_signed.key   | 45 +---
 server/test/resources/certs/rsa_self_signed.crt | 33 +++---
 server/test/resources/certs/rsa_self_signed.key | 38 +++--
 .../certs/rsa_self_signed_with_pwd.crt  | 33 +++---
 .../certs/rsa_self_signed_with_pwd.key  | 41 --
 7 files changed, 148 insertions(+), 94 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b1cbc44/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
--
diff --git a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java 
b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
index 1292ce1..276bf8f 100755
--- a/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
+++ b/server/test/org/apache/cloudstack/network/lb/CertServiceTest.java
@@ -242,7 +242,7 @@ public class CertServiceTest {
 certService.uploadSslCert(uploadCmd);
 }
 
-/*
+
 @Test
 public void runUploadSslCertBadChain() throws IOException, 
IllegalAccessException, NoSuchFieldException {
 Assume.assumeTrue(isOpenJdk() || isJCEInstalled());
@@ -297,9 +297,9 @@ public class CertServiceTest {
 assertTrue(e.getMessage().contains("Invalid certificate chain"));
 }
 }
-*/
 
-/*
+
+
 @Test
 public void runUploadSslCertNoRootCert() throws IOException, 
IllegalAccessException, NoSuchFieldException {
 
@@ -356,9 +356,9 @@ public class CertServiceTest {
 }
 
 }
-*/
 
-/*
+
+
 @Test
 public void runUploadSslCertNoChain() throws IOException, 
IllegalAccessException, NoSuchFieldException {
 
@@ -409,9 +409,9 @@ public class CertServiceTest {
 }
 
 }
-*/
 
-/*
+
+
 @Test
 public void runUploadSslCertBadPassword() throws IOException, 
IllegalAccessException, NoSuchFieldException {
 
@@ -460,7 +460,7 @@ public class CertServiceTest {
 }
 
 }
-*/
+
 
 @Test
 public void runUploadSslCertBadkeyPair() throws IOException, 
IllegalAccessException, NoSuchFieldException {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/5b1cbc44/server/test/resources/certs/rsa_ca_signed.crt
--
diff --git a/server/test/resources/certs/rsa_ca_signed.crt 
b/server/test/resources/certs/rsa_ca_signed.crt
index 0b540aa..fb74f17 100644
--- a/server/test/resources/certs/rsa_ca_signed.crt
+++ b/server/test/resources/certs/rsa_ca_signed.crt
@@ -1,17 +1,23 @@
 -BEGIN CERTIFICATE-
-MIICszCCAhwCCQCaE4goZabzDTANBgkqhkiG9w0BAQUFADCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAkNBMREwDwYDVQQHDAhTYW4gSm9zZTETMBEGA1UECgwKQ2xv
-dWRTdGFjazETMBEGA1UECwwKQ2xvdWRTdGFjazEeMBwGA1UEAwwVY2xvdWRzdGFj
-ay5hcGFjaGUub3JnMSQwIgYJKoZIhvcNAQkBFhVjbG91ZHN0YWNrQGFwYWNoZS5v
-cmcwHhcNMTQxMDIxMjI0MjA4WhcNMTUxMDIxMjI0MjA4WjCBnTELMAkGA1UEBhMC
-VVMxCzAJBgNVBAgMAkNBMREwDwYDVQQHDAhTYW4gSm9zZTETMBEGA1UECgwKQ2xv
-dWRTdGFjazETMBEGA1UECwwKQ2xvdWRTdGFjazEeMBwGA1UEAwwVY2xvdWRzdGFj
-ay5hcGFjaGUub3JnMSQwIgYJKoZIhvcNAQkBFhVjbG91ZHN0YWNrQGFwYWNoZS5v
-cmcwgZ8wDQYJKoZIhvcNAQEBBQADgY0AMIGJAoGBANrW6mzOmvTipZiL6N0Lz+T+
-W1qM7iN0k9mOC9fq/U3pN1kIvI8yDF/6eJHQDmr0Hx/GJg4TNZ761kJcB/kCu7zA
-8uILGqh2M3+qhp5zqgPfN7MAxJ65dZPdg+r1mxogHxZUcMTDcEvNKDd73xJDZK47
-iPBie/4RRPQTJS3jbWhJAgMBAAEwDQYJKoZIhvcNAQEFBQADgYEAoBURaXgxobxj
-4YEU0IHo/G1UwPhPAKahiDjQH7HxUFJoLEDGUXlP6L8Z7fN22CeX2gQoeAA3w6I2
-Oyb78wBnI3Kwlhr486NGZuxg2DSSfgK2EirIqswMa+P1/XxrArrfr/Ty4qiMEKhg
-ut+HM3oPPMVyU0Tlk/vgwgER5WD/9d0=
+MIID1TCCAr2gAwIBAgIJALXV1B5/vewhMA0GCSqGSIb3DQEBBQUAMGUxCzAJBgNV
+BAYTAkFVMQ0wCwYDVQQIDARTb21lMQwwCgYDVQQKDANPcmcxDDAKBgNVBAsMA0Rl
+djENMAsGA1UEAwwETmFtZTEcMBoGCSqGSIb3DQEJARYNdGVzdEBtYWlsLmNvbTAe
+Fw0xMzEwMjExNjE4MjJaFw0xNDEwMjExNjE4MjJaMHIxCzAJBgNVBAYTAkFVMRMw
+EQYDVQQIDApTb21lLVN0YXRlMSEwHwYDVQQKDBhJbnRlcm5ldCBXaWRnaXRzIFB0
+eSBMdGQxDTALBgNVBAMMBFN5ZWQxHDAaBgkqhkiG9w0BCQEWDXN5ZWRAdGVzdC5j
+b20wggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEKAoIBAQCpkHkV6ZHhkYc3Y92i
+YllHGbSnXIzwnbaYcfIB5NRldbxyts2Hp8HttxG0rH5DgEMdqfOowqYITe2/hAop
+ZqLuAuwEj0tlPJ/hoVnZeHlCuBps

[48/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7800: Correcting code related to unplug NIC on VMware

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: 2cd4ad201adbee3ad75dd57d8196b633cdd0494b
Parents: c3e5964
Author: Gaurav Aradhye 
Authored: Tue Nov 4 18:08:15 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Wed Nov 5 12:57:40 2014 +0530

--
 test/integration/smoke/test_nic.py | 90 +++--
 1 file changed, 30 insertions(+), 60 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2cd4ad20/test/integration/smoke/test_nic.py
--
diff --git a/test/integration/smoke/test_nic.py 
b/test/integration/smoke/test_nic.py
index f130bbe..86faa56 100644
--- a/test/integration/smoke/test_nic.py
+++ b/test/integration/smoke/test_nic.py
@@ -24,6 +24,8 @@ from marvin.lib.base import (Account,
 from marvin.lib.common import (get_zone,
get_template,
get_domain)
+from marvin.lib.utils import validateList
+from marvin.codes import PASS
 from nose.plugins.attrib import attr
 
 import signal
@@ -149,7 +151,6 @@ class TestNic(cloudstackTestCase):
 
 hypervisorIsVmware = False
 isVmwareToolInstalled = False
-assertForExceptionForNicOperations = False
 if self.hypervisor.lower() == "vmware":
 hypervisorIsVmware = True
 
@@ -163,59 +164,18 @@ class TestNic(cloudstackTestCase):
 mode=self.zone.networktype if hypervisorIsVmware else "default"
 )
 
-# If hypervisor is Vmware, then check if
-# the vmware tools are installed and the process is running
-# Vmware tools are necessary for add and remove nic operations
-if hypervisorIsVmware:
-sshClient = self.virtual_machine.get_ssh_client()
-result = str(
-sshClient.execute("service vmware-tools status")).lower()
-self.debug("and result is: %s" % result)
-if "running" in result:
-isVmwareToolInstalled = True
-
-# If Vmware tools are not installed in case of vmware hypervisor
-# then check for exception while performing add and remove nic
-# operations
-if hypervisorIsVmware and not isVmwareToolInstalled:
-assertForExceptionForNicOperations = True
-
 self.cleanup.insert(0, self.virtual_machine)
-list_vm_response = VirtualMachine.list(
+vms = VirtualMachine.list(
 self.apiclient,
 id=self.virtual_machine.id
 )
 
-self.debug(
-"Verify listVirtualMachines response for virtual machine: %s"
-% self.virtual_machine.id
-)
-
-self.assertEqual(
-isinstance(list_vm_response, list),
-True,
-"Check list response returns a valid list"
-)
-
-self.assertNotEqual(
-len(list_vm_response),
-0,
-"Check VM available in List Virtual Machines"
-)
-vm_response = list_vm_response[0]
-
 self.assertEqual(
+validateList(vms)[0],
+PASS,
+"vms list validation failed")
 
-vm_response.id,
-self.virtual_machine.id,
-"Check virtual machine id in listVirtualMachines"
-)
-
-self.assertEqual(
-vm_response.name,
-self.virtual_machine.name,
-"Check virtual machine name in listVirtualMachines"
-)
+vm_response = vms[0]
 
 self.assertEqual(
 len(vm_response.nic),
@@ -231,30 +191,40 @@ class TestNic(cloudstackTestCase):
 existing_nic_ip = vm_response.nic[0].ipaddress
 existing_nic_id = vm_response.nic[0].id
 
-if assertForExceptionForNicOperations:
-with self.assertRaises(Exception):
-self.virtual_machine.add_nic(
+self.virtual_machine.add_nic(
 self.apiclient,
 self.test_network2.id)
-
-else:
-# 1. add a nic
-self.virtual_machine.add_nic(self.apiclient, self.test_network2.id)
-
-time.sleep(5)
-# now go get the vm list?
-
-list_vm_response = VirtualMachine.list(
+list_vm_response = VirtualMachine.list(
 self.apiclient,
 id=self.virtual_machine.id
 )
 
-self.assertEqual(
+self.assertEqual(
 len(list_vm_r

[31/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

Merge branch '4.5' of https://git-wip-us.apache.org/repos/asf/cloudstack into 
4.5


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

Branch: refs/heads/master
Commit: 6df396c9c050878b005f464a4155be839dc5cd1b
Parents: 0c15396 2652195
Author: amoghvk 
Authored: Fri Oct 31 15:29:40 2014 -0700
Committer: amoghvk 
Committed: Fri Oct 31 15:29:40 2014 -0700

--
 .../src/com/cloud/storage/snapshot/SnapshotManagerImpl.java  | 8 
 1 file changed, 4 insertions(+), 4 deletions(-)
--

[25/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7821: Fix OSX cannot connect to VPN due to wrongly declaim 
ENCAPSULATION_MODE_UDP_TRANSPORT_RFC

OSX always declaims it's behind NAT no matter it's true or not, thus result in
confusion of openswan.

Add parameter "forceencaps=yes" to openswan to make sure non NAT VPN connection
from OSX can pass through.


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

Branch: refs/heads/master
Commit: e1c788ca3c69a8c8c2041c7b106f76fa49332888
Parents: c30d4ed
Author: Sheng Yang 
Authored: Thu Oct 30 17:23:34 2014 -0700
Committer: Sheng Yang 
Committed: Thu Oct 30 17:24:57 2014 -0700

--
 systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf | 1 +
 1 file changed, 1 insertion(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e1c788ca/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
--
diff --git a/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf 
b/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
index 7459e25..1cdd69d 100644
--- a/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
+++ b/systemvm/patches/debian/vpn/etc/ipsec.d/l2tp.conf
@@ -30,4 +30,5 @@ conn L2TP-PSK
 # --
 # Change 'ignore' to 'add' to enable this configuration.
 #
+forceencaps=yes
 auto=add

[08/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7660: Enhance system vm template to support baremetal Installed 
Package flask and merged the disk partition


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

Branch: refs/heads/master
Commit: 591f46847485b59e83bdfdf8bfd0478a7a755463
Parents: 58455c0
Author: Harikrishna Patnala 
Authored: Tue Oct 21 18:31:48 2014 +0530
Committer: Frank Zhang 
Committed: Wed Oct 29 15:27:01 2014 -0700

--
 .../definitions/systemvmtemplate/preseed.cfg| 42 
 1 file changed, 42 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/591f4684/tools/appliance/definitions/systemvmtemplate/preseed.cfg
--
diff --git a/tools/appliance/definitions/systemvmtemplate/preseed.cfg 
b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
index 1e4fb4e..724e05b 100644
--- a/tools/appliance/definitions/systemvmtemplate/preseed.cfg
+++ b/tools/appliance/definitions/systemvmtemplate/preseed.cfg
@@ -128,48 +128,6 @@ d-i partman-auto/choose_recipe select atomic
 # just point at it.
 #d-i partman-auto/expert_recipe_file string /hd-media/recipe
 
-d-i partman-auto/expert_recipe string \
-  boot-root ::\
-  30 50 100 ext4  \
-  $primary{ } $bootable{ }\
-  method{ format } format{ }  \
-  use_filesystem{ } filesystem{ ext4 }\
-  mountpoint{ /boot } \
-  .   \
-  250 40 400 ext4 \
-  method{ format } format{ }  \
-  use_filesystem{ } filesystem{ ext4 }\
-  mountpoint{ / } \
-  .   \
-  50 100 200 ext4 \
-  method{ format } format{ }  \
-  use_filesystem{ } filesystem{ ext4 }\
-  mountpoint{ /home } \
-  .   \
-  700 70 1100 ext4\
-  method{ format } format{ }  \
-  use_filesystem{ } filesystem{ ext4 }\
-  mountpoint{ /usr }  \
-  .   \
-  400 40 500 ext4 \
-  method{ format } format{ }  \
-  use_filesystem{ } filesystem{ ext4 }\
-  mountpoint{ /opt }  \
-  .   \
-  450 70 1000 ext4\
-  method{ format } format{ }  \
-  use_filesystem{ } filesystem{ ext4 }\
-  mountpoint{ /var }  \
-  .   \
-  50 60 100 ext4  \
-  method{ format } format{ }  \
-  use_filesystem{ } filesystem{ ext4 }\
-  mountpoint{ /tmp }  \
-  .   \
-  70 100 256 linux-swap   \
-  method{ swap } format{ }\
-  .
-
 # If not, you can put an entire recipe into the preconfiguration file in one
 # (logical) line. This example creates a small /boot partition, suitable
 # swap, and uses the rest of the space for the root partition:

[19/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7632:Automation for volume life cycle testPath

Signed-off-by: SrikanteswaraRao Talluri 
This closes #32


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

Branch: refs/heads/master
Commit: a69950f6a97819c9c071ad9f278377f2a5ca77ca
Parents: aa1e260
Author: Prashant Kumar Mishra 
Authored: Thu Oct 9 11:42:56 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 18:30:25 2014 +0530

--
 .../testpaths/testpath_volumelifecycle.py   | 967 ++-
 1 file changed, 732 insertions(+), 235 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/a69950f6/test/integration/testpaths/testpath_volumelifecycle.py
--
diff --git a/test/integration/testpaths/testpath_volumelifecycle.py 
b/test/integration/testpaths/testpath_volumelifecycle.py
index d30f2b0..526d20c 100644
--- a/test/integration/testpaths/testpath_volumelifecycle.py
+++ b/test/integration/testpaths/testpath_volumelifecycle.py
@@ -16,11 +16,12 @@
 # under the License.
 """Utilities functions
 """
-#All tests inherit from cloudstackTestCase
+# All tests inherit from cloudstackTestCase
 from marvin.cloudstackTestCase import cloudstackTestCase
-#Import Integration Libraries
+# Import Integration Libraries
 from marvin.codes import FAILED, PASS
-#base - contains all resources as entities and defines create, delete, list 
operations on them
+# base - contains all resources as entities and defines create, delete,
+# list operations on them
 from marvin.lib.base import (Account,
  VirtualMachine,
  ServiceOffering,
@@ -28,10 +29,11 @@ from marvin.lib.base import (Account,
  DiskOffering,
  Volume,
  Template,
- StoragePool)
+ StoragePool,
+ Resources)
 from marvin.lib.utils import cleanup_resources, validateList
 
-#common - commonly used methods for all tests are listed here
+# common - commonly used methods for all tests are listed here
 from marvin.lib.common import (get_zone,
get_domain,
get_template,
@@ -43,54 +45,97 @@ import tempfile
 
 
 def verify_attach_volume(self, vmid, volid):
-list_volumes = Volume.list(self.userapiclient,
-   id=volid
-   )
-self.assertEqual(validateList(list_volumes)[0], PASS, "Check List 
volume response for volume %s" % volid)
-self.assertEqual(len(list_volumes), 1, "There is no data disk attached 
to vm id:%s" % vmid)
-self.assertEqual(list_volumes[0].virtualmachineid, vmid, "Check if 
volume state (attached) is reflected")
-self.debug("volume id:%s successfully attached to vm id%s" % (volid, 
vmid))
-return
+list_volumes = Volume.list(self.userapiclient,
+   id=volid
+   )
+self.assertEqual(
+validateList(list_volumes)[0],
+PASS,
+"Check List volume response for volume %s" %
+volid)
+self.assertEqual(
+len(list_volumes),
+1,
+"There is no data disk attached to vm id:%s" %
+vmid)
+self.assertEqual(
+list_volumes[0].virtualmachineid,
+vmid,
+"Check if volume state (attached) is reflected")
+self.debug("volume id:%s successfully attached to vm id%s" % (volid, vmid))
+return
 
 
 def verify_detach_volume(self, vmid, volid):
-list_volumes = Volume.list(self.userapiclient,
-   id=volid
-   )
-self.assertEqual(validateList(list_volumes)[0], PASS, "Check List 
volume response for volume %s" % volid)
-self.assertEqual(len(list_volumes), 1, "Detach data disk id: %s  for 
vm id :%s was not successful" % (volid, vmid))
-self.assertEqual(list_volumes[0].virtualmachineid, None, "Check if 
volume state (attached) is reflected")
-self.debug("volume id: %s successfully detached from vm id:%s" % 
(volid, vmid))
+list_volumes = Volume.list(self.userapiclient,
+   id=volid
+   )
+self.assertEqual(
+validateList(list_volumes)[0],
+PASS,
+"Check List volume response for volume %s" %
+volid)
+self.assertEqual(
+len(list_volumes),
+1,
+"Detach data disk id: %s  for vm id :%s was not succes

[41/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CVEÂ2014Â3566: Avoid using SSLv3 on apache2 webserver used by SSVM

Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/master
Commit: 2d58bb6256af8bb71dc67075fd926744a661b945
Parents: 28d5b98
Author: Rohit Yadav 
Authored: Tue Nov 4 14:49:19 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Nov 4 14:49:19 2014 +0530

--
 tools/appliance/definitions/systemvm64template/postinstall.sh | 1 +
 tools/appliance/definitions/systemvmtemplate/postinstall.sh   | 1 +
 2 files changed, 2 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d58bb62/tools/appliance/definitions/systemvm64template/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvm64template/postinstall.sh 
b/tools/appliance/definitions/systemvm64template/postinstall.sh
index 32e59d9..b634f11 100644
--- a/tools/appliance/definitions/systemvm64template/postinstall.sh
+++ b/tools/appliance/definitions/systemvm64template/postinstall.sh
@@ -223,6 +223,7 @@ configure_apache2() {
# Backup stock apache configuration since we may modify it in Secondary 
Storage VM
cp /etc/apache2/sites-available/default 
/etc/apache2/sites-available/default.orig
cp /etc/apache2/sites-available/default-ssl 
/etc/apache2/sites-available/default-ssl.orig
+   sed -i 's/SSLProtocol all -SSLv2$/SSLProtocol all -SSLv2 -SSLv3/g' 
/etc/apache2/mods-available/ssl.conf
 }
 
 configure_services() {

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/2d58bb62/tools/appliance/definitions/systemvmtemplate/postinstall.sh
--
diff --git a/tools/appliance/definitions/systemvmtemplate/postinstall.sh 
b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
index a292203..a1ae792 100644
--- a/tools/appliance/definitions/systemvmtemplate/postinstall.sh
+++ b/tools/appliance/definitions/systemvmtemplate/postinstall.sh
@@ -213,6 +213,7 @@ configure_apache2() {
# Backup stock apache configuration since we may modify it in Secondary 
Storage VM
cp /etc/apache2/sites-available/default 
/etc/apache2/sites-available/default.orig
cp /etc/apache2/sites-available/default-ssl 
/etc/apache2/sites-available/default-ssl.orig
+   sed -i 's/SSLProtocol all -SSLv2$/SSLProtocol all -SSLv2 -SSLv3/g' 
/etc/apache2/mods-available/ssl.conf
 }
 
 configure_services() {

[15/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7684: Fixed Exception not raised issue in secondary storage limits 
test suite test_ss_max_limits.py

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: dc4b04fbe87048849d51e9e4dbcce566de7f9cf0
Parents: b9fed95
Author: Gaurav Aradhye 
Authored: Wed Oct 8 11:57:45 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 15:31:19 2014 +0530

--
 test/integration/component/test_ss_max_limits.py | 19 +--
 1 file changed, 13 insertions(+), 6 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/dc4b04fb/test/integration/component/test_ss_max_limits.py
--
diff --git a/test/integration/component/test_ss_max_limits.py 
b/test/integration/component/test_ss_max_limits.py
index ba886e8..49a1e4f 100644
--- a/test/integration/component/test_ss_max_limits.py
+++ b/test/integration/component/test_ss_max_limits.py
@@ -101,7 +101,7 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
 self.services["template_2"]["hypervisor"] = builtin_info[1]
 self.services["template_2"]["format"] = builtin_info[2]
 
-template = Template.register(self.apiclient,
+template = Template.register(self.userapiclient,
  self.services["template_2"],
  zoneid=self.zone.id,
  account=self.child_do_admin.name if not 
inProject else None,
@@ -110,7 +110,7 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
 
 template.download(self.apiclient)
 
-templates = Template.list(self.apiclient,
+templates = Template.list(self.userapiclient,
   templatefilter=\
   
self.services["template_2"]["templatefilter"],
   id=template.id)
@@ -131,6 +131,10 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
 self.child_do_admin = Account.create(self.apiclient, 
self.services["account"], admin=True,
  domainid=self.child_domain.id)
 
+self.userapiclient = self.testClient.getUserApiClient(
+UserName=self.child_do_admin.name,
+DomainName=self.child_do_admin.domain)
+
 # Create project as a domain admin
 self.project = Project.create(self.apiclient, 
self.services["project"],
   account=self.child_do_admin.name,
@@ -195,11 +199,12 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
 self.assertEqual(response[0], PASS, response[1])
 
 with self.assertRaises(Exception):
-template = Template.register(self.apiclient,
+template = Template.register(self.userapiclient,
  self.services["template_2"],
  zoneid=self.zone.id,
  account=self.child_do_admin.name,
  domainid=self.child_do_admin.domainid)
+template.delete(self.userapiclient)
 return
 
 @attr(tags=["advanced"], required_hardware="false")
@@ -231,11 +236,12 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
 self.assertEqual(response[0], PASS, response[1])
 
 with self.assertRaises(Exception):
-template = Template.register(self.apiclient,
+template = Template.register(self.userapiclient,
  self.services["template_2"],
  zoneid=self.zone.id,
  account=self.child_do_admin.name,
  domainid=self.child_do_admin.domainid)
+template.delete(self.userapiclient)
 return
 
 @attr(tags=["advanced"], required_hardware="false")
@@ -256,7 +262,7 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
 self.assertEqual(response[0], PASS, response[1])
 
 try:
-projects = Project.list(self.apiclient, id=self.project.id, 
listall=True)
+projects = Project.list(self.userapiclient, id=self.project.id, 
listall=True)
 except Exception as e:
 self.fail("failed to get projects list: %s" % e)
 
@@ -272,8 +278,9 @@ class TestMaxSecondaryStorageLimits(cloudstackTestCase):
 self.asser

[47/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

Fixed CLOUDSTACK-7242: Adding a securing config using configDepo doesnt work

In ConfigurationVo, changed the setter to do the encryption if required
like the getter. Called the setter in constructor as well.

Removed references of encryption check in different places.

Reviewed-by: Santhosh Edukulla

This closes #35


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

Branch: refs/heads/master
Commit: c3e5964dcbbd3b3ff34562aeeb9f8daa154ee7d1
Parents: c15ed74
Author: Rajani Karuturi 
Authored: Tue Nov 4 18:16:50 2014 +0530
Committer: Rajani Karuturi 
Committed: Wed Nov 5 11:49:38 2014 +0530

--
 .../config/dao/ConfigurationDaoImpl.java  |  3 ---
 .../framework/config/impl/ConfigurationVO.java| 18 +++---
 .../com/cloud/server/ConfigurationServerImpl.java |  3 +--
 3 files changed, 16 insertions(+), 8 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3e5964d/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
--
diff --git 
a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
 
b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
index 2934b01..f3f0495 100644
--- 
a/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
+++ 
b/framework/config/src/org/apache/cloudstack/framework/config/dao/ConfigurationDaoImpl.java
@@ -210,9 +210,6 @@ public class ConfigurationDaoImpl extends 
GenericDaoBasehttp://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3e5964d/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
--
diff --git 
a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
 
b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
index cda96c9..b317ea2 100644
--- 
a/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
+++ 
b/framework/config/src/org/apache/cloudstack/framework/config/impl/ConfigurationVO.java
@@ -73,8 +73,8 @@ public class ConfigurationVO implements Configuration {
 this.instance = instance;
 this.component = component;
 this.name = name;
-this.value = value;
 this.description = description;
+setValue(value);
 }
 
 public ConfigurationVO(String component, ConfigKey key) {
@@ -122,11 +122,23 @@ public class ConfigurationVO implements Configuration {
 
 @Override
 public String getValue() {
-return (("Hidden".equals(getCategory()) || 
"Secure".equals(getCategory())) ? DBEncryptionUtil.decrypt(value) : value);
+if(isEncryptedConfig()) {
+return DBEncryptionUtil.decrypt(value);
+} else {
+return value;
+}
 }
 
 public void setValue(String value) {
-this.value = value;
+if(isEncryptedConfig()) {
+this.value = DBEncryptionUtil.encrypt(value);
+} else {
+this.value = value;
+}
+}
+
+private boolean isEncryptedConfig() {
+return "Hidden".equals(getCategory()) || 
"Secure".equals(getCategory());
 }
 
 @Override

http://git-wip-us.apache.org/repos/asf/cloudstack/blob/c3e5964d/server/src/com/cloud/server/ConfigurationServerImpl.java
--
diff --git a/server/src/com/cloud/server/ConfigurationServerImpl.java 
b/server/src/com/cloud/server/ConfigurationServerImpl.java
index 990f2ff..7b0d898 100755
--- a/server/src/com/cloud/server/ConfigurationServerImpl.java
+++ b/server/src/com/cloud/server/ConfigurationServerImpl.java
@@ -203,7 +203,6 @@ public class ConfigurationServerImpl extends ManagerBase 
implements Configuratio
 String instance = "DEFAULT";
 String component = c.getComponent();
 String value = c.getDefaultValue();
-value = ("Hidden".equals(category) || 
"Secure".equals(category)) ? DBEncryptionUtil.encrypt(value) : value;
 String description = c.getDescription();
 ConfigurationVO configVO = new ConfigurationVO(category, 
instance, component, name, value, description);
 configVO.setDefaultValue(value);
@@ -635,7 +634,7 @@ public class ConfigurationServerImpl extends ManagerBase 
implements

[16/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7691: Fixed 'Exception not raised' issue in test_project_limits.py

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: e2ba1b614c7792856314cfa363f2a4e9cd667065
Parents: dc4b04f
Author: Gaurav Aradhye 
Authored: Thu Oct 9 14:56:34 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 15:32:24 2014 +0530

--
 .../component/test_project_limits.py| 51 ++--
 1 file changed, 37 insertions(+), 14 deletions(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/e2ba1b61/test/integration/component/test_project_limits.py
--
diff --git a/test/integration/component/test_project_limits.py 
b/test/integration/component/test_project_limits.py
index 5f33ad8..5d37f0b 100644
--- a/test/integration/component/test_project_limits.py
+++ b/test/integration/component/test_project_limits.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
@@ -17,16 +17,35 @@
 """ P1 tests for Resource limits
 """
 #Import Local Modules
-import marvin
 from nose.plugins.attrib import attr
-from marvin.cloudstackTestCase import *
-from marvin.cloudstackAPI import *
-from marvin.lib.utils import *
-from marvin.lib.base import *
-from marvin.lib.common import *
+from marvin.cloudstackTestCase import cloudstackTestCase
+#from marvin.cloudstackAPI import *
+from marvin.lib.utils import (cleanup_resources,
+  validateList)
+from marvin.lib.base import (Account,
+ Domain,
+ Project,
+ Template,
+ Snapshot,
+ Volume,
+ NetworkOffering,
+ ServiceOffering,
+ VirtualMachine,
+ DiskOffering,
+ Configurations,
+ Network,
+ PublicIPAddress)
+from marvin.lib.common import (get_domain,
+   get_zone,
+   get_template,
+   list_snapshots,
+   list_volumes,
+   list_configurations,
+   list_resource_limits,
+   update_resource_limit
+   )
 from marvin.codes import PASS
-import datetime
-
+import time
 
 class Services:
 """Test Resource Limits Services
@@ -525,6 +544,11 @@ class TestResourceLimitsProject(cloudstackTestCase):
 cls.services["account"],
 domainid=cls.domain.id
 )
+
+cls.userapiclient = cls.testClient.getUserApiClient(
+UserName=cls.account.name,
+DomainName=cls.account.domain)
+
 # Create project as a domain admin
 cls.project = Project.create(
  cls.api_client,
@@ -713,7 +737,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
 
 # Exception should be raised for second Public IP
 with self.assertRaises(Exception):
-public_ip_2 = PublicIPAddress.create(
+PublicIPAddress.create(
self.apiclient,
zoneid=virtual_machine_1.zoneid,
services=self.services["server"],
@@ -772,7 +796,6 @@ class TestResourceLimitsProject(cloudstackTestCase):
 True,
 "Check for list volume response return valid data"
 )
-volume = volumes[0]
 
 self.debug("Creating snapshot from volume: %s" % volumes[0].id)
 # Create a snapshot from the ROOTDISK
@@ -915,7 +938,7 @@ class TestResourceLimitsProject(cloudstackTestCase):
 self.debug("Creating template from volume: %s" % volume.id)
 # Create a template from the ROOTDISK
 template_1 = Template.create(
-

[36/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

systemvm: Prefer TLS over SSL in apache, POODLE workaround (CVEÂ2014Â3566)

Just prefer TLS over SSL in apache configuration in systemvm

Signed-off-by: Rohit Yadav 
(cherry picked from commit 88acc9bd53cbf6f8896d32576f916c20704a3403)
Signed-off-by: Rohit Yadav 


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

Branch: refs/heads/master
Commit: 84e44a4dba5fdab33ed76d787f84705366e4e670
Parents: 07ba078
Author: Rohit Yadav 
Authored: Tue Nov 4 01:43:55 2014 +0530
Committer: Rohit Yadav 
Committed: Tue Nov 4 01:50:06 2014 +0530

--
 systemvm/patches/debian/config/etc/apache2/httpd.conf | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/84e44a4d/systemvm/patches/debian/config/etc/apache2/httpd.conf
--
diff --git a/systemvm/patches/debian/config/etc/apache2/httpd.conf 
b/systemvm/patches/debian/config/etc/apache2/httpd.conf
index 0565a8c..2a6b921 100644
--- a/systemvm/patches/debian/config/etc/apache2/httpd.conf
+++ b/systemvm/patches/debian/config/etc/apache2/httpd.conf
@@ -1,2 +1,2 @@
-SSLProtocol -ALL +SSLv3 +TLSv1
+SSLProtocol +TLSv1 +TLSv1.1 +TLSv1.2
 SSLCipherSuite ALL:!aNULL:!ADH:!eNULL:!LOW:!EXP:RC4+RSA:+HIGH:+MEDIUM

[18/50] [abbrv] git commit: updated refs/heads/master to 4c5f792

2014-11-05 Thread rajani

CLOUDSTACK-7728: Test script to identify product issue

Signed-off-by: SrikanteswaraRao Talluri 


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

Branch: refs/heads/master
Commit: aa1e26081208b5d6c758a6efbbf3b62ab2d6720d
Parents: 4f297ef
Author: Gaurav Aradhye 
Authored: Fri Oct 17 14:43:21 2014 +0530
Committer: SrikanteswaraRao Talluri 
Committed: Thu Oct 30 15:35:32 2014 +0530

--
 test/integration/component/test_egress_fw_rules.py | 7 +++
 1 file changed, 7 insertions(+)
--


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/aa1e2608/test/integration/component/test_egress_fw_rules.py
--
diff --git a/test/integration/component/test_egress_fw_rules.py 
b/test/integration/component/test_egress_fw_rules.py
index 12bade4..0122e4f 100755
--- a/test/integration/component/test_egress_fw_rules.py
+++ b/test/integration/component/test_egress_fw_rules.py
@@ -397,11 +397,18 @@ class TestEgressFWRules(cloudstackTestCase):
 # 2. login to VM.
 # 3. ping public network.
 # 4. public network should be reachable from the VM.
+# 5. Reboot the router
+# 6. Ping public network from VM, it should be reachable
 self.create_vm()
 self.exec_script_on_user_vm('ping -c 1 www.google.com',
 "| grep -oP \'\d+(?=% packet loss)\'",
 "['0']",
 negative_test=False)
+self.reboot_Router()
+self.exec_script_on_user_vm('ping -c 1 www.google.com',
+"| grep -oP \'\d+(?=% packet loss)\'",
+"['0']",
+negative_test=False)
 
 @attr(tags=["advanced"], required_hardware="true")
 def test_01_1_egress_fr1(self):

1 2 3 4 5 6 7 8 9 10 >

1 - 100 of 1357 matches

Mail list logo