diff --git a/.gitignore b/.gitignore index b58e6c92f39..d77203170ab 100644 --- a/.gitignore +++ b/.gitignore @@ -54,3 +54,4 @@ awsapi/modules/* .classpath .project .settings.xml +.settings/ diff --git a/cloud.spec b/cloud.spec index bd49128846b..0fdebc1cbcf 100644 --- a/cloud.spec +++ b/cloud.spec @@ -441,7 +441,7 @@ fi %{_javadir}/%{name}-user-authenticator-ldap.jar %{_javadir}/%{name}-user-authenticator-md5.jar %{_javadir}/%{name}-user-authenticator-plaintext.jar -%{_javadir}/%{name}-xen.jar +%{_javadir}/%{name}-plugin-hypervisor-xen.jar %{_javadir}/%{name}-plugin-elb.jar %{_javadir}/%{name}-plugin-nicira-nvp.jar %config(noreplace) %{_sysconfdir}/%{name}/server/* diff --git a/console-proxy/systemvm-descriptor.xml b/console-proxy/systemvm-descriptor.xml index 37a1ae9375e..44ce2ebe782 100644 --- a/console-proxy/systemvm-descriptor.xml +++ b/console-proxy/systemvm-descriptor.xml @@ -1,3 +1,21 @@ + diff --git a/debian/cloud-agent-deps.install b/debian/cloud-agent-deps.install index cd8db2aba69..b05b7d1d9d4 100644 --- a/debian/cloud-agent-deps.install +++ b/debian/cloud-agent-deps.install @@ -15,5 +15,4 @@ # specific language governing permissions and limitations # under the License. -/usr/share/java/gson-1.7.1.jar /usr/share/java/libvirt-0.4.9.jar diff --git a/debian/cloud-deps.install b/debian/cloud-deps.install index 976102f9244..74aade12543 100644 --- a/debian/cloud-deps.install +++ b/debian/cloud-deps.install @@ -30,3 +30,5 @@ /usr/share/java/jasypt-1.*.jar /usr/share/java/ejb-api-3.0.jar /usr/share/java/javax.persistence-2.0.0.jar +/usr/share/java/gson-1.7.1.jar +/usr/share/java/xapi-5.6.100-1-SNAPSHOT.jar diff --git a/debian/cloud-server.install b/debian/cloud-server.install index 76849f05f28..9cd1eebb5ff 100644 --- a/debian/cloud-server.install +++ b/debian/cloud-server.install @@ -28,4 +28,4 @@ /usr/share/java/cloud-user-authenticator-ldap.jar /usr/share/java/cloud-user-authenticator-md5.jar /usr/share/java/cloud-user-authenticator-plaintext.jar -/usr/share/java/cloud-xen.jar +/usr/share/java/cloud-plugin-hypervisor-xen.jar diff --git a/debian/control b/debian/control index a264bfcdefd..265c050cc13 100644 --- a/debian/control +++ b/debian/control @@ -16,7 +16,7 @@ Description: CloudStack library dependencies Package: cloud-agent-deps Architecture: any -Depends: openjdk-6-jre +Depends: openjdk-6-jre, cloud-deps (= ${source:Version}) Description: CloudStack agent library dependencies This package contains a number of third-party dependencies not shipped by distributions, required to run the CloudStack diff --git a/deps/install-non-oss.sh b/deps/install-non-oss.sh index 85512bdc80c..9c65a311b94 100755 --- a/deps/install-non-oss.sh +++ b/deps/install-non-oss.sh @@ -1,4 +1,20 @@ #!/bin/sh +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. mvn install:install-file -Dfile=cloud-iControl.jar -DgroupId=com.cloud.com.f5 -DartifactId=icontrol -Dversion=1.0 -Dpackaging=jar mvn install:install-file -Dfile=cloud-netscaler.jar -DgroupId=com.cloud.com.citrix -DartifactId=netscaler -Dversion=1.0 -Dpackaging=jar diff --git a/deps/pom.xml b/deps/pom.xml index be30c9ad16a..1e2008337d5 100644 --- a/deps/pom.xml +++ b/deps/pom.xml @@ -116,6 +116,17 @@ axis2-ant-plugin 1.4.1 + + + org.apache.axis + axis + ${cs.axis.version} + + + org.apache.axis + axis-jaxrpc + ${cs.axis.version} + install diff --git a/docs/en-US/images/NIC_bonding_and_multipath_IO.png b/docs/en-US/images/NIC_bonding_and_multipath_IO.png new file mode 100644 index 00000000000..e69de29bb2d diff --git a/docs/en-US/images/add-cluster.png b/docs/en-US/images/add-cluster.png new file mode 100644 index 00000000000..383f375ebed Binary files /dev/null and b/docs/en-US/images/add-cluster.png differ diff --git a/docs/en-US/images/add-guest-network.png b/docs/en-US/images/add-guest-network.png new file mode 100644 index 00000000000..5740ab58d32 Binary files /dev/null and b/docs/en-US/images/add-guest-network.png differ diff --git a/docs/en-US/images/add-new-gateway-vpc.png b/docs/en-US/images/add-new-gateway-vpc.png new file mode 100644 index 00000000000..f15b778e0f2 Binary files /dev/null and b/docs/en-US/images/add-new-gateway-vpc.png differ diff --git a/docs/en-US/images/add-tier.png b/docs/en-US/images/add-tier.png new file mode 100644 index 00000000000..881671e2133 Binary files /dev/null and b/docs/en-US/images/add-tier.png differ diff --git a/docs/en-US/images/add-vpc.png b/docs/en-US/images/add-vpc.png new file mode 100644 index 00000000000..6b9c6379d9f Binary files /dev/null and b/docs/en-US/images/add-vpc.png differ diff --git a/docs/en-US/images/add-vpn-customer-gateway.png b/docs/en-US/images/add-vpn-customer-gateway.png new file mode 100644 index 00000000000..fdc3177e9eb Binary files /dev/null and b/docs/en-US/images/add-vpn-customer-gateway.png differ diff --git a/docs/en-US/images/autoscale-config.png b/docs/en-US/images/autoscale-config.png new file mode 100644 index 00000000000..735ae961f81 Binary files /dev/null and b/docs/en-US/images/autoscale-config.png differ diff --git a/docs/en-US/images/create-vpn-connection.png b/docs/en-US/images/create-vpn-connection.png new file mode 100644 index 00000000000..cd5515f53c7 Binary files /dev/null and b/docs/en-US/images/create-vpn-connection.png differ diff --git a/docs/en-US/images/enable-disable-autoscale.png b/docs/en-US/images/enable-disable-autoscale.png new file mode 100644 index 00000000000..ee02ef21c69 Binary files /dev/null and b/docs/en-US/images/enable-disable-autoscale.png differ diff --git a/docs/en-US/images/example_of_a_multi_site_deployment.png b/docs/en-US/images/example_of_a_multi_site_deployment.png new file mode 100644 index 00000000000..e69de29bb2d diff --git a/docs/en-US/images/guest-traffic-setup.png b/docs/en-US/images/guest-traffic-setup.png new file mode 100644 index 00000000000..52508194ac1 Binary files /dev/null and b/docs/en-US/images/guest-traffic-setup.png differ diff --git a/docs/en-US/images/icon.svg b/docs/en-US/images/icon.svg new file mode 100644 index 00000000000..37f94c06c1b --- /dev/null +++ b/docs/en-US/images/icon.svg @@ -0,0 +1,37 @@ + + + + + + + + + + + + + + + + + + + + diff --git a/docs/en-US/images/large_scale_redundant_setup.png b/docs/en-US/images/large_scale_redundant_setup.png new file mode 100644 index 00000000000..e69de29bb2d diff --git a/docs/en-US/images/multi-tier-app.png b/docs/en-US/images/multi-tier-app.png new file mode 100644 index 00000000000..cec11228e26 Binary files /dev/null and b/docs/en-US/images/multi-tier-app.png differ diff --git a/docs/en-US/images/multi_node_management_server.png b/docs/en-US/images/multi_node_management_server.png new file mode 100644 index 00000000000..e69de29bb2d diff --git a/docs/en-US/images/network-acl.png b/docs/en-US/images/network-acl.png new file mode 100644 index 00000000000..5602827f415 Binary files /dev/null and b/docs/en-US/images/network-acl.png differ diff --git a/docs/en-US/images/network-setup-zone.png b/docs/en-US/images/network-setup-zone.png new file mode 100644 index 00000000000..8324ff8beaa Binary files /dev/null and b/docs/en-US/images/network-setup-zone.png differ diff --git a/docs/en-US/images/network-singlepod.png b/docs/en-US/images/network-singlepod.png new file mode 100644 index 00000000000..e1214ea7f69 Binary files /dev/null and b/docs/en-US/images/network-singlepod.png differ diff --git a/docs/en-US/images/remove-tier.png b/docs/en-US/images/remove-tier.png new file mode 100644 index 00000000000..e14d08f8052 Binary files /dev/null and b/docs/en-US/images/remove-tier.png differ diff --git a/docs/en-US/images/restart-vpc.png b/docs/en-US/images/restart-vpc.png new file mode 100644 index 00000000000..04655dc37ad Binary files /dev/null and b/docs/en-US/images/restart-vpc.png differ diff --git a/docs/en-US/images/select-vm-staticnat-vpc.png b/docs/en-US/images/select-vm-staticnat-vpc.png new file mode 100644 index 00000000000..12fde26d883 Binary files /dev/null and b/docs/en-US/images/select-vm-staticnat-vpc.png differ diff --git a/docs/en-US/images/separate_storage_network.png b/docs/en-US/images/separate_storage_network.png new file mode 100644 index 00000000000..e69de29bb2d diff --git a/docs/en-US/images/small_scale_deployment.png b/docs/en-US/images/small_scale_deployment.png new file mode 100644 index 00000000000..e69de29bb2d diff --git a/docs/en-US/images/vm-lifecycle.png b/docs/en-US/images/vm-lifecycle.png new file mode 100644 index 00000000000..97823fc568a Binary files /dev/null and b/docs/en-US/images/vm-lifecycle.png differ diff --git a/docs/en-US/images/vsphere-client.png b/docs/en-US/images/vsphere-client.png new file mode 100644 index 00000000000..2acc8b802ad Binary files /dev/null and b/docs/en-US/images/vsphere-client.png differ diff --git a/docs/en-US/site-to-site-vpn.xml b/docs/en-US/site-to-site-vpn.xml index 9fb9eb7fb36..6570aabe0bd 100644 --- a/docs/en-US/site-to-site-vpn.xml +++ b/docs/en-US/site-to-site-vpn.xml @@ -3,7 +3,6 @@ %BOOK_ENTITIES; ]> -
- Setting Up a Site-to-Site VPN Connection - A Site-to-Site VPN connection helps you establish a secure connection from an enterprise - datacenter to the cloud infrastructure. This allows users to access the guest VMs by - establishing a VPN connection to the virtual router of the account from a device in the - datacenter of the enterprise. Having this facility eliminates the need to establish VPN - connections to individual VMs. - The supported endpoints on the remote datacenters are: - - Cisco ISR with IOS 12.4 or later - Juniper J-Series routers with JunOS 9.5 or later - In addition to the specific Cisco and Juniper devices listed above, the expectation is that - any Cisco or Juniper device running on the supported operating systems are able to - establish VPN connections. - To set up a Site-to-Site VPN connection, perform the following: - - Create a Virtual Private Cloud (VPC).See . - Create a VPN Customer Gateway. - Create a VPN gateway for the VPC that you created. - Create VPN connection from the VPC VPN gateway to the customer VPN gateway. - - - - - -
+ Setting Up a Site-to-Site VPN Connection + A Site-to-Site VPN connection helps you establish a secure connection from an enterprise + datacenter to the cloud infrastructure. This allows users to access the guest VMs by + establishing a VPN connection to the virtual router of the account from a device in the + datacenter of the enterprise. Having this facility eliminates the need to establish VPN + connections to individual VMs. + The supported endpoints on the remote datacenters are: + + + Cisco ISR with IOS 12.4 or later + + + Juniper J-Series routers with JunOS 9.5 or later + + + + In addition to the specific Cisco and Juniper devices listed above, the expectation is + that any Cisco or Juniper device running on the supported operating systems are able to + establish VPN connections. + + To set up a Site-to-Site VPN connection, perform the following: + + + Create a Virtual Private Cloud (VPC). + See . + + + Create a VPN Customer Gateway. + + + Create a VPN gateway for the VPC that you created. + + + Create VPN connection from the VPC VPN gateway to the customer VPN gateway. + + + + + + + diff --git a/docs/en-US/vpc.xml b/docs/en-US/vpc.xml index 53953ad2bc0..0665d372b4e 100644 --- a/docs/en-US/vpc.xml +++ b/docs/en-US/vpc.xml @@ -3,7 +3,6 @@ %BOOK_ENTITIES; ]> -
- About Virtual Private Clouds - &PRODUCT; Virtual Private Cloud is a private, isolated part of &PRODUCT;. A VPC - can have its own virtual network topology that resembles a traditional physical network. You - can launch VMs in the virtual network that can have private addresses in the range of your - choice, for example: 10.0.0.0/16. You can define network tiers within your VPC network - range, which in turn enables you to group similar kinds of instances based on IP address - range. - For example, if a VPC has the private range 10.0.0.0/16, its guest networks can have the network ranges 10.0.1.0/24, 10.0.2.0/24, 10.0.3.0/24, and so on. - - Major Components of a VPC: - A VPC is comprised of the following network components: - - - VPC: A VPC acts as a container for multiple isolated - networks that can communicate with each other via its virtual router. - Network Tiers: Each tier acts as an isolated network with its - own VLANs and CIDR list, where you can place groups of resources, such as VMs. The - tiers are segmented by means of VLANs. The NIC of each tier acts as its - gateway. - Virtual Router: A virtual router is automatically created and - started when you create a VPC. The virtual router connect the tiers and direct - traffic among the public gateway, the VPN gateways, and the NAT instances. For each - tier, a corresponding NIC and IP exist in the virtual router. The virtual router - provides DNS and DHCP services through its IP. - Public Gateway: The traffic to and from the Internet routed - to the VPC through the public gateway. In a VPC, the public gateway is not exposed - to the end user; therefore, static routes are not support for the public - gateway. - Private Gateway: All the traffic to and from a private network routed to the VPC through the private gateway. For more information, see . - VPN Gateway: The VPC side of a VPN connection. - Site-to-Site VPN Connection: A hardware-based VPN connection - between your VPC and your datacenter, home network, or co-location facility. For - more information, see . - Customer Gateway: The customer side of a VPN Connection. For - more information, see . - NAT Instance: An instance that provides Port Address - Translation for instances to access the Internet via the public gateway. For more - information, see . - - - Network Architecture in a VPC - In a VPC, the following four basic options of network architectures are - present: - - - VPC with a public gateway only - VPC with public and private gateways - VPC with public and private gateways and site-to-site VPN access - VPC with a private gateway only and site-to-site VPN access - - - Connectivity Options for a VPC - You can connect your VPC to: - - The Internet through the public gateway. - The corporate datacenter by using a site-to-site VPN connection through the VPN gateway. - Both the Internet and your corporate datacenter by using both the public gateway and a VPN gateway. - - VPC Network Considerations - Consider the following before you create a VPC: - - A VPC, by default, is created in the enabled state. - - - A VPC can be created in Advance zone only, and can't belong to more than one zone at a time. - - - The default number of VPCs an account can create is 20. However, you can change it - by using the max.account.vpcs global parameter, which controls the maximum number of - VPCs an account is allowed to create. - - - The default number of tiers an account can create within a VPC is 3. You can - configure this number by using the vpc.max.networks parameter. - + About Virtual Private Clouds + &PRODUCT; Virtual Private Cloud is a private, isolated part of &PRODUCT;. A VPC can have its + own virtual network topology that resembles a traditional physical network. You can launch VMs + in the virtual network that can have private addresses in the range of your choice, for example: + 10.0.0.0/16. You can define network tiers within your VPC network range, which in turn enables + you to group similar kinds of instances based on IP address range. + For example, if a VPC has the private range 10.0.0.0/16, its guest networks can have the + network ranges 10.0.1.0/24, 10.0.2.0/24, 10.0.3.0/24, and so on. + + Major Components of a VPC: + A VPC is comprised of the following network components: + + - Each tier should have an unique CIDR in the VPC. Ensure that the tier's CIDR - should be within the VPC CIDR range. + VPC: A VPC acts as a container for multiple isolated + networks that can communicate with each other via its virtual router. + + + Network Tiers: Each tier acts as an isolated network + with its own VLANs and CIDR list, where you can place groups of resources, such as VMs. The + tiers are segmented by means of VLANs. The NIC of each tier acts as its gateway. + + + Virtual Router: A virtual router is automatically + created and started when you create a VPC. The virtual router connect the tiers and direct + traffic among the public gateway, the VPN gateways, and the NAT instances. For each tier, a + corresponding NIC and IP exist in the virtual router. The virtual router provides DNS and + DHCP services through its IP. + + + Public Gateway: The traffic to and from the Internet + routed to the VPC through the public gateway. In a VPC, the public gateway is not exposed to + the end user; therefore, static routes are not support for the public gateway. + + + Private Gateway: All the traffic to and from a private + network routed to the VPC through the private gateway. For more information, see . + + + VPN Gateway: The VPC side of a VPN connection. + + + Site-to-Site VPN Connection: A hardware-based VPN + connection between your VPC and your datacenter, home network, or co-location facility. For + more information, see . + + + Customer Gateway: The customer side of a VPN + Connection. For more information, see . + + + NAT Instance: An instance that provides Port Address + Translation for instances to access the Internet via the public gateway. For more + information, see . + + + + Network Architecture in a VPC + In a VPC, the following four basic options of network architectures are present: + + + + VPC with a public gateway only + + + VPC with public and private gateways + + + VPC with public and private gateways and site-to-site VPN access + + + VPC with a private gateway only and site-to-site VPN access + + + + Connectivity Options for a VPC + You can connect your VPC to: + + + + The Internet through the public gateway. + + + The corporate datacenter by using a site-to-site VPN connection through the VPN + gateway. + + + Both the Internet and your corporate datacenter by using both the public gateway and a + VPN gateway. + + + + VPC Network Considerations + Consider the following before you create a VPC: + + + + A VPC, by default, is created in the enabled state. + + + A VPC can be created in Advance zone only, and can't belong to more than one zone at a + time. + + + The default number of VPCs an account can create is 20. However, you can change it by + using the max.account.vpcs global parameter, which controls the maximum number of VPCs an + account is allowed to create. + + + The default number of tiers an account can create within a VPC is 3. You can configure + this number by using the vpc.max.networks parameter. + + + Each tier should have an unique CIDR in the VPC. Ensure that the tier's CIDR should be + within the VPC CIDR range. + + + A tier belongs to only one VPC. + + + All network tiers inside the VPC should belong to the same account. + + + When a VPC is created, by default, a SourceNAT IP is allocated to it. The Source NAT IP + is released only when the VPC is removed. + + + A public IP can be used for only one purpose at a time. If the IP is a sourceNAT, it + cannot be used for StaticNAT or port forwarding. + + + The instances only have a private IP address that you provision. To communicate with the + Internet, enable NAT to an instance that you launch in your VPC. + + + Only new networks can be added to a VPC. The maximum number of networks per VPC is + limited by the value you specify in the vpc.max.networks parameter. The default value is + three. + + + The load balancing service can be supported by only one tier inside the VPC. + + + If an IP address is assigned to a tier: + + + That IP can't be used by more than one tier at a time in the VPC. For example, if + you have tiers A and B, and a public IP1, you can create a port forwarding rule by using + the IP either for A or B, but not for both. - A tier belongs to only one VPC. + That IP can't be used for StaticNAT, load balancing, or port forwarding rules for + another guest network inside the VPC. - - All network tiers inside the VPC should belong to the same account. - - - When a VPC is created, by default, a SourceNAT IP is allocated to it. The Source - NAT IP is released only when the VPC is removed. - - A public IP can be used for only one purpose at a time. If the IP is a sourceNAT, it cannot be used for StaticNAT or port forwarding. - - The instances only have a private IP address that you provision. To communicate with the Internet, enable NAT to an instance that you launch in your VPC. - - - Only new networks can be added to a VPC. The maximum number of networks per VPC is - limited by the value you specify in the vpc.max.networks parameter. The default - value is three. - - - The load balancing service can be supported by only one tier inside the - VPC. - - If an IP address is assigned to a tier: - That IP can't be used by more than one tier at a time in the VPC. For example, if you have - tiers A and B, and a public IP1, you can create a port forwarding rule by - using the IP either for A or B, but not for both. - That IP can't be used for StaticNAT, load balancing, or port forwarding rules for another - guest network inside the VPC. - - - Remote access VPN is not supported in VPC networks. -
+ + + + Remote access VPN is not supported in VPC networks. + + + diff --git a/patches/cloudpatch-descriptor.xml b/patches/cloudpatch-descriptor.xml index 263fb341532..4710b05a253 100644 --- a/patches/cloudpatch-descriptor.xml +++ b/patches/cloudpatch-descriptor.xml @@ -1,3 +1,19 @@ + diff --git a/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup b/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup index e02b352a136..9d254d3fbb4 100755 --- a/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup +++ b/patches/systemvm/debian/config/etc/cron.daily/cloud-cleanup @@ -1,5 +1,21 @@ #!/bin/sh # /etc/cron.daily/cloud-cleanup: cleanup old cloudstack logs +# 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. cd / output=$(find /var/log/cloud -mtime +7 -size +1M -exec rm -v '{}' \; ) diff --git a/patches/systemvm/debian/config/etc/default/cloud b/patches/systemvm/debian/config/etc/default/cloud index 6da9d9466df..0b85c63f71e 100644 --- a/patches/systemvm/debian/config/etc/default/cloud +++ b/patches/systemvm/debian/config/etc/default/cloud @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + #set ENABLED to 1 if you want the init script to start the password server ENABLED=0 diff --git a/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr b/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr index 6da9d9466df..0b85c63f71e 100644 --- a/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr +++ b/patches/systemvm/debian/config/etc/default/cloud-passwd-srvr @@ -1,2 +1,19 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + #set ENABLED to 1 if you want the init script to start the password server ENABLED=0 diff --git a/patches/systemvm/debian/config/etc/init.d/cloud b/patches/systemvm/debian/config/etc/init.d/cloud index 459d2db7663..b8e6ed2bf45 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud +++ b/patches/systemvm/debian/config/etc/init.d/cloud @@ -9,6 +9,22 @@ # Default-Stop: 0 1 6 # Short-Description: Start up the cloud.com service ### END INIT INFO +# 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. #set -x diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-early-config b/patches/systemvm/debian/config/etc/init.d/cloud-early-config index a7f9b702e62..ca97d293c1c 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-early-config +++ b/patches/systemvm/debian/config/etc/init.d/cloud-early-config @@ -9,6 +9,22 @@ # Default-Stop: 0 6 # Short-Description: configure according to cmdline ### END INIT INFO +# 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. PATH="/usr/local/sbin:/usr/local/bin:/sbin:/bin:/usr/sbin:/usr/bin" diff --git a/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr b/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr index 96395b171ff..553fe0ae962 100755 --- a/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr +++ b/patches/systemvm/debian/config/etc/init.d/cloud-passwd-srvr @@ -9,7 +9,22 @@ # Default-Stop: 0 6 # Short-Description: Web server that sends passwords to User VMs ### END INIT INFO - +# 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. ENABLED=0 [ -e /etc/default/cloud-passwd-srvr ] && . /etc/default/cloud-passwd-srvr diff --git a/patches/systemvm/debian/config/etc/init.d/postinit b/patches/systemvm/debian/config/etc/init.d/postinit index d1b64fe3147..818959fde3b 100755 --- a/patches/systemvm/debian/config/etc/init.d/postinit +++ b/patches/systemvm/debian/config/etc/init.d/postinit @@ -10,6 +10,23 @@ # Short-Description: post-init ### END INIT INFO +# 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. + replace_in_file() { local filename=$1 local keyname=$2 diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-consoleproxy b/patches/systemvm/debian/config/etc/iptables/iptables-consoleproxy index 5dd39c3006b..6e230386412 100644 --- a/patches/systemvm/debian/config/etc/iptables/iptables-consoleproxy +++ b/patches/systemvm/debian/config/etc/iptables/iptables-consoleproxy @@ -1,4 +1,20 @@ -# Generated by iptables-save v1.3.8 on Thu Oct 1 18:16:05 2009 +# 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. + *nat :PREROUTING ACCEPT [0:0] :POSTROUTING ACCEPT [0:0] diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-elbvm b/patches/systemvm/debian/config/etc/iptables/iptables-elbvm index 30dbcc1013a..17baef57481 100755 --- a/patches/systemvm/debian/config/etc/iptables/iptables-elbvm +++ b/patches/systemvm/debian/config/etc/iptables/iptables-elbvm @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + *nat :PREROUTING ACCEPT [0:0] :POSTROUTING ACCEPT [0:0] diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-router b/patches/systemvm/debian/config/etc/iptables/iptables-router index e1972e3a12d..1aba34c8d3f 100644 --- a/patches/systemvm/debian/config/etc/iptables/iptables-router +++ b/patches/systemvm/debian/config/etc/iptables/iptables-router @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + *nat :PREROUTING ACCEPT [0:0] :POSTROUTING ACCEPT [0:0] diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-secstorage b/patches/systemvm/debian/config/etc/iptables/iptables-secstorage index 7dec3455747..5218fa72de6 100755 --- a/patches/systemvm/debian/config/etc/iptables/iptables-secstorage +++ b/patches/systemvm/debian/config/etc/iptables/iptables-secstorage @@ -1,4 +1,20 @@ -# Generated by iptables-save v1.3.8 on Thu Oct 1 18:16:05 2009 +# 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. + *nat :PREROUTING ACCEPT [0:0] :POSTROUTING ACCEPT [0:0] diff --git a/patches/systemvm/debian/config/etc/iptables/iptables-vpcrouter b/patches/systemvm/debian/config/etc/iptables/iptables-vpcrouter index f60a1e41234..b04af3ba7ae 100644 --- a/patches/systemvm/debian/config/etc/iptables/iptables-vpcrouter +++ b/patches/systemvm/debian/config/etc/iptables/iptables-vpcrouter @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + *nat :PREROUTING ACCEPT [0:0] :POSTROUTING ACCEPT [0:0] diff --git a/patches/systemvm/debian/config/etc/iptables/rt_tables_init b/patches/systemvm/debian/config/etc/iptables/rt_tables_init index 07ffaf3baa5..c7f086bdaed 100644 --- a/patches/systemvm/debian/config/etc/iptables/rt_tables_init +++ b/patches/systemvm/debian/config/etc/iptables/rt_tables_init @@ -1,3 +1,21 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + + # # reserved values # diff --git a/patches/systemvm/debian/config/etc/iptables/rules b/patches/systemvm/debian/config/etc/iptables/rules index 3bc7b50f74a..614c3f93bbb 100644 --- a/patches/systemvm/debian/config/etc/iptables/rules +++ b/patches/systemvm/debian/config/etc/iptables/rules @@ -1,3 +1,20 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + *nat :PREROUTING ACCEPT [0:0] :POSTROUTING ACCEPT [0:0] diff --git a/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh b/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh index cecc38af968..59ab4260f88 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh +++ b/patches/systemvm/debian/config/opt/cloud/bin/checks2svpn.sh @@ -1,4 +1,20 @@ #!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. if [ -z $1 ] then diff --git a/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh b/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh index b067a98fb00..871b789e7e5 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh +++ b/patches/systemvm/debian/config/opt/cloud/bin/cloud-nic.sh @@ -1,5 +1,20 @@ #!/usr/bin/env bash - +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. plug_nic() { sudo echo "$tableNo $tableName" >> /etc/iproute2/rt_tables 2>/dev/null diff --git a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server b/patches/systemvm/debian/config/opt/cloud/bin/passwd_server index 7e93b679c6e..95225b6a901 100755 --- a/patches/systemvm/debian/config/opt/cloud/bin/passwd_server +++ b/patches/systemvm/debian/config/opt/cloud/bin/passwd_server @@ -1,4 +1,20 @@ #!/bin/bash +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. . /etc/default/cloud-passwd-srvr diff --git a/patches/systemvm/debian/systemvm.xml b/patches/systemvm/debian/systemvm.xml index ce6ecaf6e49..fffc077a27c 100644 --- a/patches/systemvm/debian/systemvm.xml +++ b/patches/systemvm/debian/systemvm.xml @@ -1,3 +1,19 @@ + systemvm2 1572864 diff --git a/plugins/deployment-planners/user-dispersing/.settings/org.eclipse.jdt.core.prefs b/plugins/deployment-planners/user-dispersing/.settings/org.eclipse.jdt.core.prefs deleted file mode 100755 index 2b2c869b520..00000000000 --- a/plugins/deployment-planners/user-dispersing/.settings/org.eclipse.jdt.core.prefs +++ /dev/null @@ -1,13 +0,0 @@ -#Thu Aug 23 12:18:38 PDT 2012 -eclipse.preferences.version=1 -org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled -org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.6 -org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve -org.eclipse.jdt.core.compiler.compliance=1.6 -org.eclipse.jdt.core.compiler.debug.lineNumber=generate -org.eclipse.jdt.core.compiler.debug.localVariable=generate -org.eclipse.jdt.core.compiler.debug.sourceFile=generate -org.eclipse.jdt.core.compiler.problem.assertIdentifier=error -org.eclipse.jdt.core.compiler.problem.enumIdentifier=error -org.eclipse.jdt.core.compiler.problem.forbiddenReference=warning -org.eclipse.jdt.core.compiler.source=1.6 diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/Fixget_storage_reposExceptionDueToWrongReturnValueCheck.patch b/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/Fixget_storage_reposExceptionDueToWrongReturnValueCheck.patch deleted file mode 100755 index 7c41e555147..00000000000 --- a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/Fixget_storage_reposExceptionDueToWrongReturnValueCheck.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/OVSXUtility.py b/OVSXUtility.py -index 4a98bc8..1053ef7 100644 ---- a/OVSXUtility.py -+++ b/OVSXUtility.py -@@ -160,7 +160,7 @@ def get_storage_repos(): - l = parse_storage_repos() - for sr in l: - d = get_storage_free_space(sr) -- if d: -+ if len(d) > 0: - d_repos_space[sr] = d[sr] - - if not d_repos_space: diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDontTouchOCFS2ClusterWhenAgentStart.patch b/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDontTouchOCFS2ClusterWhenAgentStart.patch deleted file mode 100755 index dfe8462d072..00000000000 --- a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmDontTouchOCFS2ClusterWhenAgentStart.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/OVSAgentAutoStart.py b/OVSAgentAutoStart.py -index 88fa18c..794a363 100755 ---- a/OVSAgentAutoStart.py -+++ b/OVSAgentAutoStart.py -@@ -111,8 +111,6 @@ def prepare_cluster_heartbeat(): - JOBS = [ - ["command", join(dirname(__file__), "utils/upgrade_agent.py")], - ["function", "get_agent_version", ()], -- ["function", "prepare_cluster_root", ()], -- ["function", "prepare_cluster_heartbeat", ()], - ["command", join(dirname(__file__), "utils/upgrade.py")], - ["command_bg", join(dirname(__file__), "OVSRemasterServer.py")], - ["command_bg", join(dirname(__file__), "OVSMonitorServer.py")], diff --git a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch b/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch deleted file mode 100755 index 5f4c7a59d65..00000000000 --- a/plugins/hypervisors/ovm/scripts/vm/hypervisor/ovm/OvmPatch.patch +++ /dev/null @@ -1,23 +0,0 @@ -*** OVSServices.py 2011-06-06 12:31:23.279919998 -0700 ---- /tmp/OVSServices.py 2011-06-06 12:32:13.275919997 -0700 -*************** -*** 68,73 **** ---- 68,75 ---- - import OVSVMXParser #pylint: disable-msg=W0611 - import OVSVMDKParser #pylint: disable-msg=W0611 - -+ import OvmDispatcher -+ - from OVSWrappers import D - from OVSCommons import exposed - -*************** -*** 113,118 **** ---- 115,121 ---- - self.sleep = sleep - - self._load_modules() -+ OvmDispatcher.InitOvmDispacther() - - # #xenapi - # import xen.xend.XendAPI as XendAPI diff --git a/plugins/hypervisors/xen/build.xml b/plugins/hypervisors/xen/build.xml index 377d6b77a3d..9d3406f0ae2 100755 --- a/plugins/hypervisors/xen/build.xml +++ b/plugins/hypervisors/xen/build.xml @@ -75,7 +75,7 @@ - + diff --git a/plugins/network-elements/midokura-midonet/build.xml b/plugins/network-elements/midokura-midonet/build.xml index e69de29bb2d..6b826e700eb 100644 --- a/plugins/network-elements/midokura-midonet/build.xml +++ b/plugins/network-elements/midokura-midonet/build.xml @@ -0,0 +1,17 @@ + + diff --git a/pom.xml b/pom.xml index 972d6454c79..17ea0502fcb 100644 --- a/pom.xml +++ b/pom.xml @@ -182,20 +182,104 @@ apache-rat-plugin 0.8 - 350 - false + 0 + true .git/** .gitignore - velocity.log + **/*.crt + **/*.csr + **/*.key + **/authorized_keys + **/*.mar + **/*.jar + **/*.iso + **/*.tgz + **/*.zip **/target/** - distribution/** - **/jaxb.index - **/META-INF/MANIFEST - **/src/test/**/*.txt - **/.classpath - **/.settings/**/* - **/.project + build/build.number + console-proxy/js/jquery.js + debian/compat + debian/control + debian/dirs + debian/rules + deps/XenServerJava/src/com/xensource/xenapi/*.java + deps/XenServerJava/BSD + deps/XenServerJava/Makefile + dist/console-proxy/js/jquery.js + scripts/vm/systemvm/id_rsa.cloud + patches/systemvm/debian/xe/xen-vcpu-hotplug.rules + patches/systemvm/debian/xe/xe-linux-distribution.init + patches/systemvm/debian/systemvm.vmx + patches/systemvm/debian/config/etc/ssh/sshd_config + patches/systemvm/debian/config/etc/logrotate.d/haproxy + patches/systemvm/debian/config/etc/logrotate.d/dnsmasq + patches/systemvm/debian/config/etc/logrotate.d/apache2 + patches/systemvm/debian/config/etc/logrotate.d/ppp + patches/systemvm/debian/config/etc/logrotate.d/rsyslog + patches/systemvm/debian/config/etc/vpcdnsmasq.conf + patches/systemvm/debian/config/etc/httpd/conf/httpd.conf + patches/systemvm/debian/config/etc/haproxy/haproxy.cfg + patches/systemvm/debian/config/etc/apache2/vhostexample.conf + patches/systemvm/debian/config/etc/apache2/sites-available/default-ssl + patches/systemvm/debian/config/etc/apache2/sites-available/default + patches/systemvm/debian/config/etc/apache2/httpd.conf + patches/systemvm/debian/config/etc/apache2/ports.conf + patches/systemvm/debian/config/etc/rsyslog.conf + patches/systemvm/debian/config/etc/cloud-nic.rules + patches/systemvm/debian/config/etc/logrotate.conf + patches/systemvm/debian/config/etc/init.d/postinit + patches/systemvm/debian/config/etc/modprobe.d/aesni_intel + patches/systemvm/debian/config/etc/sysctl.conf + patches/systemvm/debian/config/etc/dnsmasq.conf + patches/systemvm/debian/config/etc/rc.local + patches/systemvm/debian/config/root/redundant_router/heartbeat.sh.templ + patches/systemvm/debian/config/root/redundant_router/keepalived.conf.templ + patches/systemvm/debian/config/root/redundant_router/check_heartbeat.sh.templ + patches/systemvm/debian/config/root/redundant_router/backup.sh.templ + patches/systemvm/debian/config/root/redundant_router/arping_gateways.sh.templ + patches/systemvm/debian/config/root/redundant_router/fault.sh.templ + patches/systemvm/debian/config/root/redundant_router/checkrouter.sh.templ + patches/systemvm/debian/config/root/redundant_router/master.sh.templ + patches/systemvm/debian/config/root/redundant_router/conntrackd.conf.templ + patches/systemvm/debian/config/root/redundant_router/enable_pubip.sh.templ + patches/systemvm/debian/config/var/lib/misc/dnsmasq.leases + patches/systemvm/debian/config/var/www/html/userdata/.htaccess + patches/systemvm/debian/config/var/www/html/latest/.htaccess + patches/systemvm/debian/vpn/etc/ipsec.conf.orig + patches/systemvm/debian/vpn/etc/ipsec.secrets.orig + patches/systemvm/debian/vpn/etc/ipsec.conf + patches/systemvm/debian/vpn/etc/ipsec.d/l2tp.conf + patches/systemvm/debian/vpn/etc/ppp/options.xl2tpd + patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf + patches/systemvm/debian/vpn/etc/xl2tpd/xl2tpd.conf.orig + patches/systemvm/debian/vpn/etc/ipsec.secrets + tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf + tools/devcloud/devcloud.cfg + ui/lib/flot/jquery.colorhelpers.js + ui/lib/flot/jquery.flot.crosshair.js + ui/lib/flot/jquery.flot.fillbetween.js + ui/lib/flot/jquery.flot.image.js + ui/lib/flot/jquery.flot.js + ui/lib/flot/jquery.flot.navigate.js + ui/lib/flot/jquery.flot.pie.js + ui/lib/flot/jquery.flot.resize.js + ui/lib/flot/jquery.flot.selection.js + ui/lib/flot/jquery.flot.stack.js + ui/lib/flot/jquery.flot.symbol.js + ui/lib/flot/jquery.flot.threshold.js + ui/lib/jquery-ui/css/jquery-ui.css + ui/lib/jquery-ui/index.html + ui/lib/jquery-ui/js/jquery-ui.js + ui/lib/jquery.cookies.js + ui/lib/jquery.easing.js + ui/lib/jquery.js + ui/lib/jquery.md5.js + ui/lib/jquery.validate.js + ui/lib/qunit/qunit.css + ui/lib/qunit/qunit.js + ui/lib/reset.css + waf diff --git a/ui/scripts/dashboard.js b/ui/scripts/dashboard.js index ce723f7ce7d..ad67dff1e53 100644 --- a/ui/scripts/dashboard.js +++ b/ui/scripts/dashboard.js @@ -139,10 +139,25 @@ }); }, capacity: function(data) { + var latestData =null; + if(window.fetchLatestflag == 1) + { + latestData = { + + fetchLatest:true + } + } + else + { + latestData = { + fetchLatest:false + } + } + window.fetchLatestflag = 0; if (data.zones) { $.ajax({ url: createURL('listCapacity'), - data: { fetchLatest: true }, + data: latestData, success: function(json) { var capacities = json.listcapacityresponse.capacity; @@ -243,7 +258,7 @@ $.ajax({ url: createURL('listCapacity'), data: { - fetchLatest: true, + fetchLatest: false, sortBy: 'usage', page: 0, pagesize: 8 diff --git a/ui/scripts/instances.js b/ui/scripts/instances.js index 345f4563dac..b18d44c6bbc 100644 --- a/ui/scripts/instances.js +++ b/ui/scripts/instances.js @@ -1206,15 +1206,13 @@ success:function(json) { // Handling the display of network name for a VM under the NICS tabs args.response.success({ - data: $.map(args.context.instances[0].nic, function(nic, index) { - var name = 'NIC ' + (index + 1); - var networkname = json.listvirtualmachinesresponse.virtualmachine[0].nic[index].networkname; + data: $.map(json.listvirtualmachinesresponse.virtualmachine[0].nic, function(nic, index) { + var name = 'NIC ' + (index + 1); if (nic.isdefault) { name += ' (' + _l('label.default') + ')'; } return $.extend(nic, { - name: name, - networkname: networkname + name: name }); }) }); diff --git a/ui/scripts/templates.js b/ui/scripts/templates.js index d926d05b821..7a99d79b4fc 100644 --- a/ui/scripts/templates.js +++ b/ui/scripts/templates.js @@ -204,42 +204,11 @@ } }, - osCategory: { - label: 'OS Category', - select: function(args) { - $.ajax({ - url: createURL("listOsCategories"), - dataType: "json", - async: true, - success: function(json) { - var osCats = json.listoscategoriesresponse.oscategory; - var items = []; - if (isAdmin()) - items.push({id: -1, description: "All OS"}); - $(osCats).each(function() { - items.push({id: this.id, description: this.name}); - }); - args.response.success({data: items}); - } - }); - } - }, - osTypeId: { label: 'label.os.type', - dependsOn: 'osCategory', select: function(args) { - if(args.osCategory == null) - return; - - var apiCmd; - if(args.osCategory == -1) - apiCmd = "listOsTypes"; - else - apiCmd = "listOsTypes&oscategoryid=" + args.osCategory; - $.ajax({ - url: createURL(apiCmd), + url: createURL("listOsTypes"), dataType: "json", async: true, success: function(json) { @@ -814,46 +783,15 @@ isBoolean: true, isChecked: true }, - - osCategory: { - label: 'OS Category', - dependsOn: 'isBootable', - select: function(args) { - $.ajax({ - url: createURL("listOsCategories"), - dataType: "json", - async: true, - success: function(json) { - var osCats = json.listoscategoriesresponse.oscategory; - var items = []; - if (isAdmin()) - items.push({id: -1, description: "All OS"}); - $(osCats).each(function() { - items.push({id: this.id, description: this.name}); - }); - args.response.success({data: items}); - } - }); - } - }, - + osTypeId: { label: 'label.os.type', - dependsOn: ['isBootable','osCategory'], + dependsOn: 'isBootable', isHidden: false, validation: { required: true }, select: function(args) { - if(args.osCategory == null) - return; - - var apiCmd; - if(args.osCategory == -1) - apiCmd = "listOsTypes"; - else - apiCmd = "listOsTypes&oscategoryid=" + args.osCategory; - $.ajax({ - url: createURL(apiCmd), + url: createURL("listOsTypes"), dataType: "json", async: true, success: function(json) { diff --git a/ui/scripts/ui-custom/dashboard.js b/ui/scripts/ui-custom/dashboard.js index 0ae8bb1a598..2d814212962 100644 --- a/ui/scripts/ui-custom/dashboard.js +++ b/ui/scripts/ui-custom/dashboard.js @@ -179,6 +179,7 @@ //Fetch Latest action $dashboard.find('.fetch-latest').click(function() { + window.fetchLatestflag = 1; var $browser = $('#browser .container'); if ($(this).hasClass('fetch-latest')) $('#navigation li.dashboard').click(); diff --git a/ui/scripts/ui/dialog.js b/ui/scripts/ui/dialog.js index 88ffe57214e..2d22637f6d5 100644 --- a/ui/scripts/ui/dialog.js +++ b/ui/scripts/ui/dialog.js @@ -117,56 +117,52 @@ var $value = $('
').addClass('value') .appendTo($formItem); var $input, $dependsOn, selectFn, selectArgs; - var dependsOn = $.isArray(field.dependsOn) ? field.dependsOn : [field.dependsOn] ; //now an array + var dependsOn = field.dependsOn; // Depends on fields - if (dependsOn.length) { - $.each(dependsOn, function(key, value){ - var dependsOn = value; + if (field.dependsOn) { + $formItem.attr('depends-on', dependsOn); + $dependsOn = $form.find('input, select').filter(function() { + return $(this).attr('name') === dependsOn; + }); - $formItem.attr('depends-on-'+value, dependsOn); - $dependsOn = $form.find('input, select').filter(function() { - return $(this).attr('name') === dependsOn; + if ($dependsOn.is('[type=checkbox]')) { + var isReverse = args.form.fields[dependsOn].isReverse; + + // Checkbox + $dependsOn.bind('click', function(event) { + var $target = $(this); + var $dependent = $target.closest('form').find('[depends-on=\'' + dependsOn + '\']'); + + if (($target.is(':checked') && !isReverse) || + ($target.is(':unchecked') && isReverse)) { + $dependent.css('display', 'inline-block'); + $dependent.each(function() { + if ($(this).data('dialog-select-fn')) { + $(this).data('dialog-select-fn')(); + } + }); + } else if (($target.is(':unchecked') && !isReverse) || + ($target.is(':checked') && isReverse)) { + $dependent.hide(); + } + + $dependent.find('input[type=checkbox]').click(); + + if (!isReverse) { + $dependent.find('input[type=checkbox]').attr('checked', false); + } else { + $dependent.find('input[type=checkbox]').attr('checked', true); + } + + return true; }); - if ($dependsOn.is('[type=checkbox]')) { - var isReverse = args.form.fields[dependsOn].isReverse; - - // Checkbox - $dependsOn.bind('click', function(event) { - var $target = $(this); - var $dependent = $target.closest('form').find('[depends-on-' + value + '=\'' + dependsOn + '\']'); - - if (($target.is(':checked') && !isReverse) || - ($target.is(':unchecked') && isReverse)) { - $dependent.css('display', 'inline-block'); - $dependent.each(function() { - if ($(this).find('select').data('dialog-select-fn')) { - $(this).find('select').data('dialog-select-fn')(); - } - }); - } else if (($target.is(':unchecked') && !isReverse) || - ($target.is(':checked') && isReverse)) { - $dependent.hide(); - } - - $dependent.find('input[type=checkbox]').click(); - - if (!isReverse) { - $dependent.find('input[type=checkbox]').attr('checked', false); - } else { - $dependent.find('input[type=checkbox]').attr('checked', true); - } - - return true; - }); - - // Show fields by default if it is reverse checkbox - if (isReverse) { - $dependsOn.click(); - } - }; - }); + // Show fields by default if it is reverse checkbox + if (isReverse) { + $dependsOn.click(); + } + } } // Determine field type of input @@ -211,35 +207,31 @@ // Pass form item to provider for additional manipulation $.extend(selectArgs, { $select: $input }); - if (dependsOn.length) { - $.each(dependsOn, function(key, value){ - var dependsOn = value; - - $dependsOn = $input.closest('form').find('input, select').filter(function() { - return $(this).attr('name') === dependsOn; - }); - - $dependsOn.bind('change', function(event) { - var $target = $(this); - - if (!$dependsOn.is('select')) return true; - - var dependsOnArgs = {}; - - $input.find('option').remove(); - - if (!$target.children().size()) return true; - - dependsOnArgs[dependsOn] = $target.val(); - selectFn($.extend(selectArgs, dependsOnArgs)); - - return true; - }); - - if (!$dependsOn.is('select')) { - selectFn(selectArgs); - } + if (dependsOn) { + $dependsOn = $input.closest('form').find('input, select').filter(function() { + return $(this).attr('name') === dependsOn; }); + + $dependsOn.bind('change', function(event) { + var $target = $(this); + + if (!$dependsOn.is('select')) return true; + + var dependsOnArgs = {}; + + $input.find('option').remove(); + + if (!$target.children().size()) return true; + + dependsOnArgs[dependsOn] = $target.val(); + selectFn($.extend(selectArgs, dependsOnArgs)); + + return true; + }); + + if (!$dependsOn.is('select')) { + selectFn(selectArgs); + } } else { selectFn(selectArgs); } diff --git a/wscript_configure b/wscript_configure index 0e909631241..965847dd101 100644 --- a/wscript_configure +++ b/wscript_configure @@ -322,7 +322,7 @@ depsclasspath = [ in_javadir(_basename(x)) for x in _glob(_join(conf.srcdir,"dep conf.env.DEPSCLASSPATH = pathsep.join(depsclasspath) # the MS classpath points to JARs required to run the management server -msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras core-extras vmware-base ovm dp-user-concentrated-pod dp-user-dispersing host-allocator-random plugin-f5 plugin-netscaler plugin-ovs plugin-srx storage-allocator-random user-authenticator-ldap user-authenticator-md5 user-authenticator-plaintext vmware xen plugin-nicira-nvp plugin-elb plugin-netapp".split() ] +msclasspath = [ in_javadir("%s-%s.jar"%(conf.env.PACKAGE,x)) for x in "utils api core server server-extras core-extras vmware-base ovm dp-user-concentrated-pod dp-user-dispersing host-allocator-random plugin-f5 plugin-netscaler plugin-ovs plugin-srx storage-allocator-random user-authenticator-ldap user-authenticator-md5 user-authenticator-plaintext vmware plugin-hypervisor-xen plugin-nicira-nvp plugin-elb plugin-netapp".split() ] conf.env.MSCLASSPATH = pathsep.join(msclasspath) # the agent and simulator classpaths point to JARs required to run these two applications