You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cloudstack.apache.org by bh...@apache.org on 2015/03/18 06:35:44 UTC
git commit: updated refs/heads/master to b011c9b
Repository: cloudstack
Updated Branches:
refs/heads/master f0da19a06 -> b011c9bad
Add missing license headers from recent branch merge 3c429ee
Signed-off-by: Rohit Yadav <ro...@shapeblue.com>
Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/b011c9ba
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/b011c9ba
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/b011c9ba
Branch: refs/heads/master
Commit: b011c9bad4000e0ebf5472961e9a0d7235b85c0a
Parents: f0da19a
Author: Rohit Yadav <ro...@shapeblue.com>
Authored: Wed Mar 18 11:03:54 2015 +0530
Committer: Rohit Yadav <ro...@shapeblue.com>
Committed: Wed Mar 18 11:03:54 2015 +0530
----------------------------------------------------------------------
pom.xml | 5 +++++
systemvm/patches/debian/config/etc/chef/solo.rb | 17 +++++++++++++++++
.../debian/config/opt/cloud/bin/checkrouter.sh | 16 ++++++++++++++++
.../patches/debian/config/opt/cloud/bin/ian.py | 17 +++++++++++++++++
.../patches/debian/config/opt/cloud/bin/test.sh | 16 ++++++++++++++++
.../opt/cloud/templates/conntrackd.conf.templ | 16 ++++++++++++++++
systemvm/test/python/TestCsAddress.py | 17 +++++++++++++++++
systemvm/test/python/TestCsApp.py | 17 +++++++++++++++++
systemvm/test/python/TestCsCmdLine.py | 17 +++++++++++++++++
systemvm/test/python/TestCsConfig.py | 17 +++++++++++++++++
systemvm/test/python/TestCsDatabag.py | 17 +++++++++++++++++
systemvm/test/python/TestCsDhcp.py | 17 +++++++++++++++++
systemvm/test/python/TestCsFile.py | 17 +++++++++++++++++
systemvm/test/python/TestCsGuestNetwork.py | 17 +++++++++++++++++
systemvm/test/python/TestCsHelper.py | 17 +++++++++++++++++
systemvm/test/python/TestCsInterface.py | 17 +++++++++++++++++
systemvm/test/python/TestCsNetfilter.py | 17 +++++++++++++++++
systemvm/test/python/TestCsProcess.py | 17 +++++++++++++++++
systemvm/test/python/TestCsRedundant.py | 17 +++++++++++++++++
systemvm/test/python/TestCsRoute.py | 17 +++++++++++++++++
systemvm/test/python/TestCsRule.py | 17 +++++++++++++++++
systemvm/test/python/runtests.sh | 16 ++++++++++++++++
tools/vagrant/devcloud/Vagrantfile | 17 +++++++++++++++++
23 files changed, 375 insertions(+)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 652c1d6..f0980fd 100644
--- a/pom.xml
+++ b/pom.xml
@@ -741,6 +741,7 @@
<exclude>**/*.zip</exclude>
<exclude>**/target/**</exclude>
<exclude>**/.vagrant</exclude>
+ <exclude>**/*.json</exclude>
<exclude>awsapi/overlays/**</exclude>
<exclude>build/build.number</exclude>
<exclude>services/console-proxy/server/js/jquery.js</exclude>
@@ -764,6 +765,10 @@
<exclude>services/console-proxy/server/conf/environment.properties</exclude>
<exclude>services/secondary-storage/conf/agent.properties</exclude>
<exclude>services/secondary-storage/conf/environment.properties</exclude>
+ <exclude>test/systemvm/README.md</exclude>
+ <exclude>tools/appliance/.ruby-version</exclude>
+ <exclude>tools/vagrant/systemvm/vagrant.pub</exclude>
+ <exclude>tools/vagrant/systemvm/.ruby-version</exclude>
<exclude>tools/devcloud/basebuild/puppet-devcloudinitial/files/network.conf</exclude>
<exclude>tools/appliance/definitions/devcloud/*</exclude>
<exclude>tools/appliance/definitions/systemvmtemplate/*</exclude>
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/patches/debian/config/etc/chef/solo.rb
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/etc/chef/solo.rb b/systemvm/patches/debian/config/etc/chef/solo.rb
index c7cc01d..3207dd1 100644
--- a/systemvm/patches/debian/config/etc/chef/solo.rb
+++ b/systemvm/patches/debian/config/etc/chef/solo.rb
@@ -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.
+
data_bags_path "/var/chef/data_bags"
cookbook_path "/var/chef/cookbooks"
log_level :debug
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
index 4b50f9b..b5ea189 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/checkrouter.sh
@@ -1,4 +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.
STATUS=$(cat /etc/cloudstack/cmdline.json | grep redundant_state | awk '{print $2;}' | sed -e 's/[,\"]//g')
if [ "$?" -ne "0" ]
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/patches/debian/config/opt/cloud/bin/ian.py
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/ian.py b/systemvm/patches/debian/config/opt/cloud/bin/ian.py
index 17cc466..186c594 100644
--- a/systemvm/patches/debian/config/opt/cloud/bin/ian.py
+++ b/systemvm/patches/debian/config/opt/cloud/bin/ian.py
@@ -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.
+
from cs.CsGuestNetwork import CsGuestNetwork
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/patches/debian/config/opt/cloud/bin/test.sh
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/bin/test.sh b/systemvm/patches/debian/config/opt/cloud/bin/test.sh
index 347ba52..0ffd4e5 100755
--- a/systemvm/patches/debian/config/opt/cloud/bin/test.sh
+++ b/systemvm/patches/debian/config/opt/cloud/bin/test.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.
cp /opt/cloud/testdata/* /etc/cloudstack
/opt/cloud/bin/update_config.py cmd_line.json
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/patches/debian/config/opt/cloud/templates/conntrackd.conf.templ
----------------------------------------------------------------------
diff --git a/systemvm/patches/debian/config/opt/cloud/templates/conntrackd.conf.templ b/systemvm/patches/debian/config/opt/cloud/templates/conntrackd.conf.templ
index 091de10..40f92a0 100644
--- a/systemvm/patches/debian/config/opt/cloud/templates/conntrackd.conf.templ
+++ b/systemvm/patches/debian/config/opt/cloud/templates/conntrackd.conf.templ
@@ -1,3 +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.
#
# Synchronizer settings
#
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsAddress.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsAddress.py b/systemvm/test/python/TestCsAddress.py
index 01017c6..15e4e14 100644
--- a/systemvm/test/python/TestCsAddress.py
+++ b/systemvm/test/python/TestCsAddress.py
@@ -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.
+
import unittest
from cs.CsAddress import CsAddress
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsApp.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsApp.py b/systemvm/test/python/TestCsApp.py
index 656af44..c5ea7a1 100644
--- a/systemvm/test/python/TestCsApp.py
+++ b/systemvm/test/python/TestCsApp.py
@@ -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.
+
import unittest
from cs.CsApp import CsApp
from cs.CsAddress import CsIP
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsCmdLine.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsCmdLine.py b/systemvm/test/python/TestCsCmdLine.py
index 87d0471..594ccd9 100644
--- a/systemvm/test/python/TestCsCmdLine.py
+++ b/systemvm/test/python/TestCsCmdLine.py
@@ -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.
+
import unittest
from cs.CsDatabag import CsCmdLine
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsConfig.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsConfig.py b/systemvm/test/python/TestCsConfig.py
index 3f552ed..c24700e 100644
--- a/systemvm/test/python/TestCsConfig.py
+++ b/systemvm/test/python/TestCsConfig.py
@@ -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.
+
import unittest
from cs.CsConfig import CsConfig
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsDatabag.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsDatabag.py b/systemvm/test/python/TestCsDatabag.py
index 5d16ea9..bff4fe5 100644
--- a/systemvm/test/python/TestCsDatabag.py
+++ b/systemvm/test/python/TestCsDatabag.py
@@ -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.
+
import unittest
from cs.CsDatabag import CsDataBag
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsDhcp.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsDhcp.py b/systemvm/test/python/TestCsDhcp.py
index 6477ad5..348f078 100644
--- a/systemvm/test/python/TestCsDhcp.py
+++ b/systemvm/test/python/TestCsDhcp.py
@@ -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.
+
import unittest
import mock
from cs.CsDhcp import CsDhcp
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsFile.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsFile.py b/systemvm/test/python/TestCsFile.py
index eb2ea70..aeed8f2 100644
--- a/systemvm/test/python/TestCsFile.py
+++ b/systemvm/test/python/TestCsFile.py
@@ -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.
+
import unittest
from cs.CsFile import CsFile
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsGuestNetwork.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsGuestNetwork.py b/systemvm/test/python/TestCsGuestNetwork.py
index ba774b8..08a6b37 100644
--- a/systemvm/test/python/TestCsGuestNetwork.py
+++ b/systemvm/test/python/TestCsGuestNetwork.py
@@ -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.
+
import unittest
from cs.CsGuestNetwork import CsGuestNetwork
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsHelper.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsHelper.py b/systemvm/test/python/TestCsHelper.py
index 57f5d13..bae38e0 100644
--- a/systemvm/test/python/TestCsHelper.py
+++ b/systemvm/test/python/TestCsHelper.py
@@ -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.
+
import unittest
import mock
from cs import CsHelper
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsInterface.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsInterface.py b/systemvm/test/python/TestCsInterface.py
index faa088d..7c73c5c 100644
--- a/systemvm/test/python/TestCsInterface.py
+++ b/systemvm/test/python/TestCsInterface.py
@@ -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.
+
import unittest
from cs.CsAddress import CsInterface
from cs.CsConfig import CsConfig
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsNetfilter.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsNetfilter.py b/systemvm/test/python/TestCsNetfilter.py
index 9a6846c..a64140d 100644
--- a/systemvm/test/python/TestCsNetfilter.py
+++ b/systemvm/test/python/TestCsNetfilter.py
@@ -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.
+
import unittest
from cs.CsNetfilter import CsNetfilter
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsProcess.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsProcess.py b/systemvm/test/python/TestCsProcess.py
index 2b701c7..78449ed 100644
--- a/systemvm/test/python/TestCsProcess.py
+++ b/systemvm/test/python/TestCsProcess.py
@@ -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.
+
import unittest
from cs.CsProcess import CsProcess
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsRedundant.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsRedundant.py b/systemvm/test/python/TestCsRedundant.py
index b1573c8..1283d3d 100644
--- a/systemvm/test/python/TestCsRedundant.py
+++ b/systemvm/test/python/TestCsRedundant.py
@@ -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.
+
import unittest
from cs.CsRedundant import CsRedundant
from cs.CsConfig import CsConfig
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsRoute.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsRoute.py b/systemvm/test/python/TestCsRoute.py
index 1c9f8a3..dc464d5 100644
--- a/systemvm/test/python/TestCsRoute.py
+++ b/systemvm/test/python/TestCsRoute.py
@@ -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.
+
import unittest
from cs.CsRoute import CsRoute
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/TestCsRule.py
----------------------------------------------------------------------
diff --git a/systemvm/test/python/TestCsRule.py b/systemvm/test/python/TestCsRule.py
index b84896d..f8b6fae 100644
--- a/systemvm/test/python/TestCsRule.py
+++ b/systemvm/test/python/TestCsRule.py
@@ -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.
+
import unittest
from cs.CsRule import CsRule
import merge
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/systemvm/test/python/runtests.sh
----------------------------------------------------------------------
diff --git a/systemvm/test/python/runtests.sh b/systemvm/test/python/runtests.sh
index 0442e4c..8ecdb3d 100644
--- a/systemvm/test/python/runtests.sh
+++ b/systemvm/test/python/runtests.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.
# requires netaddr
http://git-wip-us.apache.org/repos/asf/cloudstack/blob/b011c9ba/tools/vagrant/devcloud/Vagrantfile
----------------------------------------------------------------------
diff --git a/tools/vagrant/devcloud/Vagrantfile b/tools/vagrant/devcloud/Vagrantfile
index f23deeb..ca99fee 100644
--- a/tools/vagrant/devcloud/Vagrantfile
+++ b/tools/vagrant/devcloud/Vagrantfile
@@ -1,4 +1,21 @@
# -*- mode: ruby -*-
+# 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.
+#
# vi: set ft=ruby :
# Vagrantfile API/syntax version. Don't touch unless you know what you're doing!