git commit: updated refs/heads/master to fe5ab4a
Repository: cloudstack Updated Branches: refs/heads/master 578e500bc -> fe5ab4aa9 CLOUDSTACK-4840: Final set of test cases for Multiple IPs per NIC feature Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/fe5ab4aa Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/fe5ab4aa Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/fe5ab4aa Branch: refs/heads/master Commit: fe5ab4aa9186bcd8b38daef80f2f83794cef7a23 Parents: 578e500 Author: Ashutosh K Authored: Sun Mar 23 21:15:45 2014 -0700 Committer: Girish Shilamkar Committed: Sun Mar 23 21:15:45 2014 -0700 -- .../component/test_multiple_ips_per_nic.py | 442 ++- tools/marvin/marvin/config/config.cfg | 10 +- tools/marvin/marvin/integration/lib/base.py | 13 +- 3 files changed, 459 insertions(+), 6 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/fe5ab4aa/test/integration/component/test_multiple_ips_per_nic.py -- diff --git a/test/integration/component/test_multiple_ips_per_nic.py b/test/integration/component/test_multiple_ips_per_nic.py index dcbb453..486a7d3 100644 --- a/test/integration/component/test_multiple_ips_per_nic.py +++ b/test/integration/component/test_multiple_ips_per_nic.py @@ -37,18 +37,21 @@ from marvin.integration.lib.base import (Account, PublicIPAddress, StaticNATRule, FireWallRule, - NATRule) + NATRule, + Router) from marvin.integration.lib.common import (get_domain, get_zone, get_template, get_free_vlan, setSharedNetworkParams, createEnabledNetworkOffering, - shouldTestBeSkipped) + shouldTestBeSkipped, + wait_for_cleanup) from nose.plugins.attrib import attr from marvin.codes import PASS, ISOLATED_NETWORK, VPC_NETWORK, SHARED_NETWORK, FAIL from ddt import ddt, data +import time def createNetwork(self, networkType): """Create a network of given type (isolated/shared/isolated in VPC)""" @@ -851,3 +854,438 @@ class TestNetworkRules(cloudstackTestCase): public_ip.delete(self.apiclient) return + +@ddt +class TestVmNetworkOperations(cloudstackTestCase): +"""Test VM and Network operations with network rules created on secondary IP +""" + +@classmethod +def setUpClass(cls): +cloudstackTestClient = super(TestVmNetworkOperations,cls).getClsTestClient() +cls.api_client = cloudstackTestClient.getApiClient() + +# Fill services from the external config file +cls.services = cloudstackTestClient.getConfigParser().parsedDict + +# Get Zone, Domain and templates +cls.domain = get_domain(cls.api_client, cls.services) +cls.zone = get_zone(cls.api_client, cls.services) +cls.mode = str(cls.zone.networktype).lower() +cls.template = get_template( +cls.api_client, +cls.zone.id, +cls.services["ostype"] +) +cls.services["virtual_machine"]["zoneid"] = cls.zone.id +cls.services["virtual_machine"]["template"] = cls.template.id +cls.service_offering = ServiceOffering.create( +cls.api_client, +cls.services["service_offering"] +) +cls._cleanup = [cls.service_offering] +cls.services["shared_network_offering"]["specifyVlan"] = "True" +cls.services["shared_network_offering"]["specifyIpRanges"] = "True" + +cls.shared_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["shared_network_offering"]) +cls._cleanup.append(cls.shared_network_offering) + +if cls.mode == "advanced": +cls.isolated_network_offering = CreateEnabledNetworkOffering(cls.api_client, cls.services["isolated_network_offering"]) +cls._cleanup.append(cls.isolated_network_offering) +cls.isolated_network_offering_vpc = CreateEnabledNetworkOffering(cls.api_client, cls.services["nw_offering_isolated_vpc"]) +cls._cleanup.append(cls.isolated_network_offering_vpc
[3/3] git commit: updated refs/heads/master to 93c46c9
CLOUDSTACK-6105: Initial version Windowsfication of the management server Signed-off-by: Abhinandan Prateek Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/93c46c9b Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/93c46c9b Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/93c46c9b Branch: refs/heads/master Commit: 93c46c9be8df1b60b587810dbfc28c4726dcbc80 Parents: fe5ab4a Author: Damodar Reddy Authored: Thu Mar 20 22:36:46 2014 +0530 Committer: Abhinandan Prateek Committed: Mon Mar 24 10:54:46 2014 +0530 -- scripts/installer/windows/acs.wxs | 229 ++ scripts/installer/windows/client.wxs| 2414 ++ scripts/installer/windows/start.bat | 12 + scripts/vm/systemvm/injectkeys.py | 142 ++ .../cloud/server/ConfigurationServerImpl.java | 33 +- .../server/ConfigurationServerImplTest.java | 26 + 6 files changed, 2853 insertions(+), 3 deletions(-) -- http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93c46c9b/scripts/installer/windows/acs.wxs -- diff --git a/scripts/installer/windows/acs.wxs b/scripts/installer/windows/acs.wxs new file mode 100644 index 000..7967478 --- /dev/null +++ b/scripts/installer/windows/acs.wxs @@ -0,0 +1,229 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + NOT Installed + NOT Installed + + + + + + + + + + + + + + + + + + + +
[1/3] CLOUDSTACK-6105: Initial version Windowsfication of the management server
Repository: cloudstack
Updated Branches:
refs/heads/master fe5ab4aa9 -> 93c46c9be
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93c46c9b/scripts/installer/windows/start.bat
--
diff --git a/scripts/installer/windows/start.bat
b/scripts/installer/windows/start.bat
new file mode 100644
index 000..e819fa2
--- /dev/null
+++ b/scripts/installer/windows/start.bat
@@ -0,0 +1,12 @@
+:: 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.
+echo Starting Apache CloudStack > C:\Work\tmp.out
+START %CATALINA_HOME%\bin\startup.bat
+echo Started Aoache CloudStack >> C:\Work\tmp.out
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/93c46c9b/scripts/vm/systemvm/injectkeys.py
--
diff --git a/scripts/vm/systemvm/injectkeys.py
b/scripts/vm/systemvm/injectkeys.py
new file mode 100644
index 000..bd840f9
--- /dev/null
+++ b/scripts/vm/systemvm/injectkeys.py
@@ -0,0 +1,142 @@
+#!/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.
+
+
+# Copies keys that enable SSH communication with system vms
+# $1 = new public key
+# $2 = new private key
+'''
+All imports go here...
+'''
+import os
+import shutil
+import os.path
+import sys
+import subprocess
+import commands
+import traceback
+import filecmp
+
+pathSep=os.sep
+TMP=os.path.expanduser("~") + os.sep + "tmp" #Get Home Directory
+MOUNTPATH=TMP + pathSep + "systemvm_mnt"
+TMPDIR=TMP + pathSep + "cloud" + pathSep + "systemvm"
+osType=os.name
+
+os.makedirs(TMP)
+os.makedirs(MOUNTPATH)
+os.makedirs(TMPDIR)
+
+def clean_up():
+ shutil.rmtree(TMP)
+ #$SUDO umount $MOUNTPATH
+
+def inject_into_iso(pubKey,systemiso):
+ isofile=systemvmpath
+ newpubkey=pubKey
+ backup=isofile + ".bak"
+ tmpiso=TMP + pathSep + systemiso
+ if not os.path.exists(isofile):
+ print("Could not open %s" % isofile)
+ clean_up()
+ sys.exit(IOError)
+ command = "7z x -y " + isofile + " -o" + MOUNTPATH
+ status = os.system(command)
+ if status != 0:
+ print ("Failed to mount original iso %" % isofile)
+ clean_up()
+ sys.exit(status)
+ pubKeyFileOld=open(MOUNTPATH + pathSep + "authorized_keys", 'r')
+ pubKeyFileNew=open(newpubkey, 'r')
+ for line1 in pubKeyFileOld:
+ for line2 in pubKeyFileNew:
+ if line1 == line2:
+ pubKeyFileOld.close()
+ pubKeyFileNew.close()
+ return 0
+ pubKeyFileOld.close()
+ pubKeyFileNew.close()
+ try:
+ shutil.copy(isofile, backup)
+ except:
+ print("Failed to backup original iso %" % isofile)
+ clean_up()
+ sys.exit(IOError)
+ shutil.rmtree(TMPDIR)
+ try :
+ shutil.copytree(MOUNTPATH, TMPDIR)
+ except :
+ print ("Failed to copy from original iso %s" % isofile)
+ clean_up()
+ sys.exit(IOError)
+ try :
+ shutil.copyfile(newpubkey, TMPDIR + pathSep + "authorized_keys")
+ except :
+ print ("Failed to copy key %s from original iso to new iso" %
newpubkey)
+ traceback.print_exc(file=sys.stdout)
+ clean_up()
+ sys.exit(IOError)
