4.2

CHANGES

@@ -4,12 +4,24 @@ Apache CloudStack CHANGES
 Full release notes for each release are located in the project's documentation website:  
 http://cloudstack.apache.org/docs
 
-Version 4.2.0
+Version 4.2.1
 ------------------------
 
-In progress
+Important Fixes:
+
+*CLOUDSTACK-4817: Configurable option to choose single vs multipart upload for S3 API
+*CLOUDSTACK-4717: Allow network with public IP Address without needing SourceNAT
+*CLOUDSTACK-4649: Device Id Changes for Xen
+*CLOUDSTACK-4816: Provide configurable option to choose single vs multipart upload to S3 object storage
+*CLOUDSTACK-3677: Xenserver VMSnapshot
+*CLOUDSTACK-723:  UCS rework
+
+The exhaustive list of known issues and fixes is in Release Notes.
 
+Version 4.2.0
+------------------------
 
+Please check the release notes for details
 
 
 Version 4.1.0

LICENSE

@@ -306,7 +306,7 @@ Within the scripts/vm/hypervisor/xenserver directory
         from OpenStack, LLC  http://www.openstack.org 
             swift 
 
-Within the tools/appliance/definitions/{devcloud,systemvmtemplate,systemvmtemplate64} directories
+Within the tools/appliance/definitions/{devcloud,systemvmtemplate,systemvmtemplate64} directory
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as follows)
 
             Copyright (c) 2010-2012 Patrick Debois 
@@ -460,7 +460,7 @@ Within the ui/lib directory
 
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as follows)
 
-            Copyright (c) 2006 - 2011 J�rn Zaefferer 
+            Copyright (c) 2006 - 2011 Jörn Zaefferer 
 
             Permission is hereby granted, free  of charge, to any person obtaining
             a  copy  of this  software  and  associated  documentation files  (the
@@ -655,7 +655,7 @@ Within the ui/lib/jquery-ui directory
 Within the ui/lib/qunit directory
     licensed under the MIT License http://www.opensource.org/licenses/mit-license.php  (as follows)
 
-            Copyright (c) 2012 John Resig, J�rn Zaefferer 
+            Copyright (c) 2012 John Resig, Jörn Zaefferer 
 
             Permission is hereby granted, free  of charge, to any person obtaining
             a  copy  of this  software  and  associated  documentation files  (the
@@ -686,3 +686,10 @@ Within the utils/src/com/cloud/utils/db directory
         from Clinton Begin  http://code.google.com/p/mybatis/ 
             ScriptRunner.java  from http://code.google.com/p/mybatis/
 
+Within the utils/src/org/apache/commons/httpclient/contrib/ssl directory
+    licensed under the Apache License, Version 2 http://www.apache.org/licenses/LICENSE-2.0.txt  (as above)
+    Copyright (c) 2007 The Apache Software Foundation
+        from The Apache Software Foundation  http://www.apache.org/ 
+            EasySSLProtocolSocketFactory.java 
+            EasyX509TrustManager.java 
+

agent-simulator/tomcatconf/commands-simulator.properties.in

@@ -16,4 +16,4 @@
 # under the License.
 
 
-configureSimulator=com.cloud.api.commands.ConfigureSimulator;1
+configureSimulator=com.cloud.api.commands.ConfigureSimulatorCmd;1

agent/bindir/cloudstack-agent-upgrade.in

@@ -0,0 +1,63 @@
+#!/usr/bin/python
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+from cloudutils.networkConfig import networkConfig
+from cloudutils.utilities import bash
+import logging
+import re
+def isOldStyleBridge(brName):
+    if brName.find("cloudVirBr") == 0:
+       return True
+    else:
+       return False
+def upgradeBridgeName(brName, enslavedDev):
+    print("upgrade bridge: %s, %s"%(brName, enslavedDev))
+    vlanId = brName.replace("cloudVirBr", "")
+    print("find vlan Id: %s"%vlanId)
+    phyDev = enslavedDev.split(".")[0]
+    print("find physical device %s"%phyDev)
+    newBrName = "br" + phyDev + "-" + vlanId
+    print("new bridge name %s"%newBrName)
+    bash("ip link set %s down"%brName) 
+    bash("ip link set %s name %s"%(brName, newBrName))
+    bash("ip link set %s up" %newBrName)
+    cmd = "iptables-save | grep FORWARD | grep -w " +  brName
+    rules = bash(cmd).stdout.split('\n')
+    rules.pop()
+    for rule in rules:
+        try:
+            delrule = re.sub("-A", "-D", rule)
+            newrule = re.sub(" " + brName + " ", " " + newBrName + " ", rule)
+            bash("iptables " + delrule)
+            bash("iptables " + newrule)
+        except:
+            logging.exception("Ignoring failure to update rules for rule " + rule + " on bridge " + brName)
+if __name__ == '__main__':
+   netlib = networkConfig() 
+   bridges = netlib.listNetworks()
+   bridges = filter(isOldStyleBridge, bridges)
+   for br in bridges:
+       enslavedDev = netlib.getEnslavedDev(br, 1)
+       if enslavedDev is not None:
+           upgradeBridgeName(br, enslavedDev)
+
+   bridges = netlib.listNetworks()
+   bridges = filter(isOldStyleBridge, bridges)
+   if len(bridges) > 0:
+       print("Warning: upgrade is not finished, still some bridges have the old style name:" + str(bridges))
+   else:
+       print("Upgrade succeed")

agent/bindir/libvirtqemuhook.in

@@ -0,0 +1,53 @@
+#!/usr/bin/python
+# Licensed to the Apache Software Foundation (ASF) under one
+# or more contributor license agreements.  See the NOTICE file
+# distributed with this work for additional information
+# regarding copyright ownership.  The ASF licenses this file
+# to you under the Apache License, Version 2.0 (the
+# "License"); you may not use this file except in compliance
+# with the License.  You may obtain a copy of the License at
+# 
+#   http://www.apache.org/licenses/LICENSE-2.0
+# 
+# Unless required by applicable law or agreed to in writing,
+# software distributed under the License is distributed on an
+# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+# KIND, either express or implied.  See the License for the
+# specific language governing permissions and limitations
+# under the License.
+import sys
+from xml.dom.minidom import parse
+from cloudutils.configFileOps import configFileOps
+from cloudutils.networkConfig import networkConfig
+def isOldStyleBridge(brName):
+    if brName.find("cloudVirBr") == 0:
+       return True
+    else:
+       return False
+def getGuestNetworkDevice():
+    netlib = networkConfig() 
+    cfo = configFileOps("/etc/cloudstack/agent/agent.properties")
+    guestDev = cfo.getEntry("guest.network.device")
+    enslavedDev = netlib.getEnslavedDev(guestDev, 1)
+    return enslavedDev 
+def handleMigrateBegin():
+    try:
+        domain = parse(sys.stdin)
+        for interface in domain.getElementsByTagName("interface"):
+            source = interface.getElementsByTagName("source")[0]
+            bridge = source.getAttribute("bridge")
+            if not isOldStyleBridge(bridge):
+                continue
+            vlanId = bridge.replace("cloudVirBr","")
+            phyDev = getGuestNetworkDevice()
+            newBrName="br" + phyDev + "-" + vlanId
+            source.setAttribute("bridge", newBrName)
+        print(domain.toxml())
+    except:
+        pass
+if __name__ == '__main__':
+    if len(sys.argv) != 5:
+        sys.exit(0)
+
+    if sys.argv[2] == "migrate" and sys.argv[3] == "begin":
+        handleMigrateBegin() 

agent/conf/agent.properties

@@ -94,3 +94,23 @@ domr.scripts.dir=scripts/network/domr/kvm
 # libvirt.vif.driver=com.cloud.hypervisor.kvm.resource.DirectVifDriver
 # network.direct.source.mode=private
 # network.direct.device=eth0
+
+# setting to enable the cpu model to kvm guest globally.
+# three option:custom,host-model and host-passthrough.
+# custom - user custom the CPU model which specified by guest.cpu.model.
+# host-model - identify the named CPU model which most closely matches the host,
+# and then request additional CPU flags to complete the match. This should give
+# close to maximum functionality/performance, which maintaining good
+# reliability/compatibility if the guest is migrated to another host with slightly different host CPUs.
+# host-passthrough - tell KVM to passthrough the host CPU with no modifications.
+# The difference to host-model, instead of just matching feature flags,
+# every last detail of the host CPU is matched. This gives absolutely best performance,
+# and can be important to some apps which check low level CPU details,
+# but it comes at a cost wrt migration. The guest can only be migrated to
+# an exactly matching host CPU.
+#
+# guest.cpu.mode=custom|host-model|host-passthrough
+# This param is only valid if guest.cpu.mode=custom,
+# for examples:"Conroe" "Penryn", "Nehalem", "Westmere", "pentiumpro" and so
+# on,run virsh capabilities for more details.
+# guest.cpu.model=

agent/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.2.1-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>

agent/src/com/cloud/agent/resource/consoleproxy/ConsoleProxyResource.java

@@ -112,6 +112,7 @@ public Answer executeRequest(final Command cmd) {
     }
 
     private Answer execute(StartConsoleProxyAgentHttpHandlerCommand cmd) {
+    	s_logger.info("Invoke launchConsoleProxy() in responding to StartConsoleProxyAgentHttpHandlerCommand");
         launchConsoleProxy(cmd.getKeystoreBits(), cmd.getKeystorePassword(), cmd.getEncryptorPassword());
         return new Answer(cmd);
     }
@@ -361,29 +362,31 @@ public void run() {
                     try {
                         Class<?> consoleProxyClazz = Class.forName("com.cloud.consoleproxy.ConsoleProxy");
                         try {
+                        	s_logger.info("Invoke setEncryptorPassword(), ecnryptorPassword: " + encryptorPassword);
                             Method methodSetup = consoleProxyClazz.getMethod(
                                     "setEncryptorPassword", String.class);
                             methodSetup.invoke(null, encryptorPassword);
 
+                        	s_logger.info("Invoke startWithContext()");
                             Method method = consoleProxyClazz.getMethod(
                                     "startWithContext", Properties.class,
                                     Object.class, byte[].class, String.class);
                             method.invoke(null, _properties, resource, ksBits,
                                     ksPassword);
                         } catch (SecurityException e) {
-                            s_logger.error("Unable to launch console proxy due to SecurityException");
+                            s_logger.error("Unable to launch console proxy due to SecurityException", e);
                             System.exit(ExitStatus.Error.value());
                         } catch (NoSuchMethodException e) {
-                            s_logger.error("Unable to launch console proxy due to NoSuchMethodException");
+                            s_logger.error("Unable to launch console proxy due to NoSuchMethodException", e);
                             System.exit(ExitStatus.Error.value());
                         } catch (IllegalArgumentException e) {
-                            s_logger.error("Unable to launch console proxy due to IllegalArgumentException");
+                            s_logger.error("Unable to launch console proxy due to IllegalArgumentException", e);
                             System.exit(ExitStatus.Error.value());
                         } catch (IllegalAccessException e) {
-                            s_logger.error("Unable to launch console proxy due to IllegalAccessException");
+                            s_logger.error("Unable to launch console proxy due to IllegalAccessException", e);
                             System.exit(ExitStatus.Error.value());
                         } catch (InvocationTargetException e) {
-                            s_logger.error("Unable to launch console proxy due to InvocationTargetException");
+                            s_logger.error("Unable to launch console proxy due to InvocationTargetException " + e.getTargetException().toString(), e);
                             System.exit(ExitStatus.Error.value());
                         }
                     } catch (final ClassNotFoundException e) {
@@ -402,22 +405,22 @@ public void run() {
                 Method methodSetup = consoleProxyClazz.getMethod("setEncryptorPassword", String.class);
                 methodSetup.invoke(null, encryptorPassword);
             } catch (SecurityException e) {
-                s_logger.error("Unable to launch console proxy due to SecurityException");
+                s_logger.error("Unable to launch console proxy due to SecurityException", e);
                 System.exit(ExitStatus.Error.value());
             } catch (NoSuchMethodException e) {
-                s_logger.error("Unable to launch console proxy due to NoSuchMethodException");
+                s_logger.error("Unable to launch console proxy due to NoSuchMethodException", e);
                 System.exit(ExitStatus.Error.value());
             } catch (IllegalArgumentException e) {
-                s_logger.error("Unable to launch console proxy due to IllegalArgumentException");
+                s_logger.error("Unable to launch console proxy due to IllegalArgumentException", e);
                 System.exit(ExitStatus.Error.value());
             } catch (IllegalAccessException e) {
-                s_logger.error("Unable to launch console proxy due to IllegalAccessException");
+                s_logger.error("Unable to launch console proxy due to IllegalAccessException", e);
                 System.exit(ExitStatus.Error.value());
             } catch (InvocationTargetException e) {
-                s_logger.error("Unable to launch console proxy due to InvocationTargetException");
+                s_logger.error("Unable to launch console proxy due to InvocationTargetException " + e.getTargetException().toString(), e);
                 System.exit(ExitStatus.Error.value());
             } catch (final ClassNotFoundException e) {
-                s_logger.error("Unable to launch console proxy due to ClassNotFoundException");
+                s_logger.error("Unable to launch console proxy due to ClassNotFoundException", e);
                 System.exit(ExitStatus.Error.value());
             }
         }

api/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.cloudstack</groupId>
     <artifactId>cloudstack</artifactId>
-    <version>4.2.0-SNAPSHOT</version>
+    <version>4.2.1-SNAPSHOT</version>
   </parent>
   <dependencies>
     <dependency>

api/src/com/cloud/agent/api/to/DataTO.java

@@ -18,9 +18,12 @@
  */
 package com.cloud.agent.api.to;
 
+import com.cloud.hypervisor.Hypervisor;
+
 public interface DataTO {
     public DataObjectType getObjectType();
     public DataStoreTO getDataStore();
+    public Hypervisor.HypervisorType getHypervisorType();
     /**
      * @return
      */

api/src/com/cloud/agent/api/to/DhcpTO.java

@@ -0,0 +1,64 @@
+// Licensed to the Apache Software Foundation (ASF) under one
+// or more contributor license agreements.  See the NOTICE file
+// distributed with this work for additional information
+// regarding copyright ownership.  The ASF licenses this file
+// to you under the Apache License, Version 2.0 (the
+// "License"); you may not use this file except in compliance
+// with the License.  You may obtain a copy of the License at
+//
+//   http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing,
+// software distributed under the License is distributed on an
+// "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+// KIND, either express or implied.  See the License for the
+// specific language governing permissions and limitations
+// under the License.
+package com.cloud.agent.api.to;
+
+public class DhcpTO {
+    String routerIp;
+    String gateway;
+    String netmask;
+    String startIpOfSubnet;
+
+    public DhcpTO(String routerIp, String gateway, String netmask, String StartIpOfSubnet) {
+        this.routerIp = routerIp;
+        this.startIpOfSubnet = StartIpOfSubnet;
+        this.gateway = gateway;
+        this.netmask =netmask;
+
+    }
+
+    public void setRouterIp(String routerIp){
+        this.routerIp = routerIp;
+    }
+
+    public void setGateway(String gateway) {
+        this.gateway = gateway;
+    }
+
+    public void setNetmask(String netmask) {
+        this.netmask = netmask ;
+    }
+
+    public void setStartIpOfSubnet( String ipOfSubNet) {
+        startIpOfSubnet = ipOfSubNet;
+    }
+
+    public String getRouterIp() {
+        return routerIp;
+    }
+
+    public String getGateway() {
+        return gateway;
+    }
+
+    public String getNetmask() {
+        return netmask;
+    }
+    public String getStartIpOfSubnet() {
+        return startIpOfSubnet;
+    }
+
+}