diff --git a/conpaas/sql/src/conpaassql-manager-gui/MANIFEST.in b/MANIFEST.in similarity index 100% rename from conpaas/sql/src/conpaassql-manager-gui/MANIFEST.in rename to MANIFEST.in diff --git a/README b/README deleted file mode 100644 index 378653b630bf60931f723b619d4cebabba1c7bb8..0000000000000000000000000000000000000000 --- a/README +++ /dev/null @@ -1,12 +0,0 @@ -Contrail -======== - -Contrail is a complete Cloud platform which integrates a full Infrastructure-as-a-Service and Platform-as-a-Service facilities. It allows Cloud providers to seamlessly integrate resources from other Clouds with their own infrastructure, and breaks the current customer lock-in situation by allowing live application migration from one cloud to another. - -Documentation (and detailed installation instructions) can be found online in the [Contrail Wiki](http://contrail.ow2.org). - - -License -------- - -See LICENSE files in the directory common/licenses. diff --git a/conpaas/sql/src/conpaassql-manager-gui/README.rst b/README.rst similarity index 100% rename from conpaas/sql/src/conpaassql-manager-gui/README.rst rename to README.rst diff --git a/common/contegrator/.project b/common/contegrator/.project deleted file mode 100644 index 94a49c3dd92bbc86e168b8475bd1e848c89bf359..0000000000000000000000000000000000000000 --- a/common/contegrator/.project +++ /dev/null @@ -1,17 +0,0 @@ - - - contegrator - - - - - - org.python.pydev.PyDevBuilder - - - - - - org.python.pydev.pythonNature - - diff --git a/common/contegrator/.pydevproject b/common/contegrator/.pydevproject deleted file mode 100644 index fbaa0b2d75abff9272263775c41beac07f06a3bd..0000000000000000000000000000000000000000 --- a/common/contegrator/.pydevproject +++ /dev/null @@ -1,10 +0,0 @@ - - - - -Python 2.7 -python 2.7 - -/contegrator/src - - diff --git a/common/contegrator/example/conpaas-frontend/README.txt b/common/contegrator/example/conpaas-frontend/README.txt deleted file mode 100644 index 7e4a34c5364bb4da6b49d19e355c8f6bfe998bab..0000000000000000000000000000000000000000 --- a/common/contegrator/example/conpaas-frontend/README.txt +++ /dev/null @@ -1,55 +0,0 @@ -1. install mysql - -2. replace /etc/init/mysql.conf with: ----- -# MySQL Service - -description "MySQL Server" -author "Mario Limonciello " - -start on (net-device-up - and local-filesystems - and runlevel [2345]) -stop on runlevel [016] - -respawn - -env HOME=/etc/mysql -umask 007 - -# The default of 5 seconds is too low for mysql which needs to flush buffers -kill timeout 300 - -pre-start script - #Sanity checks - [ -r $HOME/my.cnf ] - [ -d /var/run/mysqld ] || install -m 755 -o mysql -g root -d /var/run/mysqld - # Load AppArmor profile - if aa-status --enabled 2>/dev/null; then - apparmor_parser -r /etc/apparmor.d/usr.sbin.mysqld || true - fi - #commented out below to make this work on a rootfs system - #LC_ALL=C BLOCKSIZE= df --portability /var/lib/mysql/. | tail -n 1 | awk '{ exit ($4<4096) }' -end script - -exec /usr/sbin/mysqld - -post-start script - for i in `seq 1 30` ; do - /usr/bin/mysqladmin --defaults-file="${HOME}"/debian.cnf ping && { - exec "${HOME}"/debian-start - # should not reach this line - exit 2 - } - sleep 1 - done - exit 1 -end script ----- -(commenting out LC_ALL= ... ; optionally, just remove that line with a script) - -3. run sql (needs running mysql instance, so needs to be done in test script): - -root@one-conpaas:~# mysql -u root -e "create database conpaas_test character set = 'utf8';" -root@one-conpaas:~# mysql -u root -e "grant all on conpaas_test.* to 'test'@'localhost' identified by 'test';" - diff --git a/common/contegrator/example/conpaas-frontend/nodes/head/config/conpaas-conf.tar.gz b/common/contegrator/example/conpaas-frontend/nodes/head/config/conpaas-conf.tar.gz deleted file mode 100644 index 2fcabdda56559577160b2892eb9f449ebfe5634e..0000000000000000000000000000000000000000 Binary files a/common/contegrator/example/conpaas-frontend/nodes/head/config/conpaas-conf.tar.gz and /dev/null differ diff --git a/common/contegrator/example/conpaas-frontend/nodes/head/config/conpaas-db-script.tar.gz b/common/contegrator/example/conpaas-frontend/nodes/head/config/conpaas-db-script.tar.gz deleted file mode 100644 index 2d2f2d711ce0cac43f88d6cd5b8339a64774f314..0000000000000000000000000000000000000000 Binary files a/common/contegrator/example/conpaas-frontend/nodes/head/config/conpaas-db-script.tar.gz and /dev/null differ diff --git a/common/contegrator/example/conpaas-frontend/nodes/head/config/mysql-upstart-rootfs-fix.tar.gz b/common/contegrator/example/conpaas-frontend/nodes/head/config/mysql-upstart-rootfs-fix.tar.gz deleted file mode 100644 index 069d353055cdef4551b18b1e0250f0806e81d6de..0000000000000000000000000000000000000000 Binary files a/common/contegrator/example/conpaas-frontend/nodes/head/config/mysql-upstart-rootfs-fix.tar.gz and /dev/null differ diff --git a/common/contegrator/example/conpaas-frontend/nodes/head/install.xml b/common/contegrator/example/conpaas-frontend/nodes/head/install.xml deleted file mode 100644 index 14769f21f04d751769c6e11e8feea92b3c01ba2b..0000000000000000000000000000000000000000 --- a/common/contegrator/example/conpaas-frontend/nodes/head/install.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - php5-cli - php-pear - php5-mysql - - diff --git a/common/contegrator/example/conpaas-frontend/nodes/head/scripts/fix-scripts.sh b/common/contegrator/example/conpaas-frontend/nodes/head/scripts/fix-scripts.sh deleted file mode 100755 index 6ea7cb6e9c636e933a2783dfba82631e80fc70f9..0000000000000000000000000000000000000000 --- a/common/contegrator/example/conpaas-frontend/nodes/head/scripts/fix-scripts.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -rm -f /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh -rm -f /var/lib/one/remotes/im/kvm.d/freespace.sh diff --git a/common/contegrator/example/conpaas-frontend/nodes/head/scripts/pear-install.sh b/common/contegrator/example/conpaas-frontend/nodes/head/scripts/pear-install.sh deleted file mode 100755 index de7a586b053fc1b668299b8e2459c6a26a14e877..0000000000000000000000000000000000000000 --- a/common/contegrator/example/conpaas-frontend/nodes/head/scripts/pear-install.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -pear config-set auto_discover 1 -pear install PHPUnit diff --git a/common/contegrator/example/conpaas-frontend/test/01_install.py b/common/contegrator/example/conpaas-frontend/test/01_install.py deleted file mode 100644 index 11a42dd22f7cc00ea62936ddcab3a47f56ee7582..0000000000000000000000000000000000000000 --- a/common/contegrator/example/conpaas-frontend/test/01_install.py +++ /dev/null @@ -1,18 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to -# host names -# - ct_nodeman: a NodeManager instance that can be used to issue ssh commands -# to the nodes - -# instal mysql server, outside of chroot env -def test_01_install(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - try: - ct_nodeman.sshrun("root", head, "apt-get update") - ct_nodeman.sshrun("root", head, "DEBIAN_FRONTEND=noninteractive apt-get -q -y --force-yes install mysql-server ") - ct_nodeman.sshrun("root", head, "cp -f /etc/init/mysql.conf.conpaas-frontend /etc/init/mysql.conf") - ct_nodeman.sshrun("root", head, "service mysql stop") - ct_nodeman.sshrun("root", head, "service mysql start") - finally: - pass diff --git a/common/contegrator/example/conpaas-frontend/test/10_phpunit-frontend.py b/common/contegrator/example/conpaas-frontend/test/10_phpunit-frontend.py deleted file mode 100644 index 0db9b5b973e68bff5b05e6bc84acfdaa5fbae518..0000000000000000000000000000000000000000 --- a/common/contegrator/example/conpaas-frontend/test/10_phpunit-frontend.py +++ /dev/null @@ -1,16 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to -# host names -# - ct_nodeman: a NodeManager instance that can be used to issue ssh commands -# to the nodes - -def test_conpaas_frontend(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - try: - ct_nodeman.sshrun("root", head, "mysql -u root -e \"create database conpaas_test character set = 'utf8';\"") - ct_nodeman.sshrun("root", head, "mysql -u root -e \"grant all on conpaas_test.* to 'test'@'localhost' identified by 'test';\"") - ct_nodeman.sshrun("root", head, "mysql -u test --password=test - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - rpm - - - - - - diff --git a/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root-link b/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root-link deleted file mode 120000 index 93ca1422a8da0a9effc465eccbcb17e23015542d..0000000000000000000000000000000000000000 --- a/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root-link +++ /dev/null @@ -1 +0,0 @@ -root \ No newline at end of file diff --git a/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root/contegrator-test/test-1.sh b/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root/contegrator-test/test-1.sh deleted file mode 100755 index ec3f02ef929a1b44beb3913fe58d36b59ff6c4ae..0000000000000000000000000000000000000000 --- a/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root/contegrator-test/test-1.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -# exit on error -set -e -# echo cmd -set -x - -echo "Run some script" -ls -l /root -echo "Reached" -ls -l /root/asdlfahsdfhsdfhpoh -echo "Not reached" - - -# diff --git a/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root/contegrator-test/test-monitoring-head.sh b/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root/contegrator-test/test-monitoring-head.sh deleted file mode 100755 index cc5ae9a26582d47a5b63bacc8933b5f0a4117fda..0000000000000000000000000000000000000000 --- a/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root/contegrator-test/test-monitoring-head.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -# exit on error -set -e -# echo cmd -set -x - -echo "install java" -export DEBIAN_FRONTEND=noninteractive -apt-get update -apt-get -q -y --force-yes install sun-java6-jre - -echo "Run one-sensor jar file" -cd /var/lib/contrail/ -nohup java -jar /var/lib/contrail/one-monitor-0.2-SNAPSHOT-jar-with-dependencies.jar & -nohup java -jar /var/lib/contrail/one-sensor-0.2-SNAPSHOT-jar-with-dependencies.jar & - -# diff --git a/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root/contegrator-test/test-monitoring-worker.sh b/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root/contegrator-test/test-monitoring-worker.sh deleted file mode 100755 index b62e6b0eca49626b979ea37e9fae7429433ace09..0000000000000000000000000000000000000000 --- a/common/contegrator/example/contegrator-test/nodes/worker/scripts-post-boot/root/contegrator-test/test-monitoring-worker.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -# exit on error -set -e -# echo cmd -set -x - -echo "install java" -export DEBIAN_FRONTEND=noninteractive -apt-get update -apt-get -q -y --force-yes install sun-java6-jre - -echo "Run one-sensor jar file" -cd /var/lib/contrail/ -nohup java -jar /var/lib/contrail/one-sensor-0.2-SNAPSHOT-jar-with-dependencies.jar & - -# diff --git a/common/contegrator/example/contegrator-test/nodes/worker/scripts/fix-scripts.sh b/common/contegrator/example/contegrator-test/nodes/worker/scripts/fix-scripts.sh deleted file mode 100755 index 19a5450df733ff2dc5d110c8e8ff7c247a20c8e1..0000000000000000000000000000000000000000 --- a/common/contegrator/example/contegrator-test/nodes/worker/scripts/fix-scripts.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh diff --git a/common/contegrator/example/contegrator-test/nodes/worker/scripts/fix-test.sh b/common/contegrator/example/contegrator-test/nodes/worker/scripts/fix-test.sh deleted file mode 100755 index 60cb3ca3ec9a9c4837809fc57be1cfa517225794..0000000000000000000000000000000000000000 --- a/common/contegrator/example/contegrator-test/nodes/worker/scripts/fix-test.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh - -echo "VNFS_NAME = $VNFS_NAME" -HEAD_VNFS_NAME=`echo $VNFS_NAME | sed -e 's/worker$/head/'` -cp /etc/fstab /etc/fstab.orig -# sed -e "s/one-2.2-head-jc.aufs/$HEAD_VNFS_NAME/g" /etc/fstab -[ ! -z "$BASE_VNFS_NAME_head" ] && sed -e "s/$BASE_VNFS_NAME_head/$VNFS_NAME_head/g" /etc/fstab - -# Check env variables -set +e -echo "NODE_ID = $NODE_ID" -echo "HOST_NAME = $HOST_NAME" -echo "VNFS_NAME = $VNFS_NAME" -echo "BASE_VNFS_NAME = $BASE_VNFS_NAME" -# -echo "NODE_ID_worker = $NODE_ID_worker" -echo "HOST_NAME_worker = $HOST_NAME_worker" -echo "VNFS_NAME_worker = $VNFS_NAME_worker" -echo "BASE_VNFS_NAME_worker = $BASE_VNFS_NAME_worker" - - diff --git a/common/contegrator/example/contegrator-test/test/01_hello.py b/common/contegrator/example/contegrator-test/test/01_hello.py deleted file mode 100644 index 2e7a1b60a24eac7008cb6b0bb53720beb190d880..0000000000000000000000000000000000000000 --- a/common/contegrator/example/contegrator-test/test/01_hello.py +++ /dev/null @@ -1,21 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins - -def test_01_hello(ct_node_list, ct_nodeman): - worker = ct_node_list["worker"] - try: - ct_nodeman.testrun("root", worker, "date > /root/timestamp.txt") - ct_nodeman.testrun("root", worker, "/root/some-dir/test-2.sh || true") - except: - print "Test failed" - raise - finally: - pass - -# - diff --git a/common/contegrator/example/contegrator-test/test/98_archive.py b/common/contegrator/example/contegrator-test/test/98_archive.py deleted file mode 100644 index 7137268f9e19a03c39f452441cc66ca7b16d9bbc..0000000000000000000000000000000000000000 --- a/common/contegrator/example/contegrator-test/test/98_archive.py +++ /dev/null @@ -1,24 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -import subprocess - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_archive(ct_node_list, ct_nodeman): - global jenkins_archive - worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - try: - ct_nodeman.getfile(worker, "/var/log/syslog", "./archive/worker/syslog" ) - ct_nodeman.getfile(worker, "/root/timestamp.txt", "./archive/worker/" ) - ct_nodeman.getfile(worker, "/var/log/dmesg", "./archive/worker/" ) - except: - print "Test failed" - raise - finally: - pass - -# - diff --git a/common/contegrator/example/contegrator-test/test/99_wait.py b/common/contegrator/example/contegrator-test/test/99_wait.py deleted file mode 100644 index 8d7f167c057cdeb84365c48fd2a28c8c2d7110e3..0000000000000000000000000000000000000000 --- a/common/contegrator/example/contegrator-test/test/99_wait.py +++ /dev/null @@ -1,21 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_99_wait(ct_node_list, ct_nodeman): - worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - try: - ct_nodeman.testrun("root", worker, "/srv/contegrator-test/wait-before-shutdown.sh 1800") - # ct_nodeman.sshrun("root", worker, "/usr/bin/one-test-run.sh") - except: - print "Test failed" - raise - finally: - pass - -# - diff --git a/common/contegrator/example/contegrator-test/testbedconfig.py b/common/contegrator/example/contegrator-test/testbedconfig.py deleted file mode 100644 index 7b2a17f35b14899623d1d476ba456fbd5990a6f1..0000000000000000000000000000000000000000 --- a/common/contegrator/example/contegrator-test/testbedconfig.py +++ /dev/null @@ -1,30 +0,0 @@ -testbed_node_list = [ - "n0006", - "n0007" -] - -node_passwords = { - "root@n0004": "root", - "root@n0005": "root", - "root@n0006": "root", - "root@n0007": "root", -} - -node_ssh_keys = [ - "/var/lib/jenkins/.ssh/id_rsa_jenkins_perceus_xc1", -] - -ct_perceus_util_node = "perceus" -ct_perceus_util_user = "jenkins" - -# set to true if test nodes are set-up already and all you want to do -# is run the test code. useful for debugging to avoid lengthy staging -# of test nodes on each contegrator run. -ct_prestaged = False -#ct_prestaged = True -# if you set above to true, make sure you fix the map below, -# mapping node names (node dir names) to the corresponding hosts -ct_prestaged_nodes = { - "head": "n0007", - "worker": "n0007", -} diff --git a/common/contegrator/example/one-test/nodes/head/install.xml b/common/contegrator/example/one-test/nodes/head/install.xml deleted file mode 100644 index c461119a80b171dee8f0d7d46e10968415930921..0000000000000000000000000000000000000000 --- a/common/contegrator/example/one-test/nodes/head/install.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - openjdk-6-jre-headless - - diff --git a/common/contegrator/example/one-test/nodes/head/scripts/fix-scripts.sh b/common/contegrator/example/one-test/nodes/head/scripts/fix-scripts.sh deleted file mode 100755 index 6ea7cb6e9c636e933a2783dfba82631e80fc70f9..0000000000000000000000000000000000000000 --- a/common/contegrator/example/one-test/nodes/head/scripts/fix-scripts.sh +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -rm -f /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh -rm -f /var/lib/one/remotes/im/kvm.d/freespace.sh diff --git a/common/contegrator/example/one-test/nodes/worker/install.xml b/common/contegrator/example/one-test/nodes/worker/install.xml deleted file mode 100644 index b0f5eae01de65ef5e6d804ca2b5e7953df246f9e..0000000000000000000000000000000000000000 --- a/common/contegrator/example/one-test/nodes/worker/install.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - diff --git a/common/contegrator/example/one-test/nodes/worker/scripts/fix-nfs.sh b/common/contegrator/example/one-test/nodes/worker/scripts/fix-nfs.sh deleted file mode 100755 index 15731fe9728b2d99b0c36f957fb488d0b60dd78a..0000000000000000000000000000000000000000 --- a/common/contegrator/example/one-test/nodes/worker/scripts/fix-nfs.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh - -# required for ONE worker node -echo "VNFS_NAME = $VNFS_NAME" -cp /etc/fstab /etc/fstab.orig -[ ! -z "$BASE_VNFS_NAME_head" ] && sed -e "s/$BASE_VNFS_NAME_head/$VNFS_NAME_head/g" /etc/fstab - diff --git a/common/contegrator/example/one-test/test/stress.py b/common/contegrator/example/one-test/test/stress.py deleted file mode 100644 index ac009b857506f5c75201df104a02ea3c6ff05e16..0000000000000000000000000000000000000000 --- a/common/contegrator/example/one-test/test/stress.py +++ /dev/null @@ -1,21 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -def test_stress(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - worker = ct_node_list["worker"] - try: - ct_nodeman.sshrun("root", head, "sleep 30") - ct_nodeman.sshrun("root", head, "service opennebula restart") - ct_nodeman.sshrun("root", head, "sleep 30") - # ct_nodeman.sshrun("root", head, "onehost delete " + head + " im_kvm vmm_kvm tm_nfs") - # ct_nodeman.sshrun("root", head, "onehost delete " + worker + " im_kvm vmm_kvm tm_nfs") - ct_nodeman.sshrun("root", head, "onehost create " + head + " im_kvm vmm_kvm tm_nfs") - ct_nodeman.sshrun("root", head, "onehost create " + worker + " im_kvm vmm_kvm tm_nfs") - ct_nodeman.sshrun("root", head, "onevnet publish 0") - ct_nodeman.sshrun("root", head, "/usr/bin/one-test-run.sh") - ct_nodeman.sshrun("root", head, "/srv/contegrator-test/wait-before-shutdown.sh 300") - finally: - pass diff --git a/common/contegrator/example/test-suite/nodes/node-1/config/config.tar.gz b/common/contegrator/example/test-suite/nodes/node-1/config/config.tar.gz deleted file mode 100644 index 7e0ab3e4d916148b364d7f2c1c27013c1af93403..0000000000000000000000000000000000000000 Binary files a/common/contegrator/example/test-suite/nodes/node-1/config/config.tar.gz and /dev/null differ diff --git a/common/contegrator/example/test-suite/nodes/node-1/install.xml b/common/contegrator/example/test-suite/nodes/node-1/install.xml deleted file mode 100644 index 035c75afb2a650a748618017073917ea332a682d..0000000000000000000000000000000000000000 --- a/common/contegrator/example/test-suite/nodes/node-1/install.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - fortunes - test.tar.gz - diff --git a/common/contegrator/example/test-suite/nodes/node-1/scripts/script.sh b/common/contegrator/example/test-suite/nodes/node-1/scripts/script.sh deleted file mode 100755 index 9dbc6522e66ecd0ab507575f924b257a6c1ad4b9..0000000000000000000000000000000000000000 --- a/common/contegrator/example/test-suite/nodes/node-1/scripts/script.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -touch /touched diff --git a/common/contegrator/example/test-suite/test/testcase-1.py b/common/contegrator/example/test-suite/test/testcase-1.py deleted file mode 100644 index b3da17d53444a5972b3fdec05853ad4933445797..0000000000000000000000000000000000000000 --- a/common/contegrator/example/test-suite/test/testcase-1.py +++ /dev/null @@ -1,8 +0,0 @@ - - -def test_1(): - print "I will pass." - -def test_2(): - print "I will fail." - raise Exception() diff --git a/common/contegrator/example/test-suite/test/testcase-2.py b/common/contegrator/example/test-suite/test/testcase-2.py deleted file mode 100644 index 765983f0d3774832bcb8ea51612731eb38d28d8a..0000000000000000000000000000000000000000 --- a/common/contegrator/example/test-suite/test/testcase-2.py +++ /dev/null @@ -1,6 +0,0 @@ -def test_A(): - print "I'm a failure as well." - raise ValueError() - -def not_a_test(): - print "I shouldn't be executing." diff --git a/common/contegrator/src/contegrator.py b/common/contegrator/src/contegrator.py deleted file mode 100644 index dc72c0176abea567fe6f79a3bdc1234549472695..0000000000000000000000000000000000000000 --- a/common/contegrator/src/contegrator.py +++ /dev/null @@ -1,191 +0,0 @@ -''' -contegrator.py - -integration test driver for Contrail -- manage VNFS capsules for test machines -- provision and boot test machines via perceus -- run test cases - -@author: jaka -''' - -import sys -import logging -import os -import types -import traceback -import argparse - -from image.imager import Imager -from nodes.nodeman import NodeMan, Node, ResourceError - -from testbedconfig import testbed_node_list, ct_prestaged, ct_prestaged_nodes - -usage = "contegrator " - -ct_node_list = {} -ct_nodeman = None -tc_fail_total = -1 -tc_failed_name = [] - -def prepare_nodes(release_tag, nodes_dir, test_dir, vnfsname_tag): - global ct_node_list, ct_nodeman - print "Preparing images for release ", release_tag - print "from configuration directory", nodes_dir - - imager = Imager(release_tag, nodes_dir, vnfsname_tag, testbed_node_list) - images = imager.prepare_nodes(ct_prestaged) - if images == None: - return False, images, imager - for image in images: - print "Node '", image, "' image name", images[image].image_name, "image type", images[image].get_image_type() - print "Images prepared (stage 1)." - - - print "Acquiring physical nodes and preparing images (stage 2)" - nodeman = NodeMan(testbed_node_list) - ct_nodeman = nodeman - if not ct_prestaged: - try: - nodes = {} - for image in images: - nodes[image] = nodeman.add_phy_node(image, images[image].image_name) - - images = imager.prepare_nodes_run_scripts(images, nodes, ct_prestaged) - if images == None: - return False, images, imager - for image in images: - print "Node '", image, "' image name", images[image].image_name, "image type", images[image].get_image_type(), "run_script" - print "Images prepared (stage 2)." - - print "Booting images ..." - for image in nodes: - node = nodes[image] - nodeman.reboot_phy_node(node) - ct_node_list[image] = node.get_host_name() - if nodeman.wait_for_phy_nodes(10, 30): - print "Nodes booted." - else: - print "Error: nodes not booted in time." - imager.purge_nodes(images, ct_prestaged) - images = {} - return False, images, imager - except ResourceError as ex: - logging.exception("Failed to add physical node.") - print "No more physical nodes to work with." - imager.purge_nodes(images, ct_prestaged) - images = {} - return False, images, imager - except Exception as ex: - logging.exception(ex) - imager.purge_nodes(images, ct_prestaged) - images = {} - return False, images, imager - else: - ct_node_list = ct_prestaged_nodes - - for node in ct_node_list: - print "Node", node, "running on host", ct_node_list[node] - - print "Nodes are up and running." - return True, images, imager - -def run_tests(): - global tc_fail_total - global tc_failed_name - tc_fail_total = 0 - # at this point, test scripts have hostnames of nodes (named after their respective directories) - # readily available in dict ct_node_list, key is node name (aka node dir name), value is - # host name - - # NOTE: we currently only support test cases coded in python - tmp_test_cases = os.listdir(test_dir) - test_cases = [] - for tc in tmp_test_cases: - if tc.endswith(".py"): - tc = tc.replace(".py", "") - test_cases.append(tc) - sys.path.insert(0, test_dir) - test_cases.sort() - for tc in test_cases: - print "Executing test module:", tc - # import test case as a module - tc_pass = 0 - tc_fail = 0 - tc_total = 0 - try: - tc_mod = __import__(tc, globals(), locals(), ['*']) - except: - print "Test case __import__", tc, "failed." - traceback.print_exc(None, sys.stdout) - tc_fail += 1 - tc_total += 1 - continue - fnc_names = dir(tc_mod) - fnc_names.sort() - for i in fnc_names: - if i.startswith("test_"): - f = tc_mod.__dict__.get(i) - if isinstance(f, types.FunctionType): - tc_name = tc + "." + i - print "Running test case", tc_name - tc_total += 1 - try: - f(ct_node_list, ct_nodeman) - print "Test case", tc_name, "passed." - tc_pass += 1 - except: - print "Test case", tc_name, "failed." - traceback.print_exc(None, sys.stdout) - tc_fail += 1 - tc_fail_total += 1 - tc_failed_name.append(tc_name) - print "Passed / Failed / Total:", tc_pass, "/", tc_fail, "/", tc_total - - - -if __name__ == '__main__': - # takes three arguments: - # 1. release tag to test (should equal the tag used by bamboo to - # store binary packages) - # 2. path to test suite dir (containing path to nodes and test directories) - # 3. vnfsname tag (job name), to generate unique/sefl-describing VNFS names - parser = argparse.ArgumentParser(description="Contegrator integration test") - parser.add_argument("release_tag", type=str, help="release tag") - parser.add_argument("testsuite_dir", type=str, help="path to test suite") - parser.add_argument("vnfsname_tag", type=str, help="vnfsname tag (job name)") - parser.add_argument("--leave-nodes-alive", dest='leave_nodes_alive', action="store_true", - help = "Do not shutdown nodes when done" ) - args = parser.parse_args() - print args - - release_tag = args.release_tag - nodes_dir = os.path.join(args.testsuite_dir, "nodes") - test_dir = os.path.join(args.testsuite_dir, "test") - vnfsname_tag = args.vnfsname_tag - - logging.basicConfig(level = logging.DEBUG) - - logging.debug("contegrator starting.") - status, images, imager = prepare_nodes(release_tag, nodes_dir, test_dir, vnfsname_tag) - - if status: - run_tests() - - if not ct_prestaged and not args.leave_nodes_alive: - # finally, shut down nodes and purge test vnfses - print "Shutting nodes down ..." - ct_nodeman.shutdown_phy_nodes_halt() - print "Nodes shut down." - print "Purging test VNFS capsules ..." - imager.purge_nodes(images, ct_prestaged) - print "VNFS capsules purged." - else: - print "Leaving nodes alive..." - - print "Have a nice day." - if tc_fail_total != 0: - print "Failed test case count: ", tc_fail_total - for tc_name in tc_failed_name: - print " " + tc_name - sys.exit(1) diff --git a/common/contegrator/src/image/imagedef.py b/common/contegrator/src/image/imagedef.py deleted file mode 100644 index fee010e2dc4c53490a24c125016cf1fd4a88c17a..0000000000000000000000000000000000000000 --- a/common/contegrator/src/image/imagedef.py +++ /dev/null @@ -1,196 +0,0 @@ -''' -Created on Aug 30, 2011 - -@author: jaka -''' - -from xml.etree import ElementTree - -import logging -import string -import tempfile -import urllib -import shutil - -class ImageDefError(Exception): - def __init__(self, msg): - self._msg = msg - - def get_error_message(self): - return self._msg - -class ImageDef(object): - ''' - Example image definition XML: - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - upstream-package-name-1 - upstream-package-name-2 - upstream-package-name-3 - contrail-package-name-1 - contrail-package-name-2 - - ''' - - TAG_NODE = "node" - TAG_UPSTREAM = "upstream" - TAG_CONTRAIL = "contrail" - TAG_TARGZ = "targz" - - ATTR_TYPE = "type" - ATTR_BASE = "base" - # OW2/bamboo/nexus repository. - ATTR_REPO = "repository_contrail" - # repo for manually prepared tar.gz. Should contain dir structure /var/lib/... - ATTR_REPO_TARGZ = "repository_targz" - - IMAGE_TYPE_VNFS = "vnfs" - IMAGE_TYPE_VM = "vm" - - def __init__(self): - ''' - Constructor - ''' - self.syspackages = [] - self.ctrpackages = [] - self.tgzpackages = [] - self.repo = None - self.repo_targz = "" - self.type = None - self.base = None - self._release_tag = None - # imager add this - self.image_name = "" - self.mount_path = "" - - def _init_from_elem(self, root, release_tag): - self._release_tag = release_tag - logging.debug("Parsing image definition") - if root.tag != ImageDef.TAG_NODE: - raise ImageDefError("Root element is not " + ImageDef.TAG_NODE) - if not ( ImageDef.ATTR_TYPE in root.attrib and - ImageDef.ATTR_BASE in root.attrib and - ImageDef.ATTR_REPO in root.attrib ): - raise ImageDefError("Node must specify type, base image and repository URL") - self.repo = root.get(ImageDef.ATTR_REPO) - self.repo_targz = root.get(ImageDef.ATTR_REPO_TARGZ) - if self.repo_targz == None: - self.repo_targz = "" # to avoid exceptions - self.base = root.get(ImageDef.ATTR_BASE) - self.type = root.get(ImageDef.ATTR_TYPE) - for pkg in root.getiterator(ImageDef.TAG_UPSTREAM): - self.syspackages.append(string.strip(pkg.text)) - for pkg in root.getiterator(ImageDef.TAG_CONTRAIL): - element = {} - element['path2'] = string.strip(pkg.get("path")) - element['file1'] = string.strip(pkg.get("file")) - element['release_tag'] = string.strip(pkg.get("release_tag") or self._release_tag) - self.ctrpackages.append(element) - for pkg in root.getiterator(ImageDef.TAG_TARGZ): - element = {} - element['path2'] = string.strip(pkg.get("path")) - element['filename'] = string.strip(pkg.get("file")) - element['release_tag'] = string.strip(pkg.get("release_tag") or self._release_tag) - self.tgzpackages.append(element) - if self.tgzpackages and self.repo_targz == "": - raise ImageDefError("Node must specify tar.gz repository") - self._init_contrail_filenames() - - # download xml from nexus, find latest .tar.gz - # save filename relative to repo/release_tag/ - # tag: bamboo tag, like "0.2-SNAPSHOT" - def _init_contrail_filenames(self): - xml_dir = tempfile.mkdtemp(".tmp", "contrail-xml-") - logging.debug("Fetching XML files to " + xml_dir ) - for pkg in self.ctrpackages: - try: - xml_url = self.repo + "/" + pkg["path2"] + "/" + pkg["release_tag"] - local_xml_path = xml_dir + "/" + pkg["file1"] + ".xml" - logging.debug(" Fetching " + xml_url + " to file " + local_xml_path) - (fname, headers) = urllib.urlretrieve(xml_url, local_xml_path) - filename = self._parse_nexus_xml(local_xml_path, pkg["file1"]) - pkg["filename"] = filename - except: - logging.exception("Failed to retrieve XML for Contrail package: " + pkg["file1"]) - shutil.rmtree(xml_dir) - return None - shutil.rmtree(xml_dir) - - # search for latest .tar.gz, starting with filter. - def _parse_nexus_xml(self, xml_path, filter): - tree = ElementTree.parse(xml_path) - root = tree.getroot() - logging.debug("Parsing Nexus XML: " + xml_path) - if root.tag != "content": - raise ImageDefError("Nexus XML, root element is not content") - data = root.find("data") - latest_content = None - latest_content_date = "1970-01-01 00:00:00.0 GMT" - for content in data.iter("content-item"): - #print content.find("lastModified").text - text = content.find("text").text - last_modified = content.find("lastModified").text - # filter - if text[-7:] != '.tar.gz': - continue - if text.find(filter) != 0: - continue - # OK, tar.gz with correct filename - if last_modified > latest_content_date: - latest_content_date = last_modified - latest_content = content - filename = latest_content.find("text").text - logging.debug("LastModified filename: " + filename) - return filename - - def parse_string(self, deftext, release_tag): - root = ElementTree.fromstring(deftext) - self._init_from_elem(root.getroot(), release_tag) - - def parse_file(self, path, release_tag): - root = ElementTree.parse(path) - self._init_from_elem(root.getroot(), release_tag) - - def get_sys_packages(self): - return self.syspackages - - # return only filenames - def get_contrail_packages(self): - ctrpackages_filename = [] - for pkg in self.ctrpackages: - ctrpackages_filename.append(pkg["filename"]) - return ctrpackages_filename - - # return full URL - def get_contrail_packages_url(self): - ctrpackages_url = [] - for pkg in self.ctrpackages: - url = self.repo + "/" + pkg["path2"] + "/" + pkg["release_tag"] + "/" + pkg["filename"] - ctrpackages_url.append(url) - return ctrpackages_url - - # return only filenames - def get_targz_packages(self): - tgzpackages_filename = [] - for pkg in self.tgzpackages: - tgzpackages_filename.append(pkg["filename"]) - return tgzpackages_filename - - # return full URL - def get_targz_packages_url(self): - tgzpackages_url = [] - for pkg in self.tgzpackages: - url = self.repo_targz + "/" + pkg["path2"] + "/" + pkg["release_tag"] + "/" + pkg["filename"] - tgzpackages_url.append(url) - return tgzpackages_url - - def get_repository(self): - return self.repo - - def get_image_type(self): - return self.type - - def get_base_image_name(self): - return self.base diff --git a/common/contegrator/src/image/imager.py b/common/contegrator/src/image/imager.py deleted file mode 100644 index bb78a2297643dc3a20bfb3f63d3b12b848c2e35c..0000000000000000000000000000000000000000 --- a/common/contegrator/src/image/imager.py +++ /dev/null @@ -1,390 +0,0 @@ -''' -Created on Aug 31, 2011 - -@author: jaka -''' - -from image.imagedef import ImageDef, ImageDefError -from perceus.perceus import Perceus -from image.installer import Installer - -import tempfile -import logging -import os -import shutil -import urllib -import subprocess - -usage = """ct-imager.py """ - -class Imager(object): - - VNFS_ID_FILE = "vnfs_id.txt" - VNFS_ID_PATH = "/" + VNFS_ID_FILE - - def __init__(self, release_tag, nodes_cfg_dir, vnfsname_tag, node_list = None): - self._release_tag = release_tag - self._vnfsname_tag = vnfsname_tag - self._nodes_cfg_dir = nodes_cfg_dir - self._perceus = Perceus(node_list) - self._images = [] - - def _get_test_vnfs_name(self, node_id): - return "test-vnfs-" + self._vnfsname_tag + "-" + self._release_tag + "-" + node_id - - # copy scripts-post-boot directory to new VNFS - def _copy_scripts_pb(self, scripts_pb_dir, mount_path, tmp_dir_rel, tmp_file): - tmp_dir_abs = mount_path + "/" + tmp_dir_rel - if os.path.isdir(scripts_pb_dir): - try: - # avoid directories, so that owner etc is not changed - cmd = "find " + scripts_pb_dir + " -type f" - file_list = subprocess.check_output(cmd, shell = True) - if len(file_list) == 0: - logging.info("No files in " + scripts_pb_dir) - else: - cmd = "cd " + scripts_pb_dir + " && tar cf " + tmp_dir_abs+"/"+tmp_file + " `find ./ -type f`" - logging.debug("tar copy-1 cmd: " + cmd) - subprocess.check_call(cmd, shell = True) - cmd = "sudo chroot " + mount_path + " tar xvf " + tmp_dir_rel+"/"+tmp_file - logging.debug("tar copy-2 cmd: " + cmd) - subprocess.check_call(cmd, shell = True) - except: - logging.exception("Failed to copy scripts-post-boot directory (" + scripts_pb_dir + " -> " + mount_path + ")") - return False - return True - - def _prepare_node_vnfs(self, imagedef, node_id): - node_cfg_dir = os.path.join(self._nodes_cfg_dir, node_id) - logging.debug("Preparing VNFS node: " + node_cfg_dir + "," + - self._release_tag + "," + node_id) - test_vnfs = self._get_test_vnfs_name(node_id) - # delete old VNFS if required - if self._perceus.exist_vnfs(test_vnfs): - logging.info("Old VNFS " + test_vnfs + " found, deleting...") - self._perceus.umount_vnfs(test_vnfs) - self._perceus.delete_vnfs(test_vnfs) - # clone VNFS - if not self._perceus.clone_vnfs(imagedef.get_base_image_name(), test_vnfs): - logging.error("Failed to clone test VNFS.") - return None - logging.debug("VNFS cloned to: " + test_vnfs) - mount_path = self._perceus.mount_vnfs(test_vnfs) - if mount_path is None: - logging.error("Failed to mount test VNFS.") - return None - logging.debug("VNFS mounted to: " + mount_path) - # fix fstab in case it sports NFS mounts - orig_fstab = os.path.join(mount_path, "etc", "fstab") - bak_fstab = os.path.join(mount_path, "etc", "fstab.bak") - cmd = "sudo chroot " + mount_path + " cp /etc/fstab /etc/fstab.bak" - subprocess.check_call(cmd, shell = True) - cmd = "sudo chroot " + mount_path + " chmod o+w /etc/fstab" - subprocess.check_call(cmd, shell = True) - with open(bak_fstab, "r") as bak_f: - with open(orig_fstab, "w") as orig_f: - line = bak_f.readline() - while(len(line) > 0): - if(line.find("nfs") != -1 and line.find(imagedef.get_base_image_name())): - line = line.replace(imagedef.get_base_image_name(), test_vnfs) - orig_f.write(line) - line = bak_f.readline() - cmd = "sudo chroot " + mount_path + " chmod o-w /etc/fstab" - subprocess.check_call(cmd, shell = True) - # install additional system packages - installer = Installer(mount_path) - if not installer.install(imagedef.get_sys_packages()): - logging.error("Failed to install system packages.") - return None - logging.debug("System packages installed.") - # create packages dir in chroot-ed image - tmp_dir_rel = "/var/tmp/contegrator" - tmp_dir_abs = mount_path + tmp_dir_rel - cmd = "mkdir -m 0777 " + tmp_dir_abs - subprocess.check_call(cmd, shell = True) - # fetch contrail packages - if len(imagedef.get_contrail_packages()) > 0: - pkg_dir = tempfile.mkdtemp(".tmp", "contrail", dir = mount_path + tmp_dir_rel) - pkg_dir_rel = os.path.relpath(pkg_dir, mount_path) - cmd = "sudo chroot " + mount_path + " chmod 0777 " + pkg_dir_rel - subprocess.check_call(cmd, shell = True) - logging.debug("Fetching contrail packages to " + pkg_dir + ": " + - " ".join(imagedef.get_contrail_packages()) + " ...") - local_pkg_paths_rel = [] - for pkg, pkg_url in zip(imagedef.get_contrail_packages(), imagedef.get_contrail_packages_url()): - try: - #pkg_url = imagedef.get_repository() + "/" + self._release_tag + "/" + pkg - local_pkg_path = pkg_dir + "/" + pkg - logging.debug("Fetching " + pkg_url + " to " + local_pkg_path) - (fname, headers) = urllib.urlretrieve(pkg_url, local_pkg_path) - local_pkg_paths_rel.append(os.path.relpath(fname, mount_path)) - logging.debug("Fetched package " + pkg_url + " to " + fname) - except: - logging.exception("Failed to retrieve Contrail package: " + pkg) - return None - logging.debug("Contrail packages fetched. Unpacking ...") - # install contrail packages - if not installer.unpack_bamboo(local_pkg_paths_rel): - logging.error("Failed to unpack Contrail packages.") - return None - logging.debug("Contrail packages unpacked.") - try: - pass # shutil.rmtree(pkg_dir) - except: - logging.exception("Failed to remove temporary package dir: " + pkg_dir) - else: - logging.debug("No contrail packages to fetch.") - - # fetch targz packages - if len(imagedef.get_targz_packages()) > 0: - pkg_dir = tempfile.mkdtemp(".tmp", "contrail-targz-", dir = mount_path + tmp_dir_rel) - pkg_dir_rel = os.path.relpath(pkg_dir, mount_path) - cmd = "sudo chroot " + mount_path + " chmod 0777 " + pkg_dir_rel - subprocess.check_call(cmd, shell = True) - logging.debug("Fetching targz packages to " + pkg_dir + ": " + - " ".join(imagedef.get_targz_packages()) + " ...") - local_pkg_paths_rel = [] - for pkg, pkg_url in zip(imagedef.get_targz_packages(), imagedef.get_targz_packages_url()): - try: - #pkg_url = imagedef.get_repository() + "/" + self._release_tag + "/" + pkg - local_pkg_path = pkg_dir + "/" + pkg - logging.debug("Fetching " + pkg_url + " to " + local_pkg_path) - (fname, headers) = urllib.urlretrieve(pkg_url, local_pkg_path) - local_pkg_paths_rel.append(os.path.relpath(fname, mount_path)) - logging.debug("Fetched package " + pkg_url + " to " + fname) - except: - logging.exception("Failed to retrieve targz package: " + pkg) - return None - logging.debug("Targz packages fetched. Unpacking ...") - # install targz packages - if not installer.unpack(local_pkg_paths_rel): - logging.error("Failed to unpack targz packages.") - return None - logging.debug("Targz packages unpacked.") - try: - pass # shutil.rmtree(pkg_dir) - except: - logging.exception("Failed to remove temporary package dir: " + pkg_dir) - else: - logging.debug("No contrail packages to fetch.") - - # unpack config files - cfg_dir = os.path.join(node_cfg_dir, "config") - if os.path.isdir(cfg_dir): - pkg_dir = tempfile.mkdtemp(".tmp", "config-", dir = mount_path + tmp_dir_rel) - pkg_dir_rel = os.path.relpath(pkg_dir, mount_path) - cmd = "sudo chroot " + mount_path + " chmod 0777 " + pkg_dir_rel - subprocess.check_call(cmd, shell = True) - tmp_cfg_files = os.listdir(cfg_dir) - cfg_files = [] - for f in tmp_cfg_files: - p = os.path.join(cfg_dir, f) - if not f.startswith(".") and f.endswith(".tar.gz") and os.path.isfile(p): - shutil.copyfile(p, os.path.join(pkg_dir, f)) - cfg_files.append(pkg_dir_rel + "/" + f) - if len(cfg_files) > 0: - logging.debug("Unpacking config files ...") - if not installer.unpack(cfg_files): - logging.error("Failed to unpack configuration tarballs.") - return None - logging.debug("Config files unpacked.") - else: - logging.debug("No config files to unpack.") - # copy scripts-post-boot directory - scripts_pb_dir = os.path.join("./", "scripts-post-boot") # jenkins env variable WORKSPACE == './' - self._copy_scripts_pb(scripts_pb_dir, mount_path, tmp_dir_rel, "scripts-pb-1.tar") - scripts_pb_dir = os.path.join(self._nodes_cfg_dir, "scripts-post-boot") - self._copy_scripts_pb(scripts_pb_dir, mount_path, tmp_dir_rel, "scripts-pb-2.tar") - scripts_pb_dir = os.path.join(node_cfg_dir, "scripts-post-boot") - self._copy_scripts_pb(scripts_pb_dir, mount_path, tmp_dir_rel, "scripts-pb-3.tar") - - # create a file used to identify the node once it comes up - cmd = "sudo chroot " + mount_path + ' /bin/sh -c "echo ' + test_vnfs + ' > /' + Imager.VNFS_ID_FILE + '"' - subprocess.check_call(cmd, shell = True) - # leave vnfs mounted - imagedef.image_name = test_vnfs - imagedef.mount_path = mount_path - return imagedef - - # for VNFS images only - def _prepare_node_run_scripts(self, node_id, rv, nodes, prestaged = False): - node_cfg_dir = os.path.join(self._nodes_cfg_dir, node_id) - imagedef = rv[node_id] - node = nodes[node_id] - installer = Installer(imagedef.mount_path) - # fix /etc/hostname - cmd = "sudo chroot " + imagedef.mount_path + ' /bin/sh -c "echo ' + node.get_host_name() + ' > /etc/hostname "' - subprocess.check_call(cmd, shell=True) - # execute scripts, chrooted - # TODO: what do we want to pass to these scripts via env var? - # some ideas: - # - original and cloned vnfs names - # But - sudo resets environment - env = {} - env.update({ 'NODE_ID': node_id }) - env.update({ 'HOST_NAME': node.get_host_name() }) - env.update({ 'VNFS_NAME': imagedef.image_name }) - env.update({ 'BASE_VNFS_NAME': imagedef.get_base_image_name() }) - # and for all other images - for image2 in rv: - imagedef2 = rv[image2] - node2 = nodes[image2] - env.update({ 'NODE_ID_' + image2: image2 }) - env.update({ 'HOST_NAME_' + image2: node2.get_host_name() }) - env.update({ 'VNFS_NAME_' + image2: imagedef2.image_name }) - env.update({ 'BASE_VNFS_NAME_' + image2: imagedef2.get_base_image_name() }) - # Write env to file, for scripts-post-boot - env_file_tmp = tempfile.mkstemp(".tmp", "env.sh-") - env_file_fd = env_file_tmp[0] - env_file_name = env_file_tmp[1] - # open(os.path.join(imagedef.mount_path, "root/contegrator-test/env.sh"), "w") - for key in env: - os.write(env_file_fd, key + "=" + str(env[key]) + "\n") - os.close(env_file_fd) - shutil.copyfile(env_file_name, os.path.join(imagedef.mount_path, "var/tmp/contegrator/env.sh")) - #cmd = "sudo chroot " + imagedef.mount_path + " cp /var/tmp/contegrator/env.sh /root/contegrator-test/env.sh" - #subprocess.check_call(cmd, shell=True) - cmd = "sudo chroot " + imagedef.mount_path + " cp /var/tmp/contegrator/env.sh /srv/contegrator-test/env.sh" - subprocess.check_call(cmd, shell=True) - # - scripts_dir = os.path.join(node_cfg_dir, "scripts") - if os.path.isdir(scripts_dir): - tmp_script_files = os.listdir(scripts_dir) - script_files = [] - for f in tmp_script_files: - p = os.path.join(scripts_dir, f) - if not f.startswith(".") and os.path.isfile(p): - script_files.append(f) - if len(script_files) > 0: - tmp_dir = tempfile.mkdtemp(".tmp", "contrail", - os.path.join(imagedef.mount_path, "tmp")) - logging.debug("Temporary scripts dir: " + tmp_dir) - (head, tail) = os.path.split(tmp_dir) - if len(tail) == 0: - (head, tail) = os.path.split(head) - chroot_tmp_dir = os.path.join("/tmp", tail) - logging.debug("Temporary scripts dir (chroot): " + chroot_tmp_dir) - for script in script_files: - try: - src_script_path = os.path.join(node_cfg_dir, "scripts", script) - dst_script_path = os.path.join(tmp_dir, script) - logging.debug("Copying script file " + src_script_path + " to " + dst_script_path) - shutil.copyfile(src_script_path, dst_script_path) - os.chmod(dst_script_path, 0755) - logging.debug("Copied script file to: " + dst_script_path) - except: - logging.exception("Failed to copy script: " + script) - return None - chroot_script_path = os.path.join(chroot_tmp_dir, script) - logging.debug("Executing script (in chroot): " + chroot_script_path) - if not installer.chroot([chroot_script_path], env): - logging.error("Failed to execute script: " + script) - return None - logging.debug("Executed.") - try: - shutil.rmtree(tmp_dir) - except: - logging.exception("Failed to remove temporary scripts dir: " + tmp_dir) - logging.debug("Scripts executed.") - else: - logging.debug("No scripts found.") - # umount VNFS - if not self._perceus.umount_vnfs(imagedef.image_name, force=True): - logging.error("Failed to unmount test VNFS.") - return None - logging.debug("VNFS unmounted") - return imagedef.image_name - - def _prepare_node(self, node_id, prestaged = False): - node_cfg_dir = os.path.join(self._nodes_cfg_dir, node_id) - logging.debug("Preparing node " + node_id + " for release " + - self._release_tag + " from config dir " + node_cfg_dir) - # 1. parse image XML - imagedef = ImageDef() - install_path = os.path.join(node_cfg_dir, "install.xml") - try: - logging.debug("Parsing install configuration file: " + install_path) - imagedef.parse_file(install_path, self._release_tag) - except ImageDefError as error: - logging.exception("Failed to parse node install file: " + - error.get_error_message()) - return None - except Exception as ex: - logging.exception("Failed to parse node install file.") - return None - if not prestaged: - if imagedef.get_image_type() == ImageDef.IMAGE_TYPE_VNFS: - if not prestaged: - return self._prepare_node_vnfs(imagedef, node_id) - else: - print "Unsupported image type:", imagedef.get_image_type() - return None - else: - imagedef.image_name = "__prestaged__" - return imagedef - - def _purge_vnfs(self, vnfs_name): - # we might be using this after error, thus we do not know in what state the vnfs is: - # thus unmount first (and silently fail if not mounted), then delete - # .nfs files can be problem, thus additional rm -fr - self._perceus.umount_vnfs(vnfs_name, force=True) - self._perceus.delete_vnfs(vnfs_name) - vnfs_dir = "/usr/var/lib/perceus/vnfs/" + vnfs_name - vnfs_mount = "/mnt/" + vnfs_name - if os.path.isdir(vnfs_dir) and len(vnfs_name) > 0: - logging.error("Directory " + vnfs_dir + " still exists, deleting manually") - subprocess.call("umount " + vnfs_dir + "/rootfs/proc || true", shell = True) - subprocess.call("[ -L " + vnfs_mount + " ] && rm -f " + vnfs_mount + " || true", shell = True) - subprocess.call("rm -fr " + vnfs_dir + " || true", shell = True) - - def prepare_nodes(self, prestaged = False): - nodes_list = os.listdir(self._nodes_cfg_dir) - rv = {} - for node in nodes_list: - p = os.path.join(self._nodes_cfg_dir, node) - if node.startswith(".") or not os.path.isdir(p): - continue -# (image_name, image_type, imagedef) = self._prepare_node(node, prestaged) - imagedef = self._prepare_node(node, prestaged) - if imagedef: # and imagedef.image_name is not "": - logging.info("Created node image " + node + " (" + - imagedef.image_name + " , " + imagedef.get_image_type() + ")") -# rv[node] = { "name": image_name, "type": image_type } - rv[node] = imagedef - else: - logging.error("Failed to create node image for node: " + node) - self.purge_nodes(rv, prestaged) - return None - return rv - - # run scripts in chroot environment - def prepare_nodes_run_scripts(self, rv, nodes, prestaged = False): - if prestaged: - return rv - for node_id in rv: - imagedef = rv[node_id] - node = nodes[node_id] - logging.info("Running config scripts for node: " + node_id) - ret = self._prepare_node_run_scripts(node_id, rv, nodes, prestaged) - if ret: - logging.info("Run config scripts for node - OK: " + node_id) - else: - logging.error("Failed to run config scripts for node: " + node_id) - self.purge_nodes(rv, prestaged) - return None - return rv - - def purge_nodes(self, rv, prestaged = False): - if prestaged: - return - if rv == None: - return - for node in rv: - imagedef = rv[node] - if imagedef.type == ImageDef.IMAGE_TYPE_VNFS: - self._purge_vnfs(imagedef.image_name) - elif imagedef.type == ImageDef.IMAGE_TYPE_VM: - # TODO: - pass - else: - logging.error("Unknown node image type: " + imagedef.get_image_type()) diff --git a/common/contegrator/src/image/installer.py b/common/contegrator/src/image/installer.py deleted file mode 100644 index b176670abff9e92530e29949bec9d20ca6692314..0000000000000000000000000000000000000000 --- a/common/contegrator/src/image/installer.py +++ /dev/null @@ -1,131 +0,0 @@ -''' -Created on Aug 30, 2011 - -@author: jaka -''' - -import subprocess -from subprocess import CalledProcessError - -import logging -import os -import shutil - -class Installer(object): - ''' - classdocs - ''' - - def __init__(self, mount_point): - ''' - Constructor - ''' - self._mount_point = mount_point - self._tar_cmd = "tar" - self._apt_cmd = "apt-get" - self._chroot_cmd = "chroot" - self._sudo_cmd = "sudo" - - def install(self, package_list): - logging.debug("Installing system packages: " + " ".join(package_list)) - if None is package_list or len(package_list) == 0: - return True - # first, update apt repo - arg_list = [self._sudo_cmd, self._chroot_cmd, self._mount_point, \ - self._apt_cmd, "-q", "-y", "--force-yes", "update"] - try: - subprocess.check_call(arg_list) - except CalledProcessError as error: - logging.exception("Failed to update VNFS apt repo: " + str(error.returncode)) - return False - except OSError as error: - logging.exception("Failed to update VNFS apt repo.") - return False - arg_list = [self._sudo_cmd, self._chroot_cmd, self._mount_point, \ - self._apt_cmd, "-q", "-y", "--force-yes", "install"] - arg_list.extend(package_list) - logging.debug("Install cmd: " + " ".join(arg_list)) - try: - new_env = os.environ.copy() - new_env['DEBIAN_FRONTEND'] = "noninteractive" - subprocess.check_call(arg_list, env = new_env) - except CalledProcessError as error: - logging.exception("Failed to install packages to VNFS: " + str(error.returncode)) - return False - except OSError as error: - logging.exception("Failed to install packages to VNFS.") - return False - return True - - # tarball_list - relative to chroot dir - def unpack(self, tarball_list): - for tarball in tarball_list: - try: - logging.debug(tarball + ":") - subprocess.check_call([self._sudo_cmd, self._chroot_cmd, self._mount_point, \ - self._tar_cmd, "xzvf", tarball, "-C", "/"]) - except CalledProcessError as error: - logging.exception("Failed to install packages to VNFS: " + str(error.returncode)) - return False - return True - - # tarball_list - relative to chroot dir - def unpack_bamboo(self, tarball_list): - pkg_dir = "/var/tmp/contegrator/bamboo" - pkg_dir_abs = self._mount_point + "/" + pkg_dir - subprocess.check_call([self._sudo_cmd, self._chroot_cmd, self._mount_point, "mkdir", pkg_dir]) - for tarball in tarball_list: - try: - logging.debug(tarball + ":") - arg_list = [self._sudo_cmd, self._chroot_cmd, self._mount_point, \ - self._tar_cmd, "xzvf", tarball, "-C", pkg_dir] - subprocess.check_call(arg_list) - except CalledProcessError as error: - logging.exception("Failed to install packages to VNFS: " + str(error.returncode)) - return False - for pkg_subdir_rel in os.listdir(pkg_dir_abs): - # abs path in chroot - pkg_subdir = os.path.join(pkg_dir, pkg_subdir_rel) - # abs path outside of chroot - pkg_subdir_abs = self._mount_point + "/" + pkg_subdir - if os.path.isdir(pkg_subdir_abs): - logging.debug("Tar/untar " + pkg_subdir_abs) - try: - arg_list = [self._sudo_cmd, self._chroot_cmd, self._mount_point, \ - self._tar_cmd, 'cf', pkg_dir+"/temp.tar", "-C", pkg_subdir, "./"] - subprocess.check_call(arg_list) - arg_list = [self._sudo_cmd, self._chroot_cmd, self._mount_point, \ - self._tar_cmd, 'xf', pkg_dir+"/temp.tar", "-C", "/"] - subprocess.check_call(arg_list) - except CalledProcessError as error: - logging.exception("Failed to install packages to VNFS (tar/untar): " + str(error.returncode)) - return False - else: - logging.debug("Skip " + pkg_subdir_abs) - continue - return True - - def chroot(self, cmd_args, env = {}): - arg_list = [self._sudo_cmd, self._chroot_cmd, self._mount_point] - arg_list.extend(cmd_args) - logging.debug("Chroot cmd: " + " ".join(arg_list)) - try: - new_env = os.environ.copy() - new_env.update(env) - subprocess.check_call(arg_list, env = new_env) - return True - except CalledProcessError as error: - logging.exception("Failed to execute chrooted script: " + str(error.returncode)) - return False - - def delete(self, local_path): - abs_path = os.path.join(self._mount_point, local_path) - arg_list = [self._sudo_cmd, self._chroot_cmd, self._mount_point, \ - "rm", "-fr", local_path] - logging.debug("Deleting " + abs_path) - try: - subprocess.check_call(arg_list) - return True - except: - logging.exception("Failed to remove " + abs_path) - return False diff --git a/common/contegrator/src/nodes/__init__.py b/common/contegrator/src/nodes/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/common/contegrator/src/nodes/nodeman.py b/common/contegrator/src/nodes/nodeman.py deleted file mode 100644 index 90b190413c8f92bed335b0ecf5c1bba5bc74483a..0000000000000000000000000000000000000000 --- a/common/contegrator/src/nodes/nodeman.py +++ /dev/null @@ -1,225 +0,0 @@ -''' -Created on Aug 31, 2011 - -@author: jaka -''' - -from perceus.perceus import Perceus -from image.imagedef import ImageDef -from image.imager import Imager - -from testbedconfig import node_passwords, ct_perceus_util_node, ct_perceus_util_user - -from fabric.api import env, get -from fabric.operations import run, _AttributeString - -import logging -import time -import subprocess - -class ResourceError(Exception): - def __init__(self, msg): - self._msg = msg - - def get_message(self): - return self._msg - - -class Node(object): - def __init__(self, **nodeparams): - self._name = nodeparams['name'] - self._host = nodeparams['host'] - self._image_name = nodeparams['image_name'] - self._image_type = nodeparams['image_type'] - - def get_name(self): - return self._name - - def get_host_name(self): - return self._host - - def get_image_name(self): - return self._image_name - - def get_image_type(self): - return self._image_type - - def __str__(self, *args, **kwargs): - return "(" + self._host + "," + self._image_type + ":" + self._image_name + ")" - - -class NodeMan(object): - def __init__(self, available_nodes = None, - perceus_util_cmd = "/srv/util/perceus-util.sh"): - self._perceus_util_cmd = perceus_util_cmd - self._perceus = Perceus(available_nodes) - self._phy_nodes = [] - - def setup_fabric_env(self): - env.shell = "/bin/bash -l -i -c" - env.passwords = node_passwords - env.warn_only = True - env.disable_known_hosts = True - - def _run_via_ssh(self, node, cmd, **kwargs): - args = { "user": "root", - "timeout": 30 } - args.update(kwargs) - self.setup_fabric_env() - env.host_string = args["user"] + "@" + node - cmd_str = " ".join(cmd) - logging.debug("Running [" + cmd_str + "] on " + env.host_string) - try: - rv = run(cmd_str) - except SystemExit as e: - rv = _AttributeString("") - rv.succeeded = False - rv.failed = True - rv.return_code = -1 - logging.debug("Success: " + str(rv.succeeded)) - logging.debug("Return code: " + str(rv.return_code)) - logging.debug("Output: " + rv) - return rv - - def sshrun(self, user, host, cmd): - self.setup_fabric_env() - env.host_string = user + "@" + host - try: - rv = run(cmd) - except SystemExit as e: - rv = _AttributeString("") - rv.succeeded = False - rv.failed = True - rv.return_code = -1 - logging.debug("Success: " + str(rv.succeeded)) - logging.debug("Return code: " + str(rv.return_code)) - logging.debug("Output: " + rv) - return rv - - def testrun(self, user, host, cmd): - rv = self.sshrun(user, host, cmd) - if rv.failed: - raise Exception("sshrun() failed") - return rv - - # Get (log) file with scp. - def getfile(self, node, src, dest): - args = { "user": "root", - "timeout": 30 } - self.setup_fabric_env() - env.host_string = args["user"] + "@" + node - try: - get(src, dest) - logging.info("File copied: " + node + ":" + src + " -> " + dest) - except: - logging.exception("Error: copy file " + node + ":" + src + " -> " + dest) - - def _log_cmd(self, cmd_list): - logging.debug("Command: " + " ".join(cmd_list)) - - def _ucmd(self, args): - cmd = ["sudo", self._perceus_util_cmd] - cmd.extend(args) - self._log_cmd(cmd) - return cmd - - def _pu_reboot_node(self, node): - try: - self.sshrun(ct_perceus_util_user, ct_perceus_util_node, - " ".join(self._ucmd(["node", "power", "of", node]))) - time.sleep(3) - self.sshrun(ct_perceus_util_user, ct_perceus_util_node, - " ".join(self._ucmd(["node", "power", "on", node]))) - time.sleep(3) - self.sshrun(ct_perceus_util_user, ct_perceus_util_node, - " ".join(self._ucmd(["node", "power", "wol", node]))) - return True - except Exception, e: - logging.exception("Failed to reboot node.") - return False - - def _pu_shutdown_node(self, node): - try: - self.sshrun(ct_perceus_util_user, ct_perceus_util_node, - " ".join(self._ucmd(["node", "power", "of", node]))) - return True - except Exception, e: - logging.exception("Failed to shutdown node.") - return False - - def add_phy_node(self, name, vnfs): - host = self._perceus.acquire_node(vnfs) - if host is None: - raise ResourceError("No more nodes left.") - node = Node(name = name, host = host, image_name = vnfs, image_type = ImageDef.IMAGE_TYPE_VNFS) - logging.debug("Added new physical node " + str(node)) - self._phy_nodes.append(node) - return node - - def get_phy_nodes(self): - return self._phy_nodes - - def reboot_phy_node(self, node): - self._pu_reboot_node(node.get_host_name()) - - def shutdown_phy_node(self, node): - self._pu_shutdown_node(node.get_host_name()) - - def shutdown_phy_nodes(self): - for node in self._phy_nodes: - self.shutdown_phy_node(node) - - # shutdown with halt cmd, wait, do power off afterwards - def shutdown_phy_nodes_halt(self, wait_time = 300): - for node in self._phy_nodes: - self._halt_phy_node(node) - self._wait_for_phy_nodes_halt(wait_time) - time.sleep(5) - # power off - self.shutdown_phy_nodes() - - # execute halt cmd - def _halt_phy_node(self, node): - output = self._run_via_ssh(node.get_host_name(), [ "sh -c 'halt && exit'" ]) - return (output.succeeded == True and output.return_code == 0) - - # test with fping - def _wait_for_phy_nodes_halt(self, wait_time = 300, sleep_time = 10): - while wait_time >= 0: - node_alive = 0 - for node in self._phy_nodes: - ret = subprocess.call("fping -q -c 1 -t 100 " + node.get_host_name(), shell = True) - logging.debug("Node " + node.get_host_name() + " alive check: " + str(ret)) - if ret == 0: - node_alive += 1 - if node_alive == 0: - logging.debug("OK, all nodes dead") - return True - wait_time -= sleep_time - time.sleep(sleep_time) - logging.error("Timeout waiting for nodes shutdown") - return False - - - def is_phy_node_booted(self, node): - output = self._run_via_ssh(node.get_host_name(), [ "cat", Imager.VNFS_ID_PATH ]) - return (output.succeeded == True and output.return_code == 0 and output == node.get_image_name()) - - def wait_for_phy_nodes(self, retries = 0, sleep_time = 60): - logging.debug("Waiting for physical nodes to boot.") - while True: - n = 0 - for node in self._phy_nodes: - if self.is_phy_node_booted(node): - logging.debug("Node " + str(node) + " booted.") - n += 1 - else: - logging.debug("Node " + str(node) + " not booted yet.") - break - if n == len(self._phy_nodes): - return True - logging.debug("Retries left: " + str(retries)) - retries -= 1 - if retries < 0: - return False - time.sleep(sleep_time) diff --git a/common/contegrator/src/perceus/__init__.py b/common/contegrator/src/perceus/__init__.py deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/common/contegrator/src/perceus/perceus.py b/common/contegrator/src/perceus/perceus.py deleted file mode 100644 index c0722fb3e9b07086673f589acde08fd66b4b2504..0000000000000000000000000000000000000000 --- a/common/contegrator/src/perceus/perceus.py +++ /dev/null @@ -1,169 +0,0 @@ -''' -Created on Aug 30, 2011 - -@author: jaka -''' - -import subprocess -from subprocess import CalledProcessError -from fabric.api import env -from fabric.operations import run, _AttributeString - -import re -import os -import logging -import string - -from testbedconfig import node_ssh_keys, ct_perceus_util_node, ct_perceus_util_user - -class Perceus(object): - - _debug = True - - def __init__(self, available_nodes = None, - perceus_cmd = "perceus"): - self._sudo_cmd = 'sudo' - self._perceus_cmd = perceus_cmd - self._available_nodes = available_nodes - if self._available_nodes is None: - self._available_nodes = self.list_nodes() - self._allocated_nodes = [] - - def setup_fabric_env(self): - env.shell = "/bin/bash -l -i -c" - env.key_filename = node_ssh_keys - env.warn_only = True - env.disable_known_hosts = True - - def _run_via_ssh(self, node, cmd, **kwargs): - args = { "user": ct_perceus_util_user, #"root", - "timeout": 30 } - args.update(kwargs) - self.setup_fabric_env() - env.host_string = args["user"] + "@" + node - cmd_str = " ".join(cmd) - logging.debug("Running [" + cmd_str + "] on " + env.host_string) - try: - rv = run(cmd_str) - except SystemExit as e: - rv = _AttributeString("") - rv.succeeded = False - rv.failed = True - rv.return_code = -1 - logging.debug("Success: " + str(rv.succeeded)) - logging.debug("Return code: " + str(rv.return_code)) - logging.debug("Output: " + rv) - return rv - - def _log_cmd(self, cmd_list): - logging.debug("Command: " + " ".join(cmd_list)) - - def _pcmd(self, args): - cmd = [self._sudo_cmd, self._perceus_cmd, "-y"] - if not Perceus._debug: - cmd.append("-q") - cmd.extend(args) - self._log_cmd(cmd) - return cmd - - # try to refresh NFS mount, before using it locally - def _refresh_nfs(self, vnfs=None): - try: - subprocess.call(["ls", "/usr/var/lib/perceus/"], stdout=subprocess.PIPE) - subprocess.call(["ls", "/usr/var/lib/perceus/vnfs/"], stdout=subprocess.PIPE) - if vnfs: - subprocess.call(["ls", "/usr/var/lib/perceus/vnfs/" + vnfs], stdout=subprocess.PIPE) - subprocess.call(["ls", "/usr/var/lib/perceus/vnfs/" + vnfs + "/rootfs/"], stdout=subprocess.PIPE) - except: - pass - - def clone_vnfs(self, src_vnfs, tgt_vnfs): - rv = self._run_via_ssh("perceus", self._pcmd(["vnfs", "clone", src_vnfs, tgt_vnfs])) - self._refresh_nfs(src_vnfs) - if rv.failed: - logging.error("Failed to clone VNFS " + src_vnfs + " " + tgt_vnfs) - return False - self._refresh_nfs(tgt_vnfs) - return True - - def mount_vnfs(self, vnfs): - self._refresh_nfs(vnfs) - try: - output = subprocess.check_output(self._pcmd(["vnfs", "mount", vnfs])) - logging.debug("--- output start ---") - logging.debug(output) - logging.debug("--- output end ---") - # The VNFS can be found at: /mnt/test-vnfs-X-node-1 - match = re.search("The VNFS can be found at: (\S+)", output) - logging.debug("Match: " + str(match)) - if match is None: - return None - # fix /etc/mtab - subprocess.check_call("sudo chroot /mnt/" + vnfs + " /bin/sh -c \"echo '' > /etc/mtab\"", shell = True) - return match.group(1) - except CalledProcessError as error: - logging.error("Failed to mount VNFS: " + str(error.returncode)) - return None - - def umount_vnfs(self, vnfs, force=False): - self._refresh_nfs() - try: - vnfs_mount = "/mnt/" + vnfs - if os.path.isdir(vnfs_mount) or force: - subprocess.check_call(self._pcmd(["vnfs", "umount", vnfs])) - return True - except CalledProcessError as error: - logging.error("Failed to unmount VNFS: " + str(error.returncode)) - return False - - def exist_vnfs(self, vnfs): - self._refresh_nfs() - vnfs_dir = "/usr/var/lib/perceus/vnfs/" + vnfs - return os.path.isdir(vnfs_dir) - - def delete_vnfs(self, vnfs): - rv = self._run_via_ssh("perceus", self._pcmd(["vnfs", "delete", vnfs])) - self._refresh_nfs(vnfs) - if rv.failed: - logging.error("Failed to delete VNFS " + vnfs) - return False - return True - - def acquire_node(self, vnfs): - try: - if len(self._available_nodes) == 0: - return None - node = self._available_nodes.pop() - subprocess.check_call(self._pcmd(["node", "set", "vnfs", vnfs, node])) - self._allocated_nodes.append(node) - return node - except CalledProcessError as error: - self._available_nodes.push(node) - logging.error("Failed to set node vnfs: " + str(error.returncode)) - return None - - def release_node(self, node): - try: - self._allocated_nodes.remove(node) - self._available_nodes.append(node) - return True - except ValueError: - return False - - def release_all_nodes(self): - for node in self._allocated_nodes: - self._available_nodes.append(node) - self._allocated_nodes = [] - - def list_nodes(self): - output = subprocess.check_output(self._pcmd(["node", "list"])) - logging.debug("--- output start ---") - logging.debug(output) - logging.debug("--- output end ---") - nodes = string.split(output) - i = 0 - for node in nodes: - i += 1 - logging.debug("Node " + str(i) + " [" + node + "]") - return nodes - diff --git a/common/contegrator/src/testbedconfig.py b/common/contegrator/src/testbedconfig.py deleted file mode 100644 index b0b778c2af4cbd0f82f291bbe1d09630b8c1dcd7..0000000000000000000000000000000000000000 --- a/common/contegrator/src/testbedconfig.py +++ /dev/null @@ -1,29 +0,0 @@ -testbed_node_list = [ - "n0004", - "n0005", - "n0006", -] - -node_passwords = { - "root@n0004": "root", - "root@n0005": "root", - "root@n0006": "root", -} - -node_ssh_keys = [ - "/var/lib/jenkins/.ssh/id_rsa_jenkins_perceus_xc1", -] - -ct_perceus_util_node = "perceus" -ct_perceus_util_user = "jenkins" - -# set to true if test nodes are set-up already and all you want to do -# is run the test code. useful for debugging to avoid lengthy staging -# of test nodes on each contegrator run. -ct_prestaged = False -# if you set above to true, make sure you fix the map below, -# mapping node names (node dir names) to the corresponding hosts -ct_prestaged_nodes = { - "head": "n0005", - "worker": "n0004", -} diff --git a/common/contrail-parent/pom.xml b/common/contrail-parent/pom.xml deleted file mode 100644 index 971418c5fb8fbd885b1c480869f56980b8e6e3dd..0000000000000000000000000000000000000000 --- a/common/contrail-parent/pom.xml +++ /dev/null @@ -1,294 +0,0 @@ - - - 4.0.0 - org.ow2.contrail - contrail - 0.3-SNAPSHOT - pom - - org.ow2 - ow2 - 1.3 - - - - 2.2.1 - - - UTF-8 - https://oss.sonatype.org/content/repositories/snapshots/ - - - scm:svn:svn://svn.forge.objectweb.org/svnroot/contrail/trunk/common/contrail-parent - scm:svn:svn+ssh://sandre@svn.forge.objectweb.org/svnroot/contrail/trunk/common/contrail-parent - http://websvn.ow2.org/listing.php?repname=contrail& - - Contrail Parent POM - Contrail is a complete Cloud platform which integrates a full Infrastructure-as-a-Service and Platform-as-a-Service facilities. It allows Cloud providers to seamlessly integrate resources from other Clouds with their own infrastructure, and breaks the current customer lock-in situation by allowing live application migration from one cloud to another. - http://contrail.ow2.org/ - 2010 - - Contrail Consortium - http://contrail-project.eu/partners - - - - BSD3 - http://www.opensource.org/licenses/BSD-3-Clause - repo - - - Apache 2 - http://www.opensource.org/licenses/Apache-2.0 - repo - - - - Atlassian Jira - http://jira.ow2.org/browse/CONTRAIL - - - Atlassian Bamboo - http://bamboo.ow2.org/browse/CONTRAIL - - - - Notifications Mailing List - contrail-notifs-subscribe@ow2.org - contrail-notifs-unsubscribe@ow2.org - http://mail.ow2.org/wws/info/contrail-notifs - http://mail-archive.ow2.org/contrail-notifs/index.html - - - Commits Mailing List - contrail-commits-subscribe@ow2.org - contrail-commits-unsubscribe@ow2.org - http://mail.ow2.org/wws/info/contrail-commits - http://mail-archive.ow2.org/contrail-commits/index.html - - - Developers Mailing List - contrail-dev-subscribe@ow2.org - contrail-dev-unsubscribe@ow2.org - http://mail.ow2.org/wws/info/contrail-dev - http://mail-archive.ow2.org/contrail-dev/index.html - - - - install - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.7 - - - org.apache.maven.plugins - maven-resources-plugin - 2.5 - - - org.apache.maven.plugins - maven-gpg-plugin - 1.4 - - - org.apache.maven.plugins - maven-compiler-plugin - 2.3.2 - - 1.6 - 1.6 - - - - org.apache.maven.plugins - maven-javadoc-plugin - 2.7 - - - org.apache.maven.plugins - maven-war-plugin - 2.2 - - - org.apache.maven.plugins - maven-release-plugin - 2.2.2 - - forked-path - - - - org.codehaus.mojo - unix-maven-plugin - 1.0-alpha-5 - - - org.apache.maven.plugins - maven-enforcer-plugin - 1.0 - - - enforce-maven - - enforce - - - - - (,2.1.0),(2.1.0,2.2.0),(2.2.0,) - Maven 2.1.0 and 2.2.0 produce incorrect GPG signatures and checksums respectively - - - - - - - - - - - - - log4j - log4j - 1.2.16 - - - - - - sonatype-public - http://oss.sonatype.org/content/groups/public/ - - true - - - true - - - - contrail-3rdparty - Contrail 3rd party Repository - http://contrail.ow2.org/repositories/thirdparty - - true - - - false - - - - - - release - - - - org.apache.maven.plugins - maven-source-plugin - - - attach-sources - - jar-no-fork - - - - - - org.apache.maven.plugins - maven-javadoc-plugin - - - attach-javadocs - - jar - - - - - - org.apache.maven.plugins - maven-gpg-plugin - - - sign-artifacts - verify - - sign - - - - - - - - - sonatype - - false - - - - sonatype-snapshots-repo - Sonatype Nexus Snapshots - https://oss.sonatype.org/content/repositories/snapshots - - false - - - true - - - - - - sonatype-nexus-snapshots - Sonatype Nexus Snapshots - ${sonatypeOssDistMgmtSnapshotsUrl} - - - sonatype-nexus-staging - Nexus Release Repository - https://oss.sonatype.org/service/local/staging/deploy/maven2 - - - - - ow2 - - true - - - - - ow2-releases - OW2 Releases Repository - http://repository.ow2.org/nexus/content/repositories/releases - - true - - - false - - - - - - - - org.apache.maven.plugins - maven-release-plugin - - -Pow2 - - - - - - - - diff --git a/common/dev/ovf-development/documents/Contacts b/common/dev/ovf-development/documents/Contacts deleted file mode 100644 index 89fba914a3ed8f3dd439d873ac34436841f0e489..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/documents/Contacts +++ /dev/null @@ -1,13 +0,0 @@ -Contacts list - -CNR -iacoperi@gmail.com (GTalk) -emanuele.carlini@gmail.com (GTalk) -kirkrulez83@gmail.com -- Giacomo (GTalk) -patrizio.dazzi@gmail.com (GTalk) - -XLAB -gregor.beslic (Skype), gregor.beslic@gmail.com (GTalk) - -INRIA -dudouetf@gmail.com (GTalk) diff --git a/common/dev/ovf-development/documents/meeting-minutes/minute_30112011 b/common/dev/ovf-development/documents/meeting-minutes/minute_30112011 deleted file mode 100644 index 679150b0443e565759766deff82e921ad4840991..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/documents/meeting-minutes/minute_30112011 +++ /dev/null @@ -1,53 +0,0 @@ - - -30/11/2011 OVF Parser telco - -Partecipants: - -XLAB: Gregor Beslič -CNR: Emanuele Carlini, Iacopo Peri, Patrizio Dazzi, Giacomo Righetti -INRIA: Florian Dudouet, Piyush Harsh - - -== Agenda: -- status and the roadmap of the OVF parser. - -== Discussion: - -- All the partners agreed on the separation between actual OVF parsing and OVF rendering. -A common DOM OVF parser provide access to the application described by input OVF. Both high level (aggregate) and low level information is provided. -Other modules (render) access to this information via a public (java/code) interface. A possible render can be for open nebula, for graph management (into federation) etc.. - -- To retrieve certain information implies an access to different section of the OVF. Gregor has a document that describe how to get aggregate information from the OVF for OpenNebula. -It can work as a first draft of a document that should be filled step by step in order to easily track how to retrieve aggregate information. - -Example (Gregor,Florian,Patrizio): ProductSection of VirtualSystem for network information. - -== Prototype of render for OpenNebula consortium: -- ETA: end of December. - -Status: -* Florian is already using the common parser layer, by accessing directly to data structures. This is ok for now since the public interface is missing. The public interface should expose methods to access application data and meta-data. -- Some example (provided by Piyush): getApplicationName, getListOVFDIDs, getOVFDetails -- ACTION: Piyush to start compiling a document with tentative public interface methods used by renderers. - -== Other/Misc -ACTION: Piyush to create folder in the svn where to store useful docs for the parser (including the 2 above) and OVF file examples. - -== Next telco: -- Due to the close deadline for prototype another telco has been scheduled for the next week. Time: TBD. -ACTION: Gregor to set up a doodle. - - -== List of contacts gtalk CNR - -iacoperi@gmail.com -emanuele.carlini@gmail.com -kirkrulez83@gmail.com -- Giacomo -patrizio.dazzi@gmail.com - - - - - - diff --git a/common/dev/ovf-development/documents/ovf-to-one/Contrail-OVFtoONE.pdf b/common/dev/ovf-development/documents/ovf-to-one/Contrail-OVFtoONE.pdf deleted file mode 100644 index 7e42b230c18cb4d104a33c294c996a74f17567e8..0000000000000000000000000000000000000000 Binary files a/common/dev/ovf-development/documents/ovf-to-one/Contrail-OVFtoONE.pdf and /dev/null differ diff --git a/common/dev/ovf-development/documents/ovf-to-one/Contrail-OVFtoONE.tex b/common/dev/ovf-development/documents/ovf-to-one/Contrail-OVFtoONE.tex deleted file mode 100644 index 6055dd88d7e2e2edaf2434efbe4d5bc3b6954237..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/documents/ovf-to-one/Contrail-OVFtoONE.tex +++ /dev/null @@ -1,241 +0,0 @@ -\documentclass[a4paper,10pt]{article} -\usepackage{lscape} -% define the title -\author{Gregor~Beslic, XLAB d.o.o.} -\title{OpenNebula OVF Deployer, v 0.2} -\begin{document} -% generates the title -\maketitle -% insert the table of contents -\tableofcontents -\setlength{\parskip}{6pt} -\newcommand{\tab}{\hspace*{1em}} - -\section{General notes} -The OVF Deployer for OpenNebula is developed as part of the Contrail project. It requires the OVF parser component developed by CNR, which parses the OVF XML file, stores the OVF appliance into an internal data structure and provides an API, which the OVF Deployer uses to build and contextualize the matching OpenNebula template. The deployer should be able to build the elements as described in the following sections and leverage OpenNebula to provision the required infrastructure. Where possible, the deployer should make use of OpenNebula VM templates:\\http://opennebula.org/documentation:archives:rel2.0:template - -The networks used by the OVF Appliance (VirtualSystemsCollection) should be created by the system administrator before the actual parsing takes place. They should be made public or owned by the user submitting the appliance. Every VirtualMachine (VirtualSystem element) will define its own reference to the network, but the reference can be the same for all VirtualMachines. - -Files, such as disks and virtual machine images are referenced via URIs and copied (downloaded) into the local filesystem (cached). This way, each remote file is downloaded only once. - -\section{References element} - -\begin{center} - \begin{tabular}{ | l | l | l | l | l | p{3cm} |} - \hline - Required & Contrail entity & OpenNebula entity & VM Template variables\\\hline - No & None & None & None - \\\hline - \end{tabular} -\end{center} - -Example:\\ -\texttt{ -\tab\\ -\tab\tab\\ -\tab\tab\\ -\tab\tab\\ -\tab -} -\\\\ -This element references hard disk, which can be fetched remotely. The deployer will check if all the files exist and throw an Exception otherwise. It will also check for the correct filesizes of these files (\texttt{ovf:size} element) and store the local copy in the filesystem (e.g. /nebula/images) in the form of ``id\_size.ext'', for example /nebula/images/lamp-base\_180114671.vmdk. If the file with the same name and size exists in the local filesystem, the deployer will use the local copy (it will assume the file is already cached). - -\section{DiskSection element} - -\begin{center} - \begin{tabular}{ | l | l | l | l | l | p{3cm} |} - \hline - Required & Contrail entity & OpenNebula entity & VM Template variables\\\hline - Yes & None & None & None (referenced directly from VirtualSystem) - \\\hline - \end{tabular} -\end{center} - -Example:\\ -\texttt{ -\tab\\ -\tab\tabList of the virtual disks used in the package\\ -\tab\tab\\ -\tab -} - -All virtual disks referenced in \texttt{} section should be listed here - only the disks referenced here can be used and only these disk will be cached (downloaded). The \texttt{ovf:capacity} and \texttt{ovf:populatedSize} elements are ignored - the filesize checks are performed on the downloaded file referencing the \texttt{ovf:size} element from the previous section (References). - -\section{NetworkSection element} - -\begin{center} - \begin{tabular}{ | l | l | l | l | l | p{3cm} |} - \hline - Required & Contrail entity & OpenNebula entity & VM Template variables\\\hline - Yes & Network & Virtual Network & value of \texttt{ovf:name} maps to NETWORK=```` - \\\hline - \end{tabular} -\end{center} - -Example:\\ -\texttt{ -\tab\\ -\tab\tabLogical networks used in the package\\ -\tab\tab\\ -\tab\tab\tabThe network that the LAMP Service will be available on\\ -\tab\tab\\ -\tab\tab\\ -\tab\tab\tabSome other network\\ -\tab\tab\\ -\tab -} - -All networks used by VirtualSystems (VMs) should be referenced here. The value of the \texttt{ovf:name} attribute references an existing network in OpenNebula. The user submitting the OVF file should be the owner of these networks or the networks have to be public. - -All VirtualSystem elements use one of the networks specified here. The Deployer will check the networks: -\\a) exist -\\b) are public -\\c) are owned by the current user if they are private - -The Deployer will throw an Exception otherwise. - -\section{VirtualSystemsCollection element} - -\begin{center} - \begin{tabular}{ | l | l | l | l | l | p{3cm} |} - \hline - Required & Contrail entity & OpenNebula entity & VM Template variables\\\hline - No & Appliance & A group of Virtual Machines & None - \\\hline - \end{tabular} -\end{center} - -This element makes describing the Contrail appliance a bit more elegant, e.g.\\ -\texttt{ -\tabVirtual appliance with a 2-tier distributed LAMP stack\\ -\tabLAMP Service -} - -The VirtualSystem element also defines all properties (key - value pairs) used within the VirtualSystem child elements. -This is not a required element - it should also be possible to describe the Contrail Applicance as multiple VirtualSystem elements withour VirtualSystemsCollection parent element. -\\\\ - -\subsection{StartupSection element} - -\begin{center} - \begin{tabular}{ | l | l | l | l | l | p{3cm} |} - \hline - Required & Contrail entity & OpenNebula entity & VM Template variables\\\hline - No & None & None & None - \\\hline - \end{tabular} -\end{center} - -Example:\\ -\texttt{ -\tab\\ -\tab\tabStartup order of the virtual machines\\ -\tab\tab\\ -\tab -} - -This section defines the order and startup delays of the provisioned systems. Systems with order = '2' should be provisioned after the system with order='1' enters the running state, but not later than startDelay seconds. - -All attributes except \texttt{ovf:order} and \texttt{ovf:startDelay} should be ignored at this point. The VirtualSystems are referenced via attribute \texttt{ovf:id}, which should be unique withing the -scope of the whole OVF document. - -\subsection{VirtualSystem element} - -\begin{center} - \begin{tabular}{ | l | l | l | l | l | p{3cm} |} - \hline - Required & Contrail entity & OpenNebula entity & VM Template variables\\\hline - Yes & Virtual Machine & Virtual Machine & \texttt{value of maps to NAME = ''} - \\\hline - \end{tabular} -\end{center} - -This element represents a single Virtual Machine in OpenNebula. Optional element within the \texttt{ProductSection} is also the IP address this VirtualMachine should claim, e.g.\\ -\texttt{ -\tab\\ -\tab\tab\\ -\tab\tab\tab\\ -\tab\tab\\ -\tab -} - -\subsubsection{Item, ResourceType = 3} - -\begin{center} - \begin{tabular}{ | l | l | l | l | l | p{3cm} |} - \hline - Required & Contrail entity & OpenNebula entity & VM Template variables\\\hline - No & Virtual CPU & Virtual CPU & \texttt{ -> VCPU} - \\\hline - \end{tabular} -\end{center} - -This element represents Virtual CPU count for a single VirtualSystem (VM). It can be empty - VMs provisioned without VCPU attribute will default to 1. - -\subsubsection{Item, ResourceType = 4} - -\begin{center} - \begin{tabular}{ | l | l | l | l | l | p{3cm} |} - \hline - Required & Contrail entity & OpenNebula entity & VM Template variables\\\hline - No & RAM & Memory & \texttt{ -> MEMORY, in megabytes} - \\\hline - \end{tabular} -\end{center} - -This element represents the amount of RAM for a single VirtualSystem (VM). Since OpenNebula expects the memory to be provided in Megabytes, the deployer will make an API call to the parser with the parameter unit set to MB. It is the responsibility of the parser to correctly store the memory value provided by the OVF file (e.g. convert it to bytes). - -\subsubsection{Item, ResourceType = 10} - -\begin{center} - \begin{tabular}{ | l | l | l | l | l | p{3cm} |} - \hline - Required & Contrail entity & OpenNebula entity & VM Template variables\\\hline - Yes & Virtual Network & VM Network & \texttt{ -> network-name} - \\\hline - \end{tabular} -\end{center} - -This element represents the virtual network used by the current VirtualMachine. The network provided by \texttt{} should be referenced within the \texttt{} element of the OVF file or an Exception will be thrown. - -\subsubsection{Item, ResourceType = 17} - -\begin{center} - \begin{tabular}{ | l | l | l | l | l | p{3cm} |} - \hline - Required & Contrail entity & OpenNebula entity & VM Template variables\\\hline - Yes & Hard disk & OS / Swap / Datablock & \texttt{ -> single DISK = [``]} - \\\hline - \end{tabular} -\end{center} - -At least one hard disk is required (the first disk represents the operating system disk).\\ -TODO: Datablock and Swap disks - - -\section{OpenNebula sample template} - -The following template can be used to provision a new VirtualMachine and replace the vm-prefixed values with the actual values retrieved by the parser.\\ -\texttt{ -\tab NAME = "vmNAME"\\ -\tab CPU = 1\\ -\tab VCPU = vmVCPU\\ -\tab MEMORY = vmMEM\\ -\tab OS = [ boot="hd", arch="x86\_64" ]\\ -\tab DISK = [\\ -\tab\tab "image = "vmDISKOS"\\ -\tab ]\\ -\tab NIC = [\\ -\tab\tab NETWORK = "vmNETWORK"\\ -\tab ]\\ -\tab GRAPHICS = [\\ -\tab\tab type="vnc",\\ -\tab\tab listen="localhost"\\ -\tab ] -} - -\end{document} \ No newline at end of file diff --git a/common/dev/ovf-development/samples/contrail_petstore.xml b/common/dev/ovf-development/samples/contrail_petstore.xml deleted file mode 100644 index 5b0e0b26053220ab4e077432883dfd044dc3658d..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/contrail_petstore.xml +++ /dev/null @@ -1,618 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - Describes the set of virtual disks - - - - - - - - - - - - - - - - - - List of logical networks used in the package - - The network used to link the web server node and the engine frontend node. - - - The network used to link the engine nodes. - - - The network used to link the engine backend node and the db frontend node. - - - The network used to link the db nodes. - - - - - - - - - The packaging of the Contrail PetStoreService multi-tier application - Contrail PetStore Service - - - Describes product information for the service - Contrail PetStore Web Portal - Some Random Organization - 4.5 - 4.5-b4523 - http://www.vmware.com/go/ovf - http://www.vmware.com/ - - Network properties - - - - - - Defines minimum reservations for CPU and memory - - - byte * 2^20 - 512 MB reservation - 0 - 512 - 4 - - - - byte * 2^20 - 384 MB reservation - 0 - 384 - 4 - - - - - MHz - 1000 MHz reservation - 1 - 500 - 3 - - - MHz - 500 MHz reservation - 1 - 500 - 3 - - - MHz - 1500 MHz reservation - 1 - 1500 - 3 - - - - - Specifies how the composite service is powered-on and off - - - - - - - - - - - The virtual machine containing the WebServer application - - Describes the product information - Apache Webserver - Apache Software Foundation - 6.5 - 6.5-b2432 - - - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/web - 22001 - 1000 - 17 - - - true - VM Network - Ethernet adapter on "VM Network" - - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - - - - - The virtual machines containing the subgraph for the engine of the application - - - - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/engine_frontend - 22001 - 1000 - 17 - - - - - - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/engine_worker - 22001 - 1000 - 17 - - - - - - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/engine_worker - 22001 - 1000 - 17 - - - - - - - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/engine_backend - 22001 - 1000 - 17 - - - - - - - - Describes a clustered database instance - - Product Information - Somebody Clustered SQL Server - TBD - 2.5 - 2.5-b1234 - - - - - Specifies how the composite service is powered-on and off - - - - - - - - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/db_frontend - 22001 - 1000 - 17 - - - - - - - Describes a virtual machine with the database image installed - Database Instance I - - - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/db_backend - 22001 - 1000 - 17 - - - true - VM Network - Ethernet adapter on "VM Network" - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - - - - - - Describes a virtual machine with the database image installed - Database Instance II - - Specifies the OVF properties available in the OVF environment - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/db_backend - 22001 - 1000 - 17 - - - true - VM Network - Ethernet adapter on "VM Network" - - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - - - - - - - \ No newline at end of file diff --git a/common/dev/ovf-development/samples/custom-extension.ovf b/common/dev/ovf-development/samples/custom-extension.ovf deleted file mode 100755 index cf260aa982674eef338a40cbf8e8c67e1eb7a1dd..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/custom-extension.ovf +++ /dev/null @@ -1,90 +0,0 @@ - - - - - - - - - - - - - - Description of custom extension - somevalue - - - - - List of the virtual disks used in the package - - - - - - Logical networks used in the package - - - - - - - - somevalue - - - - - - - Small single-VM example with OVF extensibility - - Virtual Hardware Requirements: 256MB, 1 CPU, 1 disk, 1 NIC - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - true - VM Network - Ethernet adapter on "VM Network" - 3 - 10 - - - SCSI Controller 0 - LSI Logic - 4 - LsiLogic - 6 - - - Harddisk 1 - ovf:/disk/custom - 5 - 4 - 17 - - - - diff --git a/common/dev/ovf-development/samples/custom-extension.xsd b/common/dev/ovf-development/samples/custom-extension.xsd deleted file mode 100755 index e0f7c544ecf11db6550e032a3b7b0251abf0aec7..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/custom-extension.xsd +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/dev/ovf-development/samples/de-DE-bundle.xml b/common/dev/ovf-development/samples/de-DE-bundle.xml deleted file mode 100755 index d9d2f55ce3a0e18b11090d3abb5543964d9905fc..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/de-DE-bundle.xml +++ /dev/null @@ -1,26 +0,0 @@ - - - - - - - Das Netzwerk MyService werden verfügbar auf - Kontakt Kunden-Support für alle dringenden - Fragen - Emailadresse des Administrators - IP-Adresse für den Service - Primär IP-adresse für die Datenbank - Sekundär IP-Adresse für die Datenbank - Log-Ebene für den Service - Minimal - Installieren mit minimal Nutzung der Ressourcen - Normal - Installieren mit normalen Nutzung der - Ressourcen - diff --git a/common/dev/ovf-development/samples/dsp8023_1.1.xsd.xml b/common/dev/ovf-development/samples/dsp8023_1.1.xsd.xml deleted file mode 100644 index e1d3106c66a9529ae2a76d19b4e978e63a6854f4..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/dsp8023_1.1.xsd.xml +++ /dev/null @@ -1,1002 +0,0 @@ - - - - - - - - - - - - - - Determines whether import should fail if the Section is - not understood - - - - - - Comma-separated list of supported transport types - - - - - - Root element of OVF Descriptor - - - - - - Root OVF descriptor type - - - - - References to all external files - - - - - Package level meta-data - - - - - Content: A VirtualSystem or a - VirtualSystemCollection - - - - - Localized string resource bundles - - - - - - - - - - - - Type for list of external resources - - - - - - - - - - - Type for an external reference to a - resource - - - - - - - Reference key used in other parts of the - package - - - - - Location of external resource - - - - - Size in bytes of the files (if - known) - - - - - Compression type (gzip, bzip2, or none if empty or not - specified) - - - - - Chunk size (except for last chunk) - - - - - - - - Base element for content types. This is the head the - subsitution group - - - - - - Base class for content - - - - - Info element describes the meaning of the content, - this is typically shown if the type is not understood by an - application - - - - - An optional localizable display name of the content - - - - - - Content body is a list of Sections - - - - - - - - - - - - Element substitutable for Content since VirtualSystem_Type - is a derivation of Content_Type - - - - - - Content describing a virtual system - - - - - - - - - Element substitutable for Content since VirtualSystemCollection_Type - is a derivation of Content_Type - - - - - - A collection of Content. - - - - - - - - - - - - - - - Root element of I18N string bundle - - - - - - Type for string resource bundle - - - - - Resource bundle element - - - - - - String element value - - - - String element identifier - - - - - - - - - - - - Locale for this string resource - bundle - - - - - Reference to external resource - bundle - - - - - - - - - - Base elements for OVF sections. This is the head of the - substitution group. - - - - - - - Base type for Sections, subclassing this is the most - common form of extensibility. Subtypes define more specific - elements. - - - - Info element describes the meaning of the Section, - this is typically shown if the Section is not understood by an - application - - - - - - - - - - Type for localizable string - - - - - Default string value - - - - Identifier for lookup in string resource bundle - for alternate locale - - - - - - - - - - - - Element substitutable for Section since - AnnotationSection_Type is a derivation of Section_Type - - - - - - - User defined annotation - - - - - - - - - - - - - - Element substitutable for Section since ProductSection_Type - is a derivation of Section_Type - - - - - - Product information for a virtual - appliance - - - - - - - Name of product - - - - - Name of product vendor - - - - - Product version, short form - - - - - Product version, long form - - - - - URL resolving to product description - - - - - URL resolving to vendor description - - - - - Experimental: URL resolving to deployed product instance - - - - - Experimental: Display icon for product - - - - - - - - - - - - Properties for application-level - customization - - - - Property grouping - delimiter - - - - - Property element - - - - - - Short description of - property - - - - - Description of - property - - - - - - - - Alternative default - property values for different - configuration - - - - - - Property - identifier - - - - - Property - type - - - - - A comma-separated set of type - qualifiers - - - - - Determines whether the property - value is configurable during - installation - - - - - Default value for - property - - - - - Determines whether the property - value should be obscured during deployment - - - - - - - - - - - - Property identifier prefix - - - - - Property identifier suffix - - - - - - - - - Type for alternative default values for properties when - DeploymentOptionSection is used - - - - - - - Alternative default property value - - - - - Configuration from DeploymentOptionSection in which - this value is default - - - - - - - - Element substitutable for Section since NetworkSection_Type - is a derivation of Section_Type - - - - - - Descriptions of logical networks used within the - package - - - - - - - - - - - - - - - - - - - - - - Element substitutable for Section since DiskSection_Type is - a derivation of Section_Type - - - - - - Descriptions of virtual disks used within the - package - - - - - - - - - - - - - - Type for virtual disk descriptor - - - - - - - Identifier for virtual disk - - - - - Reference to virtual disk content. If not specified a - blank virtual disk is created of size given by capacity - attribute - - - - - Virtual disk capacity, can be specified as either an - xs:long size or as a reference to a property using ${property_name}. - - - - - - Unit of allocation for ovf:capacity. If not specified - default value is bytes. Value shall match a recognized value for the - UNITS qualifier in DSP0004. - - - - - Format of virtual disk given as a URI that identifies - the disk type - - - - - Estimated populated size of disk in - bytes - - - - - Reference to potential parent disk - - - - - - - - Element substitutable for Section since - OperatingSystemSection_Type is a derivation of Section_Type - - - - - - - Specification of the operating system installed in the - guest - - - - - - - - - - Identifier defined by the - CIM_OperatingSystem.OsType enumeration - - - - - Version defined by the - CIM_OperatingSystem.Version field - - - - - - - - - Element substitutable for Section since EulaSection_Type is - a derivation of Section_Type - - - - - - End-User License Agreement - - - - - - - - - - - - - - Element substitutable for Section since - VirtualHardwareSection_Type is a derivation of Section_Type - - - - - - - Specifies virtual hardware requirements for a virtual - machine - - - - - - - - - - - Unique identifier of this VirtualHardwareSection - (within a VirtualSystem) - - - - - - - - - - Element substitutable for Section since - ResourceAllocationSection_Type is a derivation of Section_Type - - - - - - - Resource constraints on a - VirtualSystemCollection - - - - - - - - - - - - - - Element substitutable for Section since InstallSection_Type - is a derivation of Section_Type - - - - - - If present indicates that the virtual machine needs to be - initially booted to install and configure the software - - - - - - - - - Delay in seconds to wait for power off to - complete after initial boot - - - - - - - - - Element substitutable for Section since StartupSection_Type - is a derivation of Section_Type - - - - - - Specifies the order in which entities in a - VirtualSystemCollection are powered on and shut down - - - - - - - - - Unique identifier of - the content (within a VirtualSystemCollection) - - - - - - Startup order. Entities are started - up starting with lower-numbers first, starting - from 0. Items with same order identifier may be - started up concurrently or in any order. The - order is reversed for - shutdown. - - - - - Delay in seconds to wait for power - on to complete - - - - - Resumes power-on sequence if guest - software reports ok - - - - - Delay in seconds to wait for power - off to complete - - - - - Start action to use, valid values - are: 'powerOn', 'none' - - - - - Stop action to use, valid values - are: ''powerOff' , 'guestShutdown', - 'none' - - - - - - - - - - - - - - Element substitutable for Section since - DeploymentOptionSection_Type is a derivation of Section_Type - - - - - - - Enumeration of discrete deployment - options - - - - - - - - - - - - - - - - - - - - - - - - Wrapper for - CIM_VirtualSystemSettingData_Type - - - - - - - - - - - - Wrapper for - CIM_ResourceAllocationSettingData_Type - - - - - Determines whether import should fail if entry - is not understood - - - - - Configuration from DeploymentOptionSection this - entry is valid for - - - - - States that this entry is a range - marker - - - - - - - diff --git a/common/dev/ovf-development/samples/ibm-ovf-sample.ovf b/common/dev/ovf-development/samples/ibm-ovf-sample.ovf deleted file mode 100755 index 7d18894d0236575716833b42508eb4da5b432544..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/ibm-ovf-sample.ovf +++ /dev/null @@ -1,565 +0,0 @@ - - - - - - - - - - - Disk-related information for the Linux file systems included -within this package. - - - - - - - - The networks to which virtual network ports connect when deploying this package. - - - A network to which the virtual system in the package is to be connected (default description). - - - - - - A virtual system to be created when deploying this package. - EXAMPLE2 - - - The virtual hardware requirements of the target virtual system. - - - z/VM system: EXAMPLE2 - - system-EXAMPLE2 - IBM:zVM:LINUX - - BEG - - 1048576 - byte*2^10 - - 0100 - - LNKNOPAS LANG AMENG - - - - Share for CPU type CP - cpushare-cp - CP - 3 - 0 - 100 - - - Share for CPU type IFL - cpushare-ifl - IFL - 3 - 0 - 100 - - - Share for CPU type ICF - cpushare-icf - ICF - 3 - 0 - 100 - - - Share for CPU type ZAAP - cpushare-zaap - ZAAP - 3 - 0 - 100 - - - Share for CPU type ZIIP - cpushare-ziip - ZIIP - 3 - 0 - 100 - - - - 00 - CPU 00 - cpu-00 - CP - 3 - 1 - - - 01 - CPU 01 - cpu-01 - CP - 3 - 1 - - - - Memory - memory - 4 - 1048576 - byte*2^10 - - - - 0600 - network1 - Network Interface eth0 - network-interface-eth0 - 10 - 1 - - ibm:qdio - - 3 - - - - - - 0100 - Disk: 0100 - disk-0100 - - ibm:z:3390 - 31 - - 3338 - - count - - 737280 - - minidisk-volser - - W - - - 0101 - Disk: 0101 - disk-0101 - ibm:z:3390 - 31 - 3338 - count - 737280 - minidisk-volser - W - - - 0102 - Disk: 0102 - disk-0102 - ibm:z:3390 - 31 - 3338 - count - 737280 - minidisk-volser - W - - - 0103 - Disk: 0103 - disk-0103 - ibm:z:3390 - 31 - 3338 - count - 737280 - minidisk-volser - W - - - 0104 - Disk: 0104 - disk-0104 - ibm:z:3390 - 31 - 3238 - count - 737280 - minidisk-volser - W - - - 0300 - Disk: 0300 - disk-0300 - ibm:z:9336 - 31 - 524288 - count - 512 - vdisk - MR - - - 0301 - Disk: 0301 - disk-0301 - ibm:z:9336 - 31 - 1048576 - count - 512 - vdisk - MR - - - - - This section describes the OVF package itself. - ExampleWithLVM - Example system with LVM volume groups. - - - This section describes the customizable properties of this virtual system. - Red Hat Enterprise Linux Server release 5.3 on z/VM. - General Settings - - Timezone Offset - Timezone Offset - - TCP/IP Network Settings - - Use DHCP for eth0 - Use DHCP for eth0 - - - IP Address for eth0 - IP Address for eth0, if not using DHCP (IP V4 or V6 format) - - - Default gateway for eth0 - Default gateway for eth0, if not using DHCP (IP V4 or V6 format) - - - Network mask for eth0 - Network mask for eth0, if not using DHCP (IP V4 or V6 format) - - - IP address of primary DNS server for eth0 - - IP address of primary DNS server for eth0, if not using DHCP (IP V4 or V6 format) - - - - IP address of secondary DNS server for eth0 - - IP address of secondary DNS server for eth0, if not using DHCP (IP V4 or V6 format) - - - - Register eth0 with DNS server - Register IP address and long DNS hostname of eth0 with the DNS server - - - Hostname for eth0 - Hostname for eth0 - - - Domain name for eth0 - Domain name for eth0 - - - Short hostname for the system - Short hostname for the system - - - DNS domain name for the system - DNS domain name for the system - - - - Additional annotation for the virtual system - z/VM system: EXAMPLE2 - - - Information about the operating system in the virtual system. - Red Hat Enterprise Linux Server release 5.3 - - - - Indicates that the system needs to be booted after deployment to run first-boot customization. - - - - - - Defines how the image files (containing Linux file system content) -are deployed to Linux mount points. -Optionally, provides a configuration proposal for each file system. - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines a configuration proposal for the Linux LVM2. The volume groups -defined here are referenced by the Linux file system configuration proposals in the -LinuxFileSystemSection. The physical volumes defined here reference logical disks, -or Item elements of ResourceType=31 (LogicalDisk). - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/dev/ovf-development/samples/lamp-multi-vm.ovf b/common/dev/ovf-development/samples/lamp-multi-vm.ovf deleted file mode 100755 index c3bf475b766a64777d4b7bdf12ec7425e25f8361..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/lamp-multi-vm.ovf +++ /dev/null @@ -1,316 +0,0 @@ - - - - - - - - - - - - - - List of the virtual disks used in the package - - - - - - - Logical networks used in the package - - The network that the LAMP Service will be available - on - - - - Virtual appliance with a 2-tier distributed LAMP stack - LAMP Service - - - Product information for the service - My Lamp Service - 1.0 - 1.0.0 - - - Product customization for Operating System Level - Linux Distribution X - 2.6.3 - - Specifies the hostname for database virtual - machine - - - Specifies the hostname for application server virtual - machine - - - Specifies the IP address for the database virtual - machine - - - Specifies the IP address for application server - VM - - - Specifies the subnet to use on the deployed network - - - - Specifies the gateway on the deployed network - - - - A comma separated list of DNS servers on the deployed - network - - - Specify TCP read max buffer size in mega bytes. Default is - 16. - - - Specify TCP write max buffer size in mega bytes. Default is - 16. - - - - - Product customization for the installed Apache Web Server - Apache Distribution Y - 2.6.6 - - Port number for HTTP requests - - - Port number for HTTPS requests - - - Number of threads created on startup. - - - Minimum number of idle threads to handle request spikes. - - - - Maximum number of idle threads - - - Limits the number of simultaneous requests that will be - served. - - - - - Product customization for the installed MySql Database Server - MySQL Distribution Z - 5.0 - - Buffer to cache repeated queries for faster access (in - MB) - - - The number of concurrent connections that can be - served - - - Number of seconds to wait before timing out a connection - - - - - - Product customization for the installed PHP component - PHP Distribution U - 5.0 - - How many minutes a session has to be idle before it is - timed out - - - The number of concurrent sessions that can be served - - - - How much memory in megabytes a script can consume before - being killed - - - - Startup order of the virtual machines - - - - - The configuration of the AppServer virtual machine - Application Server - - - Product customization for the installed Linux system - Linux Distribution X - 2.6.3 - - - - - - - - - - Guest Operating System - Linux 2.6.x - - - Virtual Hardware Requirements: 256 MB, 1 CPU, 1 disk, 1 NIC - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - true - VM Network - Ethernet adapter on "VM Network" - 3 - PCNet32 - 10 - - - SCSI Controller 0 - LSI Logic - 4 - LsiLogic - 6 - - - Harddisk 1 - ovf:/disk/lamp-app - 5 - 4 - 17 - - - - - The configuration of the database virtual machine - Database Server - - - Product customization for the installed Linux system - Linux Distribution X - 2.6.3 - - - - - - - - - - Guest Operating System - Linux 2.6.x - - - Virtual Hardware Requirements: 256 MB, 1 CPU, 1 disk, 1 nic - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - true - VM Network - Ethernet adapter on "VM Network" - 3 - 10 - - - SCSI Controller 0 - LSI Logic - 4 - LsiLogic - 6 - - - Harddisk 1 - ovf:/disk/lamp-db - 5 - 4 - 17 - - - - - diff --git a/common/dev/ovf-development/samples/lamp.ovf b/common/dev/ovf-development/samples/lamp.ovf deleted file mode 100755 index 932f7ea3b408ed802021ce2c5260d9bbf179c74f..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/lamp.ovf +++ /dev/null @@ -1,198 +0,0 @@ - - - - - - - - - - - - List of the virtual disks used in the package - - - - - Logical networks used in the package - - The network that the LAMP Service will be available - on - - - - Single-VM Virtual appliance with LAMP stack - LAMP Virtual Appliance - - - Product information for the service - Lamp Service - 1.0 - 1.0.0 - - - - Product customization for the installed Linux system - Linux Distribution X - 2.6.3 - - Specifies the hostname for the appliance - - - Specifies the IP address for the appliance - - - Specifies the subnet to use on the deployed network - - - - Specifies the gateway on the deployed network - - - - A comma separated list of DNS servers on the deployed - network - - - Specify TCP read max buffer size in mega bytes. Default is - 16. - - - Specify TCP write max buffer size in mega bytes. Default is - 16. - - - - - Product customization for the installed Apache Web Server - Apache Distribution Y - 2.6.6 - - Port number for HTTP requests - - - Port number for HTTPS requests - - - Number of threads created on startup. - - - Minimum number of idle threads to handle request spikes. - - - - Maximum number of idle threads - - - Limit the number of simultaneous requests that will be - served. - - - - - Product customization for the installed MySql Database Server - MySQL Distribution Z - 5.0 - - Buffer to cache repeated queries for faster access (in - MB) - - - The number of concurrent connections that can be - served - - - Number of seconds to wait before timing out a connection - - - - - - Product customization for the installed PHP component - PHP Distribution U - 5.0 - - How many minutes a session has to be idle before it is - timed out - - - The number of concurrent sessions that can be served - - - - How much memory in megabytes a script can consume before - being killed - - - - Guest Operating System - Linux 2.6.x - - - Virtual Hardware Requirements: 256MB, 1 CPU, 1 disk, 1 NIC - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - true - VM Network - Ethernet adapter on "VM Network" - 3 - 10 - - - SCSI Controller 0 - LSI Logic - 4 - LsiLogic - 6 - - - Harddisk 1 - ovf:/disk/lamp - 5 - 4 - 17 - - - - diff --git a/common/dev/ovf-development/samples/myservice-dbvm1-env.xml b/common/dev/ovf-development/samples/myservice-dbvm1-env.xml deleted file mode 100755 index e32af6527c573d327c142ebd2a83f9c39ff40c7b..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/myservice-dbvm1-env.xml +++ /dev/null @@ -1,40 +0,0 @@ - - - - - - - - ESX Server - 3.0.1 - VMware, Inc. - en_US - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/dev/ovf-development/samples/myservice-webvm-env.xml b/common/dev/ovf-development/samples/myservice-webvm-env.xml deleted file mode 100755 index d13b6e2fe8d71b0e1f262392825f1b03ba72546c..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/myservice-webvm-env.xml +++ /dev/null @@ -1,41 +0,0 @@ - - - - - - - - ESX Server - 3.0.1 - VMware, Inc. - en_US - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/common/dev/ovf-development/samples/myservice.ovf b/common/dev/ovf-development/samples/myservice.ovf deleted file mode 100755 index 796a72b252d382c89f26a94462b7e1ab250ceccc..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/myservice.ovf +++ /dev/null @@ -1,385 +0,0 @@ - - - - - - - - - - - - - - - - Describes the set of virtual disks - - - - - - - List of logical networks used in the package - - The network that the service - will be available on - - - - - List of deployment options available in the package - - - Deploy service with minimal - resource use - - - - Deploy service with standard - resource use - - - - - The packaging of the PetStoreService multi-tier application - PetStore Service - - - Describes product information for the service - Petstore Web Portal - Some Random Organization - 4.5 - 4.5-b4523 - http://www.vmware.com/go/ovf - http://www.vmware.com/ - - Email properties - - - Email address of - service administrator - - Network properties - - - IP address of the - service - - - - Primary IP address of - the database - - - - A secondary IP - address for the database - - Logging properties - - - Logging level for - the service - - - - - A annotation on this service - Contact customer support for - any urgent issues - - - Defines minimum reservations for CPU and memory - - byte * 2^20 - 512 MB reservation - 0 - 512 - 4 - - - byte * 2^20 - 384 MB reservation - 0 - 384 - 4 - - - MHz - 1000 MHz reservation - 1 - 500 - 3 - - - MHz - 500 MHz reservation - 1 - 500 - 3 - - - MHz - 1500 MHz reservation - 1 - 1500 - 3 - - - - Specifies how the composite service is powered-on and off - - - - - The virtual machine containing the WebServer application - Petstore Web Server - - Describes the product information - Apache Webserver - Apache Software Foundation - 6.5 - 6.5-b2432 - - - Guest Operating System - Linux 2.4.x - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-4 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - true - VM Network - Ethernet adapter on "VM Network" - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - 0 - Harddisk 1 - ovf:/disk/web - 22001 - 1000 - 17 - - - - - - Describes a clustered database instance - Database Tier - - Product Information - Somebody Clustered SQL Server - TBD - 2.5 - 2.5-b1234 - - - - - - Specifies how the composite service is powered-on and off - - - - - - Describes a virtual machine with the database image installed - Database Instance I - - Specifies the OVF properties available in the OVF environment - - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-4 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - true - VM Network - Ethernet adapter on "VM Network" - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - 0 - Harddisk 1 - ovf:/disk/db - 22001 - 1000 - 17 - - - - Guest Operating System - Linux 2.4.x - - - - - Describes a virtual machine with the database image installed - Database Instance II - - Specifies the OVF properties available in the OVF environment - - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-4 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - true - VM Network - Ethernet adapter on "VM Network" - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - 0 - Harddisk 1 - ovf:/disk/db - 22001 - 1000 - 17 - - - - Guest Operating System - Linux 2.4.x - - - - - - - - - Netværket servicen skal være tilgængelig på - Kontakt kundeservice i tilfælde af - kritiske problemer - Email adresse for administrator - IP adresse for service - Primær IP adresse for database - Sekundær IP adresse for database - Logningsniveau for service - Minimal - Installer service med minimal brug af - resourcer - Normal - Installer service med normal brug af - resourcer - - diff --git a/common/dev/ovf-development/samples/petstore.xml b/common/dev/ovf-development/samples/petstore.xml deleted file mode 100644 index 29d880812c09b2ad3a564bbe4c530cacde7b1bba..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/petstore.xml +++ /dev/null @@ -1,366 +0,0 @@ - - - - - - - - - - Describes the set of virtual disks - - - - - - - List of logical networks used in the package - - The network that the service will be available on - - - - - List of deployment options available in the package - - - Deploy service with minimal resource use - - - - Deploy service with standard resource use - - - - - The packaging of the PetStoreService multi-tier application - - PetStore Service - - - Describes product information for the service - PetStore Web Portal - Some Random Organization - 4.5 - 4.5-b4523 - http://www.vmware.com/go/ovf - http://www.vmware.com/ - Email properties - - - Email address of service administrator - - Network properties - - - IP address of the service - - - - Primary IP address of the database - - - - A secondary IP address for the database - - Logging properties - - - Logging level for the service - - - - - A annotation on this service - Contact customer support for any urgent issues - - - Defines minimum reservations for CPU and memory - - byte * 2^20 - 512 MB reservation - 0 - 512 - 4 - - - byte * 2^20 - 384 MB reservation - 0 - 3844 - - - MHz - 1000 MHz reservation - 1 - 500 - 3 - - - MHz - 500 MHz reservation - 1 - 500 - 3 - - - MHz - 1500 MHz reservation - 1 - 1500 - 3 - - - - Specifies how the composite service is powered-on and off - - - - - - The virtual machine containing the WebServer application - - Describes the product information - Apache Webserver - Apache Software Foundation - 6.5 - 6.5-b2432 - - - Guest Operating System - Linux 2.4.x - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - true - VM Network - Ethernet adapter on "VM Network" - - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - 0 - Harddisk 1 - ovf:/disk/web - 22001 - 1000 - 17 - - - - - - Describes a clustered database instance - - Product Information - Somebody Clustered SQL Server - TBD - 2.5 - 2.5-b1234 - - - - - - Specifies how the composite service is powered-on and off - - - - - - Describes a virtual machine with the database image installed - - Database Instance I - - Specifies the OVF properties available in the OVF environment - - - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - true - VM Network - Ethernet adapter on "VM Network" - - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - - 1000 - LsiLogic - 6 - - - 0 - Harddisk 1 - ovf:/disk/db - 22001 - 1000 - 17 - - - - Guest Operating System - Linux 2.4.x - - - - - Describes a virtual machine with the database image installed - Database Instance II - - Specifies the OVF properties available in the OVF environment - - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - true - VM Network - Ethernet adapter on "VM Network" - - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - 0 - Harddisk 1 - ovf:/disk/db - 22001 - 1000 - 17 - - - - Guest Operating System - Linux 2.4.x - - - - - - - - - Netværket servicen skal være tilgængelig på - Kontakt kundeservice i tilfælde af kritiske problemer - Email adresse for administrator - IP adresse for service - Primær IP adresse for database - Sekundær IP adresse for database - Logningsniveau for service - Minimal - Installer service med minimal brug af resourcer - Normal - Installer service med normal brug af resourcer - - - - - - ESX Server - 3.0.1 - VMware, Inc. - en_US - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/common/dev/ovf-development/samples/petstore_env_WebTier.xml b/common/dev/ovf-development/samples/petstore_env_WebTier.xml deleted file mode 100644 index 1c4baf5b9ed40d95de429259e674b165c1b5e067..0000000000000000000000000000000000000000 --- a/common/dev/ovf-development/samples/petstore_env_WebTier.xml +++ /dev/null @@ -1,32 +0,0 @@ - - - - - ESX Server - 3.0.1 - VMware, Inc. - en_US - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Virtual disk information - - - - The list of logical networks - - The VM Network network - - - - A virtual machine - Small VM - - The kind of installed guest operating system - Microsoft Windows Server 2003, Standard Edition (32-bit) - - - Virtual hardware requirements - - Virtual Hardware Family - 0 - Small VM - vmx-07 - - - hertz * 10^6 - Number of Virtual CPUs - 1 virtual CPU(s) - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 512MB of memory - 2 - 4 - 512 - - - 0 - SCSI Controller - SCSI controller 0 - 3 - lsilogic - 6 - - - 1 - IDE Controller - IDE 1 - 4 - 5 - - - 0 - IDE Controller - IDE 0 - 5 - 5 - - - 0 - false - Floppy Drive - Floppy drive 1 - 6 - 14 - - - The main CD drive - 0 - false - CD/DVD Drive 1 - 7 - 4 - 15 - - - 7 - true - VM Network - E1000 ethernet adapter on "VM Network" - Network adapter 1 - 8 - E1000 - 10 - - - The main Hard Disk - 0 - Hard disk 1 - ovf:/disk/vmdisk1 - 9 - 3 - 17 - - - - diff --git a/common/integration-test/federation-api/README b/common/integration-test/federation-api/README deleted file mode 100644 index 6a71ef1dde101ecd973425e9abe9944582fa45df..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-api/README +++ /dev/null @@ -1,3 +0,0 @@ -Test for federation-api. -Should run on VM, but currently will be deployed to a physical node - VNFS image. -VNFS one-2.2-node-jaKa.aufs is used - it is almost vanillia ubuntu. diff --git a/common/integration-test/federation-api/nodes/federation/install.xml b/common/integration-test/federation-api/nodes/federation/install.xml deleted file mode 100644 index 0b59f6d9a52b139ac876b9327aa3d1a2a1861e56..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-api/nodes/federation/install.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - rpm - - - diff --git a/common/integration-test/federation-api/nodes/federation/scripts/fix-scripts.sh b/common/integration-test/federation-api/nodes/federation/scripts/fix-scripts.sh deleted file mode 100755 index 19a5450df733ff2dc5d110c8e8ff7c247a20c8e1..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-api/nodes/federation/scripts/fix-scripts.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/federation-api/test/01_federation_api_install.py b/common/integration-test/federation-api/test/01_federation_api_install.py deleted file mode 100644 index 679b831cb6b8bf57b5044215563d7ecab02874c0..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-api/test/01_federation_api_install.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_install(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/install.sh") -# - diff --git a/common/integration-test/federation-api/test/02_federation_api_setup.py b/common/integration-test/federation-api/test/02_federation_api_setup.py deleted file mode 100644 index c487947d70c06ef45560b2d880434a334403c32d..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-api/test/02_federation_api_setup.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_setup(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/mysql-setup.sh") -# - diff --git a/common/integration-test/federation-api/test/03_federation_api_run.py b/common/integration-test/federation-api/test/03_federation_api_run.py deleted file mode 100644 index f6ec4377809e67e7da30e1fe1555547997949431..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-api/test/03_federation_api_run.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_fed_api(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - #ct_nodeman.sshrun("root", worker, "sleep 30") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/test.sh") - -# diff --git a/common/integration-test/federation-api/test/10_federation_api_test.py b/common/integration-test/federation-api/test/10_federation_api_test.py deleted file mode 100644 index 4585214e509c367bae13bef4188821a8c5ff06a2..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-api/test/10_federation_api_test.py +++ /dev/null @@ -1,13 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -def test_01_rest_interface(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - #ct_nodeman.sshrun("root", worker, "sleep 30") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/test-rest-interface.sh") - -# diff --git a/common/integration-test/federation-api/test/90_wait_run.py b/common/integration-test/federation-api/test/90_wait_run.py deleted file mode 100644 index c3736e1a4a24e1c273b244ab8aa53aecd527ae93..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-api/test/90_wait_run.py +++ /dev/null @@ -1,17 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# test should run for 5 min ? -def test_03_wait(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - #head = ct_node_list["head"] - #worker = ct_node_list["worker"] - sec = 302 - print "Test will run for " + str(sec) + " secundes..." - ct_nodeman.testrun("root", federation, "sleep " + str(sec) + " || true") - -# - diff --git a/common/integration-test/federation-api/test/99_wait.py b/common/integration-test/federation-api/test/99_wait.py deleted file mode 100644 index 4379f58899d74fdf252f09fe8728fcf174e0fa14..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-api/test/99_wait.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_99_wait(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - #head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/wait-before-shutdown.sh 300") - -# - diff --git a/common/integration-test/federation-web/README b/common/integration-test/federation-web/README deleted file mode 100644 index 6a71ef1dde101ecd973425e9abe9944582fa45df..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/README +++ /dev/null @@ -1,3 +0,0 @@ -Test for federation-api. -Should run on VM, but currently will be deployed to a physical node - VNFS image. -VNFS one-2.2-node-jaKa.aufs is used - it is almost vanillia ubuntu. diff --git a/common/integration-test/federation-web/nodes/federation/install.xml b/common/integration-test/federation-web/nodes/federation/install.xml deleted file mode 100644 index 95ff4f3e7e240cb78b1d18ec6f703daeff52a716..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/nodes/federation/install.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - - diff --git a/common/integration-test/federation-web/nodes/federation/scripts/fix-scripts.sh b/common/integration-test/federation-web/nodes/federation/scripts/fix-scripts.sh deleted file mode 100755 index 19a5450df733ff2dc5d110c8e8ff7c247a20c8e1..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/nodes/federation/scripts/fix-scripts.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/federation-web/test/01_federation_api_install.py b/common/integration-test/federation-web/test/01_federation_api_install.py deleted file mode 100644 index 679b831cb6b8bf57b5044215563d7ecab02874c0..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/test/01_federation_api_install.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_install(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/install.sh") -# - diff --git a/common/integration-test/federation-web/test/01_federation_web_install.py b/common/integration-test/federation-web/test/01_federation_web_install.py deleted file mode 100644 index 99c3d6c3a6cbe15c7478045236aa37625a9805c8..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/test/01_federation_web_install.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_install(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-web/install.sh") -# - diff --git a/common/integration-test/federation-web/test/02_federation_api_setup.py b/common/integration-test/federation-web/test/02_federation_api_setup.py deleted file mode 100644 index c487947d70c06ef45560b2d880434a334403c32d..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/test/02_federation_api_setup.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_setup(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/mysql-setup.sh") -# - diff --git a/common/integration-test/federation-web/test/02_federation_web_setup.py b/common/integration-test/federation-web/test/02_federation_web_setup.py deleted file mode 100644 index cd4065373ec26a83257b6d083357cddb2cd899cf..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/test/02_federation_web_setup.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_setup(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-web/setup.sh") -# - diff --git a/common/integration-test/federation-web/test/03_federation_api_run.py b/common/integration-test/federation-web/test/03_federation_api_run.py deleted file mode 100644 index f6ec4377809e67e7da30e1fe1555547997949431..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/test/03_federation_api_run.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_fed_api(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - #ct_nodeman.sshrun("root", worker, "sleep 30") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/test.sh") - -# diff --git a/common/integration-test/federation-web/test/10_federation_api_test.py b/common/integration-test/federation-web/test/10_federation_api_test.py deleted file mode 100644 index 4585214e509c367bae13bef4188821a8c5ff06a2..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/test/10_federation_api_test.py +++ /dev/null @@ -1,13 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -def test_01_rest_interface(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - #ct_nodeman.sshrun("root", worker, "sleep 30") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/test-rest-interface.sh") - -# diff --git a/common/integration-test/federation-web/test/20_federation_web_initial_data.py b/common/integration-test/federation-web/test/20_federation_web_initial_data.py deleted file mode 100644 index fa36e65c7fae3d9a37e93d90b9ac0982c0120f2d..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/test/20_federation_web_initial_data.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_setup(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-web/setup-initial-data.sh") -# - diff --git a/common/integration-test/federation-web/test/90_wait_run.py b/common/integration-test/federation-web/test/90_wait_run.py deleted file mode 100644 index c3736e1a4a24e1c273b244ab8aa53aecd527ae93..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/test/90_wait_run.py +++ /dev/null @@ -1,17 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# test should run for 5 min ? -def test_03_wait(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - #head = ct_node_list["head"] - #worker = ct_node_list["worker"] - sec = 302 - print "Test will run for " + str(sec) + " secundes..." - ct_nodeman.testrun("root", federation, "sleep " + str(sec) + " || true") - -# - diff --git a/common/integration-test/federation-web/test/99_wait.py b/common/integration-test/federation-web/test/99_wait.py deleted file mode 100644 index 4379f58899d74fdf252f09fe8728fcf174e0fa14..0000000000000000000000000000000000000000 --- a/common/integration-test/federation-web/test/99_wait.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_99_wait(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - #head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/wait-before-shutdown.sh 300") - -# - diff --git a/common/integration-test/monitoring-core-test/README b/common/integration-test/monitoring-core-test/README deleted file mode 100644 index 06d87e3ed5fc55eca5b77f822978f5c8438126f0..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-core-test/README +++ /dev/null @@ -1,12 +0,0 @@ -justinc -Contegrator test for testing contegrator - -A single node - worker - is used. - -Directories: -./nodes/worker/scripts-post-boot/ -Content is copied to nodes root filesystem, and can be used after node boot. -File ./nodes/worker/scripts-post-boot/root/contegrator-test/test-1.sh will be available at /root/contegrator-test/test-1.sh. - -./nodes/worker/scripts -Content is executed in chroot environment, before node boot. diff --git a/common/integration-test/monitoring-core-test/nodes/worker/config/dot-sh-are-ignored.sh b/common/integration-test/monitoring-core-test/nodes/worker/config/dot-sh-are-ignored.sh deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/common/integration-test/monitoring-core-test/nodes/worker/config/tar-gz-is-unpacked.tar.gz b/common/integration-test/monitoring-core-test/nodes/worker/config/tar-gz-is-unpacked.tar.gz deleted file mode 100644 index 729e4d784f51c847ccef45353d2f14e1707025e9..0000000000000000000000000000000000000000 Binary files a/common/integration-test/monitoring-core-test/nodes/worker/config/tar-gz-is-unpacked.tar.gz and /dev/null differ diff --git a/common/integration-test/monitoring-core-test/nodes/worker/install.xml b/common/integration-test/monitoring-core-test/nodes/worker/install.xml deleted file mode 100644 index 273aa084bb45bc7bfa7f1aa636e8c85d1aa41892..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-core-test/nodes/worker/install.xml +++ /dev/null @@ -1,24 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - - ruby1.9.1-full - rubygems1.9 - g++ - make - openjdk-6-jre-headless - - - diff --git a/common/integration-test/monitoring-core-test/nodes/worker/scripts/fix-scripts.sh b/common/integration-test/monitoring-core-test/nodes/worker/scripts/fix-scripts.sh deleted file mode 100755 index c41190d2b4f3d13deabbe16821fc4ff3aca42820..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-core-test/nodes/worker/scripts/fix-scripts.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# fix /etc/fstab to mount ONE head /var/lib/one ... -# Eg. append some lines to /etc/fstab - this will be done before booting node, after installing upstream, contrail and tar.gz packets from nodes install.xml - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/monitoring-core-test/test/01_monitoring_core_test.py b/common/integration-test/monitoring-core-test/test/01_monitoring_core_test.py deleted file mode 100644 index 8380ed2dcb795230115463a9dcd9383fd410b541..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-core-test/test/01_monitoring_core_test.py +++ /dev/null @@ -1,56 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_99_wait(ct_node_list, ct_nodeman): - worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - try: - ct_nodeman.testrun("root", worker, "/srv/contegrator-test/wait-before-shutdown.sh 303") - # ct_nodeman.sshrun("root", worker, "/usr/bin/one-test-run.sh") - except: - print "Test failed" - raise - finally: - pass - -def test_01_install(ct_node_list, ct_nodeman): - worker = ct_node_list["worker"] - try: - ct_nodeman.testrun("root", worker, "date > /root/timestamp.txt") - # test-2.sh comes from config/xyz.tar.gz - ct_nodeman.testrun("root", worker, "/root/some-dir/test-2.sh || true") - ct_nodeman.testrun("root", worker, "/srv/contegrator-test/monitoring-core/worker-install.sh") - except: - print "Test failed" - raise - finally: - pass - - -def test_02_setup(ct_node_list, ct_nodeman): - worker = ct_node_list["worker"] - try: - ct_nodeman.testrun("root", worker, "/srv/contegrator-test/monitoring-core/worker-setup.sh") - except: - print "Test failed" - raise - finally: - pass - -def test_03_run(ct_node_list, ct_nodeman): - worker = ct_node_list["worker"] - try: - # will wait until monitoring-worker-install.sh finishes... - ct_nodeman.testrun("root", worker, "/srv/contegrator-test/monitoring-core/worker-run.sh") - except: - print "Test failed" - raise - finally: - pass - -# - diff --git a/common/integration-test/monitoring-core-test/test/check_01.py.disabled b/common/integration-test/monitoring-core-test/test/check_01.py.disabled deleted file mode 100644 index b661dc520677793ff9d36f381b7c351bd2233294..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-core-test/test/check_01.py.disabled +++ /dev/null @@ -1,32 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_99_wait(ct_node_list, ct_nodeman): - worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - try: - ct_nodeman.testrun("root", worker, "touch /tmp/wait_on_kill; while [ -f /tmp/wait_on_kill ]; do sleep 1; done; sleep 10") - # ct_nodeman.sshrun("root", worker, "/usr/bin/one-test-run.sh") - except: - print "Test failed" - raise - finally: - pass - -def test_01_hello(ct_node_list, ct_nodeman): - worker = ct_node_list["worker"] - try: - ct_nodeman.testrun("root", worker, "date > /root/timestamp.txt") - ct_nodeman.testrun("root", worker, "/root/some-dir/test-2.sh || true") - except: - print "Test failed" - raise - finally: - pass - -# - diff --git a/common/integration-test/monitoring-infrastructure-test/README b/common/integration-test/monitoring-infrastructure-test/README deleted file mode 100644 index e07e7ed7c7726323a32bb56eb64c435de740a251..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/README +++ /dev/null @@ -1,12 +0,0 @@ -justinc -Test for headNodeRestProxy, one-monitor, one-sensor - -ONE head and worker nodes are used. - -Directories: -./nodes/worker/scripts-post-boot/ -Content is copied to nodes root filesystem, and can be used after node boot. -File ./nodes/worker/scripts-post-boot/root/contegrator-test/test-1.sh will be available at /root/contegrator-test/test-1.sh. - -./nodes/worker/scripts -Content is executed in chroot environment, before node boot. diff --git a/common/integration-test/monitoring-infrastructure-test/nodes/head/install.xml b/common/integration-test/monitoring-infrastructure-test/nodes/head/install.xml deleted file mode 100644 index 5e548ccf67a35db62ae78db2b7cd23a5e5f157a9..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/nodes/head/install.xml +++ /dev/null @@ -1,16 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - openjdk-6-jre-headless - sysstat - - - - diff --git a/common/integration-test/monitoring-infrastructure-test/nodes/head/scripts/fix-nfs.sh b/common/integration-test/monitoring-infrastructure-test/nodes/head/scripts/fix-nfs.sh deleted file mode 100755 index 15731fe9728b2d99b0c36f957fb488d0b60dd78a..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/nodes/head/scripts/fix-nfs.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh - -# required for ONE worker node -echo "VNFS_NAME = $VNFS_NAME" -cp /etc/fstab /etc/fstab.orig -[ ! -z "$BASE_VNFS_NAME_head" ] && sed -e "s/$BASE_VNFS_NAME_head/$VNFS_NAME_head/g" /etc/fstab - diff --git a/common/integration-test/monitoring-infrastructure-test/nodes/head/scripts/fix-scripts.sh b/common/integration-test/monitoring-infrastructure-test/nodes/head/scripts/fix-scripts.sh deleted file mode 100755 index b57590ebabb347aa449e63693fea957d24bdb1f9..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/nodes/head/scripts/fix-scripts.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# fix /etc/fstab to mount ONE head /var/lib/one ... -# Eg. append some lines to /etc/fstab - this will be done before booting node, after installing upstream, contrail and tar.gz packets from nodes install.xml - -rm -f /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh -rm -f /var/lib/one/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/monitoring-infrastructure-test/nodes/worker/install.xml b/common/integration-test/monitoring-infrastructure-test/nodes/worker/install.xml deleted file mode 100644 index ea93fd98e8c4d6ea44dbbc01febf547b4eb618f5..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/nodes/worker/install.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - openjdk-6-jre-headless - sysstat - - diff --git a/common/integration-test/monitoring-infrastructure-test/nodes/worker/scripts/fix-nfs.sh b/common/integration-test/monitoring-infrastructure-test/nodes/worker/scripts/fix-nfs.sh deleted file mode 100755 index 15731fe9728b2d99b0c36f957fb488d0b60dd78a..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/nodes/worker/scripts/fix-nfs.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh - -# required for ONE worker node -echo "VNFS_NAME = $VNFS_NAME" -cp /etc/fstab /etc/fstab.orig -[ ! -z "$BASE_VNFS_NAME_head" ] && sed -e "s/$BASE_VNFS_NAME_head/$VNFS_NAME_head/g" /etc/fstab - diff --git a/common/integration-test/monitoring-infrastructure-test/nodes/worker/scripts/fix-scripts.sh b/common/integration-test/monitoring-infrastructure-test/nodes/worker/scripts/fix-scripts.sh deleted file mode 100755 index 9ed95c25a3fd837342e0d49f7b4b6c8d05d5d5c7..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/nodes/worker/scripts/fix-scripts.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# fix /etc/fstab to mount ONE head /var/lib/one ... -# Eg. append some lines to /etc/fstab - this will be done before booting node, after installing upstream, contrail and tar.gz packets from nodes install.xml - -# rm -f /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/monitoring-infrastructure-test/test/01_monitoring_infrastructure_install.py b/common/integration-test/monitoring-infrastructure-test/test/01_monitoring_infrastructure_install.py deleted file mode 100644 index b555603a3869ef861cdaa1f1db7594ec6c96d461..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/test/01_monitoring_infrastructure_install.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_02_install_monitoring(ct_node_list, ct_nodeman): - # federation = ct_node_list["federation"] - head = ct_node_list["head"] - worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-infrastructure/one-monitor-install.sh") - -# - diff --git a/common/integration-test/monitoring-infrastructure-test/test/02_monitoring_infrastructure_setup.py b/common/integration-test/monitoring-infrastructure-test/test/02_monitoring_infrastructure_setup.py deleted file mode 100644 index ff7f62701d82418a8f186e37571b75caccde8fdf..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/test/02_monitoring_infrastructure_setup.py +++ /dev/null @@ -1,25 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -def test_03_setup_sensor(ct_node_list, ct_nodeman): - # federation = ct_node_list["federation"] - head = ct_node_list["head"] - worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-infrastructure/one-sensor-setup.sh") - ct_nodeman.testrun("root", worker, "/srv/contegrator-test/monitoring-infrastructure/one-sensor-setup.sh") - -def test_04_setup_monitoring(ct_node_list, ct_nodeman): - # federation = ct_node_list["federation"] - head = ct_node_list["head"] - worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-infrastructure/one-monitor-setup.sh") - -def test_10_restart_tomcat(ct_node_list, ct_nodeman): - # federation = ct_node_list["federation"] - head = ct_node_list["head"] - worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "service tomcat6 restart") -# - diff --git a/common/integration-test/monitoring-infrastructure-test/test/03_monitoring_infrastructure_run.py b/common/integration-test/monitoring-infrastructure-test/test/03_monitoring_infrastructure_run.py deleted file mode 100644 index 6dd7ef77827bd1f434350af5dfc8459e30ad0cb3..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/test/03_monitoring_infrastructure_run.py +++ /dev/null @@ -1,21 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_01_monitor(ct_node_list, ct_nodeman): - # federation = ct_node_list["federation"] - head = ct_node_list["head"] - worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-infrastructure/one-monitor-run.sh") - -def test_02_sensor(ct_node_list, ct_nodeman): - # federation = ct_node_list["federation"] - head = ct_node_list["head"] - worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-infrastructure/one-sensor-run.sh") - ct_nodeman.testrun("root", worker, "/srv/contegrator-test/monitoring-infrastructure/one-sensor-run.sh") - -# - diff --git a/common/integration-test/monitoring-infrastructure-test/test/90_wait_run.py b/common/integration-test/monitoring-infrastructure-test/test/90_wait_run.py deleted file mode 100644 index a11e1719aef1ba6694874e954f61c32514044bfa..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/test/90_wait_run.py +++ /dev/null @@ -1,17 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# test should run for 5 min ? -def test_03_wait(ct_node_list, ct_nodeman): - # federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - sec = 302 - print "Test will run for " + str(sec) + " secundes..." - ct_nodeman.testrun("root", head, "sleep " + str(sec) + " || true") - -# - diff --git a/common/integration-test/monitoring-infrastructure-test/test/98_monitoring_infrastructure_archive.py b/common/integration-test/monitoring-infrastructure-test/test/98_monitoring_infrastructure_archive.py deleted file mode 100644 index 37f76868dcb5ca37997d9a924c6d30b4b20dc208..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/test/98_monitoring_infrastructure_archive.py +++ /dev/null @@ -1,20 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_archive(ct_node_list, ct_nodeman): - # federation = ct_node_list["federation"] - head = ct_node_list["head"] - worker = ct_node_list["worker"] - # nohup redirect - ct_nodeman.getfile(head, "/var/log/contrail/one-monitor.log", "archive/head/nohup-one-monitor.log" ) - ct_nodeman.getfile(head, "/var/log/contrail/one-sensor.log", "archive/head/nohup-one-sensor.log" ) - ct_nodeman.getfile(worker, "/var/log/contrail/one-sensor.log", "archive/worker/nohup-one-sensor.log" ) - - ct_nodeman.getfile(head, "/tmp/opennebula-monitor.log", "archive/head/opennebula-monitor.log" ) - ct_nodeman.getfile(head, "/tmp/opennebula-sensor.log", "archive/head/opennebula-sensor.log" ) - ct_nodeman.getfile(worker, "/tmp/opennebula-sensor.log", "archive/worker/opennebula-sensor.log" ) - -# diff --git a/common/integration-test/monitoring-infrastructure-test/test/99_wait.py b/common/integration-test/monitoring-infrastructure-test/test/99_wait.py deleted file mode 100644 index 0b59818f62dfd648777c70e91a6b3d6ed1867c96..0000000000000000000000000000000000000000 --- a/common/integration-test/monitoring-infrastructure-test/test/99_wait.py +++ /dev/null @@ -1,22 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_99_wait(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - try: - ct_nodeman.testrun("root", head, "/srv/contegrator-test/wait-before-shutdown.sh 300") - # ct_nodeman.sshrun("root", worker, "/usr/bin/one-test-run.sh") - except: - print "Test failed" - raise - finally: - pass - -# - diff --git a/common/integration-test/partner---vep-etc/README b/common/integration-test/partner---vep-etc/README deleted file mode 100644 index 478565b1cf8ec54858310a61a78221596f62ed89..0000000000000000000000000000000000000000 --- a/common/integration-test/partner---vep-etc/README +++ /dev/null @@ -1,8 +0,0 @@ -A working federation + provider setup for Contrail. -VEP is the most wanted thing - it runs on the ONE head node. - -Test is based on uros---federation-api-etc. -Only a few files are added/overwritten from this directory, before actually running the test. -Main differences are: - - root and contrail unix user - - OpenVPN to the nodes diff --git a/common/integration-test/partner---vep-etc/test/01_openvpn_install.py b/common/integration-test/partner---vep-etc/test/01_openvpn_install.py deleted file mode 100644 index 5a28c226ceec2b5cabc5365c70a8ef059083eefe..0000000000000000000000000000000000000000 --- a/common/integration-test/partner---vep-etc/test/01_openvpn_install.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_install(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/partner-vep/openvpn-install.sh") -# - diff --git a/common/integration-test/partner---vep-etc/test/02_openvpn_setup.py b/common/integration-test/partner---vep-etc/test/02_openvpn_setup.py deleted file mode 100644 index 349514c12a64a6e25a616768bbcf329b08c4c110..0000000000000000000000000000000000000000 --- a/common/integration-test/partner---vep-etc/test/02_openvpn_setup.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_setup(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/partner-vep/openvpn-setup.sh") -# - diff --git a/common/integration-test/partner---vep-etc/test/03_openvpn_run.py b/common/integration-test/partner---vep-etc/test/03_openvpn_run.py deleted file mode 100644 index a16d12fae7fa7c03364993097396a4c32551f77d..0000000000000000000000000000000000000000 --- a/common/integration-test/partner---vep-etc/test/03_openvpn_run.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_run(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/partner-vep/openvpn-run.sh") -# - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/edit-conf-file.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/edit-conf-file.sh deleted file mode 100755 index d4ed4d4a759c7e0f9b2ac19825a9a065aae52776..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/edit-conf-file.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -# $1 - File -# Line in conf file is "rabbit_mq_host = n0003" -# Set $2 = 'rabbit_mq_host=asdf' - no spaces! - -# exit on error -set -e -# echo cmd -# set -x - -DATE=`date +%Y%m%d-%H%M%S` - -FILE=$1 -shift - -echo "Modify config file $FILE" -cp $FILE $FILE.back-$DATE -for PARAM in $@ -do - KEY=`echo $PARAM | sed 's/=.*$//'` - NEW_VALUE=`echo $PARAM | sed "s/$KEY=//"` - NEW_LINE="$KEY = $NEW_VALUE" - echo " $NEW_LINE" - sed -i "s/^$KEY[[:space:]]*=.*$/$NEW_LINE/" $FILE - grep -q "^$NEW_LINE\$" $FILE || echo "Error: line replace failed" -done - - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/install.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/install.sh deleted file mode 100755 index f8f6f15a781b5a7b648d9ba3bdf2383cafbaecf3..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/install.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -export DEBIAN_FRONTEND=noninteractive -apt-get update 1>/dev/null -echo "Install apt packages" -apt-get -q -y --force-yes install mysql-server -apt-get -q -y --force-yes install tomcat6 curl - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/mysql-setup.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/mysql-setup.sh deleted file mode 100755 index 1baf90cd339579bbb1c651d76faf19051f9b42b4..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/mysql-setup.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -SCHEMA_PATH="/etc/contrail/federation-api/Providers-db.sql" -MYSQL=`which mysql` -Q1="CREATE USER 'contrail'@'localhost' IDENTIFIED BY 'contrail';" -Q2="SET PASSWORD FOR 'contrail'@'localhost' = PASSWORD('contrail');" -Q3="GRANT SELECT,INSERT,UPDATE,DELETE,CREATE,DROP ON contrail.* TO 'contrail'@'localhost';" -SQL="${Q1}${Q2}${Q3}" - -$MYSQL -u root < ${SCHEMA_PATH} -$MYSQL -u root -e "$SQL" diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/run.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/run.sh deleted file mode 100755 index 21f6472fac330b29903eed2039ef8cf095383c97..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/run.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -echo "Run deamons" -service tomcat6 restart diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/test-rest-interface.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/test-rest-interface.sh deleted file mode 100755 index 462e93d628a9f776d5da1836817116847fd11307..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/test-rest-interface.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -cd /srv/contegrator-test/federation-api/ -svn export svn://svn.forge.objectweb.org/svnroot/contrail/trunk/federation/federation-api/src/main/resources/scripts/rest_example.sh -./rest_example.sh $HOST_NAME_federation 8080 - -# - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/test.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/test.sh deleted file mode 100755 index 3baf0dbbb03fc12515763baa96bb5c5355be9830..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-api/test.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -curl -X GET http://${HOST_NAME_federation}:8080/federation-api/users - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-web/install.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-web/install.sh deleted file mode 100755 index 823a1db37d543f05e550d2dd53615fa6fb209da8..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/federation-web/install.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -export DEBIAN_FRONTEND=noninteractive -apt-get update 1>/dev/null -echo "Install federation-web" - -apt-get -q -y --force-yes install supervisor -apt-get -q -y --force-yes install python-setuptools build-essential python-dev -easy_install pip -pip install virtualenv - -mkdir -p /usr/share/contrail/federation/ -mkdir -p /var/log/contrail/ -cd /usr/share/contrail/federation/ -svn co svn://svn.forge.objectweb.org/svnroot/contrail/trunk/federation/federation-web -cd federation-web - -virtualenv env -env/bin/pip install -r requirements.txt -env/bin/python setup.py install -mkdir -p /etc/contrail/federation/ - -mkdir -p /tmp/federwebstatic/ -chmod 777 /tmp/federwebstatic/ -R - - -# assumes federation-api is at localhost -env/bin/python manage.py default_settings > /etc/contrail/federation/federation-web.conf - -cat > /etc/supervisor/conf.d/federationweb.conf < /etc/contrail/federation/federation-web.conf - -cat > /etc/supervisor/conf.d/federationweb.conf </dev/null -echo "Install apt packages" -# apt-get -q -y --force-yes install sun-java6-jre # partner repo -apt-get -q -y --force-yes install rabbitmq-server -echo "Install rubygems" -# gem, gem1.9, gem1.9.1 -GEM_INSTALL='gem install -d --no-rdoc --no-ri' -$GEM_INSTALL json -$GEM_INSTALL xml-simple -$GEM_INSTALL amqp # (needs g++, sudo aptitude install g++) -$GEM_INSTALL sinatra -$GEM_INSTALL thin -$GEM_INSTALL sourcify - -# fix message: -# Invalid gemspec in [/var/lib/gems/1.8/specifications/tilt-1.3.3.gemspec]: invalid date format in specification: "2011-08-25 00:00:00.000000000Z" -if [ -d /var/lib/gems/1.8/specifications/ ]; -then - [ -n "`find /var/lib/gems/1.8/specifications/ -type f`" ] && \ - sed -i 's/ 00:00:00.000000000Z//' /var/lib/gems/1.8/specifications/* -fi -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-core/worker-run.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-core/worker-run.sh deleted file mode 100755 index 3c7279a6d0ea72c343b0add85734aaf7cb68d2a4..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-core/worker-run.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -echo "Run QueueManager2.rb file" -#cd /var/lib/contrail/ -# nohup java -jar /usr/share/contrail/monitoring/one-sensor/one-sensor-0.2-SNAPSHOT-jar-with-dependencies.jar & -nohup ruby /usr/share/contrail/monitoring/QueueManager2.rb & - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-core/worker-setup.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-core/worker-setup.sh deleted file mode 100755 index 8387b84ca586cde188a35d882a327af30219fded..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-core/worker-setup.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -echo "Setup rabbitmq" -rabbitmqctl change_password guest 123 -# add user if required -rabbitmqctl list_users | grep '^contrail[[:space:]]' || \ - rabbitmqctl add_user contrail contrail -rabbitmqctl set_permissions contrail ".*" ".*" ".*" -rabbitmqctl list_permissions - -# echo "Setup mysql - TODO" - -echo "Copy config files" -# cp /usr/share/contrail/monitoring/one-sensor/config where ? -# cp /usr/share/contrail/monitoring/one-sensor/hostConfig where ? - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-monitor-install.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-monitor-install.sh deleted file mode 100755 index 0e0e5f7130c7cfbfd4e222f5c06975812bb9d9ea..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-monitor-install.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# ruby1.9 etc installed in chroot -export DEBIAN_FRONTEND=noninteractive -apt-get update 1>/dev/null -echo "Install apt packages" -# apt-get -q -y --force-yes install sun-java6-jre # partner repo -apt-get -q -y --force-yes install rabbitmq-server -apt-get -q -y --force-yes install tomcat6 -# ganglia-monitor (node), gmond ? - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-monitor-run.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-monitor-run.sh deleted file mode 100755 index a56ce8e537168220d1e4418e3821aed567a8c3b2..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-monitor-run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -echo "Run one-monitor.jar" -mkdir /var/log/contrail/ || true -cd /usr/share/contrail/monitoring/one-monitor/ # config file -nohup java -jar /usr/share/contrail/monitoring/one-monitor/one-monitor-0.2-SNAPSHOT-jar-with-dependencies.jar >> /var/log/contrail/one-monitor.log & -sleep 10 # nohup needs some time ? -echo " done" -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-monitor-setup.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-monitor-setup.sh deleted file mode 100755 index 3891c95b0ced0b29acc4a1884c10cbbbd4351bd7..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-monitor-setup.sh +++ /dev/null @@ -1,30 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -echo "Setup rabbitmq" -# rabbitmqctl change_password guest 123 -rabbitmqctl change_password guest guest -# add user if required -rabbitmqctl list_users | grep '^contrail[[:space:]]' || \ - rabbitmqctl add_user contrail contrail -rabbitmqctl set_permissions contrail ".*" ".*" ".*" -rabbitmqctl list_permissions - -# echo "Setup mysql - TODO" - -# echo "Copy config files" -# cp /usr/share/contrail/monitoring/one-sensor/config where ? -# cp /usr/share/contrail/monitoring/one-sensor/hostConfig where ? - -echo "Setup ONE monitor config" -CONF="/usr/share/contrail/monitoring/one-monitor/config" -/srv/contegrator-test/edit-conf-file.sh $CONF \ - rabbit_mq_host=$HOST_NAME_head \ -# - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-sensor-run.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-sensor-run.sh deleted file mode 100755 index 12c9b3dd7137fb9af0a76bc508c9e4706579e395..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-sensor-run.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -echo "Run one-sensor.jar" -mkdir /var/log/contrail/ || true -cd /usr/share/contrail/monitoring/one-sensor/ # config file assumed to be in PWd dir -nohup java -jar /usr/share/contrail/monitoring/one-sensor/one-sensor-0.2-SNAPSHOT-jar-with-dependencies.jar >> /var/log/contrail/one-sensor.log & -sleep 10 # nohup needs some time ? -echo " done" -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-sensor-setup.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-sensor-setup.sh deleted file mode 100755 index 5d40a9be2dd5eec830731d0cf72aa5581c9d814f..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/monitoring-infrastructure/one-sensor-setup.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -echo "Setup ONE sensor config" -CONF="/usr/share/contrail/monitoring/one-sensor/config" -/srv/contegrator-test/edit-conf-file.sh $CONF \ - rabbit_mq_host=$HOST_NAME_head \ -# - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/debian-1.oneimage-template b/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/debian-1.oneimage-template deleted file mode 100644 index 55b35c97b35788b2e7b95ba6f5e5abcb6a24898e..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/debian-1.oneimage-template +++ /dev/null @@ -1,9 +0,0 @@ -NAME = "debian-1" -PATH = "/srv/one-images/debian-600.qcow2.z" -PUBLIC = YES -DESCRIPTION = "Debin 6.0, context - net OK" -# -TYPE = OS -DEV_PREFIX = hd -DRIVER = qcow2 -BUS = virtio # ide (not IDE), SCSI, virtio diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/debian-1.vm-template b/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/debian-1.vm-template deleted file mode 100644 index 6465c6097cd25dfb97380da48fed8d906eaac727..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/debian-1.vm-template +++ /dev/null @@ -1,22 +0,0 @@ -NAME = "debian-vm-1" -DESCRIPTION = "Debian 6" -MEMORY = 250 -ARCHITECTURE = x86_64 -CPU = 2 - -# additional arch seems to be required to boot debian iamge -# or is the first ARCHITECTURE ignored ? -OS = [ -# boot="hd", - ARCH = x86_64 -] - -BOOT = hd - -DISK = [ IMAGE = "debian-1"] - -NIC = [ NETWORK = "private-lan"] - -GRAPHICS = [type="vnc"] -RANK = FREECPU -# FEATURES = [ acpi="no" ] diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/setup-images.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/setup-images.sh deleted file mode 100755 index 239dedfcaa55f332c3fe8b0373ed286709427102..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/setup-images.sh +++ /dev/null @@ -1,17 +0,0 @@ -#!/bin/bash -# Param - image templates to register - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -# -IMAGES="$@" -for img in $IMAGES -do - echo "Image template: $img" - oneimage register "$img" -done diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/setup.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/setup.sh deleted file mode 100755 index b6b1e299904a09650f7a2f0af0afb8a5bd1a42a8..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/setup.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# -oneuser create contrail contrail - -# TODO: ssh keys -# add onehost, test image is already present -# ssh_config - StrictHostKeyChecking no -[ ! -z "$HOST_NAME_head" ] && onehost create $HOST_NAME_head im_kvm vmm_kvm tm_nfs -[ ! -z "$HOST_NAME_worker" ] && onehost create $HOST_NAME_worker im_kvm vmm_kvm tm_nfs -[ ! -z "$HOST_NAME_worker1" ] && onehost create $HOST_NAME_worker1 im_kvm vmm_kvm tm_nfs -[ ! -z "$HOST_NAME_worker2" ] && onehost create $HOST_NAME_worker2 im_kvm vmm_kvm tm_nfs -# -onevnet publish private-lan - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/ubu-11.10.oneimage-template b/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/ubu-11.10.oneimage-template deleted file mode 100644 index e0a66200f933b01e65a5da9a26c9054d8c8a5acd..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/ubu-11.10.oneimage-template +++ /dev/null @@ -1,10 +0,0 @@ -NAME = "ubu-11.10" -PATH = "/srv/one-images/ubu-11.10.qcow2.z" -PUBLIC = YES -# CD context in /mnt/init.sh -DESCRIPTION = "Ubuntu 11.10, optional CD context" -# -TYPE = OS -DEV_PREFIX = hd -DRIVER = qcow2 -BUS = virtio # ide (not IDE), SCSI, virtio diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/ubu-11.10.vm-template b/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/ubu-11.10.vm-template deleted file mode 100644 index 968e3f152d12ba9759a8c0260121cb343b005ad3..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/one-head/ubu-11.10.vm-template +++ /dev/null @@ -1,22 +0,0 @@ -NAME = "ubu-11.10" -DESCRIPTION = "Ubuntu 11.10" -MEMORY = 250 -ARCHITECTURE = x86_64 -CPU = 2 - -# additional arch seems to be required to boot debian iamge -# or is the first ARCHITECTURE ignored ? -OS = [ -# boot="hd", - ARCH = x86_64 -] - -BOOT = hd - -DISK = [ IMAGE = "ubu-11.10"] - -NIC = [ NETWORK = "private-lan"] - -GRAPHICS = [type="vnc"] -RANK = FREECPU -# FEATURES = [ acpi="no" ] diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/contrail.n0001.xc2.conf b/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/contrail.n0001.xc2.conf deleted file mode 100644 index 2bad3d78b053b87dfbaeb89c9dee1259c9a37a8b..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/contrail.n0001.xc2.conf +++ /dev/null @@ -1,303 +0,0 @@ -################################################# -# Sample OpenVPN 2.0 config file for # -# multi-client server. # -# # -# This file is for the server side # -# of a many-clients <-> one-server # -# OpenVPN configuration. # -# # -# OpenVPN also supports # -# single-machine <-> single-machine # -# configurations (See the Examples page # -# on the web site for more info). # -# # -# This config should work on Windows # -# or Linux/BSD systems. Remember on # -# Windows to quote pathnames and use # -# double backslashes, e.g.: # -# "C:\\Program Files\\OpenVPN\\config\\foo.key" # -# # -# Comments are preceded with '#' or ';' # -################################################# - -# Which local IP address should OpenVPN -# listen on? (optional) -;local a.b.c.d - -# Which TCP/UDP port should OpenVPN listen on? -# If you want to run multiple OpenVPN instances -# on the same machine, use a different port -# number for each one. You will need to -# open up this port on your firewall. -port 1194 - -# TCP or UDP server? -# justinc, test witch netcat, upd didnt work, tcp did. -proto tcp -;proto udp - -# "dev tun" will create a routed IP tunnel, -# "dev tap" will create an ethernet tunnel. -# Use "dev tap0" if you are ethernet bridging -# and have precreated a tap0 virtual interface -# and bridged it with your ethernet interface. -# If you want to control access policies -# over the VPN, you must create firewall -# rules for the the TUN/TAP interface. -# On non-Windows systems, you can give -# an explicit unit number, such as tun0. -# On Windows, use "dev-node" for this. -# On most systems, the VPN will not function -# unless you partially or fully disable -# the firewall for the TUN/TAP interface. -;dev tap -dev tun - -# Windows needs the TAP-Win32 adapter name -# from the Network Connections panel if you -# have more than one. On XP SP2 or higher, -# you may need to selectively disable the -# Windows firewall for the TAP adapter. -# Non-Windows systems usually don't need this. -;dev-node MyTap - -# SSL/TLS root certificate (ca), certificate -# (cert), and private key (key). Each client -# and the server must have their own cert and -# key file. The server and all clients will -# use the same ca file. -# -# See the "easy-rsa" directory for a series -# of scripts for generating RSA certificates -# and private keys. Remember to use -# a unique Common Name for the server -# and each of the client certificates. -# -# Any X509 key management system can be used. -# OpenVPN can also use a PKCS #12 formatted key file -# (see "pkcs12" directive in man page). -ca /etc/easy-rsa/2.0/contrail.n0001.xc2-keys/contrail.n0001.xc2-ca.crt -cert /etc/easy-rsa/2.0/contrail.n0001.xc2-keys/contrail.n0001.xc2-server.crt -key /etc/easy-rsa/2.0/contrail.n0001.xc2-keys/contrail.n0001.xc2-server.key # This file should be kept secret - -# Diffie hellman parameters. -# Generate your own with: -# openssl dhparam -out dh1024.pem 1024 -# Substitute 2048 for 1024 if you are using -# 2048 bit keys. -dh /etc/easy-rsa/2.0/contrail.n0001.xc2-keys/dh1024.pem - -# Configure server mode and supply a VPN subnet -# for OpenVPN to draw client addresses from. -# The server will take 10.8.0.1 for itself, -# the rest will be made available to clients. -# Each client will be able to reach the server -# on 10.8.0.1. Comment this line out if you are -# ethernet bridging. See the man page for more info. -server 10.250.0.0 255.255.255.0 - -# Maintain a record of client <-> virtual IP address -# associations in this file. If OpenVPN goes down or -# is restarted, reconnecting clients can be assigned -# the same virtual IP address from the pool that was -# previously assigned. -ifconfig-pool-persist ipp.txt - -# Configure server mode for ethernet bridging. -# You must first use your OS's bridging capability -# to bridge the TAP interface with the ethernet -# NIC interface. Then you must manually set the -# IP/netmask on the bridge interface, here we -# assume 10.8.0.4/255.255.255.0. Finally we -# must set aside an IP range in this subnet -# (start=10.8.0.50 end=10.8.0.100) to allocate -# to connecting clients. Leave this line commented -# out unless you are ethernet bridging. -;server-bridge 10.8.0.4 255.255.255.0 10.8.0.50 10.8.0.100 - -# Configure server mode for ethernet bridging -# using a DHCP-proxy, where clients talk -# to the OpenVPN server-side DHCP server -# to receive their IP address allocation -# and DNS server addresses. You must first use -# your OS's bridging capability to bridge the TAP -# interface with the ethernet NIC interface. -# Note: this mode only works on clients (such as -# Windows), where the client-side TAP adapter is -# bound to a DHCP client. -;server-bridge - -# Push routes to the client to allow it -# to reach other private subnets behind -# the server. Remember that these -# private subnets will also need -# to know to route the OpenVPN client -# address pool (10.8.0.0/255.255.255.0) -# back to the OpenVPN server. -;push "route 192.168.20.0 255.255.255.0" -# rabim 10.1.0.0 - 10.1.5.255 -push "route 10.1.0.0 255.255.240.0" -#push "route 10.250.0.0 255.255.255.0" - -# To assign specific IP addresses to specific -# clients or if a connecting client has a private -# subnet behind it that should also have VPN access, -# use the subdirectory "ccd" for client-specific -# configuration files (see man page for more info). - -# EXAMPLE: Suppose the client -# having the certificate common name "Thelonious" -# also has a small subnet behind his connecting -# machine, such as 192.168.40.128/255.255.255.248. -# First, uncomment out these lines: -;client-config-dir ccd -;route 192.168.40.128 255.255.255.248 -# Then create a file ccd/Thelonious with this line: -# iroute 192.168.40.128 255.255.255.248 -# This will allow Thelonious' private subnet to -# access the VPN. This example will only work -# if you are routing, not bridging, i.e. you are -# using "dev tun" and "server" directives. - -# EXAMPLE: Suppose you want to give -# Thelonious a fixed VPN IP address of 10.9.0.1. -# First uncomment out these lines: -;client-config-dir ccd -;route 10.9.0.0 255.255.255.252 -# Then add this line to ccd/Thelonious: -# ifconfig-push 10.9.0.1 10.9.0.2 - -# Suppose that you want to enable different -# firewall access policies for different groups -# of clients. There are two methods: -# (1) Run multiple OpenVPN daemons, one for each -# group, and firewall the TUN/TAP interface -# for each group/daemon appropriately. -# (2) (Advanced) Create a script to dynamically -# modify the firewall in response to access -# from different clients. See man -# page for more info on learn-address script. -;learn-address ./script - -# If enabled, this directive will configure -# all clients to redirect their default -# network gateway through the VPN, causing -# all IP traffic such as web browsing and -# and DNS lookups to go through the VPN -# (The OpenVPN server machine may need to NAT -# or bridge the TUN/TAP interface to the internet -# in order for this to work properly). -;push "redirect-gateway def1 bypass-dhcp" - -# Certain Windows-specific network settings -# can be pushed to clients, such as DNS -# or WINS server addresses. CAVEAT: -# http://openvpn.net/faq.html#dhcpcaveats -# The addresses below refer to the public -# DNS servers provided by opendns.com. -;push "dhcp-option DNS 208.67.222.222" -;push "dhcp-option DNS 208.67.220.220" - -# Uncomment this directive to allow different -# clients to be able to "see" each other. -# By default, clients will only see the server. -# To force clients to only see the server, you -# will also need to appropriately firewall the -# server's TUN/TAP interface. -;client-to-client - -# Uncomment this directive if multiple clients -# might connect with the same certificate/key -# files or common names. This is recommended -# only for testing purposes. For production use, -# each client should have its own certificate/key -# pair. -# -# IF YOU HAVE NOT GENERATED INDIVIDUAL -# CERTIFICATE/KEY PAIRS FOR EACH CLIENT, -# EACH HAVING ITS OWN UNIQUE "COMMON NAME", -# UNCOMMENT THIS LINE OUT. -duplicate-cn - -# The keepalive directive causes ping-like -# messages to be sent back and forth over -# the link so that each side knows when -# the other side has gone down. -# Ping every 10 seconds, assume that remote -# peer is down if no ping received during -# a 120 second time period. -keepalive 10 120 - -# For extra security beyond that provided -# by SSL/TLS, create an "HMAC firewall" -# to help block DoS attacks and UDP port flooding. -# -# Generate with: -# openvpn --genkey --secret ta.key -# -# The server and each client must have -# a copy of this key. -# The second parameter should be '0' -# on the server and '1' on the clients. -;tls-auth ta.key 0 # This file is secret - -# Select a cryptographic cipher. -# This config item must be copied to -# the client config file as well. -;cipher BF-CBC # Blowfish (default) -;cipher AES-128-CBC # AES -;cipher DES-EDE3-CBC # Triple-DES - -# Enable compression on the VPN link. -# If you enable it here, you must also -# enable it in the client config file. -#comp-lzo - -# The maximum number of concurrently connected -# clients we want to allow. -;max-clients 100 - -# It's a good idea to reduce the OpenVPN -# daemon's privileges after initialization. -# -# You can uncomment this out on -# non-Windows systems. -user nobody -group nogroup - -# The persist options will try to avoid -# accessing certain resources on restart -# that may no longer be accessible because -# of the privilege downgrade. -persist-key -persist-tun - -# Output a short status file showing -# current connections, truncated -# and rewritten every minute. -status openvpn-status.log - -# By default, log messages will go to the syslog (or -# on Windows, if running as a service, they will go to -# the "\Program Files\OpenVPN\log" directory). -# Use log or log-append to override this default. -# "log" will truncate the log file on OpenVPN startup, -# while "log-append" will append to it. Use one -# or the other (but not both). -;log openvpn.log -log-append /var/log/openvpn.log - -# Set the appropriate level of log -# file verbosity. -# -# 0 is silent, except for fatal errors -# 4 is reasonable for general usage -# 5 and 6 can help to debug connection problems -# 9 is extremely verbose -;verb 3 -verb 4 - -# Silence repeating messages. At most 20 -# sequential messages of the same message -# category will be output to the log. -;mute 20 diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/openvpn-install.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/openvpn-install.sh deleted file mode 100755 index d0e9dd9fec4df04661bfbc3234b670232363e763..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/openvpn-install.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -export DEBIAN_FRONTEND=noninteractive -apt-get update 1>/dev/null -echo "Install apt packages" -apt-get -q -y --force-yes install openvpn - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/openvpn-run.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/openvpn-run.sh deleted file mode 100755 index 6456f9c9ab1d420d8b3287da0108f1fa5fdc2870..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/openvpn-run.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -service openvpn stop -service openvpn start - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/openvpn-setup.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/openvpn-setup.sh deleted file mode 100755 index 9573ef2a1632c1304c30fa653f1952a936711071..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/partner-vep/openvpn-setup.sh +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -cp /srv/contegrator-test/partner-vep/contrail.n0001.xc2.conf /etc/openvpn/ - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/praasc/install.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/praasc/install.sh deleted file mode 100755 index 750e4bc49311a3630f1dc2a8153e0cfd0edfd4e8..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/praasc/install.sh +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -export DEBIAN_FRONTEND=noninteractive -apt-get update 1>/dev/null -echo "Install PRaaSC to ONE head" - -apt-get -q -y --force-yes install python-setuptools python-dev - -mkdir -p /usr/share/contrail/federation -mkdir -p /var/log/contrail/ -mkdir -p /var/lib/contrail/ - -cd /usr/share/contrail/federation -svn co svn://svn.forge.objectweb.org/svnroot/contrail/trunk/federation/PRaaSC -cd PRaaSC -python setup.py install - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/praasc/run.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/praasc/run.sh deleted file mode 100755 index 5af3c368cfecd9a5c85fa9d1d287fe7920e46a6d..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/praasc/run.sh +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -praasc >> /var/log/contrail/praasc.log 2>&1 & -sleep 5 -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/praasc/setup.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/praasc/setup.sh deleted file mode 100755 index 0fc7561f8f34bb527debaf658b3d61991cc917b0..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/praasc/setup.sh +++ /dev/null @@ -1,18 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -# SSH key already copied to proxy2.contrail.xlab.si - -cat > /etc/praasc.conf < - - - - - - - - - - - - Describes the set of virtual disks - - - - - - - List of logical networks used in the package - - The network used to link the web server node and the engine frontend node. - - - - - - The packaging of the double ubuntu multi-tier application - Contrail Test Application - - dsl-image - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 512 MB of memory - 2 - 4 - 512 - - - 0 - Harddisk 1 - ovf:/disk/dsl-1a - 22001 - 1000 - 17 - - - true - private-lan - Ethernet adapter on "private-lan" - - 3 - PCNet32 - 10 - - - - - dsl-image - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 512 MB of memory - 2 - 4 - 512 - - - 0 - Harddisk 1 - ovf:/disk/dsl-1b - 22001 - 1000 - 17 - - - true - private-lan - Ethernet adapter on "private-lan" - - 3 - PCNet32 - 10 - - - - - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/install.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/install.sh deleted file mode 100755 index 4260a51a081d81929955275e9fd360131a5de6b3..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -export DEBIAN_FRONTEND=noninteractive -apt-get update 1>/dev/null -echo "Install apt packages" -# apt-get -q -y --force-yes install sun-java6-jre # partner repo -apt-get -q -y --force-yes install mysql-server - - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/run.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/run.sh deleted file mode 100755 index 6afafb330ecde81882de6437ace48ecc456015b4..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/run.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -echo "Run vep-cli.jar" -mkdir /var/log/contrail/ || true -cd /usr/share/contrail/vep/ # config file assumed to be in PWd dir ? -nohup java -jar /usr/share/contrail/vep/vep-cli-1.0-SNAPSHOT-jar-with-dependencies.jar >> /var/log/contrail/vep.log & -sleep 10 # nohup needs some time ? -echo " done" -# - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/setup-one-head.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/setup-one-head.sh deleted file mode 100755 index dfa739e55d6e2360fea9a46525b095240b8f142e..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/setup-one-head.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/bin/bash - -# executed on ONE head - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# ONE setup - contrail cluster -onecluster create contrail -if [ ! -z "$HOST_NAME_head" ]; then - onecluster addhost $HOST_NAME_head contrail -fi -if [ ! -z "$HOST_NAME_worker" ]; then - onecluster addhost $HOST_NAME_worker contrail -fi -if [ ! -z "$HOST_NAME_worker1" ]; then - onecluster addhost $HOST_NAME_worker1 contrail -fi -if [ ! -z "$HOST_NAME_worker2" ]; then - onecluster addhost $HOST_NAME_worker2 contrail -fi - -# - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/setup.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/setup.sh deleted file mode 100755 index f46337eb63c8ba3a29ae0592c2d43d6908ac0d22..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/setup.sh +++ /dev/null @@ -1,49 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# mysql already installed - -# mysql is on current node -/srv/contegrator-test/edit-conf-file.sh /usr/share/contrail/vep/vep.properties \ - vepdb.choice=sqlite \ - mysql.ip=$HOST_NAME \ - mysql.port=3306 \ - mysql.user=vepuser \ - mysql.pass=pass1234 \ - -# ONE head is on node head -/srv/contegrator-test/edit-conf-file.sh /usr/share/contrail/vep/vep.properties \ - one.ip=$HOST_NAME_head \ - one.port=2633 \ - one.user=oneadmin \ - one.pass=oneadmin \ -# TODO: contrail.cluster=1 - -# setup mysql user, pass -# db ? -#mysql -u root -e "create database conpaas_test character set = 'utf8';" -mysql -u root -e "grant all on vepdb.* to 'vepuser'@'localhost' identified by 'pass1234';" -mysql -u root -e "grant all on vepdb.* to 'vepuser'@'$HOST_NAME' identified by 'pass1234';" -mysql -u root -e "grant all on vepdb.* to 'vepuser'@'$HOST_NAME.xc2.xlab.lan' identified by 'pass1234';" -# TODO: -#mysql -u test --password=test - - - - - - - - - - - Describes the set of virtual disks - - - - - - - List of logical networks used in the package - - The network used to link the web server node and the engine frontend node. - - - - - - The packaging of the double ubuntu multi-tier application - Contrail Test Application - - Ubuntu image 11.10 - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 512 MB of memory - 2 - 4 - 512 - - - 0 - Harddisk 1 - ovf:/disk/ubuntu1 - 22001 - 1000 - 17 - - - true - private-lan - Ethernet adapter on "private-lan" - - 3 - PCNet32 - 10 - - - - - Ubuntu image 11.10 - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 512 MB of memory - 2 - 4 - 512 - - - 0 - Harddisk 1 - ovf:/disk/ubuntu2 - 22001 - 1000 - 17 - - - true - private-lan - Ethernet adapter on "private-lan" - - 3 - PCNet32 - 10 - - - - - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/vep.db.n0006 b/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/vep.db.n0006 deleted file mode 100644 index 56865a6bc31d17fe5a074fb4e7bf1db656c1c478..0000000000000000000000000000000000000000 Binary files a/common/integration-test/scripts-post-boot/srv/contegrator-test/vep-cli/vep.db.n0006 and /dev/null differ diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/install-strongswan.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/install-strongswan.sh deleted file mode 100755 index 11815bb91aaa3bef833fddd16be71dd31e48a520..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/install-strongswan.sh +++ /dev/null @@ -1,29 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -export DEBIAN_FRONTEND=noninteractive -apt-get update -apt-get -q -y --force-yes install strongswan - -# "whoami", get VNFS name -# "10.31.1.253:/usr/var/lib/perceus//vnfs/test-vnfs-vin-0.2-SNAPSHOT-head/rootfs on / type nfs ... " -# head, worker1 or worker2? -NODE_NAME=`mount | grep ' on / type' | sed "s|/|\n|g" | grep '^test-vnfs-' | sed "s/-/\n/g" | tail -n1` - -# config certs -CERT_SRC="/srv/contegrator-test/vin/strongswan-ca" -cp ${CERT_SRC}/ca-cert.der /etc/ipsec.d/cacerts/ -cp ${CERT_SRC}/one-${NODE_NAME}-cert.der /etc/ipsec.d/certs/ -cp ${CERT_SRC}/one-${NODE_NAME}-key.der /etc/ipsec.d/private/ -# here should be some sample/test config ? -touch /var/lib/strongswan/ipsec.secrets.inc - -service ipsec restart - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/install.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/install.sh deleted file mode 100755 index c4edd8c6df7e79bcbc11b11d6adc1b7058226729..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/install.sh +++ /dev/null @@ -1,16 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -# get required jar/class files -(cd / && tar xzvf /srv/contegrator-test/vin/vin-support.tar.gz) -INTERFACEDIR=/usr/share/contrail/support/vin/interface-scripts -chmod +x $INTERFACEDIR/* -chmod u+s $INTERFACEDIR/* - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/ca-cert.der b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/ca-cert.der deleted file mode 100644 index 1051e2cd0e7b4a7efc5e8525bb416ff1f10bbee4..0000000000000000000000000000000000000000 Binary files a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/ca-cert.der and /dev/null differ diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/ca-key.der b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/ca-key.der deleted file mode 100644 index 18c28e555a4e42b5212cad809e5215419cc52bed..0000000000000000000000000000000000000000 Binary files a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/ca-key.der and /dev/null differ diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-head-cert.der b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-head-cert.der deleted file mode 100644 index 138f8413445d00b3b6c1d962ed6c19d7647a50fd..0000000000000000000000000000000000000000 Binary files a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-head-cert.der and /dev/null differ diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-head-key.der b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-head-key.der deleted file mode 100644 index 69ab4497209e7e96f405350f5106217ab35769c4..0000000000000000000000000000000000000000 Binary files a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-head-key.der and /dev/null differ diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker1-cert.der b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker1-cert.der deleted file mode 100644 index d1d1c1e429a0be23457d13fb9e434482293121be..0000000000000000000000000000000000000000 Binary files a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker1-cert.der and /dev/null differ diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker1-key.der b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker1-key.der deleted file mode 100644 index 40a8e88aaff36bdb6c37aac793b4b3c0f4a9603e..0000000000000000000000000000000000000000 Binary files a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker1-key.der and /dev/null differ diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker2-cert.der b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker2-cert.der deleted file mode 100644 index 039018b61d0ea31908f495f63f968488781a17ad..0000000000000000000000000000000000000000 Binary files a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker2-cert.der and /dev/null differ diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker2-key.der b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker2-key.der deleted file mode 100644 index 5df67b9eaa5b46b0304c7655ee7644ef7ca15b5c..0000000000000000000000000000000000000000 Binary files a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/one-worker2-key.der and /dev/null differ diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/strongswan-build-ca.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/strongswan-build-ca.sh deleted file mode 100755 index eaa0882ec318cc4184e3709d427e6c890b22bd2b..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/strongswan-ca/strongswan-build-ca.sh +++ /dev/null @@ -1,28 +0,0 @@ -#!/bin/bash - -# exit on error -set -e -# echo cmd -set -x - -# justinc, recreate sample strongswan certs -exit 0 # requires strongswan package, which includes daemon... - -create_peer() { -PEER=$1 - ipsec pki --gen > ${PEER}-key.der - ipsec pki --pub --in ${PEER}-key.der | ipsec pki --issue --cacert ca-cert.der --cakey ca-key.der --dn "C=CH, O=strongSwan, CN=${PEER}" > ${PEER}-cert.der -} - -TARGET_DIR="/srv/contegrator-test/vin/strongswan-ca" -mkdir ${TARGET_DIR} -cd ${TARGET_DIR} -ipsec pki --gen > ca-key.der -ipsec pki --self --in ca-key.der --dn "C=CH, O=strongSwan, CN=strongSwan CA" --ca > ca-cert.der - -create_peer one-head -create_peer one-worker1 -create_peer one-worker2 - -# - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/contrail-vm.one b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/contrail-vm.one deleted file mode 100644 index 984ec12959e4122479d72b54c4bd1c92931ad0a9..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/contrail-vm.one +++ /dev/null @@ -1,66 +0,0 @@ - -NAME="vin-vm" - -## -CPU = 0.5 -MEMORY = 400 - -OS = [ - arch = x86_64 -] - -DISK=[ - BUS=virtio, - #DEV_PREFIX=vd, - DEV_PREFIX=hd, - DISK_ID=0, - DRIVER=qcow2, - READONLY=no, - SOURCE=/srv/one-images/ubu-11.10.qcow2.z, -# SOURCE=/srv/one-images/debian-600.qcow2.z, -# SOURCE=/var/scratch/reeuwijk/conpaas-one-kvm-x86.img, - TARGET=hda - ] - -NIC = [ - # NETWORK = "Small network" - # OpenNebula API change: now refer to NETWORK ID: - NETWORK_ID=0 -] - -GRAPHICS = [ - TYPE = "vnc", - LISTEN = "0.0.0.0" -] - -FEATURES = [ - # Needed for graceful shutdown with KVM: - acpi="yes" -] - -RAW = [ - type = "kvm", - data = " " -] - -MYDIR="/srv/contegrator-test/vin/test-files" -CONTEXT = [ - hostname = "$NAME", - VIN_VMID = "$VIN_VM_ID", - VIN_IBIS_SERVER = "$VIN_IBIS_SERVER", - VIN_POOL_NAME = "$VIN_POOL_NAME", - # OpenNebula API change: now refer to NETWORK ID: -# dns = "$NETWORK[DNS, NETWORK=\"private-lan\"]", -# dns = "$NETWORK[DNS, NETWORK_ID=0]", -# gateway = "$NETWORK[GATEWAY, NETWORK=\"private-lan\"]", -# netmask = "$NETWORK[NETMASK, NETWORK=\"private-lan\"]", - dns = "10.31.1.253", - gateway = "10.1.0.254", - netmask = "255.255.255.0", - # files = "/srv/tmp-write/one/contrail-vm/init.sh /srv/tmp-write/vin/jars/vin.jar /srv/tmp-write/one/id_rsa.pub /srv/tmp-write/vin/interface-scripts /srv/tmp-write/vin/vin-support.tar.gz /srv/tmp-write/vin/logconfig /srv/tmp-write/jc-vin/strongswan-ca", - files = "$MYDIR/contrail-vm/init.sh $MYDIR/../vin.jar $MYDIR/id_rsa.pub $MYDIR/../vin-support.tar.gz $MYDIR/logconfig $MYDIR/../strongswan-ca", - target = "hdc", - root_pubkey = "id_rsa.pub", - username = "opennebula", - user_pubkey = "id_rsa.pub" -] diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/contrail-vm/init.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/contrail-vm/init.sh deleted file mode 100755 index 6a849e131d63104a10e9013ac92074ad9c1a216a..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/contrail-vm/init.sh +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/bash - -# -------------------------------------------------------------------------- # -# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # -# # -# Licensed 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 VM contextualization" > /var/log/context.log -set -x - -if [ -f /mnt/context.sh ] -then - . /mnt/context.sh -fi - - -echo $HOSTNAME > /etc/hostname -hostname $HOSTNAME -sed -i "/127.0.1.1/s/ubuntu/$HOSTNAME/" /etc/hosts - -if [ -n "$IP_PUBLIC" ]; then - ifconfig eth0 $IP_PUBLIC -fi - -if [ -n "$NETMASK" ]; then - ifconfig eth0 netmask $NETMASK -fi - - -if [ -f /mnt/$ROOT_PUBKEY ]; then - mkdir -p /root/.ssh - cat /mnt/$ROOT_PUBKEY >> /root/.ssh/authorized_keys - #chmod -R 600 /root/.ssh/ - chmod 600 /root/.ssh/authorized_keys - chmod 700 /root/.ssh -fi - -if [ -n "$USERNAME" ]; then - useradd -s /bin/bash -m $USERNAME - if [ -f /mnt/$USER_PUBKEY ]; then - mkdir -p /home/$USERNAME/.ssh/ - cat /mnt/$USER_PUBKEY >> /home/$USERNAME/.ssh/authorized_keys - chown -R $USERNAME:$USERNAME /home/$USERNAME/.ssh - chmod 600 /home/$USERNAME/.ssh/authorized_keys - fi -fi - -# added: -if [ -n "$GATEWAY" ]; then - # Change gateway from default; note eth0 is already active - ( echo Orig network: - ifconfig -a - netstat -r - echo Now set GATEWAY to $GATEWAY - ) >> /var/log/context.log 2>&1 - - ifdown eth0 - # Update GATEWAY and NETMASK configs in ifcfg-eth0 - # CentOS - # mv /etc/sysconfig/network-scripts/ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-eth0.orig - # sed -e "s/ GATEWAY=.*/ GATEWAY=$GATEWAY/" -e "s/ NETMASK=.*/ NETMASK=$NETMASK/" < /etc/sysconfig/network-scripts/ifcfg-eth0.orig > /etc/sysconfig/network-scripts/ifcfg-eth0 - # cp /etc/sysconfig/network-scripts/ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-eth0.sav - # - # Debian with single eth0, so sed can replace all lines - cp /etc/network/interfaces /etc/network/interfaces.orig - sed -i -e "s/gateway.*/gateway $GATEWAY/" -e "s/netmask.*/netmask $NETMASK/" /etc/network/interfaces - cp /etc/network/interfaces /etc/network/interfaces.sav - ifup eth0 - - ( echo current network: - ifconfig -a - netstat -r - ) >> /var/log/context.log 2>&1 -fi - -# added: -if [ -n "$DNS" ]; then - echo "Setting DNS server to $DNS" >>/var/log/context.log - echo "nameserver $DNS" >/etc/resolv.conf -fi - -if [ -f /mnt/vin.jar ]; then - CONTRAILDIR=/usr/share/contrail/vin - CONTRAILWORKDIR=/var/lib/contrail/vin - ONEDIR=$CONTRAILDIR/one - INTERFACEDIR=$CONTRAILDIR/interface-scripts - STRONGSWANDIR=$CONTRAILDIR/strongSwan - - mkdir -p $CONTRAILDIR - mkdir -p $CONTRAILWORKDIR - mkdir -p $INTERFACEDIR - mkdir -p $STRONGSWANDIR - - cp /mnt/vin.jar $CONTRAILDIR - VIN_DIRECTORY=/usr/share/contrail/support/vin - (cd / && tar xvzf /mnt/vin-support.tar.gz) - cp -a /mnt/logconfig ${VIN_DIRECTORY} - - # strongSwan doesn't like an empty dir, so give it a dummy .conf - touch $STRONGSWANDIR/dummy.conf - - # Install interface scripts for the various network modes - # cp /mnt/interface-scripts/strongswan/* $INTERFACEDIR - # cp /mnt/interface-scripts/open/* $INTERFACEDIR - # cp /mnt/interface-scripts/iproute2/* $INTERFACEDIR - # cp /mnt/interface-scripts/test/* $INTERFACEDIR - # cp /mnt/interface-scripts/host/* $INTERFACEDIR - # cp /mnt/interface-scripts/host-routing/* $INTERFACEDIR - # cp /mnt/interface-scripts/guest-routing/* $INTERFACEDIR - cp $VIN_DIRECTORY/interface-scripts/* $INTERFACEDIR - - # Make the whole lot executable and SUID root - chmod +x $INTERFACEDIR/* - chmod u+s $INTERFACEDIR/* - -# justinc -export DEBIAN_FRONTEND=noninteractive -apt-get update 1>/dev/null -apt-get -q -y --force-yes install strongSwan openjdk-6-jre-headless tcpdump -echo "include /var/lib/contrail/vin/strongSwan/*.conf" >> /etc/ipsec.conf -# -cp /mnt/strongswan-ca/ca-cert.der /etc/ipsec.d/cacerts -cp /mnt/strongswan-ca/one-worker1-cert.der /etc/ipsec.d/certs/ -cp /mnt/strongswan-ca/one-worker1-key.der /etc/ipsec.d/private/ -cp /mnt/strongswan-ca/one-worker2-cert.der /etc/ipsec.d/certs/ -cp /mnt/strongswan-ca/one-worker2-key.der /etc/ipsec.d/private/ -# one cert for multiple clients -echo ": RSA /etc/ipsec.d/private/one-worker1-key.der" >> /etc/ipsec.secrets -ipsec restart # load new certs -# -(cd / && ln -sf /usr/share/contrail) -# Jar-files from library. -LIBCLASSPATH="${VIN_DIRECTORY}/logconfig" -add_to_libclasspath () { - JARFILES=`cd "$1" && ls *.jar 2>/dev/null` - for i in ${JARFILES} ; do - if [ -z "$LIBCLASSPATH" ] ; then - LIBCLASSPATH="$1/$i" - else - LIBCLASSPATH="$LIBCLASSPATH:$1/$i" - fi - done -} -# Add the jar files in the VideoPlayer lib dir to the classpath. -add_to_libclasspath "${VIN_DIRECTORY}"/used-jars/ipl -add_to_libclasspath "${VIN_DIRECTORY}"/used-jars/saga -add_to_libclasspath "${VIN_DIRECTORY}"/used-jars -add_to_libclasspath "${VIN_DIRECTORY}"/jars -#pushd "${VIN_DIRECTORY}" - - echo 1 > /proc/sys/net/ipv4/ip_forward - echo "Starting VIN agent: VIN_POOL_NAME=$VIN_POOL_NAME VIN_IBIS_SERVER=$VIN_IBIS_SERVER VIN_VMID=$VIN_VMID" >>/var/log/context.log - # FIXME: should run as non-root - /usr/bin/java \ - -server -XX:+HeapDumpOnOutOfMemoryError \ - -Dibis.pool.name=$VIN_POOL_NAME \ - -Dibis.server.address=$VIN_IBIS_SERVER \ - -Xmx1500M \ - -enableassertions \ - -classpath "${CLASSPATH-""}:$LIBCLASSPATH" \ - org.ow2.contrail.resource.vin.agent.VinAgent \ - -scriptsDir=$INTERFACEDIR $VIN_VMID >> /var/log/vin-agent.log 2>&1 & -fi -#popd -echo "Completed VM contextualization" >> /var/log/context.log diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/controller.properties b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/controller.properties deleted file mode 100644 index 31a5641346ee23807a54bf33cfdb812504fec462..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/controller.properties +++ /dev/null @@ -1,9 +0,0 @@ - -controller.ports.start = 13000 -controller.ports.end = 20000 -controller.localaddresses.start = 10.32.1.0 -controller.localaddresses.end = 10.32.1.255 -controller.macaddresses.start = 11:22:33:00:00:00 -controller.macaddresses.end = 11:22:33:00:00:FF -controller.verbose = true - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/id_rsa.pub b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/id_rsa.pub deleted file mode 100644 index 64fa287979be6cb1a11a54329b55fa5ce34a95db..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/id_rsa.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQD5oK4M7FkSlLaCyi1M0Dnr4ZWmxmi6x/cEfgwbpWMn8QtsUQ92WNygIIMA+B2/907pOuj0c4ZKM8IqorqyS/CpPlbbub+GmjvMdurAINj+50k0sP8t6mQqVbxJyw4gVvVTtQOejtKR1u4JS5/a89IYglf0Zqe+WJgOlSc8wWFtQ9LoQQHQX/LY8cbpxRJy8YzBT7sREmM1U6nqnkVlNLNXLwCxvnaeODnSeSImZl/z0OZkVsO7lIJQnVJHyXBm2tAD5GIzfmVgZBQHJPH7UooQLoXJpDkVH0IqESV++FjnVDityNeemqmiAP61tMMdbbq4hl8b7LL7F00v2MXVhyKn root@n0005 diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/init.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/init.sh deleted file mode 100755 index 8d8a755b5d156878f50b6a75955be544ef545255..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/init.sh +++ /dev/null @@ -1,176 +0,0 @@ -#!/bin/bash - -# -------------------------------------------------------------------------- # -# Copyright 2002-2011, OpenNebula Project Leads (OpenNebula.org) # -# # -# Licensed 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 VM contextualization" > /var/log/context.log -set -x - -if [ -f /mnt/context.sh ] -then - . /mnt/context.sh -fi - - -echo $HOSTNAME > /etc/hostname -hostname $HOSTNAME -sed -i "/127.0.1.1/s/ubuntu/$HOSTNAME/" /etc/hosts - -if [ -n "$IP_PUBLIC" ]; then - ifconfig eth0 $IP_PUBLIC -fi - -if [ -n "$NETMASK" ]; then - ifconfig eth0 netmask $NETMASK -fi - - -if [ -f /mnt/$ROOT_PUBKEY ]; then - mkdir -p /root/.ssh - cat /mnt/$ROOT_PUBKEY >> /root/.ssh/authorized_keys - #chmod -R 600 /root/.ssh/ - chmod 600 /root/.ssh/authorized_keys - chmod 700 /root/.ssh -fi - -if [ -n "$USERNAME" ]; then - useradd -s /bin/bash -m $USERNAME - if [ -f /mnt/$USER_PUBKEY ]; then - mkdir -p /home/$USERNAME/.ssh/ - cat /mnt/$USER_PUBKEY >> /home/$USERNAME/.ssh/authorized_keys - chown -R $USERNAME:$USERNAME /home/$USERNAME/.ssh - chmod 600 /home/$USERNAME/.ssh/authorized_keys - fi -fi - -# added: -if [ -n "$GATEWAY" ]; then - # Change gateway from default; note eth0 is already active - ( echo Orig network: - ifconfig -a - netstat -r - echo Now set GATEWAY to $GATEWAY - ) >> /var/log/context.log 2>&1 - - ifdown eth0 - # Update GATEWAY and NETMASK configs in ifcfg-eth0 - # CentOS - # mv /etc/sysconfig/network-scripts/ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-eth0.orig - # sed -e "s/ GATEWAY=.*/ GATEWAY=$GATEWAY/" -e "s/ NETMASK=.*/ NETMASK=$NETMASK/" < /etc/sysconfig/network-scripts/ifcfg-eth0.orig > /etc/sysconfig/network-scripts/ifcfg-eth0 - # cp /etc/sysconfig/network-scripts/ifcfg-eth0 /etc/sysconfig/network-scripts/ifcfg-eth0.sav - # - # Debian with single eth0, so sed can replace all lines - cp /etc/network/interfaces /etc/network/interfaces.orig - sed -i -e "s/gateway.*/gateway $GATEWAY/" -e "s/netmask.*/netmask $NETMASK/" /etc/network/interfaces - cp /etc/network/interfaces /etc/network/interfaces.sav - ifup eth0 - - ( echo current network: - ifconfig -a - netstat -r - ) >> /var/log/context.log 2>&1 -fi - -# added: -if [ -n "$DNS" ]; then - echo "Setting DNS server to $DNS" >>/var/log/context.log - echo "nameserver $DNS" >/etc/resolv.conf -fi - -if [ -f /mnt/vin.jar ]; then - CONTRAILDIR=/usr/share/contrail/vin - CONTRAILWORKDIR=/var/lib/contrail/vin - ONEDIR=$CONTRAILDIR/one - INTERFACEDIR=$CONTRAILDIR/interface-scripts - STRONGSWANDIR=$CONTRAILDIR/strongSwan - - mkdir -p $CONTRAILDIR - mkdir -p $CONTRAILWORKDIR - mkdir -p $INTERFACEDIR - mkdir -p $STRONGSWANDIR - - cp /mnt/vin.jar $CONTRAILDIR - VIN_DIRECTORY=/usr/share/contrail/support/vin - (cd / && tar xvzf /mnt/vin-support.tar.gz) - cp -a /mnt/logconfig ${VIN_DIRECTORY} - - # strongSwan doesn't like an empty dir, so give it a dummy .conf - touch $STRONGSWANDIR/dummy.conf - - # Install interface scripts for the various network modes - # cp /mnt/interface-scripts/strongswan/* $INTERFACEDIR - # cp /mnt/interface-scripts/open/* $INTERFACEDIR - # cp /mnt/interface-scripts/iproute2/* $INTERFACEDIR - # cp /mnt/interface-scripts/test/* $INTERFACEDIR - # cp /mnt/interface-scripts/host/* $INTERFACEDIR - # cp /mnt/interface-scripts/host-routing/* $INTERFACEDIR - # cp /mnt/interface-scripts/guest-routing/* $INTERFACEDIR - cp $VIN_DIRECTORY/interface-scripts/* $INTERFACEDIR - - # Make the whole lot executable and SUID root - chmod +x $INTERFACEDIR/* - chmod u+s $INTERFACEDIR/* - -# justinc -export DEBIAN_FRONTEND=noninteractive -apt-get update 1>/dev/null -apt-get -q -y --force-yes install strongSwan openjdk-6-jre-headless tcpdump -echo "include /var/lib/contrail/vin/strongSwan/*.conf" >> /etc/ipsec.conf -# -cp /mnt/strongswan-ca/ca-cert.der /etc/ipsec.d/cacerts -cp /mnt/strongswan-ca/one-worker1-cert.der /etc/ipsec.d/certs/ -cp /mnt/strongswan-ca/one-worker1-key.der /etc/ipsec.d/private/ -cp /mnt/strongswan-ca/one-worker2-cert.der /etc/ipsec.d/certs/ -cp /mnt/strongswan-ca/one-worker2-key.der /etc/ipsec.d/private/ -# one cert for multiple clients -echo ": RSA /etc/ipsec.d/private/one-worker1-key.der" >> /etc/ipsec.secrets -ipsec restart # load new certs -# -(cd / && ln -sf /usr/share/contrail) -# Jar-files from library. -LIBCLASSPATH="${VIN_DIRECTORY}/logconfig" -add_to_libclasspath () { - JARFILES=`cd "$1" && ls *.jar 2>/dev/null` - for i in ${JARFILES} ; do - if [ -z "$LIBCLASSPATH" ] ; then - LIBCLASSPATH="$1/$i" - else - LIBCLASSPATH="$LIBCLASSPATH:$1/$i" - fi - done -} -# Add the jar files in the VideoPlayer lib dir to the classpath. -add_to_libclasspath "${VIN_DIRECTORY}"/used-jars/ipl -add_to_libclasspath "${VIN_DIRECTORY}"/used-jars/saga -add_to_libclasspath "${VIN_DIRECTORY}"/used-jars -add_to_libclasspath "${VIN_DIRECTORY}"/jars -#pushd "${VIN_DIRECTORY}" - - echo 1 > /proc/sys/net/ipv4/ip_forward - echo "Starting VIN agent: VIN_POOL_NAME=$VIN_POOL_NAME VIN_IBIS_SERVER=$VIN_IBIS_SERVER VIN_VMID=$VIN_VMID" >>/var/log/context.log - # FIXME: should run as non-root - /usr/bin/java \ - -server -XX:+HeapDumpOnOutOfMemoryError \ - -Dibis.pool.name=$VIN_POOL_NAME \ - -Dibis.server.address=$VIN_IBIS_SERVER \ - -Xmx1500M \ - -enableassertions \ - -classpath "${CLASSPATH-""}:$LIBCLASSPATH" \ - org.ow2.contrail.resource.vin.agent.VinAgent \ - -scriptsDir=$INTERFACEDIR $VIN_VMID >> /var/log/vin-agent.log 2>&1 & -fi -#popd -echo "Completed VM contextualization" >> /var/log/context.log diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/logconfig/log4j.properties b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/logconfig/log4j.properties deleted file mode 100644 index 1a043a0767e7eceaae89fe7d2446037f85a702dd..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/logconfig/log4j.properties +++ /dev/null @@ -1,41 +0,0 @@ -#print warnings to console... -log4j.rootLogger=trace, CONSOLE - -# Possible levels: -# trace, debug, info, warn, error, fatal - -log4j.logger.ibis.constellation=info -log4j.logger.ibis.ipl.server=warn -log4j.logger.ibis.ipl=warn -log4j.logger.ibis.io=warn -log4j.logger.org.ow2.contrail.resource.vin.deployer=warn -log4j.logger.org.ow2.contrail.resource.vin.agent.engine=warn -log4j.logger.org.ow2.contrail.resource.vin.common.receiver=warn -log4j.logger.org.ow2.contrail.resource.vin.common.transmitter=warn -log4j.logger.org.ow2.contrail.resource.vin.controller.administration=warn -log4j.logger.org.ow2.contrail.resource.vin.controller.ControllerEngine=warn -log4j.logger.org.ow2.contrail.resource.vin.controller.server=warn -log4j.logger.org.ow2.contrail.resource.vin.controller.Tester=warn -log4j.logger.org.ow2.contrail.resource.vin.controller.IbisServer=warn -log4j.logger.org.ow2.contrail.resource.vin.agent.Iproute2NetworkHandler=warn -log4j.logger.ibis.smartsockets=warn -log4j.logger.ibis.util=warn -log4j.logger.org.gridlab.gat=warn -log4j.logger.org.ogf.saga=warn -log4j.logger.org.ogf.sage=warn -log4j.logger.org.ow2.contrail.resource.vin.common.demo=trace, DEMOCONSOLE -log4j.additivity.org.ow2.contrail.resource.vin.common.demo=false - - -#console appender -log4j.appender.CONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.CONSOLE.target=System.err -log4j.appender.CONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.CONSOLE.layout.ConversionPattern=%d{HH:mm:ss} %-5p [%t] %c - %m%n - - -#democonsole appender -log4j.appender.DEMOCONSOLE=org.apache.log4j.ConsoleAppender -log4j.appender.DEMOCONSOLE.target=System.err -log4j.appender.DEMOCONSOLE.layout=org.apache.log4j.PatternLayout -log4j.appender.DEMOCONSOLE.layout.ConversionPattern=%m%n diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/minimal.vin b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/minimal.vin deleted file mode 100644 index 637855d874ac2c45ced781dd2629aa62850da5a2..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/minimal.vin +++ /dev/null @@ -1,22 +0,0 @@ -{ - "lifetime":600, - "machines":[ - {"name":"h0", - "properties":{"address":"n0006.xc2.xlab.lan","deployer":"OpenNebula", - "template":"contrail-vm.one"}}, - {"name":"h1", - "properties":{"address":"n0006.xc2.xlab.lan","deployer":"OpenNebula", - "template":"contrail-vm.one"}} - ], - "networks":[ - {"encapsulation":"strongswan", - "properties":{ - "name":"testnetwork", - "maximumSize":"12", - "context":"vm" - }, - "machines":[ - "h0", "h1" - ]} - ] -} diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/one-last-vm.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/one-last-vm.sh deleted file mode 100755 index 75077b8f3d947abd5970964c2b85d9553555d566..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/one-last-vm.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -sleep 2 # hm ? -onevm list | tail -n1 | awk '{print $1}' - diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/one-machine.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/one-machine.sh deleted file mode 100755 index 56be6ed949fb8ef0e1342b6a47be73f441361859..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test-files/one-machine.sh +++ /dev/null @@ -1,46 +0,0 @@ -#!/bin/sh -set -e -u -set -x -# untarred vin-support.tar.gz -VIN_HOME=/usr/share/contrail/support/vin/ -# where is controller.properties -TEST_FILES_DIR=/srv/contegrator-test/vin/test-files/ - -# Check setting of VIN_HOME -if [ -z "$VIN_HOME" ]; then - echo "please set VIN_HOME to the location of your Vin installation" 1>&2 - exit 1 -fi - -# Jar-files from library. -LIBCLASSPATH="logconfig" -add_to_libclasspath () { - JARFILES=`cd "$1" && ls *.jar 2>/dev/null` - for i in ${JARFILES} ; do - if [ -z "$LIBCLASSPATH" ] ; then - LIBCLASSPATH="$1/$i" - else - LIBCLASSPATH="$LIBCLASSPATH:$1/$i" - fi - done -} - -# Add the jar files in the VideoPlayer lib dir to the classpath. -# add_to_libclasspath "${VIN_HOME}" -add_to_libclasspath "${VIN_HOME}"/used-jars/ipl -add_to_libclasspath "${VIN_HOME}"/used-jars/saga -add_to_libclasspath "${VIN_HOME}"/used-jars -add_to_libclasspath "${VIN_HOME}"/jars -LIBCLASSPATH="$LIBCLASSPATH:${TEST_FILES_DIR}/logconfig" - -# And finally, run ... -# -Dsmartsockets.file="$VIN_HOME"/smartsockets.properties \ -# cd ${VIN_HOME} -exec java \ - -server -XX:+HeapDumpOnOutOfMemoryError \ - -classpath bin:"${CLASSPATH-""}:$LIBCLASSPATH" \ - -Xmx1500M \ - -enableassertions \ - org.ow2.contrail.resource.vin.controller.tester.CommandLine -p=$TEST_FILES_DIR/controller.properties $TEST_FILES_DIR/minimal.vin - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test_1.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test_1.sh deleted file mode 100755 index a9a66da3567d9970e0c5bab6c5a9eeb914729867..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/test_1.sh +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -# get required jar/class files -(cd /srv/contegrator-test/vin/test-files && ./one-machine.sh) - - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/vin-setup-strongswan.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/vin-setup-strongswan.sh deleted file mode 100755 index 3a22fe129fe1497e6832e5f7ab6fbdf96dbccd25..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/vin/vin-setup-strongswan.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh - -# exit on error -set -e -# echo cmd -set -x - -# whoami, get VNFS name -# "10.31.1.253:/usr/var/lib/perceus//vnfs/test-vnfs-vin-0.2-SNAPSHOT-head/rootfs on / type nfs ... " -# head, worker1, worker2 -NODE_NAME=`mount | grep ' on / type' | sed "s|/|\n|g" | grep '^test-vnfs-' | sed "s/-/\n/g" | tail -n1` - -# diff --git a/common/integration-test/scripts-post-boot/srv/contegrator-test/wait-before-shutdown.sh b/common/integration-test/scripts-post-boot/srv/contegrator-test/wait-before-shutdown.sh deleted file mode 100755 index cbd9bfc011acb65725f7e77754122c4cbb5c4a36..0000000000000000000000000000000000000000 --- a/common/integration-test/scripts-post-boot/srv/contegrator-test/wait-before-shutdown.sh +++ /dev/null @@ -1,40 +0,0 @@ -#!/bin/bash - -# exit on error -set -e -# echo cmd -#set -x - -WAIT_TIME=3600 -SLEEP_TIME=10 - -# optional param -[ $# -ge 1 ] && WAIT_TIME=$1 - -FILE1="/tmp/remove_to_end_test.$$" -FILE2="/tmp/remove_to_end_test" -cat < - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - - - - diff --git a/common/integration-test/uros---federation-api-etc/nodes/federation/scripts/fix-scripts.sh b/common/integration-test/uros---federation-api-etc/nodes/federation/scripts/fix-scripts.sh deleted file mode 100755 index b57590ebabb347aa449e63693fea957d24bdb1f9..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/nodes/federation/scripts/fix-scripts.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# fix /etc/fstab to mount ONE head /var/lib/one ... -# Eg. append some lines to /etc/fstab - this will be done before booting node, after installing upstream, contrail and tar.gz packets from nodes install.xml - -rm -f /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh -rm -f /var/lib/one/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/uros---federation-api-etc/nodes/head/install.xml b/common/integration-test/uros---federation-api-etc/nodes/head/install.xml deleted file mode 100644 index d30db7eacda1dcd771eff37ac43f18f4e6ea4c8d..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/nodes/head/install.xml +++ /dev/null @@ -1,31 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - - ruby1.9.1-full - rubygems1.9 - g++ - make - - - openjdk-6-jre-headless - sysstat - - - - - openjdk-6-jre-headless - curl - - - diff --git a/common/integration-test/uros---federation-api-etc/nodes/head/scripts/fix-scripts.sh b/common/integration-test/uros---federation-api-etc/nodes/head/scripts/fix-scripts.sh deleted file mode 100755 index b57590ebabb347aa449e63693fea957d24bdb1f9..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/nodes/head/scripts/fix-scripts.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# fix /etc/fstab to mount ONE head /var/lib/one ... -# Eg. append some lines to /etc/fstab - this will be done before booting node, after installing upstream, contrail and tar.gz packets from nodes install.xml - -rm -f /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh -rm -f /var/lib/one/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/uros---federation-api-etc/test/01_federation_api_install.py b/common/integration-test/uros---federation-api-etc/test/01_federation_api_install.py deleted file mode 100644 index 6337ba470865ef4901fabafc3837444d8007fc18..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/01_federation_api_install.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_install(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/install.sh") -# - diff --git a/common/integration-test/uros---federation-api-etc/test/01_federation_praasc_install.py b/common/integration-test/uros---federation-api-etc/test/01_federation_praasc_install.py deleted file mode 100644 index e82bd8f5ff88b1a87959fe928f1fdda7b38093d9..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/01_federation_praasc_install.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_02_install_praasc(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/praasc/install.sh") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/01_federation_web_install.py b/common/integration-test/uros---federation-api-etc/test/01_federation_web_install.py deleted file mode 100644 index 99c3d6c3a6cbe15c7478045236aa37625a9805c8..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/01_federation_web_install.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_install(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-web/install.sh") -# - diff --git a/common/integration-test/uros---federation-api-etc/test/01_monitoring_core_install.py b/common/integration-test/uros---federation-api-etc/test/01_monitoring_core_install.py deleted file mode 100644 index c676ba159f77e6c6109c535d82a24a4c20baffe1..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/01_monitoring_core_install.py +++ /dev/null @@ -1,16 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_install(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "date > /root/timestamp.txt") - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-core/worker-install.sh") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/01_monitoring_infrastructure_install.py b/common/integration-test/uros---federation-api-etc/test/01_monitoring_infrastructure_install.py deleted file mode 100644 index fe0bbd2e6f723f997c0e4a6a4c11bef0ab852986..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/01_monitoring_infrastructure_install.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_02_install_monitoring(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-infrastructure/one-monitor-install.sh") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/02_federation_api_setup.py b/common/integration-test/uros---federation-api-etc/test/02_federation_api_setup.py deleted file mode 100644 index 806ada3e41b053b0f4b0c05d77b1ef64f2c8fda4..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/02_federation_api_setup.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_setup(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/mysql-setup.sh") -# - diff --git a/common/integration-test/uros---federation-api-etc/test/02_federation_praasc_setup.py b/common/integration-test/uros---federation-api-etc/test/02_federation_praasc_setup.py deleted file mode 100644 index adb374ef490c8aaa6f90f7bd45898ada9bb49089..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/02_federation_praasc_setup.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_02_setup_praasc(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/praasc/setup.sh") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/02_federation_web_setup.py b/common/integration-test/uros---federation-api-etc/test/02_federation_web_setup.py deleted file mode 100644 index cd4065373ec26a83257b6d083357cddb2cd899cf..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/02_federation_web_setup.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_setup(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-web/setup.sh") -# - diff --git a/common/integration-test/uros---federation-api-etc/test/02_monitoring_core_setup.py b/common/integration-test/uros---federation-api-etc/test/02_monitoring_core_setup.py deleted file mode 100644 index 9a34e2a101d6dc8ab3478b33ad405a94d1d56b6e..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/02_monitoring_core_setup.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_setup(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-core/worker-setup.sh") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/02_monitoring_infrastructure_setup.py b/common/integration-test/uros---federation-api-etc/test/02_monitoring_infrastructure_setup.py deleted file mode 100644 index 81db5a714f8b673b7ea59e115bc47afa46c14799..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/02_monitoring_infrastructure_setup.py +++ /dev/null @@ -1,24 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -def test_03_setup_sensor(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-infrastructure/one-sensor-setup.sh") - -def test_04_setup_monitoring(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-infrastructure/one-monitor-setup.sh") - -def test_10_restart_tomcat(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "service tomcat6 restart") -# - diff --git a/common/integration-test/uros---federation-api-etc/test/02_one_setup.py b/common/integration-test/uros---federation-api-etc/test/02_one_setup.py deleted file mode 100644 index e735f7aa3e0e9f96a76e7e8233d12b33873ef1df..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/02_one_setup.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_02_setup_one(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/one-head/setup.sh") - - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/02_vep_setup.py b/common/integration-test/uros---federation-api-etc/test/02_vep_setup.py deleted file mode 100644 index ec9a4b534a26856e99bf820ba3f2f29d304ca381..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/02_vep_setup.py +++ /dev/null @@ -1,34 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_01_setup_linux(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - pass - -def test_10_install_vep(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/install.sh") - -def test_11_setup_vep(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/setup.sh") - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/setup-one-head.sh") - -# seems some time is needed before starting jar files -def disable_test_99_setup_wait(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "sleep 60") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/03_federation_api_run.py b/common/integration-test/uros---federation-api-etc/test/03_federation_api_run.py deleted file mode 100644 index 783f0ddf641a2db08a70932bbd738713aa6c00e6..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/03_federation_api_run.py +++ /dev/null @@ -1,17 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_fed_api(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - #ct_nodeman.sshrun("root", worker, "sleep 30") - ct_nodeman.testrun("root", federation, "service tomcat6 status") - ct_nodeman.testrun("root", federation, "ps afxu | grep java") - ct_nodeman.testrun("root", federation, "netstat -plane | grep java") - ct_nodeman.testrun("root", federation, "curl -X GET http://0.0.0.0:8080/federation-api/users") -# diff --git a/common/integration-test/uros---federation-api-etc/test/03_federation_praasc_run.py b/common/integration-test/uros---federation-api-etc/test/03_federation_praasc_run.py deleted file mode 100644 index e4775122bd1855b0ac73a84647dc3fa0c468fcd6..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/03_federation_praasc_run.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_03_run_praasc(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/praasc/run.sh") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/03_monitoring_core_run.py b/common/integration-test/uros---federation-api-etc/test/03_monitoring_core_run.py deleted file mode 100644 index fddaf3d7ad9612a79c0313bc022441e38a5a8e88..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/03_monitoring_core_run.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_run(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-core/worker-run.sh") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/03_monitoring_infrastructure_run.py b/common/integration-test/uros---federation-api-etc/test/03_monitoring_infrastructure_run.py deleted file mode 100644 index 012bc9592844734c698a019bbf6584b263e559a7..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/03_monitoring_infrastructure_run.py +++ /dev/null @@ -1,20 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_01_monitor(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-infrastructure/one-monitor-run.sh") - -def test_02_sensor(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/monitoring-infrastructure/one-sensor-run.sh") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/03_vep_run.py b/common/integration-test/uros---federation-api-etc/test/03_vep_run.py deleted file mode 100644 index d08af3b6f49aff67bd93f4a225992bc056740631..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/03_vep_run.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_01_vep(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/run.sh") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/10_federation_api_test.py b/common/integration-test/uros---federation-api-etc/test/10_federation_api_test.py deleted file mode 100644 index 4585214e509c367bae13bef4188821a8c5ff06a2..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/10_federation_api_test.py +++ /dev/null @@ -1,13 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -def test_01_rest_interface(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - #ct_nodeman.sshrun("root", worker, "sleep 30") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-api/test-rest-interface.sh") - -# diff --git a/common/integration-test/uros---federation-api-etc/test/10_vep_test.py b/common/integration-test/uros---federation-api-etc/test/10_vep_test.py deleted file mode 100644 index 8037938a42787d83727ab8e440246792d9721f1e..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/10_vep_test.py +++ /dev/null @@ -1,16 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_01_vep(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/test-1-a.sh") - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/test-1-b.sh") - - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/20_federation_web_initial_data.py b/common/integration-test/uros---federation-api-etc/test/20_federation_web_initial_data.py deleted file mode 100644 index fa36e65c7fae3d9a37e93d90b9ac0982c0120f2d..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/20_federation_web_initial_data.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_setup(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - # head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.testrun("root", federation, "/srv/contegrator-test/federation-web/setup-initial-data.sh") -# - diff --git a/common/integration-test/uros---federation-api-etc/test/90_wait_run.py b/common/integration-test/uros---federation-api-etc/test/90_wait_run.py deleted file mode 100644 index bc6deb2815cb8f889c5ef0008dbf1787c6b7afad..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/90_wait_run.py +++ /dev/null @@ -1,17 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# test should run for 5 min ? -def test_03_wait(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - sec = 302 - print "Test will run for " + str(sec) + " secundes..." - ct_nodeman.testrun("root", head, "sleep " + str(sec) + " || true") - -# - diff --git a/common/integration-test/uros---federation-api-etc/test/98_federation_web_archive.py b/common/integration-test/uros---federation-api-etc/test/98_federation_web_archive.py deleted file mode 100644 index 04e940d0d4ce349149c26d92370ec18e3398f806..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/98_federation_web_archive.py +++ /dev/null @@ -1,16 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_archive(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.getfile(federation, "/var/log/contrail/federationweb.log", "archive/federation/federationweb.log" ) - -# - - diff --git a/common/integration-test/uros---federation-api-etc/test/98_monitoring_infrastructure_archive.py b/common/integration-test/uros---federation-api-etc/test/98_monitoring_infrastructure_archive.py deleted file mode 100644 index 6d122e6c5cf86e4839699365a0e41f895776097f..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/98_monitoring_infrastructure_archive.py +++ /dev/null @@ -1,21 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_archive(ct_node_list, ct_nodeman): - global jenkins_archive - federation = ct_node_list["federation"] - head = ct_node_list["head"] - # worker = ct_node_list["worker"] - # nohup redirect - ct_nodeman.getfile(head, "/var/log/contrail/one-monitor.log", "archive/head/nohup-one-monitor.log" ) - ct_nodeman.getfile(head, "/var/log/contrail/one-sensor.log", "archive/head/nohup-one-sensor.log" ) - # ct_nodeman.getfile(worker, "/var/log/contrail/one-sensor.log", "archive/worker/nohup-one-sensor.log" ) - - ct_nodeman.getfile(head, "/tmp/opennebula-monitor.log", "archive/head/opennebula-monitor.log" ) - ct_nodeman.getfile(head, "/tmp/opennebula-sensor.log", "archive/head/opennebula-sensor.log" ) - # ct_nodeman.getfile(worker, "/tmp/opennebula-sensor.log", "archive/worker/opennebula-sensor.log" ) - -# diff --git a/common/integration-test/uros---federation-api-etc/test/98_praasc_archive.py b/common/integration-test/uros---federation-api-etc/test/98_praasc_archive.py deleted file mode 100644 index 48f04ca120a5379297c2e322af288eb32ba13559..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/98_praasc_archive.py +++ /dev/null @@ -1,16 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_archive(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.getfile(head, "/var/log/contrail/praasc.log", "archive/head/praasc.log" ) - -# - - diff --git a/common/integration-test/uros---federation-api-etc/test/98_vep_archive.py b/common/integration-test/uros---federation-api-etc/test/98_vep_archive.py deleted file mode 100644 index e6a26e773742f3b2a39d216abdc9f3d59ee3b3d1..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/98_vep_archive.py +++ /dev/null @@ -1,16 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_archive(ct_node_list, ct_nodeman): - federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.getfile(head, "/var/log/contrail/vep.log", "archive/head/vep.log" ) - -# - - diff --git a/common/integration-test/uros---federation-api-etc/test/99_wait.py b/common/integration-test/uros---federation-api-etc/test/99_wait.py deleted file mode 100644 index 46719816f19e7743aee3a28d85dc767eadd1181e..0000000000000000000000000000000000000000 --- a/common/integration-test/uros---federation-api-etc/test/99_wait.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_99_wait(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/wait-before-shutdown.sh 300") - -# - diff --git a/common/integration-test/vep-cli/README b/common/integration-test/vep-cli/README deleted file mode 100644 index 62c803b3d2d7a9b49d43a520df36a86466baf2cd..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/README +++ /dev/null @@ -1,11 +0,0 @@ -justinc -Test for vepmaven -ONE head and worker nodes are used. - -Directories: -./nodes/worker/scripts-post-boot/ -Content is copied to nodes root filesystem, and can be used after node boot. -File ./nodes/worker/scripts-post-boot/root/contegrator-test/test-1.sh will be available at /root/contegrator-test/test-1.sh. - -./nodes/worker/scripts -Content is executed in chroot environment, before node boot. diff --git a/common/integration-test/vep-cli/nodes/head/install.xml b/common/integration-test/vep-cli/nodes/head/install.xml deleted file mode 100644 index 850db328b99d31af03542480577d2f5b4ca0f678..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/nodes/head/install.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - openjdk-6-jre-headless - curl - - diff --git a/common/integration-test/vep-cli/nodes/head/scripts/fix-scripts.sh b/common/integration-test/vep-cli/nodes/head/scripts/fix-scripts.sh deleted file mode 100755 index b57590ebabb347aa449e63693fea957d24bdb1f9..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/nodes/head/scripts/fix-scripts.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -# fix /etc/fstab to mount ONE head /var/lib/one ... -# Eg. append some lines to /etc/fstab - this will be done before booting node, after installing upstream, contrail and tar.gz packets from nodes install.xml - -rm -f /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh -rm -f /var/lib/one/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/vep-cli/nodes/worker/install.xml b/common/integration-test/vep-cli/nodes/worker/install.xml deleted file mode 100644 index 03d633e754bf9edb1ddf4b13aadb29a491ed831b..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/nodes/worker/install.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - diff --git a/common/integration-test/vep-cli/nodes/worker/scripts/fix-nfs.sh b/common/integration-test/vep-cli/nodes/worker/scripts/fix-nfs.sh deleted file mode 100755 index 15731fe9728b2d99b0c36f957fb488d0b60dd78a..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/nodes/worker/scripts/fix-nfs.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh - -# required for ONE worker node -echo "VNFS_NAME = $VNFS_NAME" -cp /etc/fstab /etc/fstab.orig -[ ! -z "$BASE_VNFS_NAME_head" ] && sed -e "s/$BASE_VNFS_NAME_head/$VNFS_NAME_head/g" /etc/fstab - diff --git a/common/integration-test/vep-cli/nodes/worker/scripts/fix-scripts.sh b/common/integration-test/vep-cli/nodes/worker/scripts/fix-scripts.sh deleted file mode 100755 index 9ed95c25a3fd837342e0d49f7b4b6c8d05d5d5c7..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/nodes/worker/scripts/fix-scripts.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh - -# fix /etc/fstab to mount ONE head /var/lib/one ... -# Eg. append some lines to /etc/fstab - this will be done before booting node, after installing upstream, contrail and tar.gz packets from nodes install.xml - -# rm -f /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/vep-cli/test/01_setup.py b/common/integration-test/vep-cli/test/01_setup.py deleted file mode 100644 index d69cb5c773b24c6bb6036b3da32c3b6f42ccbc23..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/test/01_setup.py +++ /dev/null @@ -1,62 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_01_setup_linux(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - worker = ct_node_list["worker"] - try: - pass - #ct_nodeman.testrun("root", head, "/root/contegrator-test/one-head-fix-nfs-exports.sh") - - # ONE worker has to mount ONE head's /var/lib/one/ dir - # TODO - contegrator - #image_name = "test-vnfs-monitoring-infrastructure-0.2-SNAPSHOT-head" # head["image_name"] - #head_vnfsrootfs = "/usr/var/lib/perceus/vnfs/" + image_name + "/rootfs" - #ct_nodeman.testrun("root", worker, "/root/contegrator-test/one-worker-fix-fstab.sh" + " 10.31.1.253 " + head_vnfsrootfs) - except: - print "Setup failed" - raise - finally: - pass - -def test_02_setup_one(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - worker = ct_node_list["worker"] - try: - pass - # add one users etc - ct_nodeman.testrun("root", head, "/srv/contegrator-test/one-head/setup.sh") - except: - print "Setup failed" - raise - finally: - pass - -def test_10_install_vep(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - worker = ct_node_list["worker"] - try: - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/install.sh") - except: - print "Install failed" - raise - finally: - pass - -def test_11_setup_vep(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - worker = ct_node_list["worker"] - try: - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/setup.sh") - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/setup-one-head.sh") - except: - print "Install failed" - raise - finally: - pass - -# - diff --git a/common/integration-test/vep-cli/test/02_run.py b/common/integration-test/vep-cli/test/02_run.py deleted file mode 100644 index 02d51044c92468d307ceeb75d8f345a63dd0b0ac..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/test/02_run.py +++ /dev/null @@ -1,20 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_01_vep(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - worker = ct_node_list["worker"] - try: - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/run.sh") - except: - print "Test failed" - raise - finally: - pass - - -# - diff --git a/common/integration-test/vep-cli/test/10_vep_test.py b/common/integration-test/vep-cli/test/10_vep_test.py deleted file mode 100644 index abbaa044cba28852f0ba5a6ebe5232f6ef564d8c..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/test/10_vep_test.py +++ /dev/null @@ -1,16 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_01_vep(ct_node_list, ct_nodeman): - #federation = ct_node_list["federation"] - head = ct_node_list["head"] - worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/test-1-a.sh") - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vep-cli/test-1-b.sh") - - -# - diff --git a/common/integration-test/vep-cli/test/90_wait_run.py b/common/integration-test/vep-cli/test/90_wait_run.py deleted file mode 100644 index b0e3fb18a80aabb2f28464141821c98f6aae076c..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/test/90_wait_run.py +++ /dev/null @@ -1,17 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# test should run for 5 min ? -def test_03_wait(ct_node_list, ct_nodeman): - #federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - sec = 302 - print "Test will run for " + str(sec) + " secundes..." - ct_nodeman.testrun("root", head, "sleep " + str(sec) + " || true") - -# - diff --git a/common/integration-test/vep-cli/test/98_archive.py b/common/integration-test/vep-cli/test/98_archive.py deleted file mode 100644 index 6891cb5b3851922197cbc56162a0a4e6276567fa..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/test/98_archive.py +++ /dev/null @@ -1,21 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_archive(ct_node_list, ct_nodeman): - global jenkins_archive - head = ct_node_list["head"] - worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - try: - ct_nodeman.getfile(head, "/var/log/contrail/vep.log", "archive/head/vep.log" ) - except: - print "Test failed" - raise - finally: - pass - -# - diff --git a/common/integration-test/vep-cli/test/99_wait.py b/common/integration-test/vep-cli/test/99_wait.py deleted file mode 100644 index 0b59818f62dfd648777c70e91a6b3d6ed1867c96..0000000000000000000000000000000000000000 --- a/common/integration-test/vep-cli/test/99_wait.py +++ /dev/null @@ -1,22 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_99_wait(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - worker = ct_node_list["worker"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - try: - ct_nodeman.testrun("root", head, "/srv/contegrator-test/wait-before-shutdown.sh 300") - # ct_nodeman.sshrun("root", worker, "/usr/bin/one-test-run.sh") - except: - print "Test failed" - raise - finally: - pass - -# - diff --git a/common/integration-test/vin/README b/common/integration-test/vin/README deleted file mode 100644 index c30db9c026940cf66c8cdd6aa13543b5db1fd0d5..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/README +++ /dev/null @@ -1,4 +0,0 @@ -Test for VIN project. - -VNFS one-2.2-head-jaKa.aufs is used - it is almost vanillia ubuntu. -VNFS one-2.2-node-jaKa.aufs is used - it is almost vanillia ubuntu. diff --git a/common/integration-test/vin/nodes/head/install.xml b/common/integration-test/vin/nodes/head/install.xml deleted file mode 100644 index 4484211bdd74f3148d0cb3ab6b593ee54411afe8..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/nodes/head/install.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - openjdk-6-jre-headless - - - - diff --git a/common/integration-test/vin/nodes/head/scripts/fix-nfs.sh b/common/integration-test/vin/nodes/head/scripts/fix-nfs.sh deleted file mode 100755 index 15731fe9728b2d99b0c36f957fb488d0b60dd78a..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/nodes/head/scripts/fix-nfs.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh - -# required for ONE worker node -echo "VNFS_NAME = $VNFS_NAME" -cp /etc/fstab /etc/fstab.orig -[ ! -z "$BASE_VNFS_NAME_head" ] && sed -e "s/$BASE_VNFS_NAME_head/$VNFS_NAME_head/g" /etc/fstab - diff --git a/common/integration-test/vin/nodes/head/scripts/fix-scripts.sh b/common/integration-test/vin/nodes/head/scripts/fix-scripts.sh deleted file mode 100755 index 19a5450df733ff2dc5d110c8e8ff7c247a20c8e1..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/nodes/head/scripts/fix-scripts.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/vin/nodes/worker1/install.xml b/common/integration-test/vin/nodes/worker1/install.xml deleted file mode 100644 index 5b76cef006d5750fd1cf8864acf8b2051d01a4ce..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/nodes/worker1/install.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - openjdk-6-jre-headless - - - - diff --git a/common/integration-test/vin/nodes/worker1/scripts/fix-nfs.sh b/common/integration-test/vin/nodes/worker1/scripts/fix-nfs.sh deleted file mode 100755 index 15731fe9728b2d99b0c36f957fb488d0b60dd78a..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/nodes/worker1/scripts/fix-nfs.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh - -# required for ONE worker node -echo "VNFS_NAME = $VNFS_NAME" -cp /etc/fstab /etc/fstab.orig -[ ! -z "$BASE_VNFS_NAME_head" ] && sed -e "s/$BASE_VNFS_NAME_head/$VNFS_NAME_head/g" /etc/fstab - diff --git a/common/integration-test/vin/nodes/worker1/scripts/fix-scripts.sh b/common/integration-test/vin/nodes/worker1/scripts/fix-scripts.sh deleted file mode 100755 index 19a5450df733ff2dc5d110c8e8ff7c247a20c8e1..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/nodes/worker1/scripts/fix-scripts.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/vin/nodes/worker2/install.xml b/common/integration-test/vin/nodes/worker2/install.xml deleted file mode 100644 index 5b76cef006d5750fd1cf8864acf8b2051d01a4ce..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/nodes/worker2/install.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - xmlns="http://contrail-project.eu/schema/2011/08/install"> - - openjdk-6-jre-headless - - - - diff --git a/common/integration-test/vin/nodes/worker2/scripts/fix-nfs.sh b/common/integration-test/vin/nodes/worker2/scripts/fix-nfs.sh deleted file mode 100755 index 15731fe9728b2d99b0c36f957fb488d0b60dd78a..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/nodes/worker2/scripts/fix-nfs.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash - -source /srv/contegrator-test/env.sh -# exit on error -set -e -# echo cmd -set -x - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh - -# required for ONE worker node -echo "VNFS_NAME = $VNFS_NAME" -cp /etc/fstab /etc/fstab.orig -[ ! -z "$BASE_VNFS_NAME_head" ] && sed -e "s/$BASE_VNFS_NAME_head/$VNFS_NAME_head/g" /etc/fstab - diff --git a/common/integration-test/vin/nodes/worker2/scripts/fix-scripts.sh b/common/integration-test/vin/nodes/worker2/scripts/fix-scripts.sh deleted file mode 100755 index 19a5450df733ff2dc5d110c8e8ff7c247a20c8e1..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/nodes/worker2/scripts/fix-scripts.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/sh - -# rm /var/lib/one-nfsshare/remotes/im/kvm.d/freespace.sh diff --git a/common/integration-test/vin/test/01_vin_install.py b/common/integration-test/vin/test/01_vin_install.py deleted file mode 100644 index 193724424e7f4b86158a519d0ce089ad9af0ffba..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/test/01_vin_install.py +++ /dev/null @@ -1,28 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_01_setup_linux(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - #worker1 = ct_node_list["worker1"] - #worker2 = ct_node_list["worker2"] - pass - -def test_02_install_strongswan(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - #worker1 = ct_node_list["worker1"] - #worker2 = ct_node_list["worker2"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vin/install-strongswan.sh") -# ct_nodeman.testrun("root", worker1, "/srv/contegrator-test/vin/install-strongswan.sh") -# ct_nodeman.testrun("root", worker2, "/srv/contegrator-test/vin/install-strongswan.sh") - -def test_03_install_vin(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - #worker1 = ct_node_list["worker1"] - #worker2 = ct_node_list["worker2"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vin/install.sh") - -# - diff --git a/common/integration-test/vin/test/02_one_setup.py b/common/integration-test/vin/test/02_one_setup.py deleted file mode 100644 index 40da0a080930e73d48a358dc11ddcc0df75fb603..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/test/02_one_setup.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_02_setup_one(ct_node_list, ct_nodeman): - #federation = ct_node_list["federation"] - head = ct_node_list["head"] - #worker = ct_node_list["worker"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/one-head/setup.sh") - - -# - diff --git a/common/integration-test/vin/test/02_vin_setup.py b/common/integration-test/vin/test/02_vin_setup.py deleted file mode 100644 index 5156e4e9c19e7ea48a346620a9fe475f9f619bee..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/test/02_vin_setup.py +++ /dev/null @@ -1,20 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_03_edit_cofig(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - #worker1 = ct_node_list["worker1"] - #worker2 = ct_node_list["worker2"] - return 0 - # TODO - contegrator - head_name = "n0007" # head["name"] - conf_file = "/usr/share/contrail/monitoring/one-monitor/config" - params = "" - params += " rabbit_mq_host=" + head_name - ct_nodeman.testrun("root", head, "/srv/contegrator-test/edit-conf-file.sh " + conf_file + " " + params) - -# - diff --git a/common/integration-test/vin/test/03_vin_run.py b/common/integration-test/vin/test/03_vin_run.py deleted file mode 100644 index b1f555a3503921bf604db824df2f5fbc2c6c9f29..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/test/03_vin_run.py +++ /dev/null @@ -1,14 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -def test_01_run_vin(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - #worker1 = ct_node_list["worker1"] - #worker2 = ct_node_list["worker2"] - pass - -# - diff --git a/common/integration-test/vin/test/10_vin_tests.py b/common/integration-test/vin/test/10_vin_tests.py deleted file mode 100644 index 08c3fcf6fb6703837a122948167d090c31ad6117..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/test/10_vin_tests.py +++ /dev/null @@ -1,6 +0,0 @@ -def test_01_vin_test1(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - #worker1 = ct_node_list["worker1"] - #worker2 = ct_node_list["worker2"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/vin/test_1.sh") - diff --git a/common/integration-test/vin/test/98_vin_archive.py b/common/integration-test/vin/test/98_vin_archive.py deleted file mode 100644 index 94069902d687d6b5d1404047f218d889939973dd..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/test/98_vin_archive.py +++ /dev/null @@ -1,19 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_01_archive(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - #worker1 = ct_node_list["worker1"] - #worker2 = ct_node_list["worker2"] - # ct_nodeman.sshrun("root", worker, "read wait_on_kill2") - ct_nodeman.getfile(head, "/var/log/syslog", "./archive/head/syslog.txt" ) - ct_nodeman.getfile(head, "/var/log/dmesg", "./archive/head/dmesg.txt" ) - #ct_nodeman.getfile(worker1, "/var/log/syslog", "./archive/worker1/syslog.txt" ) - #ct_nodeman.getfile(worker1, "/var/log/dmesg", "./archive/worker1/dmesg.txt" ) - #ct_nodeman.getfile(worker2, "/var/log/syslog", "./archive/worker2/syslog.txt" ) - #ct_nodeman.getfile(worker2, "/var/log/dmesg", "./archive/worker2/dmesg.txt" ) - -# diff --git a/common/integration-test/vin/test/99_wait.py b/common/integration-test/vin/test/99_wait.py deleted file mode 100644 index 54e31037fc01aafa0b38cde3ae1dae9fd49ceca5..0000000000000000000000000000000000000000 --- a/common/integration-test/vin/test/99_wait.py +++ /dev/null @@ -1,15 +0,0 @@ -# the following variables that are in the context when the test cases are run -# are of special importance to us: -# - ct_node_list: mapping node names (dir names of node definitions) to host names -# - nodeman: a NodeManager instance that can be used to issue ssh commands to the nodes - - -# ct_nodeman.testrun - raises excetion, so that failure is detected by jenkins -def test_99_wait(ct_node_list, ct_nodeman): - head = ct_node_list["head"] - #worker1 = ct_node_list["worker1"] - #worker2 = ct_node_list["worker2"] - ct_nodeman.testrun("root", head, "/srv/contegrator-test/wait-before-shutdown.sh 304") - -# - diff --git a/common/jarlibs/OpenNebulaOVFParser.jar b/common/jarlibs/OpenNebulaOVFParser.jar deleted file mode 100644 index ba7701bd3e9a14ed58e65cebe168cdf74d294e37..0000000000000000000000000000000000000000 Binary files a/common/jarlibs/OpenNebulaOVFParser.jar and /dev/null differ diff --git a/common/jarlibs/org.opennebula.client.jar b/common/jarlibs/org.opennebula.client.jar deleted file mode 100644 index 687100332ebf11f665297b3cb6f895e6c46cb697..0000000000000000000000000000000000000000 Binary files a/common/jarlibs/org.opennebula.client.jar and /dev/null differ diff --git a/common/ovf-parser/README.txt b/common/ovf-parser/README.txt deleted file mode 100644 index 81de648bf8b65d62639703f95bc56d93a1781c7c..0000000000000000000000000000000000000000 --- a/common/ovf-parser/README.txt +++ /dev/null @@ -1,101 +0,0 @@ - ------------------------------------------- - OVF Parser - ------------------------------------------- - 2011-12-09 - -Support - - For any question about the integration send an email to: - - * iacoperi@gmail.com - - -Definition - - To include OVF-parser as dependency of one maven project you need to be sure to add a "dependency - tag" in your pom.xml of your project: - - --------------------------------------------------------------------------------------- - - org.ow2.contrail.common - ovf-parser - 0.1-SNAPSHOT - compile - - --------------------------------------------------------------------------------------- - - Maven will retrieve the ovf-parser's pom from the remote artifact downloading it in your - local repository. - - -Development - - The easiest way to import the project into Eclipse is to use m2eclipse. - - IMPORTANT: To correctly setup the project environment in eclipse first you have to compile the - maven project and after build the ".project" resource of ovf-parser. See "Compiling" section. - - -Dependencies - - The OVF parser depends from several libraries: - - * junit 4.10 - - The dependencies are automatically resolved by Maven compiling the code. - - -Sample ovf - - Resides under src/main/java/resources. - - -Parent - - OVF parser is compilable as separated maven project. Its location is under: - - - trunk/common/ - - and its direclty parent is located under: - - - trunk/common/pom.xml - - The parent TAG in its own pom.xml is: - - --------------------------------------------------------------------------------------- - - org.ow2.contrail - contrail - 0.2-SNAPSHOT - - --------------------------------------------------------------------------------------- - - -Compiling - - To simply compile the maven project go in ovf-parser folder and type: - - --------------------------------------------------------------------------------------- - $ mvn clean compile - --------------------------------------------------------------------------------------- - - If you also need to create the ".project" resource for eclipse, after compiled with maven, type: - - --------------------------------------------------------------------------------------- - $ mvn clean eclipse:eclipse - --------------------------------------------------------------------------------------- - - -Running application - - TO DO - - -Running unit tests - - TO DO - - -Generating documentation - - TO DO \ No newline at end of file diff --git a/common/ovf-parser/pom.xml b/common/ovf-parser/pom.xml deleted file mode 100644 index 64d5f63f5e2b1bd96b7668aeb26bba6a932b2f66..0000000000000000000000000000000000000000 --- a/common/ovf-parser/pom.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - 4.0.0 - org.ow2.contrail.common - ovf-parser - jar - 0.1-SNAPSHOT - OVF Parser - - org.ow2.contrail - contrail - 0.3-SNAPSHOT - ../contrail-parent - - - - junit - junit - 4.10 - compile - - - diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/OVFParser.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/OVFParser.java deleted file mode 100644 index 3122f6ec2c5ef59df5ae46eda44eea5c4c1495fd..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/OVFParser.java +++ /dev/null @@ -1,232 +0,0 @@ -package org.ow2.contrail.common; - -import java.io.BufferedReader; -import java.io.FileReader; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collection; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.xpath.XPathExpressionException; - -import org.ow2.contrail.common.implementation.ovf.Disk; -import org.ow2.contrail.common.implementation.ovf.File; -import org.ow2.contrail.common.implementation.ovf.OVFVirtualNetwork; -import org.ow2.contrail.common.implementation.ovf.OVFVirtualSystem; -import org.ow2.contrail.common.interfaces.ApplianceDescriptor; -import org.ow2.contrail.common.interfaces.ApplicationDescriptor; -import org.ow2.contrail.common.interfaces.Property; -import org.w3c.dom.DOMException; -import org.xml.sax.SAXException; - -public class OVFParser { - private ApplicationDescriptor application; - - public OVFParser(String path) throws IOException, NumberFormatException, XPathExpressionException, DOMException, - ParserConfigurationException, SAXException, URISyntaxException { - parse(path); - } - - private void parse(String path) throws IOException, NumberFormatException, XPathExpressionException, DOMException, - ParserConfigurationException, SAXException, URISyntaxException { - FileReader fr = new FileReader(path); - - BufferedReader br = new BufferedReader(fr); - StringBuffer sb = new StringBuffer(); - - while (br.ready()) { - sb.append(br.readLine()); - } - - application = org.ow2.contrail.common.implementation.ovf.OVFParser.ParseOVF(sb.toString()); - } - - /** - * Gets the IDs of all appliances in the application. - */ - public Collection getAppliances() { - Collection result = new ArrayList(); - - for (ApplianceDescriptor app : application.getAppliancesDescriptors()) { - internalGetAppliancesID(app, result); - } - - return result; - } - - private void internalGetAppliancesID(ApplianceDescriptor appliance, Collection result) { - result.add(appliance.getID()); - - for (ApplianceDescriptor app : appliance.getAppliancesDescriptors()) { - internalGetAppliancesID(app, result); - } - } - - private Collection internalGetApplianceImages(ApplianceDescriptor appliance, String applianceId, - Collection result) { - if (appliance.getID().equals(applianceId)) { - for (Disk d : appliance.getDisks()) { - result.add(d.getFile()); - return result; - } - } else { - for (ApplianceDescriptor app : appliance.getAppliancesDescriptors()) { - internalGetApplianceImages(app, applianceId, result); - } - } - - return null; - } - - /** - * Gets the disks associated to an appliance - */ - public Collection getApplianceDisk(String applianceId) { - Collection result = new ArrayList(); - for (ApplianceDescriptor appliance : application.getAppliancesDescriptors()) { - if (appliance.getID().equals(applianceId)) { - result = appliance.getDisks(); - } - } - return result; - } - - /** - * Gets the image files associated to an appliance. - */ - public Collection getApplianceImages(String applianceId) { - Collection result = new ArrayList(); - - for (ApplianceDescriptor appliance : application.getAppliancesDescriptors()) { - internalGetApplianceImages(appliance, applianceId, result); - } - return result; - } - - - - /** - * Gets the description associated to a virtual network - */ - public String getNetworkDescription(String networkId) { - for (ApplianceDescriptor appliance : application.getAppliancesDescriptors()) { - return internalGetNetworkDescription(appliance, networkId); - } - return null; - } - - private String internalGetNetworkDescription(ApplianceDescriptor app, String networkId) { - - for (OVFVirtualNetwork net : app.getAssociatedVirtualNetworks()) { - if (net.getName().equals(networkId)) { - return net.getDescription(); - } - } - for (ApplianceDescriptor child : app.getAppliancesDescriptors()) { - String temp = internalGetNetworkDescription(child, networkId); - if (temp != null) - return temp; - } - return null; - } - - /** - * Gets the names of the virtual networks associated to an appliance. - */ - public Collection getApplianceNetworks(String applianceId) { - Collection result = new ArrayList(); - - for (ApplianceDescriptor appliance : application.getAppliancesDescriptors()) { - internalGetApplianceNetworks(appliance, applianceId, result); - } - - return result; - } - - private Collection internalGetApplianceNetworks(ApplianceDescriptor appliance, String applianceId, - Collection result) { - if (appliance.getID().equals(applianceId)) { - for (OVFVirtualNetwork n : appliance.getAssociatedVirtualNetworks()) { - result.add(n.getName()); - return result; - } - } else { - for (ApplianceDescriptor app : appliance.getAppliancesDescriptors()) { - internalGetApplianceNetworks(app, applianceId, result); - } - } - - return null; - } - - /** - * Gets the Virtual System associated to an appliance - */ - public Collection getApplianceVirtualSystem(String applianceId) { - Collection result = new ArrayList(); - for (ApplianceDescriptor appliance : application.getAppliancesDescriptors()) { - internalGetApplianceVirtualSystem(appliance, applianceId, result); - } - return result; - - } - - private Collection internalGetApplianceVirtualSystem(ApplianceDescriptor appliance, String id, - Collection result) { - if (appliance.getID().equals(id)) { - for (OVFVirtualSystem vs : appliance.getVirtualSystems()) { - result.add(vs); - } - } else - for (ApplianceDescriptor child : appliance.getAppliancesDescriptors()) { - internalGetApplianceVirtualSystem(child, id, result); - } - return result; - - } - - /** - * Gets the id of the appliances associated to an appliance - */ - public Collection getChildren(String applianceId) { - Collection result = new ArrayList(); - for (ApplianceDescriptor appliance : application.getAppliancesDescriptors()) { - internalGetChildren(appliance, applianceId, result); - } - return result; - } - - private void internalGetChildren(ApplianceDescriptor appliance, String id, Collection result) { - if (appliance.getID().equals(id)) { - for (ApplianceDescriptor child : appliance.getAppliancesDescriptors()) { - result.add(child.getID()); - } - } else { - for (ApplianceDescriptor subApp : appliance.getAppliancesDescriptors()) - internalGetChildren(subApp, id, result); - } - //return result; - } - - //FIXME: to refactor. This method is temporary, it uses a lot of resources!!! - /** - * Gets all the property of the specific appliance. If any inherited property is duplicated this method keep the child property - */ - public Collection getAllProperty(String applianceId){ - Collection result = new ArrayList(); - for(ApplianceDescriptor appliance : application.getAppliancesDescriptors()){ - internalGetProperty(appliance,applianceId, result); - } - return result; - } - private void internalGetProperty(ApplianceDescriptor appliance,String applianceId, Collection result){ - if(appliance.getID().equals(applianceId)){ - result.addAll(appliance.getAllProperty()); - }else{ - for(ApplianceDescriptor subApp: appliance.getAppliancesDescriptors()){ - internalGetProperty(subApp, applianceId, result); - } - } - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/Test/TestOVFParser.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/Test/TestOVFParser.java deleted file mode 100644 index 6af7b785195bd15dcce171c69027ccdfa7ef4d4e..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/Test/TestOVFParser.java +++ /dev/null @@ -1,78 +0,0 @@ -package org.ow2.contrail.common.Test; - -import java.io.FileNotFoundException; -import java.io.IOException; -import java.net.URISyntaxException; -import java.util.Collection; - -import javax.xml.parsers.ParserConfigurationException; -import javax.xml.xpath.XPathExpressionException; - -//import org.ow2.contrail.common.implementation.ovf.Disk; -import org.ow2.contrail.common.implementation.ovf.File; -import org.ow2.contrail.common.interfaces.Property; -//import org.ow2.contrail.common.implementation.ovf.OVFParser; -//import org.ow2.contrail.common.interfaces.ApplianceDescriptor; -//import org.ow2.contrail.common.interfaces.ApplicationDescriptor; -//import org.ow2.contrail.common.application.ovf.OVFParser; -import org.w3c.dom.DOMException; -import org.xml.sax.SAXException; - -public class TestOVFParser { - - public static void main(String[] args) throws NumberFormatException, FileNotFoundException, - XPathExpressionException, DOMException, ParserConfigurationException, SAXException, IOException, - URISyntaxException - { - /*FileReader fr = new FileReader("data/contrail_petstore.xml"); - - BufferedReader br = new BufferedReader(fr); - StringBuffer sb = new StringBuffer(); - while (br.ready()) { - sb.append(br.readLine()); - } - - ApplicationDescriptor app = OVFParser.ParseOVF(sb.toString()); - - for (ApplianceDescriptor a : app.getAppliancesDescriptors()) { - for (Disk d : a.getDisks()) { - System.out.println(d.getId()); - System.out.println(d.getFile()); - } - - System.out.println("-------"); - } - - // Graph g = app.getApplicationGraph(); - // SimpleWeightedGraph g = - // app.getApplicationGraph(); - // System.out.println(g); - * - */ - - org.ow2.contrail.common.OVFParser p = new org.ow2.contrail.common.OVFParser("src/main/resources/contrail_petstore.xml"); - - for (String appId : p.getAppliances()) - { - System.out.print("Appliance Id = "); - System.out.println(appId); - - for (File f : p.getApplianceImages(appId)) - { - System.out.println("Image URI = " + f.getUri() + " " + "Image Size = " + f.getSize()); - } - - Collection networks = p.getApplianceNetworks(appId); - if (networks.size() > 0) - { - System.out.print("Associated Networks = "); - for (String n : networks) - { - System.out.println(n); - } - } - - System.out.println(); - } - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/ApplianceDescriptorImpl.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/ApplianceDescriptorImpl.java deleted file mode 100644 index 4d25505031de3ec912c67d1271ea34977afad830..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/ApplianceDescriptorImpl.java +++ /dev/null @@ -1,214 +0,0 @@ -package org.ow2.contrail.common.implementation.application; - -import java.util.ArrayList; -import java.util.Collection; - -//import mascoptLib.graphs.Vertex; - -import org.ow2.contrail.common.implementation.ovf.Disk; -import org.ow2.contrail.common.implementation.ovf.OVFProperty; -import org.ow2.contrail.common.implementation.ovf.OVFStartupSection; -import org.ow2.contrail.common.implementation.ovf.OVFVirtualHardware; -import org.ow2.contrail.common.implementation.ovf.OVFVirtualNetwork; -import org.ow2.contrail.common.implementation.ovf.OVFVirtualSystem; -import org.ow2.contrail.common.implementation.ovf.virtualhardware.OVFVirtualHwDiskDrive; -import org.ow2.contrail.common.interfaces.ApplianceDescriptor; -import org.ow2.contrail.common.interfaces.Property; - -public class ApplianceDescriptorImpl implements ApplianceDescriptor { - private String applianceURI; - private boolean isVirtualCollection; - private String id; - private long size; - - private ApplianceDescriptor parent; - - private Collection virtualSystems; - - private Collection virtualNetworks; - - private Collection property; - - private Collection childAppliances; - - private OVFStartupSection startupSection; - - public ApplianceDescriptorImpl(String lid, String luri, long lsize, - boolean vc) { - id = lid; - applianceURI = luri; - size = lsize; - isVirtualCollection = vc; - - virtualSystems = new ArrayList(); - virtualNetworks = new ArrayList(); - - property = new ArrayList(); - - childAppliances = new ArrayList(); - } - - /** - * Gets the URI of the appliance. - * - * @return A String. - */ - @Override - public String getApplianceURI() { - return applianceURI; - } - - /** - * Gets the appliance identifier. - * - * @return An identifier expressed as a String. - */ - @Override - public String getID() { - return id; - } - - /** - * Gets the image size. - * - * @return long - */ - @Override - public long getSize() { - return size; - } - - /** - * Gets the virtual systems associated with the OVF. - * - * @return A collection of OVFVirtualSystems. - */ - @Override - public Collection getVirtualSystems() { - return virtualSystems; - } - - /** - * Get the virtual networks associated with the appliance. - * - * @return A collection of OVFVirtualNetwork. - */ - @Override - public Collection getAssociatedVirtualNetworks() { - return virtualNetworks; - } - - /* - * /** Get the vertex associated with this appliance in the appliance graph. - * - * @return A Mascopt Vertex. - */ - // @Override - // public LinkedList getVertex() { - // return myVertex; - // } - - /** - * Gets the appliances this appliance is made of. - * - * @return A collection of ApplianceDescriptor. - */ - @Override - public Collection getAppliancesDescriptors() { - return childAppliances; - } - - // TODO: right now it computes the image set in a lazy way. - // avoid to recompute the set everytime. - /** - * Gets the disk images used by this appliance. - * - * @return A collection of Disk. - */ - @Override - public Collection getDisks() { - Collection result = new ArrayList(); - - // this - for (OVFVirtualSystem vs : virtualSystems) { - for (OVFVirtualHardware vh : vs.getRequiredHardware()) { - if (vh.getResourceType() == 17) { - result.add(((OVFVirtualHwDiskDrive) vh).getDisk()); - } - } - } - - // children - for (ApplianceDescriptor child : childAppliances) { - result.addAll(child.getDisks()); - } - - return result; - } - - @Override - public String toString() { - return super.toString(); - } - - @Override - public boolean isVirtualCollection() { - return this.isVirtualCollection; - } - - /** - * Gets the startup information associated with this appliance. - * - * @return A OVFStartupSection - */ - @Override - public OVFStartupSection getOVFStartupSection() { - return startupSection; - } - - /** - * Sets the startup information associated with this appliance. - * - * @return A OVFStartupSection - */ - @Override - public void setOVFStartupSection(OVFStartupSection value) { - startupSection = value; - } - - @Override - public Collection getAllProperty() { - Collection allProperty = new ArrayList(); - allProperty.addAll(this.property); - if (parent != null) { - Collection tempProp = parent.getAllProperty(); - boolean contain = false; - for (Property prop : tempProp) { - for (Property allProp : allProperty) { - if (allProp.getKey().equals(prop.getKey())) - contain = true; - } - if (!contain) { - allProperty.add(prop); - } - contain = false; - } - } - return allProperty; - } - - @Override - public Collection getProperty() { - return property; - } - - @Override - public void setParent(ApplianceDescriptor parent) { - this.parent = parent; - } - - @Override - public ApplianceDescriptor getParent() { - return parent; - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/ApplianceStartupDescriptorImpl.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/ApplianceStartupDescriptorImpl.java deleted file mode 100644 index 69176581d050b73eeab0e54f28c85c5d68919b0d..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/ApplianceStartupDescriptorImpl.java +++ /dev/null @@ -1,28 +0,0 @@ -package org.ow2.contrail.common.implementation.application; - -import org.ow2.contrail.common.interfaces.ApplianceStartupDescriptor; - -public class ApplianceStartupDescriptorImpl implements ApplianceStartupDescriptor -{ - private String id; - private int order; - - public ApplianceStartupDescriptorImpl(String id, int order) - { - this.id = id; - this.order = order; - } - - @Override - public String getApplianceId() - { - return id; - } - - @Override - public int getStartupOrder() - { - return order; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/ApplicationDescriptorImpl.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/ApplicationDescriptorImpl.java deleted file mode 100644 index 21030a995f4a8a4429b3085597050f008cc02f32..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/ApplicationDescriptorImpl.java +++ /dev/null @@ -1,70 +0,0 @@ -package org.ow2.contrail.common.implementation.application; - -import java.util.ArrayList; -import java.util.Collection; - -//If we don't need the weight of edge, we can use SimpleGraph -//import org.jgrapht.graph.DefaultEdge; -//import org.jgrapht.graph.SimpleWeightedGraph; - -import org.ow2.contrail.common.implementation.constraints.ApplicationConstraintsImpl; -import org.ow2.contrail.common.implementation.constraints.UserConstraintsImpl; -import org.ow2.contrail.common.implementation.sla.InternalSLAProposalImpl; -import org.ow2.contrail.common.interfaces.ApplianceDescriptor; -import org.ow2.contrail.common.interfaces.ApplicationConstraints; -import org.ow2.contrail.common.interfaces.ApplicationDescriptor; -import org.ow2.contrail.common.interfaces.StartupDescriptor; -import org.ow2.contrail.common.interfaces.UserConstraints; - -public class ApplicationDescriptorImpl implements ApplicationDescriptor -{ - private Collection appliances; - - private InternalSLAProposalImpl slaProposal; - - private ApplicationConstraints appConstraints; - - private UserConstraints userConstraints; - - private StartupDescriptor startupDescriptor; - - public ApplicationDescriptorImpl() - { - appliances = new ArrayList(); - slaProposal = new InternalSLAProposalImpl(); - appConstraints = new ApplicationConstraintsImpl(); - userConstraints = new UserConstraintsImpl(); - startupDescriptor = new StartupDescriptorImpl(); - } - - @Override - public InternalSLAProposalImpl getSLAProposal() - { - return slaProposal; - } - - @Override - public Collection getAppliancesDescriptors() - { - return appliances; - } - - @Override - public ApplicationConstraints getApplicationConstraints() - { - return appConstraints; - } - - @Override - public UserConstraints getUserConstraints() - { - return userConstraints; - } - - @Override - public StartupDescriptor getStartupDescriptor() - { - return startupDescriptor; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/StartupDescriptorImpl.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/StartupDescriptorImpl.java deleted file mode 100644 index 3af24351c6a403fc7c11997d3319a8213b17dcb4..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/StartupDescriptorImpl.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ow2.contrail.common.implementation.application; - -import java.util.ArrayList; -import java.util.Collection; - -import org.ow2.contrail.common.interfaces.ApplianceStartupDescriptor; -import org.ow2.contrail.common.interfaces.StartupDescriptor; - -public class StartupDescriptorImpl implements StartupDescriptor -{ - private Collection startupDescriptors = new ArrayList(); - - @Override - public Collection getStartupDescriptors() - { - return startupDescriptors; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/StartupGroupImpl.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/StartupGroupImpl.java deleted file mode 100644 index 1d7c06d79878b3c7e570ed22e5116016ea0966a6..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/application/StartupGroupImpl.java +++ /dev/null @@ -1,45 +0,0 @@ -package org.ow2.contrail.common.implementation.application; - -import java.util.ArrayList; -import java.util.Collection; - -import org.ow2.contrail.common.interfaces.StartupDescriptor; -import org.ow2.contrail.common.interfaces.StartupGroup; - -/** - * Represents a group of appliances with the same startup order. - */ -public class StartupGroupImpl implements StartupGroup -{ - private Collection startupDescriptors; - - private int delay; - - /** - * Creates a new instance of StartupGroupImpl type. - */ - public StartupGroupImpl(int delay) - { - startupDescriptors = new ArrayList(); - this.delay = delay; - } - - /** - * Gets the group of related appliances. - */ - @Override - public Collection getStartupDescriptors() - { - return startupDescriptors; - } - - /** - * Gets the time delay with respect to the next StartupGroup. - */ - @Override - public int getDelay() - { - return delay; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/constraints/ApplicationConstraintsImpl.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/constraints/ApplicationConstraintsImpl.java deleted file mode 100644 index fb2701f0c07cda57f7ea89a82c2e64ab86517524..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/constraints/ApplicationConstraintsImpl.java +++ /dev/null @@ -1,22 +0,0 @@ -package org.ow2.contrail.common.implementation.constraints; - -import org.ow2.contrail.common.interfaces.ApplianceDescriptor; -import org.ow2.contrail.common.interfaces.ApplicationConstraints; - -public class ApplicationConstraintsImpl implements ApplicationConstraints -{ - @Override - public String getCPURequirement(ApplianceDescriptor appDescr) { - return null; - } - - @Override - public String getRAMRequirement(ApplianceDescriptor appDescr) { - return null; - } - - @Override - public String getStorageRequirement(ApplianceDescriptor appDescr) { - return null; - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/constraints/UserConstraintsImpl.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/constraints/UserConstraintsImpl.java deleted file mode 100644 index dba78c7c640fe7e77777c204b511e306eda4a108..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/constraints/UserConstraintsImpl.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.ow2.contrail.common.implementation.constraints; - -import org.ow2.contrail.common.interfaces.UserConstraints; - -public class UserConstraintsImpl implements UserConstraints { - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/Disk.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/Disk.java deleted file mode 100644 index f5e4a12610ff63e976c57b0750acc0abc2d54de0..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/Disk.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - -public class Disk { - - private File file; - private String id; - - public Disk(File file, String id) - { - this.file = file; - this.id = id; - } - - public File getFile() - { - return file; - } - - public String getId() { - return id; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/File.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/File.java deleted file mode 100644 index d138e3481092513f84af2c3d6a74ab5a557a5102..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/File.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - - -public class File { - - private String id; - private String uri; - private long size; - - public File(String id, String uri, long size) - { - this.id = id; - this.uri = uri; - this.size = size; - } - - public String getId() { - return id; - } - - public String getUri() { - return uri; - } - - public long getSize() { - return size; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFItemProcessor.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFItemProcessor.java deleted file mode 100644 index df4e08717c5b01825fbeb30510a5329708445e2b..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFItemProcessor.java +++ /dev/null @@ -1,52 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - -import org.w3c.dom.Node; - -import org.w3c.dom.DOMException; -import org.w3c.dom.NodeList; - -public abstract class OVFItemProcessor { - - public abstract OVFVirtualHardware processItem(Node xmlNode) throws DOMException; - - protected OVFVirtualHardware processCommonValues(OVFVirtualHardware ovfVH, Node xmlNode) - { - // check if this virtual hardware requirement is mandatory. - Node required = xmlNode.getAttributes().getNamedItem("ovf:required"); - if (required != null) - { - if (required.getNodeValue().equalsIgnoreCase("true")) - ovfVH.setRequired(true); - else - ovfVH.setRequired(false); - } - else - { - ovfVH.setRequired(true); - } - - NodeList childs = xmlNode.getChildNodes(); - - for (int i=0;i files = new HashMap(); - private static HashMap disks = new HashMap(); - private static HashMap networks = new HashMap(); - private static HashMap vs = new HashMap(); - - /** - * Parses an OVF document. - * - * @param The - * path of the OVF document expressed as a URI. - * @return An ApplicationDescriptor - */ - public static ApplicationDescriptor ParseOVF(URI ovfURI) throws ParserConfigurationException, - FileNotFoundException, SAXException, IOException, XPathExpressionException, NumberFormatException, - DOMException, URISyntaxException { - DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance(); - - DocumentBuilder builder = domFactory.newDocumentBuilder(); - Document doc = builder.parse(new FileInputStream(ovfURI.getPath())); - ApplicationDescriptor appDesc = internalParseOVF(doc); - - return appDesc; - } - - /** - * Parses an OVF document. - * - * @param The - * content of the OVF document expressed as a String - * . - * @return An ApplicationDescriptor - */ - public static ApplicationDescriptor ParseOVF(String ovf) throws ParserConfigurationException, - FileNotFoundException, SAXException, IOException, XPathExpressionException, NumberFormatException, - DOMException, URISyntaxException { - - DocumentBuilderFactory domFactory = DocumentBuilderFactory.newInstance(); - - DocumentBuilder builder = domFactory.newDocumentBuilder(); - - StringReader sr = new StringReader(ovf); - InputSource is = new InputSource(sr); - - Document doc = builder.parse(is); - - ApplicationDescriptor appDesc = internalParseOVF(doc); - - return appDesc; - } - - /** - * Parses the VirtualSystemCollection XML element. - * - * @param The - * Node associated with the XML element to parse. - * @return An ApplianceDescriptor representing the appliance. - */ - private static ApplianceDescriptor parseVSCollection(Node n, ApplianceDescriptor parent) - throws XPathExpressionException { - XPath xpath = XPathFactory.newInstance().newXPath(); - - // id - Node id = n.getAttributes().getNamedItem("ovf:id"); - if (id == null) { - throw new RuntimeException("id was not specified for the appliance."); - } - String vsId = id.getNodeValue(); - - ApplianceDescriptor result = new ApplianceDescriptorImpl(vsId, null, 0, true); - // appliance.getVirtualSystems().add(vs.get(vsId)); - result.setParent(parent); - - // VirtualSystem OR VirtualSystemCollection -> ApplianceDescriptor - XPathExpression expr = xpath.compile("VirtualSystem | VirtualSystemCollection"); - - NodeList nodes = (NodeList) expr.evaluate(n, XPathConstants.NODESET); - for (int i = 0; i < nodes.getLength(); i++) { - Node current = nodes.item(i); - - ApplianceDescriptor child = null; - if (current.getNodeName().equals("VirtualSystem")) { - child = parseVS(current, result); - } else { - child = parseVSCollection(current, result); - } - - result.getAppliancesDescriptors().add(child); - } - - expr = xpath.compile("StartupSection"); - Node node = (Node) expr.evaluate(n, XPathConstants.NODE); - // FIXME: we need to be sure that when startup-tag missing the related - // node is null!!!! - if (node != null) - result.setOVFStartupSection(parseStartupSection(xpath, node)); - expr = xpath.compile("ProductSection/Property"); - NodeList propertyList = (NodeList) expr.evaluate(n, XPathConstants.NODESET); - parsePropertySection(result, xpath, propertyList); - return result; - } - - private static void parsePropertySection(ApplianceDescriptor appliance, XPath xpath, NodeList properties) - throws XPathExpressionException { - for (int k = 0; k < properties.getLength(); k++) { - NamedNodeMap attributes = properties.item(k).getAttributes(); - Property property = new OVFProperty(); - // FIXME: check how handle property in the proper way - property.setKey(attributes.getNamedItem("ovf:key").getNodeValue()); - - if (attributes.getNamedItem("ovf:userConfigurable") != null) { - XPathExpression expr = xpath.compile("Label"); - Node label = (Node) expr.evaluate(properties.item(k), XPathConstants.NODE); - String h = label.getAttributes().getNamedItem("ovf:msgid").getNodeValue(); - property.setLabel(label.getAttributes().getNamedItem("ovf:msgid").getNodeValue(), label.getFirstChild() - .getNodeValue()); - expr = xpath.compile("Description"); - Node desc = (Node) expr.evaluate(properties.item(k), XPathConstants.NODE); - property.setDescription(desc.getAttributes().getNamedItem("ovf:msgid").getNodeValue(), desc - .getFirstChild().getNodeValue()); - } else { - property.setValue(attributes.getNamedItem("ovf:value").getNodeValue()); - } - appliance.getProperty().add(property); - - OVFVirtualNetwork net = null; - if (attributes.getNamedItem("ovf:key").getNodeValue().equals("ip")) { - String networkName = attributes.getNamedItem("ovf:value").getNodeValue(); - String[] splitted = networkName.split("\\|"); - // represent the complex string (ip_add|type|Vnet) - if (splitted.length > 1) { - net = networks.get(networkName.split("\\|")[2]); - // FIXME: we need to hnalde the string with special setting - // like [{$vm1}], for now they are skipped - - // else - // net = networks.get(splitted[0]); - appliance.getAssociatedVirtualNetworks().add(net); - } - } - } - } - - /** - * Parses the VirtualSystem XML element. - * - * @param The - * Node associated with the XML element to parse. - * @return An ApplianceDescriptor representing the appliance. - */ - private static ApplianceDescriptor parseVS(Node n, ApplianceDescriptor parent) throws XPathExpressionException { - XPath xpath = XPathFactory.newInstance().newXPath(); - - // id - Node id = n.getAttributes().getNamedItem("ovf:id"); - if (id == null) { - throw new RuntimeException("id was not specified for the appliance."); - } - String vsId = id.getNodeValue(); - - OVFVirtualSystem ovfVS = new OVFVirtualSystem(vsId); - vs.put(vsId, ovfVS); - - // FIXME: remove NULL & 0 values; - ApplianceDescriptor appliance = new ApplianceDescriptorImpl(vsId, null, 0, false); - appliance.getVirtualSystems().add(vs.get(vsId)); - appliance.setParent(parent); - - // Reading associated VNetworks. - XPathExpression expr = xpath.compile("ProductSection/Property"); - NodeList properties = (NodeList) expr.evaluate(n, XPathConstants.NODESET); - parsePropertySection(appliance, xpath, properties); - - // parsing of the Item(s) of the VirtualHardwareSection. - expr = xpath.compile("VirtualHardwareSection/Item"); - NodeList items = (NodeList) expr.evaluate(n, XPathConstants.NODESET); - - for (int k = 0; k < items.getLength(); k++) { - Node item = items.item(k); - OVFVirtualHardware vh = null; - - // for each child element "rasd:*" do - for (int j = 0; j < item.getChildNodes().getLength(); j++) { - Node child = item.getChildNodes().item(j); - - if (child.getNodeName().equals("rasd:ResourceType")) { - int resourceType = Integer.parseInt(child.getTextContent()); - - OVFItemProcessor p = OVFResourceAllocationSettingDataTranslator.getItemProcessor(resourceType); - - vh = p.processItem(item); - ovfVS.getRequiredHardware().add(vh); - - // if ResourceType == 17 => Link "Disk" from Disks hashmap - if (vh.getResourceType() == 17) { - OVFVirtualHwDiskDrive vDisk = (OVFVirtualHwDiskDrive) vh; - String diskRef = vDisk.getHostResource(); - vDisk.setDisk(disks.get(diskRef)); - } - } - } - } - - return appliance; - } - - /** - * Internal method used to factorize common code. - */ - private static ApplicationDescriptor internalParseOVF(Document doc) throws ParserConfigurationException, - FileNotFoundException, SAXException, IOException, XPathExpressionException, NumberFormatException, - DOMException, URISyntaxException { - ApplicationDescriptor appDesc = new ApplicationDescriptorImpl(); - - XPath xpath = XPathFactory.newInstance().newXPath(); - - // References - XPathExpression expr = xpath.compile("//References/File"); - NodeList nodes = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); - for (int i = 0; i < nodes.getLength(); i++) { - NamedNodeMap attributes = nodes.item(i).getAttributes(); - - File f = new File(attributes.getNamedItem("ovf:id").getNodeValue(), attributes.getNamedItem("ovf:href") - .getNodeValue(), Long.parseLong(attributes.getNamedItem("ovf:size").getNodeValue())); - - files.put(f.getId(), f); - } - - // Disks - expr = xpath.compile("//DiskSection/Disk"); - nodes = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); - for (int i = 0; i < nodes.getLength(); i++) { - NamedNodeMap attributes = nodes.item(i).getAttributes(); - - String fileRef = attributes.getNamedItem("ovf:fileRef").getNodeValue(); - File f = files.get(fileRef); - - String diskId = attributes.getNamedItem("ovf:diskId").getNodeValue(); - disks.put("ovf:/disk/" + diskId, new Disk(f, diskId)); - } - - // Virtual Networks - expr = xpath.compile("//NetworkSection/Network"); - nodes = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); - for (int i = 0; i < nodes.getLength(); i++) { - Node current = nodes.item(i); - - // name - String name = current.getAttributes().getNamedItem("ovf:name").getNodeValue(); - - // description - String description = null; - for (int j = 0; j < current.getChildNodes().getLength(); j++) { - Node n = current.getChildNodes().item(j); - - if (n.getNodeName().equals("Description")) { - description = n.getTextContent(); - break; - } - } - - networks.put(name, new OVFVirtualNetwork(name, description)); - } - - // VirtualSystem OR VirtualSystemCollection -> ApplianceDescriptor - expr = xpath.compile("Envelope/VirtualSystem | Envelope/VirtualSystemCollection"); - nodes = (NodeList) expr.evaluate(doc, XPathConstants.NODESET); - - for (int i = 0; i < nodes.getLength(); i++) { - Node current = nodes.item(i); - - ApplianceDescriptor appliance = null; - if (current.getNodeName().equals("VirtualSystem")) { - appliance = parseVS(current, null); - } else { - appliance = parseVSCollection(current, null); - } - - appDesc.getAppliancesDescriptors().add(appliance); - } - - return appDesc; - } - - /** - * Extracts information relevant for the appliances startup. - * - * @param The - * XPath used to query about the OVF structure. - * @param The - * ApplianceDescriptor associated with the XML - * element to parse. - * @param The - * Node associated with the XML element to parse. - * @throws XPathExpressionException - */ - private static OVFStartupSection parseStartupSection(XPath xpath, Node n) throws XPathExpressionException { - OVFStartupSection result = new OVFStartupSection(); - - // StartupSection -> StartupDescriptor - XPathExpression expr = xpath.compile("Item"); - - NodeList nodes = (NodeList) expr.evaluate(n, XPathConstants.NODESET); - - // For each Item extract infos.. - for (int i = 0; i < nodes.getLength(); i++) { - NamedNodeMap attributes = nodes.item(i).getAttributes(); - - String id = attributes.getNamedItem("ovf:id").getNodeValue(); - int order = Integer.parseInt(attributes.getNamedItem("ovf:order").getNodeValue()); - - // FIXME: unused. - String startDelay = attributes.getNamedItem("ovf:startDelay").getNodeValue(); - String startAction = attributes.getNamedItem("ovf:startAction").getNodeValue(); - String waitingForGuest = attributes.getNamedItem("ovf:waitingForGuest").getNodeValue(); - String stopDelay = attributes.getNamedItem("ovf:stopDelay").getNodeValue(); - String stopAction = attributes.getNamedItem("ovf:stopAction").getNodeValue(); - - OVFStartupSection.Item startupItem = new OVFStartupSection.Item(id, order); - result.getItems().add(startupItem); - } - - return result; - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFProperty.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFProperty.java deleted file mode 100644 index ec2b0c0cddda10f64a7a7d34b79c8937f833f022..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFProperty.java +++ /dev/null @@ -1,77 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - -import org.ow2.contrail.common.interfaces.Property; - -public class OVFProperty implements Property { - - private String key; - private String value; - private Label label; - private Description description; - - @Override - public String getKey() { - return this.key; - } - - @Override - public String getValue() { - return this.value; - } - - @Override - public void setKey(String key) { - this.key = key; - } - - @Override - public void setValue(String value) { - this.value = value; - } - - public void setLabel(String msg, String description) { - label = new Label(msg, description); - } - - public void setDescription(String msg, String desc) { - description = new Description(msg, desc); - } - - private class Description { - private String msgid; - private String description; - - public Description(String msgid, String description) { - this.msgid = msgid; - this.description = description; - } - - public String getMsgid() { - return msgid; - } - - public String getDescription() { - return description; - } - - } - - private class Label { - private String msgid; - private String description; - - public Label(String msgid, String description) { - this.msgid = msgid; - this.description = description; - } - - public String getMsgid() { - return msgid; - } - - public String getDescription() { - return description; - } - - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFResourceAllocationSettingDataTranslator.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFResourceAllocationSettingDataTranslator.java deleted file mode 100644 index 20727539db6830894a03cf31ff8d4f8d93d59e12..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFResourceAllocationSettingDataTranslator.java +++ /dev/null @@ -1,84 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - -import java.util.HashMap; -import java.util.Map; - -import org.ow2.contrail.common.implementation.ovf.item_processor.OVFCdDriveProcessor; -import org.ow2.contrail.common.implementation.ovf.item_processor.OVFCpuProcessor; -import org.ow2.contrail.common.implementation.ovf.item_processor.OVFDiskDriveProcessor; -import org.ow2.contrail.common.implementation.ovf.item_processor.OVFEthernetAdapterProcessor; -import org.ow2.contrail.common.implementation.ovf.item_processor.OVFFloppyDriveProcessor; -import org.ow2.contrail.common.implementation.ovf.item_processor.OVFIdeControllerProcessor; -import org.ow2.contrail.common.implementation.ovf.item_processor.OVFMemoryProcessor; -import org.ow2.contrail.common.implementation.ovf.item_processor.OVFParallelSCSIProcessor; - -public class OVFResourceAllocationSettingDataTranslator { - - private static final Map resourceTypeToName = new HashMap(); - private static final Map resourceTypeToProcessor = new HashMap(); - - public static String getResourceName(int i) - { - if ((i>33) && (i<32768)) - return "DMTF reserved"; - else if (i>=32768) - return "Vendor Reserved"; - - // POST: i <= 33 - return resourceTypeToName.get(i); - } - - public static OVFItemProcessor getItemProcessor(int id) throws NoClassDefFoundError - { - return resourceTypeToProcessor.get(id); - } - - static - { - resourceTypeToName.put(1,"Other"); - resourceTypeToName.put(2,"Computer System"); - resourceTypeToName.put(3,"Processor"); - resourceTypeToName.put(4,"Memory"); - resourceTypeToName.put(5,"IDE Controller"); - resourceTypeToName.put(6,"Parallel SCSI HBA"); - resourceTypeToName.put(7,"FC HBA"); - resourceTypeToName.put(8,"iSCSI HBA"); - resourceTypeToName.put(9,"IB HCA"); - resourceTypeToName.put(10,"Ethernet Adapter"); - resourceTypeToName.put(11,"Other Network Adapter"); - resourceTypeToName.put(12,"I/O Slot"); - resourceTypeToName.put(13,"I/O Device"); - resourceTypeToName.put(14,"Floppy Drive"); - resourceTypeToName.put(15,"CD Drive"); - resourceTypeToName.put(16,"DVD drive"); - resourceTypeToName.put(17,"Disk Drive"); - resourceTypeToName.put(18,"Tape Drive"); - resourceTypeToName.put(19,"Storage Extent"); - resourceTypeToName.put(20,"Other storage device"); - resourceTypeToName.put(21,"Serial port"); - resourceTypeToName.put(22,"Parallel port"); - resourceTypeToName.put(23,"USB Controller"); - resourceTypeToName.put(24,"Graphics controller"); - resourceTypeToName.put(25,"IEEE 1394 Controller"); - resourceTypeToName.put(26,"Partitionable Unit"); - resourceTypeToName.put(27,"Base Partitionable Unit"); - resourceTypeToName.put(28,"Power"); - resourceTypeToName.put(29,"Cooling Capacity"); - resourceTypeToName.put(30,"Ethernet Switch Port"); - resourceTypeToName.put(31,"Logical Disk"); - resourceTypeToName.put(32,"Storage Volume"); - resourceTypeToName.put(33,"Ethernet Connection"); - // resourceTypeToName.put(DMTF reserved (..) - // resourceTypeToName.put(Vendor Reserved (32768-65535) - - // Initialize the hash map of the OVF processors. - resourceTypeToProcessor.put(3, new OVFCpuProcessor()); - resourceTypeToProcessor.put(4, new OVFMemoryProcessor()); - resourceTypeToProcessor.put(5, new OVFIdeControllerProcessor()); - resourceTypeToProcessor.put(6, new OVFParallelSCSIProcessor()); - resourceTypeToProcessor.put(10, new OVFEthernetAdapterProcessor()); - resourceTypeToProcessor.put(14, new OVFFloppyDriveProcessor()); - resourceTypeToProcessor.put(15, new OVFCdDriveProcessor()); - resourceTypeToProcessor.put(17, new OVFDiskDriveProcessor()); - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFSections.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFSections.java deleted file mode 100644 index 6c62b4c950cebea39a5b8e7afc11fcf59c51fd9e..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFSections.java +++ /dev/null @@ -1,104 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - -import java.net.URI; -import java.net.URISyntaxException; -import java.util.ArrayList; -import java.util.Collection; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1.ContentType; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1.EnvelopeType; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1.FileType; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1.ReferencesType; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1.VirtualSystemCollectionType; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1.VirtualSystemType; - -/** - * - */ -public class OVFSections { - - private Collection ovfVirtualDisks; - private Collection ovfVirtualNetworks; - private Collection ovfVirtualSystems; - - /** - * Creates an instance of the OVFSections type. - * - * @param An instance of EnvelopeType, the root element of the OVF. - */ - public OVFSections(EnvelopeType env) { - createSectionDescriptors(env); - } - - /** - * Creates a section descriptors for each of the OVF sections (disk, network, compute). - */ - private void createSectionDescriptors(EnvelopeType env) { - - ovfVirtualDisks = new ArrayList(); - - // NB: assumption1 information taken from References instead from DiskSection. - ReferencesType references = env.getReferences(); - - for (FileType file : references.getFile()) - { - // NB: assumption2: no compression is used for the disks of images. - assert(file.getCompression().isEmpty() || file.getCompression().equals("identity")); - - String href = file.getHref(); - - if (href.endsWith(".vmdk") || href.endsWith(".iso")) - { - try - { - ovfVirtualDisks.add( - new OVFVirtualDisk(file.getId(), new URI(href), file.getSize().longValue())); - } - catch (URISyntaxException e) - { - e.printStackTrace(); - } - } - } - - // OVFVirtualSystems - ContentType content = env.getContent().getValue(); - - if (content instanceof VirtualSystemCollectionType) - { - ovfVirtualSystems.add(new OVFVirtualSystem(content.getId())); - } - else if (content instanceof VirtualSystemType) - { - ovfVirtualSystems.add(new OVFVirtualSystem(content.getId())); - } - } - - /** - * Gets the virtual disks associated with the OVF. - * - * @return A collection of OVFVirtualDisk. - */ - public Collection getVirtualDisks() { - return ovfVirtualDisks; - } - - /** - * Gets the virtual systems associated with the OVF. - * - * @return A collection of OVFVirtualSystems. - */ - public Collection getVirtualSystems() { - return ovfVirtualSystems; - } - - /** - * Gets the virtual networks associated with the OVF. - * - * @return A collection of OVFVirtualNetwork. - */ - public Collection getVirtualNetworks() { - return ovfVirtualNetworks; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFStartupSection.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFStartupSection.java deleted file mode 100644 index c6dc9b40bcbd729431d608188435c5252dd68bd3..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFStartupSection.java +++ /dev/null @@ -1,53 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - -import java.util.ArrayList; -import java.util.Collection; - -import org.ow2.contrail.common.interfaces.ApplianceDescriptor; - -/** - * Represents an OVF startup section block. - */ -public class OVFStartupSection -{ - private Collection items = new ArrayList(); - - public Collection getItems() - { - return items; - } - - static class Item { - - private String id; - private int order; - - private ApplianceDescriptor appliance; - - public Item(String id, int order) - { - this.id = id; - this.order = order; - } - - public String getId() - { - return id; - } - - public int getOrder() - { - return order; - } - - public ApplianceDescriptor getApplianceDescriptor() - { - return appliance; - } - - public void setApplianceDescriptor(ApplianceDescriptor appliance) - { - this.appliance = appliance; - } - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualDisk.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualDisk.java deleted file mode 100644 index 47b663fd7837e3850dfddf26d5348d376f825b70..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualDisk.java +++ /dev/null @@ -1,29 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - -import java.net.URI; - -public class OVFVirtualDisk { - - private String id; - private URI uri; - private long size; - - public OVFVirtualDisk(String lid, URI luri, long lsize) - { - id = lid; - uri = luri; - size = lsize; - } - - public String getId() { - return id; - } - - public URI getUri() { - return uri; - } - - public long getSize() { - return size; - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualHardware.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualHardware.java deleted file mode 100644 index bcf3018e7cac1bc9c5d001d02b8f04fe0b882b26..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualHardware.java +++ /dev/null @@ -1,68 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - -/** - * Defines a virtual hardware requirements. - */ -public class OVFVirtualHardware { - - private int instanceId; - private int resourceType; - - private String elementName; - private String description; - - private boolean required; - - // Getter methods - - public boolean isRequired() { - return required; - } - - public int getInstanceId() { - return instanceId; - } - - public int getResourceType() { - return resourceType; - } - - public String getElementName() { - return elementName; - } - - public String getDescription() { - return description; - } - - // Setter methods - - public void setRequired(boolean required) { - this.required = required; - } - - public void setElementName(String value) { - elementName = value; - } - - public void setDescription(String value) { - description = value; - } - - public void setInstanceId(int value) { - instanceId = value; - } - - public void setResourceType(int value) { - resourceType = value; - } - - @Override - public String toString() - { - return "instanceId = " + Integer.toString(instanceId) + "\n" + - "resourceType = " + Integer.toString(resourceType) + "\n" + - "elementName = " + elementName + "\n" + "description = " + description + "\n" + - "required = " + Boolean.toString(required) + "\n"; - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualNetwork.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualNetwork.java deleted file mode 100644 index 2f37162a286adbcc3f4fbc45e8cfc821087989b7..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualNetwork.java +++ /dev/null @@ -1,33 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - -public class OVFVirtualNetwork { - - private String name; - private String description; - - public String getDescription() - { - return description; - } - - public void setDescription(String value) - { - description = value; - } - - public String getName() - { - return name; - } - - public void setName(String value) - { - name = value; - } - - public OVFVirtualNetwork(String name, String description) - { - this.name = name; - this.description = description; - } -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualSystem.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualSystem.java deleted file mode 100644 index cad63606dfc270f9b0fbb3aa7e5e8c9a7d3afe43..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/OVFVirtualSystem.java +++ /dev/null @@ -1,26 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf; - -import java.util.ArrayList; -import java.util.Collection; - -public class OVFVirtualSystem { - - private String id; - private Collection vh; - - public OVFVirtualSystem(String lid) - { - id = lid; - vh = new ArrayList(); - } - - public String getId() { - return id; - } - - public Collection getRequiredHardware() - { - return vh; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/AnnotationSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/AnnotationSectionType.java deleted file mode 100644 index b3785b0b6a6b930bc1c9c4d0b7f76bac551823f4..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/AnnotationSectionType.java +++ /dev/null @@ -1,112 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - - -/** - * User defined annotation - * - *

Java class for AnnotationSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="AnnotationSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <element name="Annotation" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "AnnotationSection_Type", propOrder = { - "annotation", - "any" -}) -public class AnnotationSectionType - extends SectionType -{ - - @XmlElement(name = "Annotation", required = true) - protected MsgType annotation; - @XmlAnyElement(lax = true) - protected List any; - - /** - * Gets the value of the annotation property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getAnnotation() { - return annotation; - } - - /** - * Sets the value of the annotation property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setAnnotation(MsgType value) { - this.annotation = value; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ContentType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ContentType.java deleted file mode 100644 index 84947de19b54c17b3fa8a4c426f4128bfee11bba..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ContentType.java +++ /dev/null @@ -1,206 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - - -/** - * Base class for content - * - *

Java class for Content_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="Content_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Info" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type"/>
- *         <element name="Name" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/ovf/envelope/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Content_Type", propOrder = { - "info", - "name", - "section" -}) -@XmlSeeAlso({ - VirtualSystemType.class, - VirtualSystemCollectionType.class -}) -public abstract class ContentType { - - @XmlElement(name = "Info", required = true) - protected MsgType info; - @XmlElement(name = "Name") - protected MsgType name; - @XmlElementRef(name = "Section", namespace = "http://schemas.dmtf.org/ovf/envelope/1", type = JAXBElement.class) - protected List> section; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String id; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the info property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getInfo() { - return info; - } - - /** - * Sets the value of the info property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setInfo(MsgType value) { - this.info = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setName(MsgType value) { - this.name = value; - } - - /** - * Content body is a list of Sections - * Gets the value of the section property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the section property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getSection().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link ResourceAllocationSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link NetworkSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link InstallSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link VirtualHardwareSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link SectionType }{@code >} - * {@link JAXBElement }{@code <}{@link ProductSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link AnnotationSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link DiskSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link EulaSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link OperatingSystemSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link DeploymentOptionSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link StartupSectionType }{@code >} - * - * - */ - public List> getSection() { - if (section == null) { - section = new ArrayList>(); - } - return this.section; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/DeploymentOptionSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/DeploymentOptionSectionType.java deleted file mode 100644 index 4897f3777d6e515529f8b525a9e1fc169bacb097..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/DeploymentOptionSectionType.java +++ /dev/null @@ -1,299 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import org.w3c.dom.Element; - - -/** - * Enumeration of discrete deployment - * options - * - *

Java class for DeploymentOptionSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="DeploymentOptionSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <element name="Configuration" maxOccurs="unbounded">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Label" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type"/>
- *                   <element name="Description" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type"/>
- *                 </sequence>
- *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="default" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *                 <anyAttribute processContents='lax'/>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DeploymentOptionSection_Type", propOrder = { - "configuration", - "any" -}) -public class DeploymentOptionSectionType - extends SectionType -{ - - @XmlElement(name = "Configuration", required = true) - protected List configuration; - @XmlAnyElement(lax = true) - protected List any; - - /** - * Gets the value of the configuration property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the configuration property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getConfiguration().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link DeploymentOptionSectionType.Configuration } - * - * - */ - public List getConfiguration() { - if (configuration == null) { - configuration = new ArrayList(); - } - return this.configuration; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Label" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type"/>
-     *         <element name="Description" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type"/>
-     *       </sequence>
-     *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="default" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *       <anyAttribute processContents='lax'/>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "label", - "description" - }) - public static class Configuration { - - @XmlElement(name = "Label", required = true) - protected MsgType label; - @XmlElement(name = "Description", required = true) - protected MsgType description; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String id; - @XmlAttribute(name = "default", namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected Boolean _default; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the label property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getLabel() { - return label; - } - - /** - * Sets the value of the label property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setLabel(MsgType value) { - this.label = value; - } - - /** - * Gets the value of the description property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getDescription() { - return description; - } - - /** - * Sets the value of the description property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setDescription(MsgType value) { - this.description = value; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - /** - * Gets the value of the default property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isDefault() { - if (_default == null) { - return false; - } else { - return _default; - } - } - - /** - * Sets the value of the default property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setDefault(Boolean value) { - this._default = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/DiskSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/DiskSectionType.java deleted file mode 100644 index a498513aad1954541a7a4da67e2bb34faf1d6ab0..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/DiskSectionType.java +++ /dev/null @@ -1,118 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - - -/** - * Descriptions of virtual disks used within the - * package - * - *

Java class for DiskSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="DiskSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <element name="Disk" type="{http://schemas.dmtf.org/ovf/envelope/1}VirtualDiskDesc_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "DiskSection_Type", propOrder = { - "disk", - "any" -}) -public class DiskSectionType - extends SectionType -{ - - @XmlElement(name = "Disk") - protected List disk; - @XmlAnyElement(lax = true) - protected List any; - - /** - * Gets the value of the disk property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the disk property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getDisk().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link VirtualDiskDescType } - * - * - */ - public List getDisk() { - if (disk == null) { - disk = new ArrayList(); - } - return this.disk; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/EnvelopeType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/EnvelopeType.java deleted file mode 100644 index e5cd9868df618da5a1f8f5af56c42f00d038503a..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/EnvelopeType.java +++ /dev/null @@ -1,242 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - - -/** - * Root OVF descriptor type - * - *

Java class for EnvelopeType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="EnvelopeType">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="References" type="{http://schemas.dmtf.org/ovf/envelope/1}References_Type"/>
- *         <element ref="{http://schemas.dmtf.org/ovf/envelope/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/ovf/envelope/1}Content"/>
- *         <element name="Strings" type="{http://schemas.dmtf.org/ovf/envelope/1}Strings_Type" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang default="en-US""/>
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "EnvelopeType", propOrder = { - "references", - "section", - "content", - "strings" -}) -public class EnvelopeType { - - @XmlElement(name = "References", required = true) - protected ReferencesType references; - @XmlElementRef(name = "Section", namespace = "http://schemas.dmtf.org/ovf/envelope/1", type = JAXBElement.class) - protected List> section; - @XmlElementRef(name = "Content", namespace = "http://schemas.dmtf.org/ovf/envelope/1", type = JAXBElement.class) - protected JAXBElement content; - @XmlElement(name = "Strings") - protected List strings; - @XmlAttribute(namespace = "http://www.w3.org/XML/1998/namespace") - protected String lang; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the references property. - * - * @return - * possible object is - * {@link ReferencesType } - * - */ - public ReferencesType getReferences() { - return references; - } - - /** - * Sets the value of the references property. - * - * @param value - * allowed object is - * {@link ReferencesType } - * - */ - public void setReferences(ReferencesType value) { - this.references = value; - } - - /** - * Package level meta-data Gets the value of the section property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the section property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getSection().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link ResourceAllocationSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link NetworkSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link InstallSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link VirtualHardwareSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link SectionType }{@code >} - * {@link JAXBElement }{@code <}{@link ProductSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link AnnotationSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link DiskSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link EulaSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link OperatingSystemSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link DeploymentOptionSectionType }{@code >} - * {@link JAXBElement }{@code <}{@link StartupSectionType }{@code >} - * - * - */ - public List> getSection() { - if (section == null) { - section = new ArrayList>(); - } - return this.section; - } - - /** - * Content: A VirtualSystem or a - * VirtualSystemCollection - * - * @return - * possible object is - * {@link JAXBElement }{@code <}{@link VirtualSystemType }{@code >} - * {@link JAXBElement }{@code <}{@link ContentType }{@code >} - * {@link JAXBElement }{@code <}{@link VirtualSystemCollectionType }{@code >} - * - */ - public JAXBElement getContent() { - return content; - } - - /** - * Sets the value of the content property. - * - * @param value - * allowed object is - * {@link JAXBElement }{@code <}{@link VirtualSystemType }{@code >} - * {@link JAXBElement }{@code <}{@link ContentType }{@code >} - * {@link JAXBElement }{@code <}{@link VirtualSystemCollectionType }{@code >} - * - */ - public void setContent(JAXBElement value) { - this.content = ((JAXBElement ) value); - } - - /** - * Gets the value of the strings property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the strings property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getStrings().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link StringsType } - * - * - */ - public List getStrings() { - if (strings == null) { - strings = new ArrayList(); - } - return this.strings; - } - - /** - * Gets the value of the lang property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getLang() { - if (lang == null) { - return "en-US"; - } else { - return lang; - } - } - - /** - * Sets the value of the lang property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLang(String value) { - this.lang = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/EulaSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/EulaSectionType.java deleted file mode 100644 index 0d5ac10649a36e2412275403c38db6fca38c1980..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/EulaSectionType.java +++ /dev/null @@ -1,112 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - - -/** - * End-User License Agreement - * - *

Java class for EulaSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="EulaSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <element name="License" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "EulaSection_Type", propOrder = { - "license", - "any" -}) -public class EulaSectionType - extends SectionType -{ - - @XmlElement(name = "License", required = true) - protected MsgType license; - @XmlAnyElement(lax = true) - protected List any; - - /** - * Gets the value of the license property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getLicense() { - return license; - } - - /** - * Sets the value of the license property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setLicense(MsgType value) { - this.license = value; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/FileType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/FileType.java deleted file mode 100644 index c9e5313204e571068f85ab222b2c05194ac1fe1c..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/FileType.java +++ /dev/null @@ -1,250 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.math.BigInteger; -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import org.w3c.dom.Element; - - -/** - * Type for an external reference to a - * resource - * - *

Java class for File_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="File_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="href" use="required" type="{http://www.w3.org/2001/XMLSchema}anyURI" />
- *       <attribute name="size" type="{http://www.w3.org/2001/XMLSchema}unsignedLong" />
- *       <attribute name="compression" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       <attribute name="chunkSize" type="{http://www.w3.org/2001/XMLSchema}long" />
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "File_Type", propOrder = { - "any" -}) -public class FileType { - - @XmlAnyElement(lax = true) - protected List any; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String id; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - @XmlSchemaType(name = "anyURI") - protected String href; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - @XmlSchemaType(name = "unsignedLong") - protected BigInteger size; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String compression; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected Long chunkSize; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - /** - * Gets the value of the href property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getHref() { - return href; - } - - /** - * Sets the value of the href property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setHref(String value) { - this.href = value; - } - - /** - * Gets the value of the size property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getSize() { - return size; - } - - /** - * Sets the value of the size property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setSize(BigInteger value) { - this.size = value; - } - - /** - * Gets the value of the compression property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCompression() { - if (compression == null) { - return ""; - } else { - return compression; - } - } - - /** - * Sets the value of the compression property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCompression(String value) { - this.compression = value; - } - - /** - * Gets the value of the chunkSize property. - * - * @return - * possible object is - * {@link Long } - * - */ - public Long getChunkSize() { - return chunkSize; - } - - /** - * Sets the value of the chunkSize property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setChunkSize(Long value) { - this.chunkSize = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/InstallSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/InstallSectionType.java deleted file mode 100644 index 102e764b075076ee870f89da71e4d2eec8a9706f..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/InstallSectionType.java +++ /dev/null @@ -1,118 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - - -/** - * If present indicates that the virtual machine needs to be - * initially booted to install and configure the software - * - *

Java class for InstallSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="InstallSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="initialBootStopDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "InstallSection_Type", propOrder = { - "any" -}) -public class InstallSectionType - extends SectionType -{ - - @XmlAnyElement(lax = true) - protected List any; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - @XmlSchemaType(name = "unsignedShort") - protected Integer initialBootStopDelay; - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets the value of the initialBootStopDelay property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public int getInitialBootStopDelay() { - if (initialBootStopDelay == null) { - return 0; - } else { - return initialBootStopDelay; - } - } - - /** - * Sets the value of the initialBootStopDelay property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setInitialBootStopDelay(Integer value) { - this.initialBootStopDelay = value; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/MsgType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/MsgType.java deleted file mode 100644 index ac8b7531183214bb40c1c8d4c3ebfd4003d7b13c..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/MsgType.java +++ /dev/null @@ -1,127 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.HashMap; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - * Type for localizable string - * - * Default string value - * - *

Java class for Msg_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="Msg_Type">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <attribute name="msgid" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Msg_Type", propOrder = { - "value" -}) -public class MsgType { - - @XmlValue - protected String value; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String msgid; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the msgid property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMsgid() { - if (msgid == null) { - return ""; - } else { - return msgid; - } - } - - /** - * Sets the value of the msgid property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMsgid(String value) { - this.msgid = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/NetworkSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/NetworkSectionType.java deleted file mode 100644 index c54432ea34b3a026826e318b9ab269a9b3f53610..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/NetworkSectionType.java +++ /dev/null @@ -1,238 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import org.w3c.dom.Element; - - -/** - * Descriptions of logical networks used within the - * package - * - *

Java class for NetworkSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="NetworkSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <element name="Network" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <sequence>
- *                   <element name="Description" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type" minOccurs="0"/>
- *                 </sequence>
- *                 <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <anyAttribute processContents='lax'/>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "NetworkSection_Type", propOrder = { - "network", - "any" -}) -public class NetworkSectionType - extends SectionType -{ - - @XmlElement(name = "Network") - protected List network; - @XmlAnyElement(lax = true) - protected List any; - - /** - * Gets the value of the network property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the network property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getNetwork().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link NetworkSectionType.Network } - * - * - */ - public List getNetwork() { - if (network == null) { - network = new ArrayList(); - } - return this.network; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Description" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type" minOccurs="0"/>
-     *       </sequence>
-     *       <attribute name="name" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <anyAttribute processContents='lax'/>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "description" - }) - public static class Network { - - @XmlElement(name = "Description") - protected MsgType description; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String name; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the description property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getDescription() { - return description; - } - - /** - * Sets the value of the description property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setDescription(MsgType value) { - this.description = value; - } - - /** - * Gets the value of the name property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getName() { - return name; - } - - /** - * Sets the value of the name property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setName(String value) { - this.name = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ObjectFactory.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ObjectFactory.java deleted file mode 100644 index 6ebf35b812fb7ee562496efacc0ed1ad49607478..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ObjectFactory.java +++ /dev/null @@ -1,436 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.ow2.contrail.common.application.ovf.dmtf.schemas.ovf.envelope._1 package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _ProductSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "ProductSection"); - private final static QName _InstallSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "InstallSection"); - private final static QName _VirtualSystemCollection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "VirtualSystemCollection"); - private final static QName _VirtualSystem_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "VirtualSystem"); - private final static QName _DiskSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "DiskSection"); - private final static QName _DeploymentOptionSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "DeploymentOptionSection"); - private final static QName _StartupSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "StartupSection"); - private final static QName _VirtualHardwareSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "VirtualHardwareSection"); - private final static QName _ResourceAllocationSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "ResourceAllocationSection"); - private final static QName _Strings_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "Strings"); - private final static QName _Section_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "Section"); - private final static QName _Envelope_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "Envelope"); - private final static QName _OperatingSystemSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "OperatingSystemSection"); - private final static QName _Content_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "Content"); - private final static QName _AnnotationSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "AnnotationSection"); - private final static QName _NetworkSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "NetworkSection"); - private final static QName _EulaSection_QNAME = new QName("http://schemas.dmtf.org/ovf/envelope/1", "EulaSection"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.ow2.contrail.common.application.ovf.dmtf.schemas.ovf.envelope._1 - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link VirtualDiskDescType } - * - */ - public VirtualDiskDescType createVirtualDiskDescType() { - return new VirtualDiskDescType(); - } - - /** - * Create an instance of {@link AnnotationSectionType } - * - */ - public AnnotationSectionType createAnnotationSectionType() { - return new AnnotationSectionType(); - } - - /** - * Create an instance of {@link PropertyConfigurationValueType } - * - */ - public PropertyConfigurationValueType createPropertyConfigurationValueType() { - return new PropertyConfigurationValueType(); - } - - /** - * Create an instance of {@link EulaSectionType } - * - */ - public EulaSectionType createEulaSectionType() { - return new EulaSectionType(); - } - - /** - * Create an instance of {@link VirtualSystemCollectionType } - * - */ - public VirtualSystemCollectionType createVirtualSystemCollectionType() { - return new VirtualSystemCollectionType(); - } - - /** - * Create an instance of {@link VirtualHardwareSectionType } - * - */ - public VirtualHardwareSectionType createVirtualHardwareSectionType() { - return new VirtualHardwareSectionType(); - } - - /** - * Create an instance of {@link StringsType.Msg } - * - */ - public StringsType.Msg createStringsTypeMsg() { - return new StringsType.Msg(); - } - - /** - * Create an instance of {@link NetworkSectionType } - * - */ - public NetworkSectionType createNetworkSectionType() { - return new NetworkSectionType(); - } - - /** - * Create an instance of {@link ProductSectionType.Property } - * - */ - public ProductSectionType.Property createProductSectionTypeProperty() { - return new ProductSectionType.Property(); - } - - /** - * Create an instance of {@link NetworkSectionType.Network } - * - */ - public NetworkSectionType.Network createNetworkSectionTypeNetwork() { - return new NetworkSectionType.Network(); - } - - /** - * Create an instance of {@link EnvelopeType } - * - */ - public EnvelopeType createEnvelopeType() { - return new EnvelopeType(); - } - - /** - * Create an instance of {@link ProductSectionType.Icon } - * - */ - public ProductSectionType.Icon createProductSectionTypeIcon() { - return new ProductSectionType.Icon(); - } - - /** - * Create an instance of {@link MsgType } - * - */ - public MsgType createMsgType() { - return new MsgType(); - } - - /** - * Create an instance of {@link StartupSectionType } - * - */ - public StartupSectionType createStartupSectionType() { - return new StartupSectionType(); - } - - /** - * Create an instance of {@link DeploymentOptionSectionType.Configuration } - * - */ - public DeploymentOptionSectionType.Configuration createDeploymentOptionSectionTypeConfiguration() { - return new DeploymentOptionSectionType.Configuration(); - } - - /** - * Create an instance of {@link OperatingSystemSectionType } - * - */ - public OperatingSystemSectionType createOperatingSystemSectionType() { - return new OperatingSystemSectionType(); - } - - /** - * Create an instance of {@link ProductSectionType } - * - */ - public ProductSectionType createProductSectionType() { - return new ProductSectionType(); - } - - /** - * Create an instance of {@link DeploymentOptionSectionType } - * - */ - public DeploymentOptionSectionType createDeploymentOptionSectionType() { - return new DeploymentOptionSectionType(); - } - - /** - * Create an instance of {@link InstallSectionType } - * - */ - public InstallSectionType createInstallSectionType() { - return new InstallSectionType(); - } - - /** - * Create an instance of {@link DiskSectionType } - * - */ - public DiskSectionType createDiskSectionType() { - return new DiskSectionType(); - } - - /** - * Create an instance of {@link StartupSectionType.Item } - * - */ - public StartupSectionType.Item createStartupSectionTypeItem() { - return new StartupSectionType.Item(); - } - - /** - * Create an instance of {@link VirtualSystemType } - * - */ - public VirtualSystemType createVirtualSystemType() { - return new VirtualSystemType(); - } - - /** - * Create an instance of {@link FileType } - * - */ - public FileType createFileType() { - return new FileType(); - } - - /** - * Create an instance of {@link VSSDType } - * - */ - public VSSDType createVSSDType() { - return new VSSDType(); - } - - /** - * Create an instance of {@link StringsType } - * - */ - public StringsType createStringsType() { - return new StringsType(); - } - - /** - * Create an instance of {@link ReferencesType } - * - */ - public ReferencesType createReferencesType() { - return new ReferencesType(); - } - - /** - * Create an instance of {@link RASDType } - * - */ - public RASDType createRASDType() { - return new RASDType(); - } - - /** - * Create an instance of {@link ResourceAllocationSectionType } - * - */ - public ResourceAllocationSectionType createResourceAllocationSectionType() { - return new ResourceAllocationSectionType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ProductSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "ProductSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createProductSection(ProductSectionType value) { - return new JAXBElement(_ProductSection_QNAME, ProductSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link InstallSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "InstallSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createInstallSection(InstallSectionType value) { - return new JAXBElement(_InstallSection_QNAME, InstallSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link VirtualSystemCollectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "VirtualSystemCollection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Content") - public JAXBElement createVirtualSystemCollection(VirtualSystemCollectionType value) { - return new JAXBElement(_VirtualSystemCollection_QNAME, VirtualSystemCollectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link VirtualSystemType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "VirtualSystem", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Content") - public JAXBElement createVirtualSystem(VirtualSystemType value) { - return new JAXBElement(_VirtualSystem_QNAME, VirtualSystemType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DiskSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "DiskSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createDiskSection(DiskSectionType value) { - return new JAXBElement(_DiskSection_QNAME, DiskSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link DeploymentOptionSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "DeploymentOptionSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createDeploymentOptionSection(DeploymentOptionSectionType value) { - return new JAXBElement(_DeploymentOptionSection_QNAME, DeploymentOptionSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link StartupSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "StartupSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createStartupSection(StartupSectionType value) { - return new JAXBElement(_StartupSection_QNAME, StartupSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link VirtualHardwareSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "VirtualHardwareSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createVirtualHardwareSection(VirtualHardwareSectionType value) { - return new JAXBElement(_VirtualHardwareSection_QNAME, VirtualHardwareSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ResourceAllocationSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "ResourceAllocationSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createResourceAllocationSection(ResourceAllocationSectionType value) { - return new JAXBElement(_ResourceAllocationSection_QNAME, ResourceAllocationSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link StringsType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "Strings") - public JAXBElement createStrings(StringsType value) { - return new JAXBElement(_Strings_QNAME, StringsType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "Section") - public JAXBElement createSection(SectionType value) { - return new JAXBElement(_Section_QNAME, SectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link EnvelopeType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "Envelope") - public JAXBElement createEnvelope(EnvelopeType value) { - return new JAXBElement(_Envelope_QNAME, EnvelopeType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link OperatingSystemSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "OperatingSystemSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createOperatingSystemSection(OperatingSystemSectionType value) { - return new JAXBElement(_OperatingSystemSection_QNAME, OperatingSystemSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ContentType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "Content") - public JAXBElement createContent(ContentType value) { - return new JAXBElement(_Content_QNAME, ContentType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AnnotationSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "AnnotationSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createAnnotationSection(AnnotationSectionType value) { - return new JAXBElement(_AnnotationSection_QNAME, AnnotationSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link NetworkSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "NetworkSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createNetworkSection(NetworkSectionType value) { - return new JAXBElement(_NetworkSection_QNAME, NetworkSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link EulaSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/envelope/1", name = "EulaSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/envelope/1", substitutionHeadName = "Section") - public JAXBElement createEulaSection(EulaSectionType value) { - return new JAXBElement(_EulaSection_QNAME, EulaSectionType.class, null, value); - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/OperatingSystemSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/OperatingSystemSectionType.java deleted file mode 100644 index cb9db1799a246c37dc94d3a736398081ada7fcdf..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/OperatingSystemSectionType.java +++ /dev/null @@ -1,162 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - - -/** - * Specification of the operating system installed in the - * guest - * - *

Java class for OperatingSystemSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="OperatingSystemSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <element name="Description" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *       <attribute name="version" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "OperatingSystemSection_Type", propOrder = { - "description", - "any" -}) -public class OperatingSystemSectionType - extends SectionType -{ - - @XmlElement(name = "Description") - protected MsgType description; - @XmlAnyElement(lax = true) - protected List any; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - @XmlSchemaType(name = "unsignedShort") - protected int id; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String version; - - /** - * Gets the value of the description property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getDescription() { - return description; - } - - /** - * Sets the value of the description property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setDescription(MsgType value) { - this.description = value; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets the value of the id property. - * - */ - public int getId() { - return id; - } - - /** - * Sets the value of the id property. - * - */ - public void setId(int value) { - this.id = value; - } - - /** - * Gets the value of the version property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getVersion() { - return version; - } - - /** - * Sets the value of the version property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setVersion(String value) { - this.version = value; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ProductSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ProductSectionType.java deleted file mode 100644 index ce04d549d13b4a8eda2ba85b43ded2a6e1f336ea..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ProductSectionType.java +++ /dev/null @@ -1,922 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElements; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimString; -import org.w3c.dom.Element; - - -/** - * Product information for a virtual - * appliance - * - *

Java class for ProductSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="ProductSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <element name="Product" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type" minOccurs="0"/>
- *         <element name="Vendor" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type" minOccurs="0"/>
- *         <element name="Version" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         <element name="FullVersion" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         <element name="ProductUrl" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         <element name="VendorUrl" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         <element name="AppUrl" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         <element name="Icon" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="height" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *                 <attribute name="width" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *                 <attribute name="mimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="fileRef" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <anyAttribute processContents='lax'/>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <choice maxOccurs="unbounded" minOccurs="0">
- *           <element name="Category" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type"/>
- *           <element name="Property">
- *             <complexType>
- *               <complexContent>
- *                 <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                   <sequence>
- *                     <element name="Label" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type" minOccurs="0"/>
- *                     <element name="Description" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type" minOccurs="0"/>
- *                     <element name="Value" type="{http://schemas.dmtf.org/ovf/envelope/1}PropertyConfigurationValue_Type" maxOccurs="unbounded" minOccurs="0"/>
- *                   </sequence>
- *                   <attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                   <attribute name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                   <attribute name="qualifiers" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                   <attribute name="userConfigurable" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *                   <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *                   <attribute name="password" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *                   <anyAttribute processContents='lax'/>
- *                 </restriction>
- *               </complexContent>
- *             </complexType>
- *           </element>
- *         </choice>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="class" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       <attribute name="instance" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ProductSection_Type", propOrder = { - "product", - "vendor", - "version", - "fullVersion", - "productUrl", - "vendorUrl", - "appUrl", - "icon", - "categoryOrProperty", - "any" -}) -public class ProductSectionType - extends SectionType -{ - - @XmlElement(name = "Product") - protected MsgType product; - @XmlElement(name = "Vendor") - protected MsgType vendor; - @XmlElement(name = "Version") - protected CimString version; - @XmlElement(name = "FullVersion") - protected CimString fullVersion; - @XmlElement(name = "ProductUrl") - protected CimString productUrl; - @XmlElement(name = "VendorUrl") - protected CimString vendorUrl; - @XmlElement(name = "AppUrl") - protected CimString appUrl; - @XmlElement(name = "Icon") - protected List icon; - @XmlElements({ - @XmlElement(name = "Property", type = ProductSectionType.Property.class), - @XmlElement(name = "Category", type = MsgType.class) - }) - protected List categoryOrProperty; - @XmlAnyElement(lax = true) - protected List any; - @XmlAttribute(name = "class", namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String clazz; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String instance; - - /** - * Gets the value of the product property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getProduct() { - return product; - } - - /** - * Sets the value of the product property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setProduct(MsgType value) { - this.product = value; - } - - /** - * Gets the value of the vendor property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getVendor() { - return vendor; - } - - /** - * Sets the value of the vendor property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setVendor(MsgType value) { - this.vendor = value; - } - - /** - * Gets the value of the version property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getVersion() { - return version; - } - - /** - * Sets the value of the version property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setVersion(CimString value) { - this.version = value; - } - - /** - * Gets the value of the fullVersion property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getFullVersion() { - return fullVersion; - } - - /** - * Sets the value of the fullVersion property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setFullVersion(CimString value) { - this.fullVersion = value; - } - - /** - * Gets the value of the productUrl property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getProductUrl() { - return productUrl; - } - - /** - * Sets the value of the productUrl property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setProductUrl(CimString value) { - this.productUrl = value; - } - - /** - * Gets the value of the vendorUrl property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getVendorUrl() { - return vendorUrl; - } - - /** - * Sets the value of the vendorUrl property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setVendorUrl(CimString value) { - this.vendorUrl = value; - } - - /** - * Gets the value of the appUrl property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getAppUrl() { - return appUrl; - } - - /** - * Sets the value of the appUrl property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setAppUrl(CimString value) { - this.appUrl = value; - } - - /** - * Gets the value of the icon property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the icon property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getIcon().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ProductSectionType.Icon } - * - * - */ - public List getIcon() { - if (icon == null) { - icon = new ArrayList(); - } - return this.icon; - } - - /** - * Gets the value of the categoryOrProperty property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the categoryOrProperty property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getCategoryOrProperty().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link ProductSectionType.Property } - * {@link MsgType } - * - * - */ - public List getCategoryOrProperty() { - if (categoryOrProperty == null) { - categoryOrProperty = new ArrayList(); - } - return this.categoryOrProperty; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets the value of the clazz property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getClazz() { - if (clazz == null) { - return ""; - } else { - return clazz; - } - } - - /** - * Sets the value of the clazz property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setClazz(String value) { - this.clazz = value; - } - - /** - * Gets the value of the instance property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getInstance() { - if (instance == null) { - return ""; - } else { - return instance; - } - } - - /** - * Sets the value of the instance property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setInstance(String value) { - this.instance = value; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="height" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
-     *       <attribute name="width" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
-     *       <attribute name="mimeType" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="fileRef" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <anyAttribute processContents='lax'/>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Icon { - - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - @XmlSchemaType(name = "unsignedShort") - protected Integer height; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - @XmlSchemaType(name = "unsignedShort") - protected Integer width; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String mimeType; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String fileRef; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the height property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getHeight() { - return height; - } - - /** - * Sets the value of the height property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setHeight(Integer value) { - this.height = value; - } - - /** - * Gets the value of the width property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getWidth() { - return width; - } - - /** - * Sets the value of the width property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setWidth(Integer value) { - this.width = value; - } - - /** - * Gets the value of the mimeType property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMimeType() { - return mimeType; - } - - /** - * Sets the value of the mimeType property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMimeType(String value) { - this.mimeType = value; - } - - /** - * Gets the value of the fileRef property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFileRef() { - return fileRef; - } - - /** - * Sets the value of the fileRef property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFileRef(String value) { - this.fileRef = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <sequence>
-     *         <element name="Label" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type" minOccurs="0"/>
-     *         <element name="Description" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type" minOccurs="0"/>
-     *         <element name="Value" type="{http://schemas.dmtf.org/ovf/envelope/1}PropertyConfigurationValue_Type" maxOccurs="unbounded" minOccurs="0"/>
-     *       </sequence>
-     *       <attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="type" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="qualifiers" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="userConfigurable" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *       <attribute name="value" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
-     *       <attribute name="password" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *       <anyAttribute processContents='lax'/>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "label", - "description", - "valueToFixError1" - }) - public static class Property { - - @XmlElement(name = "Label") - protected MsgType label; - @XmlElement(name = "Description") - protected MsgType description; - @XmlElement(name = "Value") - protected List valueToFixError1; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String key; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String type; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String qualifiers; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected Boolean userConfigurable; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String value; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected Boolean password; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the label property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getLabel() { - return label; - } - - /** - * Sets the value of the label property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setLabel(MsgType value) { - this.label = value; - } - - /** - * Gets the value of the description property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getDescription() { - return description; - } - - /** - * Sets the value of the description property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setDescription(MsgType value) { - this.description = value; - } - - /** - * Gets the value of the valueToFixError1 property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the valueToFixError1 property. - * - *

- * For example, to add a new item, do as follows: - *

-         *    getValueToFixError1().add(newItem);
-         * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link PropertyConfigurationValueType } - * - * - */ - public List getValueToFixError1() { - if (valueToFixError1 == null) { - valueToFixError1 = new ArrayList(); - } - return this.valueToFixError1; - } - - /** - * Gets the value of the key property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getKey() { - return key; - } - - /** - * Sets the value of the key property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setKey(String value) { - this.key = value; - } - - /** - * Gets the value of the type property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getType() { - return type; - } - - /** - * Sets the value of the type property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setType(String value) { - this.type = value; - } - - /** - * Gets the value of the qualifiers property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getQualifiers() { - return qualifiers; - } - - /** - * Sets the value of the qualifiers property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setQualifiers(String value) { - this.qualifiers = value; - } - - /** - * Gets the value of the userConfigurable property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isUserConfigurable() { - if (userConfigurable == null) { - return false; - } else { - return userConfigurable; - } - } - - /** - * Sets the value of the userConfigurable property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setUserConfigurable(Boolean value) { - this.userConfigurable = value; - } - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - if (value == null) { - return ""; - } else { - return value; - } - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the password property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isPassword() { - if (password == null) { - return false; - } else { - return password; - } - } - - /** - * Sets the value of the password property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setPassword(Boolean value) { - this.password = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/PropertyConfigurationValueType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/PropertyConfigurationValueType.java deleted file mode 100644 index 66ab43545391af45b4f2bcb9b6c851884d6d6695..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/PropertyConfigurationValueType.java +++ /dev/null @@ -1,161 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import org.w3c.dom.Element; - - -/** - * Type for alternative default values for properties when - * DeploymentOptionSection is used - * - *

Java class for PropertyConfigurationValue_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="PropertyConfigurationValue_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="configuration" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PropertyConfigurationValue_Type", propOrder = { - "any" -}) -public class PropertyConfigurationValueType { - - @XmlAnyElement(lax = true) - protected List any; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String value; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String configuration; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the configuration property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getConfiguration() { - return configuration; - } - - /** - * Sets the value of the configuration property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setConfiguration(String value) { - this.configuration = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/RASDType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/RASDType.java deleted file mode 100644 index 78f7208317723995b455721a0363d50bfe2e9640..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/RASDType.java +++ /dev/null @@ -1,131 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata.CIMResourceAllocationSettingDataType; - - -/** - * Wrapper for - * CIM_ResourceAllocationSettingData_Type - * - *

Java class for RASD_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="RASD_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}CIM_ResourceAllocationSettingData_Type">
- *       <attribute name="required" type="{http://www.w3.org/2001/XMLSchema}boolean" default="true" />
- *       <attribute name="configuration" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="bound" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "RASD_Type") -public class RASDType - extends CIMResourceAllocationSettingDataType -{ - - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected Boolean required; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String configuration; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String bound; - - /** - * Gets the value of the required property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isRequired() { - if (required == null) { - return true; - } else { - return required; - } - } - - /** - * Sets the value of the required property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setRequired(Boolean value) { - this.required = value; - } - - /** - * Gets the value of the configuration property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getConfiguration() { - return configuration; - } - - /** - * Sets the value of the configuration property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setConfiguration(String value) { - this.configuration = value; - } - - /** - * Gets the value of the bound property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getBound() { - return bound; - } - - /** - * Sets the value of the bound property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setBound(String value) { - this.bound = value; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ReferencesType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ReferencesType.java deleted file mode 100644 index 2d534b93cf080cbb1a4d10f9e222d352520ad1d3..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ReferencesType.java +++ /dev/null @@ -1,139 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import org.w3c.dom.Element; - - -/** - * Type for list of external resources - * - *

Java class for References_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="References_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="File" type="{http://schemas.dmtf.org/ovf/envelope/1}File_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "References_Type", propOrder = { - "file", - "any" -}) -public class ReferencesType { - - @XmlElement(name = "File") - protected List file; - @XmlAnyElement(lax = true) - protected List any; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the file property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the file property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getFile().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link FileType } - * - * - */ - public List getFile() { - if (file == null) { - file = new ArrayList(); - } - return this.file; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ResourceAllocationSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ResourceAllocationSectionType.java deleted file mode 100644 index 18e0236b28020ffc05a8bc6d5ce465788fdbe00b..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/ResourceAllocationSectionType.java +++ /dev/null @@ -1,118 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - - -/** - * Resource constraints on a - * VirtualSystemCollection - * - *

Java class for ResourceAllocationSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="ResourceAllocationSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <element name="Item" type="{http://schemas.dmtf.org/ovf/envelope/1}RASD_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "ResourceAllocationSection_Type", propOrder = { - "item", - "any" -}) -public class ResourceAllocationSectionType - extends SectionType -{ - - @XmlElement(name = "Item") - protected List item; - @XmlAnyElement(lax = true) - protected List any; - - /** - * Gets the value of the item property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the item property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getItem().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link RASDType } - * - * - */ - public List getItem() { - if (item == null) { - item = new ArrayList(); - } - return this.item; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/SectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/SectionType.java deleted file mode 100644 index 480ac4322e7ed0ccdbcde4e18ae8f23409d1c262..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/SectionType.java +++ /dev/null @@ -1,140 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.HashMap; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - - -/** - *

Java class for Section_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="Section_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Info" type="{http://schemas.dmtf.org/ovf/envelope/1}Msg_Type"/>
- *       </sequence>
- *       <attribute ref="{http://schemas.dmtf.org/ovf/envelope/1}required"/>
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Section_Type", propOrder = { - "info" -}) -@XmlSeeAlso({ - DeploymentOptionSectionType.class, - StartupSectionType.class, - InstallSectionType.class, - OperatingSystemSectionType.class, - AnnotationSectionType.class, - NetworkSectionType.class, - EulaSectionType.class, - ProductSectionType.class, - VirtualHardwareSectionType.class, - ResourceAllocationSectionType.class, - DiskSectionType.class -}) -public abstract class SectionType { - - @XmlElement(name = "Info", required = true) - protected MsgType info; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected Boolean required; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the info property. - * - * @return - * possible object is - * {@link MsgType } - * - */ - public MsgType getInfo() { - return info; - } - - /** - * Sets the value of the info property. - * - * @param value - * allowed object is - * {@link MsgType } - * - */ - public void setInfo(MsgType value) { - this.info = value; - } - - /** - * Gets the value of the required property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isRequired() { - if (required == null) { - return true; - } else { - return required; - } - } - - /** - * Sets the value of the required property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setRequired(Boolean value) { - this.required = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/StartupSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/StartupSectionType.java deleted file mode 100644 index 698b7af4b53b8493d8a996544073c0e5b944cf40..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/StartupSectionType.java +++ /dev/null @@ -1,388 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import org.w3c.dom.Element; - - -/** - * Specifies the order in which entities in a - * VirtualSystemCollection are powered on and shut down - * - *

Java class for StartupSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="StartupSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <element name="Item" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
- *                 <attribute name="startDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- *                 <attribute name="waitingForGuest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
- *                 <attribute name="stopDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
- *                 <attribute name="startAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOn" />
- *                 <attribute name="stopAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOff" />
- *                 <anyAttribute processContents='lax'/>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "StartupSection_Type", propOrder = { - "item", - "any" -}) -public class StartupSectionType - extends SectionType -{ - - @XmlElement(name = "Item") - protected List item; - @XmlAnyElement(lax = true) - protected List any; - - /** - * Gets the value of the item property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the item property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getItem().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link StartupSectionType.Item } - * - * - */ - public List getItem() { - if (item == null) { - item = new ArrayList(); - } - return this.item; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="order" use="required" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" />
-     *       <attribute name="startDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
-     *       <attribute name="waitingForGuest" type="{http://www.w3.org/2001/XMLSchema}boolean" default="false" />
-     *       <attribute name="stopDelay" type="{http://www.w3.org/2001/XMLSchema}unsignedShort" default="0" />
-     *       <attribute name="startAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOn" />
-     *       <attribute name="stopAction" type="{http://www.w3.org/2001/XMLSchema}string" default="powerOff" />
-     *       <anyAttribute processContents='lax'/>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Item { - - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String id; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - @XmlSchemaType(name = "unsignedShort") - protected int order; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - @XmlSchemaType(name = "unsignedShort") - protected Integer startDelay; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected Boolean waitingForGuest; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - @XmlSchemaType(name = "unsignedShort") - protected Integer stopDelay; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String startAction; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String stopAction; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - /** - * Gets the value of the order property. - * - */ - public int getOrder() { - return order; - } - - /** - * Sets the value of the order property. - * - */ - public void setOrder(int value) { - this.order = value; - } - - /** - * Gets the value of the startDelay property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public int getStartDelay() { - if (startDelay == null) { - return 0; - } else { - return startDelay; - } - } - - /** - * Sets the value of the startDelay property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setStartDelay(Integer value) { - this.startDelay = value; - } - - /** - * Gets the value of the waitingForGuest property. - * - * @return - * possible object is - * {@link Boolean } - * - */ - public boolean isWaitingForGuest() { - if (waitingForGuest == null) { - return false; - } else { - return waitingForGuest; - } - } - - /** - * Sets the value of the waitingForGuest property. - * - * @param value - * allowed object is - * {@link Boolean } - * - */ - public void setWaitingForGuest(Boolean value) { - this.waitingForGuest = value; - } - - /** - * Gets the value of the stopDelay property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public int getStopDelay() { - if (stopDelay == null) { - return 0; - } else { - return stopDelay; - } - } - - /** - * Sets the value of the stopDelay property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setStopDelay(Integer value) { - this.stopDelay = value; - } - - /** - * Gets the value of the startAction property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getStartAction() { - if (startAction == null) { - return "powerOn"; - } else { - return startAction; - } - } - - /** - * Sets the value of the startAction property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setStartAction(String value) { - this.startAction = value; - } - - /** - * Gets the value of the stopAction property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getStopAction() { - if (stopAction == null) { - return "powerOff"; - } else { - return stopAction; - } - } - - /** - * Sets the value of the stopAction property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setStopAction(String value) { - this.stopAction = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/StringsType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/StringsType.java deleted file mode 100644 index 6d2d7505ec911e3d4e9587df3830cf76f9927238..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/StringsType.java +++ /dev/null @@ -1,271 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - * Type for string resource bundle - * - *

Java class for Strings_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="Strings_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element name="Msg" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <simpleContent>
- *               <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *                 <attribute name="msgid" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <anyAttribute processContents='lax'/>
- *               </extension>
- *             </simpleContent>
- *           </complexType>
- *         </element>
- *       </sequence>
- *       <attribute ref="{http://www.w3.org/XML/1998/namespace}lang"/>
- *       <attribute name="fileRef" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Strings_Type", propOrder = { - "msg" -}) -public class StringsType { - - @XmlElement(name = "Msg") - protected List msg; - @XmlAttribute(namespace = "http://www.w3.org/XML/1998/namespace") - protected String lang; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String fileRef; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the msg property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the msg property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getMsg().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link StringsType.Msg } - * - * - */ - public List getMsg() { - if (msg == null) { - msg = new ArrayList(); - } - return this.msg; - } - - /** - * Locale for this string resource - * bundle - * - * @return - * possible object is - * {@link String } - * - */ - public String getLang() { - return lang; - } - - /** - * Sets the value of the lang property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setLang(String value) { - this.lang = value; - } - - /** - * Gets the value of the fileRef property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFileRef() { - return fileRef; - } - - /** - * Sets the value of the fileRef property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFileRef(String value) { - this.fileRef = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - - - /** - * String element value - * - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <simpleContent>
-     *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
-     *       <attribute name="msgid" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <anyAttribute processContents='lax'/>
-     *     </extension>
-     *   </simpleContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "", propOrder = { - "value" - }) - public static class Msg { - - @XmlValue - protected String value; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String msgid; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets the value of the msgid property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getMsgid() { - return msgid; - } - - /** - * Sets the value of the msgid property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setMsgid(String value) { - this.msgid = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VSSDType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VSSDType.java deleted file mode 100644 index 668507dc60c806345a30cfcf9dff9940e5914332..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VSSDType.java +++ /dev/null @@ -1,45 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata.CIMVirtualSystemSettingDataType; - - -/** - * Wrapper for - * CIM_VirtualSystemSettingData_Type - * - *

Java class for VSSD_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="VSSD_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}CIM_VirtualSystemSettingData_Type">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "VSSD_Type") -public class VSSDType - extends CIMVirtualSystemSettingDataType -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualDiskDescType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualDiskDescType.java deleted file mode 100644 index d779811323e14ca8f82ead4e67ed67e0ad5dc3a8..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualDiskDescType.java +++ /dev/null @@ -1,299 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import org.w3c.dom.Element; - - -/** - * Type for virtual disk descriptor - * - *

Java class for VirtualDiskDesc_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="VirtualDiskDesc_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="diskId" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="fileRef" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="capacity" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="capacityAllocationUnits" type="{http://www.w3.org/2001/XMLSchema}string" default="byte" />
- *       <attribute name="format" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <attribute name="populatedSize" type="{http://www.w3.org/2001/XMLSchema}long" />
- *       <attribute name="parentRef" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "VirtualDiskDesc_Type", propOrder = { - "any" -}) -public class VirtualDiskDescType { - - @XmlAnyElement(lax = true) - protected List any; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String diskId; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String fileRef; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1", required = true) - protected String capacity; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String capacityAllocationUnits; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String format; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected Long populatedSize; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String parentRef; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets the value of the diskId property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getDiskId() { - return diskId; - } - - /** - * Sets the value of the diskId property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setDiskId(String value) { - this.diskId = value; - } - - /** - * Gets the value of the fileRef property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFileRef() { - return fileRef; - } - - /** - * Sets the value of the fileRef property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFileRef(String value) { - this.fileRef = value; - } - - /** - * Gets the value of the capacity property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCapacity() { - return capacity; - } - - /** - * Sets the value of the capacity property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCapacity(String value) { - this.capacity = value; - } - - /** - * Gets the value of the capacityAllocationUnits property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getCapacityAllocationUnits() { - if (capacityAllocationUnits == null) { - return "byte"; - } else { - return capacityAllocationUnits; - } - } - - /** - * Sets the value of the capacityAllocationUnits property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setCapacityAllocationUnits(String value) { - this.capacityAllocationUnits = value; - } - - /** - * Gets the value of the format property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getFormat() { - return format; - } - - /** - * Sets the value of the format property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setFormat(String value) { - this.format = value; - } - - /** - * Gets the value of the populatedSize property. - * - * @return - * possible object is - * {@link Long } - * - */ - public Long getPopulatedSize() { - return populatedSize; - } - - /** - * Sets the value of the populatedSize property. - * - * @param value - * allowed object is - * {@link Long } - * - */ - public void setPopulatedSize(Long value) { - this.populatedSize = value; - } - - /** - * Gets the value of the parentRef property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getParentRef() { - return parentRef; - } - - /** - * Sets the value of the parentRef property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setParentRef(String value) { - this.parentRef = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualHardwareSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualHardwareSectionType.java deleted file mode 100644 index bfd9c246cddef53d799b9ae8af2f2108c9b63fcf..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualHardwareSectionType.java +++ /dev/null @@ -1,209 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import org.w3c.dom.Element; - - -/** - * Specifies virtual hardware requirements for a virtual - * machine - * - *

Java class for VirtualHardwareSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="VirtualHardwareSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Section_Type">
- *       <sequence>
- *         <element name="System" type="{http://schemas.dmtf.org/ovf/envelope/1}VSSD_Type" minOccurs="0"/>
- *         <element name="Item" type="{http://schemas.dmtf.org/ovf/envelope/1}RASD_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       <attribute ref="{http://schemas.dmtf.org/ovf/envelope/1}transport"/>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "VirtualHardwareSection_Type", propOrder = { - "system", - "item", - "any" -}) -public class VirtualHardwareSectionType - extends SectionType -{ - - @XmlElement(name = "System") - protected VSSDType system; - @XmlElement(name = "Item") - protected List item; - @XmlAnyElement(lax = true) - protected List any; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String id; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/envelope/1") - protected String transport; - - /** - * Gets the value of the system property. - * - * @return - * possible object is - * {@link VSSDType } - * - */ - public VSSDType getSystem() { - return system; - } - - /** - * Sets the value of the system property. - * - * @param value - * allowed object is - * {@link VSSDType } - * - */ - public void setSystem(VSSDType value) { - this.system = value; - } - - /** - * Gets the value of the item property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the item property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getItem().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link RASDType } - * - * - */ - public List getItem() { - if (item == null) { - item = new ArrayList(); - } - return this.item; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - if (id == null) { - return ""; - } else { - return id; - } - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - /** - * Gets the value of the transport property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getTransport() { - if (transport == null) { - return ""; - } else { - return transport; - } - } - - /** - * Sets the value of the transport property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setTransport(String value) { - this.transport = value; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualSystemCollectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualSystemCollectionType.java deleted file mode 100644 index 79ce4d313538258f19cc506aebdb215236f62a9f..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualSystemCollectionType.java +++ /dev/null @@ -1,84 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlType; - - -/** - * A collection of Content. - * - *

Java class for VirtualSystemCollection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="VirtualSystemCollection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Content_Type">
- *       <sequence>
- *         <element ref="{http://schemas.dmtf.org/ovf/envelope/1}Content" maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "VirtualSystemCollection_Type", propOrder = { - "content" -}) -public class VirtualSystemCollectionType - extends ContentType -{ - - @XmlElementRef(name = "Content", namespace = "http://schemas.dmtf.org/ovf/envelope/1", type = JAXBElement.class) - protected List> content; - - /** - * Gets the value of the content property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the content property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getContent().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link VirtualSystemType }{@code >} - * {@link JAXBElement }{@code <}{@link ContentType }{@code >} - * {@link JAXBElement }{@code <}{@link VirtualSystemCollectionType }{@code >} - * - * - */ - public List> getContent() { - if (content == null) { - content = new ArrayList>(); - } - return this.content; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualSystemType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualSystemType.java deleted file mode 100644 index ffc633515acb08814ebee5d9e4b0823fb20d1e8d..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/VirtualSystemType.java +++ /dev/null @@ -1,42 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - * Content describing a virtual system - * - *

Java class for VirtualSystem_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="VirtualSystem_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/envelope/1}Content_Type">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "VirtualSystem_Type") -public class VirtualSystemType - extends ContentType -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/package-info.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/package-info.java deleted file mode 100644 index c9438743dfcb7f610d8bf62c5ff49a8d0e10bfca..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/envelope/_1/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - -@javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.dmtf.org/ovf/envelope/1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1; diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/EntityType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/EntityType.java deleted file mode 100644 index 35b125d01412264fa327e323cde8bcb146c94fef..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/EntityType.java +++ /dev/null @@ -1,171 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.environment._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import org.w3c.dom.Element; - - -/** - * Container of sections for a specific entity - * - * - *

Java class for Entity_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="Entity_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.dmtf.org/ovf/environment/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Entity_Type", propOrder = { - "section", - "any" -}) -public class EntityType { - - @XmlElementRef(name = "Section", namespace = "http://schemas.dmtf.org/ovf/environment/1", type = JAXBElement.class) - protected List> section; - @XmlAnyElement(lax = true) - protected List any; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/environment/1", required = true) - protected String id; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the section property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the section property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getSection().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link SectionType }{@code >} - * {@link JAXBElement }{@code <}{@link PropertySectionType }{@code >} - * {@link JAXBElement }{@code <}{@link PlatformSectionType }{@code >} - * - * - */ - public List> getSection() { - if (section == null) { - section = new ArrayList>(); - } - return this.section; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - return id; - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/EnvironmentType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/EnvironmentType.java deleted file mode 100644 index 0698809a11a03927a2636b2f188a5bd166dfde66..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/EnvironmentType.java +++ /dev/null @@ -1,209 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.environment._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import org.w3c.dom.Element; - - -/** - * Type for root OVF environment - * - *

Java class for Environment_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="Environment_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.dmtf.org/ovf/environment/1}Section" maxOccurs="unbounded" minOccurs="0"/>
- *         <element name="Entity" type="{http://schemas.dmtf.org/ovf/environment/1}Entity_Type" maxOccurs="unbounded" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <attribute name="id" type="{http://www.w3.org/2001/XMLSchema}string" default="" />
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Environment_Type", propOrder = { - "section", - "entity", - "any" -}) -public class EnvironmentType { - - @XmlElementRef(name = "Section", namespace = "http://schemas.dmtf.org/ovf/environment/1", type = JAXBElement.class) - protected List> section; - @XmlElement(name = "Entity") - protected List entity; - @XmlAnyElement(lax = true) - protected List any; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/environment/1") - protected String id; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Entity independent meta-data - * sections Gets the value of the section property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the section property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getSection().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link JAXBElement }{@code <}{@link SectionType }{@code >} - * {@link JAXBElement }{@code <}{@link PropertySectionType }{@code >} - * {@link JAXBElement }{@code <}{@link PlatformSectionType }{@code >} - * - * - */ - public List> getSection() { - if (section == null) { - section = new ArrayList>(); - } - return this.section; - } - - /** - * Gets the value of the entity property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the entity property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getEntity().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link EntityType } - * - * - */ - public List getEntity() { - if (entity == null) { - entity = new ArrayList(); - } - return this.entity; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets the value of the id property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getId() { - if (id == null) { - return ""; - } else { - return id; - } - } - - /** - * Sets the value of the id property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setId(String value) { - this.id = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/ObjectFactory.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/ObjectFactory.java deleted file mode 100644 index 26b8fdd93d49a91da825c565408e05dd40eed76a..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/ObjectFactory.java +++ /dev/null @@ -1,122 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.environment._1; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.ow2.contrail.common.application.ovf.dmtf.schemas.ovf.environment._1 package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _PropertySection_QNAME = new QName("http://schemas.dmtf.org/ovf/environment/1", "PropertySection"); - private final static QName _PlatformSection_QNAME = new QName("http://schemas.dmtf.org/ovf/environment/1", "PlatformSection"); - private final static QName _Environment_QNAME = new QName("http://schemas.dmtf.org/ovf/environment/1", "Environment"); - private final static QName _Section_QNAME = new QName("http://schemas.dmtf.org/ovf/environment/1", "Section"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.ow2.contrail.common.application.ovf.dmtf.schemas.ovf.environment._1 - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link EnvironmentType } - * - */ - public EnvironmentType createEnvironmentType() { - return new EnvironmentType(); - } - - /** - * Create an instance of {@link EntityType } - * - */ - public EntityType createEntityType() { - return new EntityType(); - } - - /** - * Create an instance of {@link PropertySectionType.Property } - * - */ - public PropertySectionType.Property createPropertySectionTypeProperty() { - return new PropertySectionType.Property(); - } - - /** - * Create an instance of {@link PlatformSectionType } - * - */ - public PlatformSectionType createPlatformSectionType() { - return new PlatformSectionType(); - } - - /** - * Create an instance of {@link PropertySectionType } - * - */ - public PropertySectionType createPropertySectionType() { - return new PropertySectionType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PropertySectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/environment/1", name = "PropertySection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/environment/1", substitutionHeadName = "Section") - public JAXBElement createPropertySection(PropertySectionType value) { - return new JAXBElement(_PropertySection_QNAME, PropertySectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link PlatformSectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/environment/1", name = "PlatformSection", substitutionHeadNamespace = "http://schemas.dmtf.org/ovf/environment/1", substitutionHeadName = "Section") - public JAXBElement createPlatformSection(PlatformSectionType value) { - return new JAXBElement(_PlatformSection_QNAME, PlatformSectionType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link EnvironmentType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/environment/1", name = "Environment") - public JAXBElement createEnvironment(EnvironmentType value) { - return new JAXBElement(_Environment_QNAME, EnvironmentType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link SectionType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/ovf/environment/1", name = "Section") - public JAXBElement createSection(SectionType value) { - return new JAXBElement(_Section_QNAME, SectionType.class, null, value); - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/PlatformSectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/PlatformSectionType.java deleted file mode 100644 index b2408a8e7cdaf86b0a8c0b8bd933dc02efe8e7e2..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/PlatformSectionType.java +++ /dev/null @@ -1,226 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.environment._1; - -import java.util.ArrayList; -import java.util.List; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimString; -import org.w3c.dom.Element; - - -/** - * Information about deployment platform - * - *

Java class for PlatformSection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="PlatformSection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/environment/1}Section_Type">
- *       <sequence>
- *         <element name="Kind" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         <element name="Version" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         <element name="Vendor" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         <element name="Locale" type="{http://schemas.dmtf.org/wbem/wscim/1/common}cimString" minOccurs="0"/>
- *         <element name="Timezone" type="{http://www.w3.org/2001/XMLSchema}int" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PlatformSection_Type", propOrder = { - "kind", - "version", - "vendor", - "locale", - "timezone", - "any" -}) -public class PlatformSectionType - extends SectionType -{ - - @XmlElement(name = "Kind") - protected CimString kind; - @XmlElement(name = "Version") - protected CimString version; - @XmlElement(name = "Vendor") - protected CimString vendor; - @XmlElement(name = "Locale") - protected CimString locale; - @XmlElement(name = "Timezone") - protected Integer timezone; - @XmlAnyElement(lax = true) - protected List any; - - /** - * Gets the value of the kind property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getKind() { - return kind; - } - - /** - * Sets the value of the kind property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setKind(CimString value) { - this.kind = value; - } - - /** - * Gets the value of the version property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getVersion() { - return version; - } - - /** - * Sets the value of the version property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setVersion(CimString value) { - this.version = value; - } - - /** - * Gets the value of the vendor property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getVendor() { - return vendor; - } - - /** - * Sets the value of the vendor property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setVendor(CimString value) { - this.vendor = value; - } - - /** - * Gets the value of the locale property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getLocale() { - return locale; - } - - /** - * Sets the value of the locale property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setLocale(CimString value) { - this.locale = value; - } - - /** - * Gets the value of the timezone property. - * - * @return - * possible object is - * {@link Integer } - * - */ - public Integer getTimezone() { - return timezone; - } - - /** - * Sets the value of the timezone property. - * - * @param value - * allowed object is - * {@link Integer } - * - */ - public void setTimezone(Integer value) { - this.timezone = value; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/PropertySectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/PropertySectionType.java deleted file mode 100644 index 6375fe432b8b8ac726739a6fa0ab41679d068302..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/PropertySectionType.java +++ /dev/null @@ -1,232 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.environment._1; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; -import org.w3c.dom.Element; - - -/** - * Key/value pairs of assigned properties for an - * entity - * - *

Java class for PropertySection_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="PropertySection_Type">
- *   <complexContent>
- *     <extension base="{http://schemas.dmtf.org/ovf/environment/1}Section_Type">
- *       <sequence>
- *         <element name="Property" maxOccurs="unbounded" minOccurs="0">
- *           <complexType>
- *             <complexContent>
- *               <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *                 <attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
- *                 <anyAttribute processContents='lax'/>
- *               </restriction>
- *             </complexContent>
- *           </complexType>
- *         </element>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "PropertySection_Type", propOrder = { - "property", - "any" -}) -public class PropertySectionType - extends SectionType -{ - - @XmlElement(name = "Property") - protected List property; - @XmlAnyElement(lax = true) - protected List any; - - /** - * Gets the value of the property property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the property property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getProperty().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link PropertySectionType.Property } - * - * - */ - public List getProperty() { - if (property == null) { - property = new ArrayList(); - } - return this.property; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - - /** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

-     * <complexType>
-     *   <complexContent>
-     *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
-     *       <attribute name="key" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <attribute name="value" use="required" type="{http://www.w3.org/2001/XMLSchema}string" />
-     *       <anyAttribute processContents='lax'/>
-     *     </restriction>
-     *   </complexContent>
-     * </complexType>
-     * 
- * - * - */ - @XmlAccessorType(XmlAccessType.FIELD) - @XmlType(name = "") - public static class Property { - - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/environment/1", required = true) - protected String key; - @XmlAttribute(namespace = "http://schemas.dmtf.org/ovf/environment/1", required = true) - protected String value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the key property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getKey() { - return key; - } - - /** - * Sets the value of the key property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setKey(String value) { - this.key = value; - } - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/SectionType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/SectionType.java deleted file mode 100644 index f2e0abc2727695d57952de81033697627926a79b..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/SectionType.java +++ /dev/null @@ -1,70 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.environment._1; - -import java.util.HashMap; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - - -/** - * Abstract type for all sections in - * environment - * - *

Java class for Section_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="Section_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "Section_Type") -@XmlSeeAlso({ - PlatformSectionType.class, - PropertySectionType.class -}) -public abstract class SectionType { - - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/package-info.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/package-info.java deleted file mode 100644 index 5e2146cdac1f7e08d8e07eb9c872407643e97706..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/ovf/environment/_1/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - -@javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.dmtf.org/ovf/environment/1", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.environment._1; diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/CIMResourceAllocationSettingDataType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/CIMResourceAllocationSettingDataType.java deleted file mode 100644 index f7c7e2fe42fabcbffaa62bfd091bea1fd09ea51e..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/CIMResourceAllocationSettingDataType.java +++ /dev/null @@ -1,768 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1.RASDType; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimBoolean; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimString; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimUnsignedInt; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimUnsignedLong; -import org.w3c.dom.Element; - - -/** - *

Java class for CIM_ResourceAllocationSettingData_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="CIM_ResourceAllocationSettingData_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}Address" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}AddressOnParent" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}AllocationUnits" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}AutomaticAllocation" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}AutomaticDeallocation" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}Caption" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}Connection" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}ConsumerVisibility" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}Description" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}ElementName"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}HostResource" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}InstanceID"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}Limit" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}MappingBehavior" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}OtherResourceType" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}Parent" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}PoolID" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}Reservation" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}ResourceSubType" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}ResourceType" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}VirtualQuantity" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}VirtualQuantityUnits" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData}Weight" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CIM_ResourceAllocationSettingData_Type", propOrder = { - "address", - "addressOnParent", - "allocationUnits", - "automaticAllocation", - "automaticDeallocation", - "caption", - "connection", - "consumerVisibility", - "description", - "elementName", - "hostResource", - "instanceID", - "limit", - "mappingBehavior", - "otherResourceType", - "parent", - "poolID", - "reservation", - "resourceSubType", - "resourceType", - "virtualQuantity", - "virtualQuantityUnits", - "weight", - "any" -}) -@XmlSeeAlso({ - RASDType.class -}) -public class CIMResourceAllocationSettingDataType { - - @XmlElement(name = "Address", nillable = true) - protected CimString address; - @XmlElement(name = "AddressOnParent", nillable = true) - protected CimString addressOnParent; - @XmlElement(name = "AllocationUnits", nillable = true) - protected CimString allocationUnits; - @XmlElement(name = "AutomaticAllocation", nillable = true) - protected CimBoolean automaticAllocation; - @XmlElement(name = "AutomaticDeallocation", nillable = true) - protected CimBoolean automaticDeallocation; - @XmlElement(name = "Caption", nillable = true) - protected Caption caption; - @XmlElement(name = "Connection", nillable = true) - protected List connection; - @XmlElement(name = "ConsumerVisibility", nillable = true) - protected ConsumerVisibility consumerVisibility; - @XmlElement(name = "Description", nillable = true) - protected CimString description; - @XmlElement(name = "ElementName", required = true) - protected CimString elementName; - @XmlElement(name = "HostResource", nillable = true) - protected List hostResource; - @XmlElement(name = "InstanceID", required = true) - protected CimString instanceID; - @XmlElement(name = "Limit", nillable = true) - protected CimUnsignedLong limit; - @XmlElement(name = "MappingBehavior", nillable = true) - protected MappingBehavior mappingBehavior; - @XmlElement(name = "OtherResourceType", nillable = true) - protected CimString otherResourceType; - @XmlElement(name = "Parent", nillable = true) - protected CimString parent; - @XmlElement(name = "PoolID", nillable = true) - protected CimString poolID; - @XmlElement(name = "Reservation", nillable = true) - protected CimUnsignedLong reservation; - @XmlElement(name = "ResourceSubType", nillable = true) - protected CimString resourceSubType; - @XmlElement(name = "ResourceType", nillable = true) - protected ResourceType resourceType; - @XmlElement(name = "VirtualQuantity", nillable = true) - protected CimUnsignedLong virtualQuantity; - @XmlElement(name = "VirtualQuantityUnits", nillable = true) - protected CimString virtualQuantityUnits; - @XmlElement(name = "Weight", nillable = true) - protected CimUnsignedInt weight; - @XmlAnyElement(lax = true) - protected List any; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the address property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getAddress() { - return address; - } - - /** - * Sets the value of the address property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setAddress(CimString value) { - this.address = value; - } - - /** - * Gets the value of the addressOnParent property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getAddressOnParent() { - return addressOnParent; - } - - /** - * Sets the value of the addressOnParent property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setAddressOnParent(CimString value) { - this.addressOnParent = value; - } - - /** - * Gets the value of the allocationUnits property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getAllocationUnits() { - return allocationUnits; - } - - /** - * Sets the value of the allocationUnits property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setAllocationUnits(CimString value) { - this.allocationUnits = value; - } - - /** - * Gets the value of the automaticAllocation property. - * - * @return - * possible object is - * {@link CimBoolean } - * - */ - public CimBoolean getAutomaticAllocation() { - return automaticAllocation; - } - - /** - * Sets the value of the automaticAllocation property. - * - * @param value - * allowed object is - * {@link CimBoolean } - * - */ - public void setAutomaticAllocation(CimBoolean value) { - this.automaticAllocation = value; - } - - /** - * Gets the value of the automaticDeallocation property. - * - * @return - * possible object is - * {@link CimBoolean } - * - */ - public CimBoolean getAutomaticDeallocation() { - return automaticDeallocation; - } - - /** - * Sets the value of the automaticDeallocation property. - * - * @param value - * allowed object is - * {@link CimBoolean } - * - */ - public void setAutomaticDeallocation(CimBoolean value) { - this.automaticDeallocation = value; - } - - /** - * Gets the value of the caption property. - * - * @return - * possible object is - * {@link Caption } - * - */ - public Caption getCaption() { - return caption; - } - - /** - * Sets the value of the caption property. - * - * @param value - * allowed object is - * {@link Caption } - * - */ - public void setCaption(Caption value) { - this.caption = value; - } - - /** - * Gets the value of the connection property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the connection property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getConnection().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link CimString } - * - * - */ - public List getConnection() { - if (connection == null) { - connection = new ArrayList(); - } - return this.connection; - } - - /** - * Gets the value of the consumerVisibility property. - * - * @return - * possible object is - * {@link ConsumerVisibility } - * - */ - public ConsumerVisibility getConsumerVisibility() { - return consumerVisibility; - } - - /** - * Sets the value of the consumerVisibility property. - * - * @param value - * allowed object is - * {@link ConsumerVisibility } - * - */ - public void setConsumerVisibility(ConsumerVisibility value) { - this.consumerVisibility = value; - } - - /** - * Gets the value of the description property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getDescription() { - return description; - } - - /** - * Sets the value of the description property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setDescription(CimString value) { - this.description = value; - } - - /** - * Gets the value of the elementName property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getElementName() { - return elementName; - } - - /** - * Sets the value of the elementName property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setElementName(CimString value) { - this.elementName = value; - } - - /** - * Gets the value of the hostResource property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the hostResource property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getHostResource().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link CimString } - * - * - */ - public List getHostResource() { - if (hostResource == null) { - hostResource = new ArrayList(); - } - return this.hostResource; - } - - /** - * Gets the value of the instanceID property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getInstanceID() { - return instanceID; - } - - /** - * Sets the value of the instanceID property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setInstanceID(CimString value) { - this.instanceID = value; - } - - /** - * Gets the value of the limit property. - * - * @return - * possible object is - * {@link CimUnsignedLong } - * - */ - public CimUnsignedLong getLimit() { - return limit; - } - - /** - * Sets the value of the limit property. - * - * @param value - * allowed object is - * {@link CimUnsignedLong } - * - */ - public void setLimit(CimUnsignedLong value) { - this.limit = value; - } - - /** - * Gets the value of the mappingBehavior property. - * - * @return - * possible object is - * {@link MappingBehavior } - * - */ - public MappingBehavior getMappingBehavior() { - return mappingBehavior; - } - - /** - * Sets the value of the mappingBehavior property. - * - * @param value - * allowed object is - * {@link MappingBehavior } - * - */ - public void setMappingBehavior(MappingBehavior value) { - this.mappingBehavior = value; - } - - /** - * Gets the value of the otherResourceType property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getOtherResourceType() { - return otherResourceType; - } - - /** - * Sets the value of the otherResourceType property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setOtherResourceType(CimString value) { - this.otherResourceType = value; - } - - /** - * Gets the value of the parent property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getParent() { - return parent; - } - - /** - * Sets the value of the parent property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setParent(CimString value) { - this.parent = value; - } - - /** - * Gets the value of the poolID property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getPoolID() { - return poolID; - } - - /** - * Sets the value of the poolID property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setPoolID(CimString value) { - this.poolID = value; - } - - /** - * Gets the value of the reservation property. - * - * @return - * possible object is - * {@link CimUnsignedLong } - * - */ - public CimUnsignedLong getReservation() { - return reservation; - } - - /** - * Sets the value of the reservation property. - * - * @param value - * allowed object is - * {@link CimUnsignedLong } - * - */ - public void setReservation(CimUnsignedLong value) { - this.reservation = value; - } - - /** - * Gets the value of the resourceSubType property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getResourceSubType() { - return resourceSubType; - } - - /** - * Sets the value of the resourceSubType property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setResourceSubType(CimString value) { - this.resourceSubType = value; - } - - /** - * Gets the value of the resourceType property. - * - * @return - * possible object is - * {@link ResourceType } - * - */ - public ResourceType getResourceType() { - return resourceType; - } - - /** - * Sets the value of the resourceType property. - * - * @param value - * allowed object is - * {@link ResourceType } - * - */ - public void setResourceType(ResourceType value) { - this.resourceType = value; - } - - /** - * Gets the value of the virtualQuantity property. - * - * @return - * possible object is - * {@link CimUnsignedLong } - * - */ - public CimUnsignedLong getVirtualQuantity() { - return virtualQuantity; - } - - /** - * Sets the value of the virtualQuantity property. - * - * @param value - * allowed object is - * {@link CimUnsignedLong } - * - */ - public void setVirtualQuantity(CimUnsignedLong value) { - this.virtualQuantity = value; - } - - /** - * Gets the value of the virtualQuantityUnits property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getVirtualQuantityUnits() { - return virtualQuantityUnits; - } - - /** - * Sets the value of the virtualQuantityUnits property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setVirtualQuantityUnits(CimString value) { - this.virtualQuantityUnits = value; - } - - /** - * Gets the value of the weight property. - * - * @return - * possible object is - * {@link CimUnsignedInt } - * - */ - public CimUnsignedInt getWeight() { - return weight; - } - - /** - * Sets the value of the weight property. - * - * @param value - * allowed object is - * {@link CimUnsignedInt } - * - */ - public void setWeight(CimUnsignedInt value) { - this.weight = value; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/Caption.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/Caption.java deleted file mode 100644 index 14770cf0e4c1c1625393f42e25d8a676a803b07a..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/Caption.java +++ /dev/null @@ -1,42 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimString; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <simpleContent>
- *     <restriction base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimString">
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -public class Caption - extends CimString -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/ConsumerVisibility.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/ConsumerVisibility.java deleted file mode 100644 index c52b00a9f4afcbefc7883c85550775e82b353631..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/ConsumerVisibility.java +++ /dev/null @@ -1,42 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimAnySimpleType; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <simpleContent>
- *     <restriction base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimAnySimpleType">
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -public class ConsumerVisibility - extends CimAnySimpleType -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/MappingBehavior.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/MappingBehavior.java deleted file mode 100644 index 930b86415c89756021ba82a6aeee45219edb1f0d..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/MappingBehavior.java +++ /dev/null @@ -1,42 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimAnySimpleType; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <simpleContent>
- *     <restriction base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimAnySimpleType">
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -public class MappingBehavior - extends CimAnySimpleType -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/ObjectFactory.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/ObjectFactory.java deleted file mode 100644 index 34ac2589b4c1c3e22164cf1a71d277d4d38fc6d1..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/ObjectFactory.java +++ /dev/null @@ -1,327 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimBoolean; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimString; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimUnsignedInt; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimUnsignedLong; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.ow2.contrail.common.application.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _ElementName_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "ElementName"); - private final static QName _CIMResourceAllocationSettingData_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "CIM_ResourceAllocationSettingData"); - private final static QName _PoolID_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "PoolID"); - private final static QName _Weight_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "Weight"); - private final static QName _AddressOnParent_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "AddressOnParent"); - private final static QName _Parent_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "Parent"); - private final static QName _ResourceSubType_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "ResourceSubType"); - private final static QName _Limit_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "Limit"); - private final static QName _AutomaticAllocation_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "AutomaticAllocation"); - private final static QName _Reservation_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "Reservation"); - private final static QName _OtherResourceType_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "OtherResourceType"); - private final static QName _Connection_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "Connection"); - private final static QName _Caption_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "Caption"); - private final static QName _VirtualQuantityUnits_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "VirtualQuantityUnits"); - private final static QName _ResourceType_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "ResourceType"); - private final static QName _AllocationUnits_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "AllocationUnits"); - private final static QName _ConsumerVisibility_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "ConsumerVisibility"); - private final static QName _VirtualQuantity_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "VirtualQuantity"); - private final static QName _InstanceID_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "InstanceID"); - private final static QName _HostResource_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "HostResource"); - private final static QName _Description_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "Description"); - private final static QName _AutomaticDeallocation_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "AutomaticDeallocation"); - private final static QName _MappingBehavior_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "MappingBehavior"); - private final static QName _Address_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", "Address"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.ow2.contrail.common.application.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link ConsumerVisibility } - * - */ - public ConsumerVisibility createConsumerVisibility() { - return new ConsumerVisibility(); - } - - /** - * Create an instance of {@link MappingBehavior } - * - */ - public MappingBehavior createMappingBehavior() { - return new MappingBehavior(); - } - - /** - * Create an instance of {@link Caption } - * - */ - public Caption createCaption() { - return new Caption(); - } - - /** - * Create an instance of {@link CIMResourceAllocationSettingDataType } - * - */ - public CIMResourceAllocationSettingDataType createCIMResourceAllocationSettingDataType() { - return new CIMResourceAllocationSettingDataType(); - } - - /** - * Create an instance of {@link ResourceType } - * - */ - public ResourceType createResourceType() { - return new ResourceType(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "ElementName") - public JAXBElement createElementName(CimString value) { - return new JAXBElement(_ElementName_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CIMResourceAllocationSettingDataType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "CIM_ResourceAllocationSettingData") - public JAXBElement createCIMResourceAllocationSettingData(CIMResourceAllocationSettingDataType value) { - return new JAXBElement(_CIMResourceAllocationSettingData_QNAME, CIMResourceAllocationSettingDataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "PoolID") - public JAXBElement createPoolID(CimString value) { - return new JAXBElement(_PoolID_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimUnsignedInt }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "Weight") - public JAXBElement createWeight(CimUnsignedInt value) { - return new JAXBElement(_Weight_QNAME, CimUnsignedInt.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "AddressOnParent") - public JAXBElement createAddressOnParent(CimString value) { - return new JAXBElement(_AddressOnParent_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "Parent") - public JAXBElement createParent(CimString value) { - return new JAXBElement(_Parent_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "ResourceSubType") - public JAXBElement createResourceSubType(CimString value) { - return new JAXBElement(_ResourceSubType_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimUnsignedLong }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "Limit") - public JAXBElement createLimit(CimUnsignedLong value) { - return new JAXBElement(_Limit_QNAME, CimUnsignedLong.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimBoolean }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "AutomaticAllocation") - public JAXBElement createAutomaticAllocation(CimBoolean value) { - return new JAXBElement(_AutomaticAllocation_QNAME, CimBoolean.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimUnsignedLong }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "Reservation") - public JAXBElement createReservation(CimUnsignedLong value) { - return new JAXBElement(_Reservation_QNAME, CimUnsignedLong.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "OtherResourceType") - public JAXBElement createOtherResourceType(CimString value) { - return new JAXBElement(_OtherResourceType_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "Connection") - public JAXBElement createConnection(CimString value) { - return new JAXBElement(_Connection_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Caption }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "Caption") - public JAXBElement createCaption(Caption value) { - return new JAXBElement(_Caption_QNAME, Caption.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "VirtualQuantityUnits") - public JAXBElement createVirtualQuantityUnits(CimString value) { - return new JAXBElement(_VirtualQuantityUnits_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ResourceType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "ResourceType") - public JAXBElement createResourceType(ResourceType value) { - return new JAXBElement(_ResourceType_QNAME, ResourceType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "AllocationUnits") - public JAXBElement createAllocationUnits(CimString value) { - return new JAXBElement(_AllocationUnits_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link ConsumerVisibility }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "ConsumerVisibility") - public JAXBElement createConsumerVisibility(ConsumerVisibility value) { - return new JAXBElement(_ConsumerVisibility_QNAME, ConsumerVisibility.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimUnsignedLong }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "VirtualQuantity") - public JAXBElement createVirtualQuantity(CimUnsignedLong value) { - return new JAXBElement(_VirtualQuantity_QNAME, CimUnsignedLong.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "InstanceID") - public JAXBElement createInstanceID(CimString value) { - return new JAXBElement(_InstanceID_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "HostResource") - public JAXBElement createHostResource(CimString value) { - return new JAXBElement(_HostResource_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "Description") - public JAXBElement createDescription(CimString value) { - return new JAXBElement(_Description_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimBoolean }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "AutomaticDeallocation") - public JAXBElement createAutomaticDeallocation(CimBoolean value) { - return new JAXBElement(_AutomaticDeallocation_QNAME, CimBoolean.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link MappingBehavior }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "MappingBehavior") - public JAXBElement createMappingBehavior(MappingBehavior value) { - return new JAXBElement(_MappingBehavior_QNAME, MappingBehavior.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", name = "Address") - public JAXBElement createAddress(CimString value) { - return new JAXBElement(_Address_QNAME, CimString.class, null, value); - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/ResourceType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/ResourceType.java deleted file mode 100644 index 79681b96c7473332b577575d01d37758e8c80529..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/ResourceType.java +++ /dev/null @@ -1,42 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimAnySimpleType; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <simpleContent>
- *     <restriction base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimAnySimpleType">
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -public class ResourceType - extends CimAnySimpleType -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/package-info.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/package-info.java deleted file mode 100644 index a32691731e0278912dbd780cc28d5161d8c894b4..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_resourceallocationsettingdata/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - -@javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_ResourceAllocationSettingData", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata; diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/AutomaticRecoveryAction.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/AutomaticRecoveryAction.java deleted file mode 100644 index d4f4d5c4dab0f2f240bc846a641b9b181dd986af..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/AutomaticRecoveryAction.java +++ /dev/null @@ -1,42 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimAnySimpleType; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <simpleContent>
- *     <restriction base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimAnySimpleType">
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -public class AutomaticRecoveryAction - extends CimAnySimpleType -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/AutomaticShutdownAction.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/AutomaticShutdownAction.java deleted file mode 100644 index 051d10d9b322948a59bf340ce89d5ad67787e1c8..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/AutomaticShutdownAction.java +++ /dev/null @@ -1,42 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimAnySimpleType; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <simpleContent>
- *     <restriction base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimAnySimpleType">
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -public class AutomaticShutdownAction - extends CimAnySimpleType -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/AutomaticStartupAction.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/AutomaticStartupAction.java deleted file mode 100644 index c78521fa2d7a3b374cb6b376db8afb254da41c74..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/AutomaticStartupAction.java +++ /dev/null @@ -1,42 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimAnySimpleType; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <simpleContent>
- *     <restriction base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimAnySimpleType">
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -public class AutomaticStartupAction - extends CimAnySimpleType -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/CIMVirtualSystemSettingDataType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/CIMVirtualSystemSettingDataType.java deleted file mode 100644 index d3b68149d518d44ec9aca0629f1333a66265e8ec..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/CIMVirtualSystemSettingDataType.java +++ /dev/null @@ -1,706 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.ovf.envelope._1.VSSDType; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimDateTime; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimString; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimUnsignedShort; -import org.w3c.dom.Element; - - -/** - *

Java class for CIM_VirtualSystemSettingData_Type complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="CIM_VirtualSystemSettingData_Type">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}AutomaticRecoveryAction" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}AutomaticShutdownAction" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}AutomaticStartupAction" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}AutomaticStartupActionDelay" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}AutomaticStartupActionSequenceNumber" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}Caption" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}ConfigurationDataRoot" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}ConfigurationFile" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}ConfigurationID" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}CreationTime" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}Description" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}ElementName"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}InstanceID"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}LogDataRoot" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}Notes" maxOccurs="unbounded" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}RecoveryFile" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}SnapshotDataRoot" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}SuspendDataRoot" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}SwapFileDataRoot" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}VirtualSystemIdentifier" minOccurs="0"/>
- *         <element ref="{http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData}VirtualSystemType" minOccurs="0"/>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded" minOccurs="0"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "CIM_VirtualSystemSettingData_Type", propOrder = { - "automaticRecoveryAction", - "automaticShutdownAction", - "automaticStartupAction", - "automaticStartupActionDelay", - "automaticStartupActionSequenceNumber", - "caption", - "configurationDataRoot", - "configurationFile", - "configurationID", - "creationTime", - "description", - "elementName", - "instanceID", - "logDataRoot", - "notes", - "recoveryFile", - "snapshotDataRoot", - "suspendDataRoot", - "swapFileDataRoot", - "virtualSystemIdentifier", - "virtualSystemType", - "any" -}) -@XmlSeeAlso({ - VSSDType.class -}) -public class CIMVirtualSystemSettingDataType { - - @XmlElement(name = "AutomaticRecoveryAction", nillable = true) - protected AutomaticRecoveryAction automaticRecoveryAction; - @XmlElement(name = "AutomaticShutdownAction", nillable = true) - protected AutomaticShutdownAction automaticShutdownAction; - @XmlElement(name = "AutomaticStartupAction", nillable = true) - protected AutomaticStartupAction automaticStartupAction; - @XmlElement(name = "AutomaticStartupActionDelay", nillable = true) - protected CimDateTime automaticStartupActionDelay; - @XmlElement(name = "AutomaticStartupActionSequenceNumber", nillable = true) - protected CimUnsignedShort automaticStartupActionSequenceNumber; - @XmlElement(name = "Caption", nillable = true) - protected Caption caption; - @XmlElement(name = "ConfigurationDataRoot", nillable = true) - protected CimString configurationDataRoot; - @XmlElement(name = "ConfigurationFile", nillable = true) - protected CimString configurationFile; - @XmlElement(name = "ConfigurationID", nillable = true) - protected CimString configurationID; - @XmlElement(name = "CreationTime", nillable = true) - protected CimDateTime creationTime; - @XmlElement(name = "Description", nillable = true) - protected CimString description; - @XmlElement(name = "ElementName", required = true) - protected CimString elementName; - @XmlElement(name = "InstanceID", required = true) - protected CimString instanceID; - @XmlElement(name = "LogDataRoot", nillable = true) - protected CimString logDataRoot; - @XmlElement(name = "Notes", nillable = true) - protected List notes; - @XmlElement(name = "RecoveryFile", nillable = true) - protected CimString recoveryFile; - @XmlElement(name = "SnapshotDataRoot", nillable = true) - protected CimString snapshotDataRoot; - @XmlElement(name = "SuspendDataRoot", nillable = true) - protected CimString suspendDataRoot; - @XmlElement(name = "SwapFileDataRoot", nillable = true) - protected CimString swapFileDataRoot; - @XmlElement(name = "VirtualSystemIdentifier", nillable = true) - protected CimString virtualSystemIdentifier; - @XmlElement(name = "VirtualSystemType", nillable = true) - protected CimString virtualSystemType; - @XmlAnyElement(lax = true) - protected List any; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the automaticRecoveryAction property. - * - * @return - * possible object is - * {@link AutomaticRecoveryAction } - * - */ - public AutomaticRecoveryAction getAutomaticRecoveryAction() { - return automaticRecoveryAction; - } - - /** - * Sets the value of the automaticRecoveryAction property. - * - * @param value - * allowed object is - * {@link AutomaticRecoveryAction } - * - */ - public void setAutomaticRecoveryAction(AutomaticRecoveryAction value) { - this.automaticRecoveryAction = value; - } - - /** - * Gets the value of the automaticShutdownAction property. - * - * @return - * possible object is - * {@link AutomaticShutdownAction } - * - */ - public AutomaticShutdownAction getAutomaticShutdownAction() { - return automaticShutdownAction; - } - - /** - * Sets the value of the automaticShutdownAction property. - * - * @param value - * allowed object is - * {@link AutomaticShutdownAction } - * - */ - public void setAutomaticShutdownAction(AutomaticShutdownAction value) { - this.automaticShutdownAction = value; - } - - /** - * Gets the value of the automaticStartupAction property. - * - * @return - * possible object is - * {@link AutomaticStartupAction } - * - */ - public AutomaticStartupAction getAutomaticStartupAction() { - return automaticStartupAction; - } - - /** - * Sets the value of the automaticStartupAction property. - * - * @param value - * allowed object is - * {@link AutomaticStartupAction } - * - */ - public void setAutomaticStartupAction(AutomaticStartupAction value) { - this.automaticStartupAction = value; - } - - /** - * Gets the value of the automaticStartupActionDelay property. - * - * @return - * possible object is - * {@link CimDateTime } - * - */ - public CimDateTime getAutomaticStartupActionDelay() { - return automaticStartupActionDelay; - } - - /** - * Sets the value of the automaticStartupActionDelay property. - * - * @param value - * allowed object is - * {@link CimDateTime } - * - */ - public void setAutomaticStartupActionDelay(CimDateTime value) { - this.automaticStartupActionDelay = value; - } - - /** - * Gets the value of the automaticStartupActionSequenceNumber property. - * - * @return - * possible object is - * {@link CimUnsignedShort } - * - */ - public CimUnsignedShort getAutomaticStartupActionSequenceNumber() { - return automaticStartupActionSequenceNumber; - } - - /** - * Sets the value of the automaticStartupActionSequenceNumber property. - * - * @param value - * allowed object is - * {@link CimUnsignedShort } - * - */ - public void setAutomaticStartupActionSequenceNumber(CimUnsignedShort value) { - this.automaticStartupActionSequenceNumber = value; - } - - /** - * Gets the value of the caption property. - * - * @return - * possible object is - * {@link Caption } - * - */ - public Caption getCaption() { - return caption; - } - - /** - * Sets the value of the caption property. - * - * @param value - * allowed object is - * {@link Caption } - * - */ - public void setCaption(Caption value) { - this.caption = value; - } - - /** - * Gets the value of the configurationDataRoot property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getConfigurationDataRoot() { - return configurationDataRoot; - } - - /** - * Sets the value of the configurationDataRoot property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setConfigurationDataRoot(CimString value) { - this.configurationDataRoot = value; - } - - /** - * Gets the value of the configurationFile property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getConfigurationFile() { - return configurationFile; - } - - /** - * Sets the value of the configurationFile property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setConfigurationFile(CimString value) { - this.configurationFile = value; - } - - /** - * Gets the value of the configurationID property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getConfigurationID() { - return configurationID; - } - - /** - * Sets the value of the configurationID property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setConfigurationID(CimString value) { - this.configurationID = value; - } - - /** - * Gets the value of the creationTime property. - * - * @return - * possible object is - * {@link CimDateTime } - * - */ - public CimDateTime getCreationTime() { - return creationTime; - } - - /** - * Sets the value of the creationTime property. - * - * @param value - * allowed object is - * {@link CimDateTime } - * - */ - public void setCreationTime(CimDateTime value) { - this.creationTime = value; - } - - /** - * Gets the value of the description property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getDescription() { - return description; - } - - /** - * Sets the value of the description property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setDescription(CimString value) { - this.description = value; - } - - /** - * Gets the value of the elementName property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getElementName() { - return elementName; - } - - /** - * Sets the value of the elementName property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setElementName(CimString value) { - this.elementName = value; - } - - /** - * Gets the value of the instanceID property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getInstanceID() { - return instanceID; - } - - /** - * Sets the value of the instanceID property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setInstanceID(CimString value) { - this.instanceID = value; - } - - /** - * Gets the value of the logDataRoot property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getLogDataRoot() { - return logDataRoot; - } - - /** - * Sets the value of the logDataRoot property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setLogDataRoot(CimString value) { - this.logDataRoot = value; - } - - /** - * Gets the value of the notes property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the notes property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getNotes().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link CimString } - * - * - */ - public List getNotes() { - if (notes == null) { - notes = new ArrayList(); - } - return this.notes; - } - - /** - * Gets the value of the recoveryFile property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getRecoveryFile() { - return recoveryFile; - } - - /** - * Sets the value of the recoveryFile property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setRecoveryFile(CimString value) { - this.recoveryFile = value; - } - - /** - * Gets the value of the snapshotDataRoot property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getSnapshotDataRoot() { - return snapshotDataRoot; - } - - /** - * Sets the value of the snapshotDataRoot property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setSnapshotDataRoot(CimString value) { - this.snapshotDataRoot = value; - } - - /** - * Gets the value of the suspendDataRoot property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getSuspendDataRoot() { - return suspendDataRoot; - } - - /** - * Sets the value of the suspendDataRoot property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setSuspendDataRoot(CimString value) { - this.suspendDataRoot = value; - } - - /** - * Gets the value of the swapFileDataRoot property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getSwapFileDataRoot() { - return swapFileDataRoot; - } - - /** - * Sets the value of the swapFileDataRoot property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setSwapFileDataRoot(CimString value) { - this.swapFileDataRoot = value; - } - - /** - * Gets the value of the virtualSystemIdentifier property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getVirtualSystemIdentifier() { - return virtualSystemIdentifier; - } - - /** - * Sets the value of the virtualSystemIdentifier property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setVirtualSystemIdentifier(CimString value) { - this.virtualSystemIdentifier = value; - } - - /** - * Gets the value of the virtualSystemType property. - * - * @return - * possible object is - * {@link CimString } - * - */ - public CimString getVirtualSystemType() { - return virtualSystemType; - } - - /** - * Sets the value of the virtualSystemType property. - * - * @param value - * allowed object is - * {@link CimString } - * - */ - public void setVirtualSystemType(CimString value) { - this.virtualSystemType = value; - } - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/Caption.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/Caption.java deleted file mode 100644 index 9d11f845a60d185c364927e9e9a4a1b4470d3c69..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/Caption.java +++ /dev/null @@ -1,42 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimString; - - -/** - *

Java class for anonymous complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType>
- *   <simpleContent>
- *     <restriction base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimString">
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "") -public class Caption - extends CimString -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/ObjectFactory.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/ObjectFactory.java deleted file mode 100644 index 78d6f386e69d6d57bc80434a8e8554d24d97249c..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/ObjectFactory.java +++ /dev/null @@ -1,306 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimDateTime; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimString; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common.CimUnsignedShort; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.ow2.contrail.common.application.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _RecoveryFile_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "RecoveryFile"); - private final static QName _Caption_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "Caption"); - private final static QName _CIMVirtualSystemSettingData_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "CIM_VirtualSystemSettingData"); - private final static QName _ConfigurationFile_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "ConfigurationFile"); - private final static QName _SuspendDataRoot_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "SuspendDataRoot"); - private final static QName _VirtualSystemIdentifier_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "VirtualSystemIdentifier"); - private final static QName _AutomaticShutdownAction_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "AutomaticShutdownAction"); - private final static QName _Description_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "Description"); - private final static QName _SwapFileDataRoot_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "SwapFileDataRoot"); - private final static QName _InstanceID_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "InstanceID"); - private final static QName _AutomaticStartupActionSequenceNumber_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "AutomaticStartupActionSequenceNumber"); - private final static QName _AutomaticStartupActionDelay_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "AutomaticStartupActionDelay"); - private final static QName _VirtualSystemType_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "VirtualSystemType"); - private final static QName _AutomaticRecoveryAction_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "AutomaticRecoveryAction"); - private final static QName _AutomaticStartupAction_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "AutomaticStartupAction"); - private final static QName _ConfigurationID_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "ConfigurationID"); - private final static QName _ElementName_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "ElementName"); - private final static QName _Notes_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "Notes"); - private final static QName _CreationTime_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "CreationTime"); - private final static QName _SnapshotDataRoot_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "SnapshotDataRoot"); - private final static QName _ConfigurationDataRoot_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "ConfigurationDataRoot"); - private final static QName _LogDataRoot_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", "LogDataRoot"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.ow2.contrail.common.application.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link Caption } - * - */ - public Caption createCaption() { - return new Caption(); - } - - /** - * Create an instance of {@link CIMVirtualSystemSettingDataType } - * - */ - public CIMVirtualSystemSettingDataType createCIMVirtualSystemSettingDataType() { - return new CIMVirtualSystemSettingDataType(); - } - - /** - * Create an instance of {@link AutomaticShutdownAction } - * - */ - public AutomaticShutdownAction createAutomaticShutdownAction() { - return new AutomaticShutdownAction(); - } - - /** - * Create an instance of {@link AutomaticStartupAction } - * - */ - public AutomaticStartupAction createAutomaticStartupAction() { - return new AutomaticStartupAction(); - } - - /** - * Create an instance of {@link AutomaticRecoveryAction } - * - */ - public AutomaticRecoveryAction createAutomaticRecoveryAction() { - return new AutomaticRecoveryAction(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "RecoveryFile") - public JAXBElement createRecoveryFile(CimString value) { - return new JAXBElement(_RecoveryFile_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Caption }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "Caption") - public JAXBElement createCaption(Caption value) { - return new JAXBElement(_Caption_QNAME, Caption.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CIMVirtualSystemSettingDataType }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "CIM_VirtualSystemSettingData") - public JAXBElement createCIMVirtualSystemSettingData(CIMVirtualSystemSettingDataType value) { - return new JAXBElement(_CIMVirtualSystemSettingData_QNAME, CIMVirtualSystemSettingDataType.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "ConfigurationFile") - public JAXBElement createConfigurationFile(CimString value) { - return new JAXBElement(_ConfigurationFile_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "SuspendDataRoot") - public JAXBElement createSuspendDataRoot(CimString value) { - return new JAXBElement(_SuspendDataRoot_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "VirtualSystemIdentifier") - public JAXBElement createVirtualSystemIdentifier(CimString value) { - return new JAXBElement(_VirtualSystemIdentifier_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AutomaticShutdownAction }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "AutomaticShutdownAction") - public JAXBElement createAutomaticShutdownAction(AutomaticShutdownAction value) { - return new JAXBElement(_AutomaticShutdownAction_QNAME, AutomaticShutdownAction.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "Description") - public JAXBElement createDescription(CimString value) { - return new JAXBElement(_Description_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "SwapFileDataRoot") - public JAXBElement createSwapFileDataRoot(CimString value) { - return new JAXBElement(_SwapFileDataRoot_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "InstanceID") - public JAXBElement createInstanceID(CimString value) { - return new JAXBElement(_InstanceID_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimUnsignedShort }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "AutomaticStartupActionSequenceNumber") - public JAXBElement createAutomaticStartupActionSequenceNumber(CimUnsignedShort value) { - return new JAXBElement(_AutomaticStartupActionSequenceNumber_QNAME, CimUnsignedShort.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimDateTime }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "AutomaticStartupActionDelay") - public JAXBElement createAutomaticStartupActionDelay(CimDateTime value) { - return new JAXBElement(_AutomaticStartupActionDelay_QNAME, CimDateTime.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "VirtualSystemType") - public JAXBElement createVirtualSystemType(CimString value) { - return new JAXBElement(_VirtualSystemType_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AutomaticRecoveryAction }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "AutomaticRecoveryAction") - public JAXBElement createAutomaticRecoveryAction(AutomaticRecoveryAction value) { - return new JAXBElement(_AutomaticRecoveryAction_QNAME, AutomaticRecoveryAction.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link AutomaticStartupAction }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "AutomaticStartupAction") - public JAXBElement createAutomaticStartupAction(AutomaticStartupAction value) { - return new JAXBElement(_AutomaticStartupAction_QNAME, AutomaticStartupAction.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "ConfigurationID") - public JAXBElement createConfigurationID(CimString value) { - return new JAXBElement(_ConfigurationID_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "ElementName") - public JAXBElement createElementName(CimString value) { - return new JAXBElement(_ElementName_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "Notes") - public JAXBElement createNotes(CimString value) { - return new JAXBElement(_Notes_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimDateTime }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "CreationTime") - public JAXBElement createCreationTime(CimDateTime value) { - return new JAXBElement(_CreationTime_QNAME, CimDateTime.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "SnapshotDataRoot") - public JAXBElement createSnapshotDataRoot(CimString value) { - return new JAXBElement(_SnapshotDataRoot_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "ConfigurationDataRoot") - public JAXBElement createConfigurationDataRoot(CimString value) { - return new JAXBElement(_ConfigurationDataRoot_QNAME, CimString.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link CimString }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", name = "LogDataRoot") - public JAXBElement createLogDataRoot(CimString value) { - return new JAXBElement(_LogDataRoot_QNAME, CimString.class, null, value); - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/package-info.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/package-info.java deleted file mode 100644 index a9b20b00b4f8af21327fa48ee741a11a5e9f05aa..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/cim_schema/_2/cim_virtualsystemsettingdata/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - -@javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.dmtf.org/wbem/wscim/1/cim-schema/2/CIM_VirtualSystemSettingData", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata; diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimAnySimpleType.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimAnySimpleType.java deleted file mode 100644 index 120fd44dbba85101eb7d28d825e3a089adb29b2d..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimAnySimpleType.java +++ /dev/null @@ -1,110 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata.ConsumerVisibility; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata.MappingBehavior; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata.ResourceType; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata.AutomaticRecoveryAction; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata.AutomaticShutdownAction; -import org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata.AutomaticStartupAction; - - -/** - *

Java class for cimAnySimpleType complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimAnySimpleType">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>anySimpleType">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimAnySimpleType", propOrder = { - "value" -}) -@XmlSeeAlso({ - AutomaticRecoveryAction.class, - AutomaticShutdownAction.class, - AutomaticStartupAction.class, - ConsumerVisibility.class, - ResourceType.class, - MappingBehavior.class -}) -public class CimAnySimpleType { - - @XmlValue - @XmlSchemaType(name = "anySimpleType") - protected Object value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link Object } - * - */ - public Object getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link Object } - * - */ - public void setValue(Object value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimBase64Binary.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimBase64Binary.java deleted file mode 100644 index 319e7af26b77fa1a081930b4e6612442e4c3dbd5..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimBase64Binary.java +++ /dev/null @@ -1,90 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimBase64Binary complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimBase64Binary">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>base64Binary">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimBase64Binary", propOrder = { - "value" -}) -public class CimBase64Binary { - - @XmlValue - protected byte[] value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * byte[] - */ - public byte[] getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * byte[] - */ - public void setValue(byte[] value) { - this.value = ((byte[]) value); - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimBoolean.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimBoolean.java deleted file mode 100644 index 595e10c81977f9c440ce429149527eb765e051f4..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimBoolean.java +++ /dev/null @@ -1,88 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimBoolean complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimBoolean">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>boolean">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimBoolean", propOrder = { - "value" -}) -@XmlSeeAlso({ - QualifierBoolean.class -}) -public class CimBoolean { - - @XmlValue - protected boolean value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - */ - public boolean isValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(boolean value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimByte.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimByte.java deleted file mode 100644 index 6b88aba55915ca7df6bf13ebb117aeed0a170ea1..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimByte.java +++ /dev/null @@ -1,84 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimByte complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimByte">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>byte">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimByte", propOrder = { - "value" -}) -public class CimByte { - - @XmlValue - protected byte value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - */ - public byte getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(byte value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimChar16.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimChar16.java deleted file mode 100644 index 57b00127fa49b1543c3a0116fcd1a8e259372041..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimChar16.java +++ /dev/null @@ -1,40 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for cimChar16 complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimChar16">
- *   <simpleContent>
- *     <restriction base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimString">
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimChar16") -public class CimChar16 - extends CimString -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimDateTime.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimDateTime.java deleted file mode 100644 index 4e417b7a5cb77b4348497127f1f88c1c7d6db42d..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimDateTime.java +++ /dev/null @@ -1,215 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlElement; -import javax.xml.bind.annotation.XmlElementRef; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.datatype.Duration; -import javax.xml.datatype.XMLGregorianCalendar; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimDateTime complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimDateTime">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <choice>
- *         <element name="CIM_DateTime" type="{http://www.w3.org/2001/XMLSchema}string"/>
- *         <element name="Interval" type="{http://www.w3.org/2001/XMLSchema}duration"/>
- *         <element name="Date" type="{http://www.w3.org/2001/XMLSchema}date"/>
- *         <element name="Time" type="{http://www.w3.org/2001/XMLSchema}time"/>
- *         <element name="Datetime" type="{http://www.w3.org/2001/XMLSchema}dateTime"/>
- *       </choice>
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimDateTime", propOrder = { - "cimDateTime", - "interval", - "date", - "time", - "datetime" -}) -public class CimDateTime { - - @XmlElementRef(name = "CIM_DateTime", namespace = "http://schemas.dmtf.org/wbem/wscim/1/common", type = JAXBElement.class) - protected JAXBElement cimDateTime; - @XmlElement(name = "Interval") - protected Duration interval; - @XmlElement(name = "Date") - @XmlSchemaType(name = "date") - protected XMLGregorianCalendar date; - @XmlElement(name = "Time") - @XmlSchemaType(name = "time") - protected XMLGregorianCalendar time; - @XmlElement(name = "Datetime") - @XmlSchemaType(name = "dateTime") - protected XMLGregorianCalendar datetime; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the cimDateTime property. - * - * @return - * possible object is - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - public JAXBElement getCIMDateTime() { - return cimDateTime; - } - - /** - * Sets the value of the cimDateTime property. - * - * @param value - * allowed object is - * {@link JAXBElement }{@code <}{@link String }{@code >} - * - */ - public void setCIMDateTime(JAXBElement value) { - this.cimDateTime = ((JAXBElement ) value); - } - - /** - * Gets the value of the interval property. - * - * @return - * possible object is - * {@link Duration } - * - */ - public Duration getInterval() { - return interval; - } - - /** - * Sets the value of the interval property. - * - * @param value - * allowed object is - * {@link Duration } - * - */ - public void setInterval(Duration value) { - this.interval = value; - } - - /** - * Gets the value of the date property. - * - * @return - * possible object is - * {@link XMLGregorianCalendar } - * - */ - public XMLGregorianCalendar getDate() { - return date; - } - - /** - * Sets the value of the date property. - * - * @param value - * allowed object is - * {@link XMLGregorianCalendar } - * - */ - public void setDate(XMLGregorianCalendar value) { - this.date = value; - } - - /** - * Gets the value of the time property. - * - * @return - * possible object is - * {@link XMLGregorianCalendar } - * - */ - public XMLGregorianCalendar getTime() { - return time; - } - - /** - * Sets the value of the time property. - * - * @param value - * allowed object is - * {@link XMLGregorianCalendar } - * - */ - public void setTime(XMLGregorianCalendar value) { - this.time = value; - } - - /** - * Gets the value of the datetime property. - * - * @return - * possible object is - * {@link XMLGregorianCalendar } - * - */ - public XMLGregorianCalendar getDatetime() { - return datetime; - } - - /** - * Sets the value of the datetime property. - * - * @param value - * allowed object is - * {@link XMLGregorianCalendar } - * - */ - public void setDatetime(XMLGregorianCalendar value) { - this.datetime = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimDouble.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimDouble.java deleted file mode 100644 index c24f57935ec2a9e312dc5ef4a5c4363012c3aa07..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimDouble.java +++ /dev/null @@ -1,84 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimDouble complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimDouble">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>double">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimDouble", propOrder = { - "value" -}) -public class CimDouble { - - @XmlValue - protected double value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - */ - public double getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(double value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimFloat.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimFloat.java deleted file mode 100644 index 83a9c6a259b03d06500c643c050371c934447fef..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimFloat.java +++ /dev/null @@ -1,84 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimFloat complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimFloat">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>float">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimFloat", propOrder = { - "value" -}) -public class CimFloat { - - @XmlValue - protected float value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - */ - public float getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(float value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimHexBinary.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimHexBinary.java deleted file mode 100644 index dff4fbdfddb4639ee6db89b12bc25c1cc49accf6..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimHexBinary.java +++ /dev/null @@ -1,97 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.bind.annotation.adapters.HexBinaryAdapter; -import javax.xml.bind.annotation.adapters.XmlJavaTypeAdapter; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimHexBinary complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimHexBinary">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>hexBinary">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimHexBinary", propOrder = { - "value" -}) -public class CimHexBinary { - - @XmlValue - @XmlJavaTypeAdapter(HexBinaryAdapter.class) - @XmlSchemaType(name = "hexBinary") - protected byte[] value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public byte[] getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(byte[] value) { - this.value = ((byte[]) value); - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimInt.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimInt.java deleted file mode 100644 index 1e9780424ea972a0381dd5cf8f86dcb77dd4e846..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimInt.java +++ /dev/null @@ -1,84 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimInt complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimInt">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>int">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimInt", propOrder = { - "value" -}) -public class CimInt { - - @XmlValue - protected int value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - */ - public int getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(int value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimLong.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimLong.java deleted file mode 100644 index 5aa5c467ed6b290874efb0e8b2349598128f01e6..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimLong.java +++ /dev/null @@ -1,88 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimLong complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimLong">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>long">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimLong", propOrder = { - "value" -}) -@XmlSeeAlso({ - QualifierSInt64 .class -}) -public class CimLong { - - @XmlValue - protected long value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - */ - public long getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(long value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimReference.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimReference.java deleted file mode 100644 index df066c44eaebe515d07133323d9230b9c94578b5..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimReference.java +++ /dev/null @@ -1,105 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.ArrayList; -import java.util.HashMap; -import java.util.List; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlAnyElement; -import javax.xml.bind.annotation.XmlType; -import javax.xml.namespace.QName; - -import org.w3c.dom.Element; - - -/** - *

Java class for cimReference complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimReference">
- *   <complexContent>
- *     <restriction base="{http://www.w3.org/2001/XMLSchema}anyType">
- *       <sequence>
- *         <any processContents='lax' namespace='##other' maxOccurs="unbounded"/>
- *       </sequence>
- *       <anyAttribute processContents='lax'/>
- *     </restriction>
- *   </complexContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimReference", propOrder = { - "any" -}) -public class CimReference { - - @XmlAnyElement(lax = true) - protected List any; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the any property. - * - *

- * This accessor method returns a reference to the live list, - * not a snapshot. Therefore any modification you make to the - * returned list will be present inside the JAXB object. - * This is why there is not a set method for the any property. - * - *

- * For example, to add a new item, do as follows: - *

-     *    getAny().add(newItem);
-     * 
- * - * - *

- * Objects of the following type(s) are allowed in the list - * {@link Object } - * {@link Element } - * - * - */ - public List getAny() { - if (any == null) { - any = new ArrayList(); - } - return this.any; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimShort.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimShort.java deleted file mode 100644 index 991353754b4f5c06a0f4b09f1ffd265851be055d..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimShort.java +++ /dev/null @@ -1,84 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimShort complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimShort">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>short">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimShort", propOrder = { - "value" -}) -public class CimShort { - - @XmlValue - protected short value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - */ - public short getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(short value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimString.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimString.java deleted file mode 100644 index 9ebe9f86a88986c1715832e3c680cbfc78a26b82..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimString.java +++ /dev/null @@ -1,99 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimString complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimString">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>string">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimString", propOrder = { - "value" -}) -@XmlSeeAlso({ - CimChar16 .class, - QualifierString.class, - org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_virtualsystemsettingdata.Caption.class, - org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.cim_schema._2.cim_resourceallocationsettingdata.Caption.class -}) -public class CimString { - - @XmlValue - protected String value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link String } - * - */ - public String getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link String } - * - */ - public void setValue(String value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedByte.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedByte.java deleted file mode 100644 index 3493a45a85fe903e766dadff2f45feb470a178fd..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedByte.java +++ /dev/null @@ -1,86 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimUnsignedByte complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimUnsignedByte">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>unsignedByte">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimUnsignedByte", propOrder = { - "value" -}) -public class CimUnsignedByte { - - @XmlValue - @XmlSchemaType(name = "unsignedByte") - protected short value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - */ - public short getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(short value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedInt.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedInt.java deleted file mode 100644 index ca614b7ec20ebd1a33408bb1369175a45a58b345..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedInt.java +++ /dev/null @@ -1,90 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimUnsignedInt complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimUnsignedInt">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>unsignedInt">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimUnsignedInt", propOrder = { - "value" -}) -@XmlSeeAlso({ - QualifierUInt32 .class -}) -public class CimUnsignedInt { - - @XmlValue - @XmlSchemaType(name = "unsignedInt") - protected long value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - */ - public long getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(long value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedLong.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedLong.java deleted file mode 100644 index bdbca3e95224b4b43d75bf72806de32993dd0c9d..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedLong.java +++ /dev/null @@ -1,95 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.math.BigInteger; -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimUnsignedLong complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimUnsignedLong">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>unsignedLong">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimUnsignedLong", propOrder = { - "value" -}) -public class CimUnsignedLong { - - @XmlValue - @XmlSchemaType(name = "unsignedLong") - protected BigInteger value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - * @return - * possible object is - * {@link BigInteger } - * - */ - public BigInteger getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - * @param value - * allowed object is - * {@link BigInteger } - * - */ - public void setValue(BigInteger value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedShort.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedShort.java deleted file mode 100644 index 088bc94b3de41ec6e895bf746893a425b27672e3..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/CimUnsignedShort.java +++ /dev/null @@ -1,86 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import java.util.HashMap; -import java.util.Map; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAnyAttribute; -import javax.xml.bind.annotation.XmlSchemaType; -import javax.xml.bind.annotation.XmlType; -import javax.xml.bind.annotation.XmlValue; -import javax.xml.namespace.QName; - - -/** - *

Java class for cimUnsignedShort complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="cimUnsignedShort">
- *   <simpleContent>
- *     <extension base="<http://www.w3.org/2001/XMLSchema>unsignedShort">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "cimUnsignedShort", propOrder = { - "value" -}) -public class CimUnsignedShort { - - @XmlValue - @XmlSchemaType(name = "unsignedShort") - protected int value; - @XmlAnyAttribute - private Map otherAttributes = new HashMap(); - - /** - * Gets the value of the value property. - * - */ - public int getValue() { - return value; - } - - /** - * Sets the value of the value property. - * - */ - public void setValue(int value) { - this.value = value; - } - - /** - * Gets a map that contains attributes that aren't bound to any typed property on this class. - * - *

- * the map is keyed by the name of the attribute and - * the value is the string value of the attribute. - * - * the map returned by this method is live, and you can add new attribute - * by updating the map directly. Because of this design, there's no setter. - * - * - * @return - * always non-null - */ - public Map getOtherAttributes() { - return otherAttributes; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/ObjectFactory.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/ObjectFactory.java deleted file mode 100644 index 8497a86e85173f36ee0056af8c779d5eaa141154..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/ObjectFactory.java +++ /dev/null @@ -1,246 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import javax.xml.bind.JAXBElement; -import javax.xml.bind.annotation.XmlElementDecl; -import javax.xml.bind.annotation.XmlRegistry; -import javax.xml.namespace.QName; - - -/** - * This object contains factory methods for each - * Java content interface and Java element interface - * generated in the org.ow2.contrail.common.application.ovf.dmtf.schemas.wbem.wscim._1.common package. - *

An ObjectFactory allows you to programatically - * construct new instances of the Java representation - * for XML content. The Java representation of XML - * content can consist of schema derived interfaces - * and classes representing the binding of schema - * type definitions, element declarations and model - * groups. Factory methods for each of these are - * provided in this class. - * - */ -@XmlRegistry -public class ObjectFactory { - - private final static QName _DefaultValue_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/common", "DefaultValue"); - private final static QName _CimDateTimeCIMDateTime_QNAME = new QName("http://schemas.dmtf.org/wbem/wscim/1/common", "CIM_DateTime"); - - /** - * Create a new ObjectFactory that can be used to create new instances of schema derived classes for package: org.ow2.contrail.common.application.ovf.dmtf.schemas.wbem.wscim._1.common - * - */ - public ObjectFactory() { - } - - /** - * Create an instance of {@link CimFloat } - * - */ - public CimFloat createCimFloat() { - return new CimFloat(); - } - - /** - * Create an instance of {@link QualifierSArray } - * - */ - public QualifierSArray createQualifierSArray() { - return new QualifierSArray(); - } - - /** - * Create an instance of {@link CimInt } - * - */ - public CimInt createCimInt() { - return new CimInt(); - } - - /** - * Create an instance of {@link CimUnsignedInt } - * - */ - public CimUnsignedInt createCimUnsignedInt() { - return new CimUnsignedInt(); - } - - /** - * Create an instance of {@link CimByte } - * - */ - public CimByte createCimByte() { - return new CimByte(); - } - - /** - * Create an instance of {@link CimShort } - * - */ - public CimShort createCimShort() { - return new CimShort(); - } - - /** - * Create an instance of {@link CimUnsignedShort } - * - */ - public CimUnsignedShort createCimUnsignedShort() { - return new CimUnsignedShort(); - } - - /** - * Create an instance of {@link QualifierUInt32 } - * - */ - public QualifierUInt32 createQualifierUInt32() { - return new QualifierUInt32(); - } - - /** - * Create an instance of {@link CimDateTime } - * - */ - public CimDateTime createCimDateTime() { - return new CimDateTime(); - } - - /** - * Create an instance of {@link CimReference } - * - */ - public CimReference createCimReference() { - return new CimReference(); - } - - /** - * Create an instance of {@link CimBase64Binary } - * - */ - public CimBase64Binary createCimBase64Binary() { - return new CimBase64Binary(); - } - - /** - * Create an instance of {@link CimLong } - * - */ - public CimLong createCimLong() { - return new CimLong(); - } - - /** - * Create an instance of {@link QualifierSInt64 } - * - */ - public QualifierSInt64 createQualifierSInt64() { - return new QualifierSInt64(); - } - - /** - * Create an instance of {@link CimString } - * - */ - public CimString createCimString() { - return new CimString(); - } - - /** - * Create an instance of {@link CimChar16 } - * - */ - public CimChar16 createCimChar16() { - return new CimChar16(); - } - - /** - * Create an instance of {@link CimHexBinary } - * - */ - public CimHexBinary createCimHexBinary() { - return new CimHexBinary(); - } - - /** - * Create an instance of {@link CimUnsignedByte } - * - */ - public CimUnsignedByte createCimUnsignedByte() { - return new CimUnsignedByte(); - } - - /** - * Create an instance of {@link CimDouble } - * - */ - public CimDouble createCimDouble() { - return new CimDouble(); - } - - /** - * Create an instance of {@link CimUnsignedLong } - * - */ - public CimUnsignedLong createCimUnsignedLong() { - return new CimUnsignedLong(); - } - - /** - * Create an instance of {@link QualifierString } - * - */ - public QualifierString createQualifierString() { - return new QualifierString(); - } - - /** - * Create an instance of {@link CimAnySimpleType } - * - */ - public CimAnySimpleType createCimAnySimpleType() { - return new CimAnySimpleType(); - } - - /** - * Create an instance of {@link CimBoolean } - * - */ - public CimBoolean createCimBoolean() { - return new CimBoolean(); - } - - /** - * Create an instance of {@link QualifierBoolean } - * - */ - public QualifierBoolean createQualifierBoolean() { - return new QualifierBoolean(); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link Object }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/common", name = "DefaultValue") - public JAXBElement createDefaultValue(Object value) { - return new JAXBElement(_DefaultValue_QNAME, Object.class, null, value); - } - - /** - * Create an instance of {@link JAXBElement }{@code <}{@link String }{@code >}} - * - */ - @XmlElementDecl(namespace = "http://schemas.dmtf.org/wbem/wscim/1/common", name = "CIM_DateTime", scope = CimDateTime.class) - public JAXBElement createCimDateTimeCIMDateTime(String value) { - return new JAXBElement(_CimDateTimeCIMDateTime_QNAME, String.class, CimDateTime.class, value); - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierBoolean.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierBoolean.java deleted file mode 100644 index 6e5ce711b30ca427e14a07ceff5ded0536f6a6a9..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierBoolean.java +++ /dev/null @@ -1,60 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for qualifierBoolean complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="qualifierBoolean">
- *   <simpleContent>
- *     <extension base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimBoolean">
- *       <attribute ref="{http://schemas.dmtf.org/wbem/wscim/1/common}qualifier use="required""/>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "qualifierBoolean") -public class QualifierBoolean - extends CimBoolean -{ - - @XmlAttribute(namespace = "http://schemas.dmtf.org/wbem/wscim/1/common", required = true) - protected boolean qualifier; - - /** - * Gets the value of the qualifier property. - * - */ - public boolean isQualifier() { - return qualifier; - } - - /** - * Sets the value of the qualifier property. - * - */ - public void setQualifier(boolean value) { - this.qualifier = value; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierSArray.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierSArray.java deleted file mode 100644 index 3e8fe05db1ac4d4cc6e5c26a37407ecb8197f390..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierSArray.java +++ /dev/null @@ -1,40 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for qualifierSArray complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="qualifierSArray">
- *   <simpleContent>
- *     <extension base="<http://schemas.dmtf.org/wbem/wscim/1/common>qualifierString">
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "qualifierSArray") -public class QualifierSArray - extends QualifierString -{ - - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierSInt64.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierSInt64.java deleted file mode 100644 index f00367739ebfeb096188162b75e86e8253d2f51b..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierSInt64.java +++ /dev/null @@ -1,60 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for qualifierSInt64 complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="qualifierSInt64">
- *   <simpleContent>
- *     <extension base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimLong">
- *       <attribute ref="{http://schemas.dmtf.org/wbem/wscim/1/common}qualifier use="required""/>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "qualifierSInt64") -public class QualifierSInt64 - extends CimLong -{ - - @XmlAttribute(namespace = "http://schemas.dmtf.org/wbem/wscim/1/common", required = true) - protected boolean qualifier; - - /** - * Gets the value of the qualifier property. - * - */ - public boolean isQualifier() { - return qualifier; - } - - /** - * Sets the value of the qualifier property. - * - */ - public void setQualifier(boolean value) { - this.qualifier = value; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierString.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierString.java deleted file mode 100644 index f7d55bfcae9f33d7b86bb587185521c16d0683d0..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierString.java +++ /dev/null @@ -1,64 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlSeeAlso; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for qualifierString complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="qualifierString">
- *   <simpleContent>
- *     <extension base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimString">
- *       <attribute ref="{http://schemas.dmtf.org/wbem/wscim/1/common}qualifier use="required""/>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "qualifierString") -@XmlSeeAlso({ - QualifierSArray.class -}) -public class QualifierString - extends CimString -{ - - @XmlAttribute(namespace = "http://schemas.dmtf.org/wbem/wscim/1/common", required = true) - protected boolean qualifier; - - /** - * Gets the value of the qualifier property. - * - */ - public boolean isQualifier() { - return qualifier; - } - - /** - * Sets the value of the qualifier property. - * - */ - public void setQualifier(boolean value) { - this.qualifier = value; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierUInt32.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierUInt32.java deleted file mode 100644 index deaf1ef86f0bc67d710e3c4da2b45699dc7f78a9..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/QualifierUInt32.java +++ /dev/null @@ -1,60 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - - -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; - -import javax.xml.bind.annotation.XmlAccessType; -import javax.xml.bind.annotation.XmlAccessorType; -import javax.xml.bind.annotation.XmlAttribute; -import javax.xml.bind.annotation.XmlType; - - -/** - *

Java class for qualifierUInt32 complex type. - * - *

The following schema fragment specifies the expected content contained within this class. - * - *

- * <complexType name="qualifierUInt32">
- *   <simpleContent>
- *     <extension base="<http://schemas.dmtf.org/wbem/wscim/1/common>cimUnsignedInt">
- *       <attribute ref="{http://schemas.dmtf.org/wbem/wscim/1/common}qualifier use="required""/>
- *       <anyAttribute processContents='lax'/>
- *     </extension>
- *   </simpleContent>
- * </complexType>
- * 
- * - * - */ -@XmlAccessorType(XmlAccessType.FIELD) -@XmlType(name = "qualifierUInt32") -public class QualifierUInt32 - extends CimUnsignedInt -{ - - @XmlAttribute(namespace = "http://schemas.dmtf.org/wbem/wscim/1/common", required = true) - protected boolean qualifier; - - /** - * Gets the value of the qualifier property. - * - */ - public boolean isQualifier() { - return qualifier; - } - - /** - * Sets the value of the qualifier property. - * - */ - public void setQualifier(boolean value) { - this.qualifier = value; - } - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/package-info.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/package-info.java deleted file mode 100644 index 83f6ddfdbbd34447c342bb475321ff467ec271d6..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/dmtf/schemas/wbem/wscim/_1/common/package-info.java +++ /dev/null @@ -1,9 +0,0 @@ -// -// This file was generated by the JavaTM Architecture for XML Binding(JAXB) Reference Implementation, vJAXB 2.1.10 in JDK 6 -// See http://java.sun.com/xml/jaxb -// Any modifications to this file will be lost upon recompilation of the source schema. -// Generated on: 2011.07.20 at 12:21:44 PM CEST -// - -@javax.xml.bind.annotation.XmlSchema(namespace = "http://schemas.dmtf.org/wbem/wscim/1/common", elementFormDefault = javax.xml.bind.annotation.XmlNsForm.QUALIFIED) -package org.ow2.contrail.common.implementation.ovf.dmtf.schemas.wbem.wscim._1.common; diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/item_processor/OVFCdDriveProcessor.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/item_processor/OVFCdDriveProcessor.java deleted file mode 100644 index 615e85963edaefa2fd163154c7c03f84e7980d8d..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/implementation/ovf/item_processor/OVFCdDriveProcessor.java +++ /dev/null @@ -1,38 +0,0 @@ -package org.ow2.contrail.common.implementation.ovf.item_processor; - - -import org.ow2.contrail.common.implementation.ovf.OVFItemProcessor; -import org.ow2.contrail.common.implementation.ovf.OVFVirtualHardware; -import org.ow2.contrail.common.implementation.ovf.virtualhardware.OVFVirtualHwCdDrive; -import org.w3c.dom.DOMException; -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; - -public class OVFCdDriveProcessor extends OVFItemProcessor { - - @Override - public OVFVirtualHardware processItem(Node xmlNode) throws DOMException { - - OVFVirtualHwCdDrive cd = new OVFVirtualHwCdDrive(); - - NodeList childs = xmlNode.getChildNodes(); - - for (int i=0; i getVirtualSystems(); - - /** - * Get the virtual networks associated with the appliance. - * - * @return A collection of OVFVirtualNetwork. - */ - public Collection getAssociatedVirtualNetworks(); - -/* /** - * Get the vertex associated with this appliance in the appliance graph. - * - * @return A Mascopt Vertex - */ - //public Vertex getVertex(); - - /** - * Gets the appliances this appliance is made of. - * - * @return A collection of ApplianceDescriptor. - */ - public Collection getAppliancesDescriptors(); - - // TODO: public Graph getApplianceGraph(); - - /** - * Gets the disk images used by this appliance. - * - * @return A collection of Disk. - */ - public Collection getDisks(); - - /** - * Check if this element represent a virtual collection - * @return - */ - public boolean isVirtualCollection(); - - /** - * Gets the startup information associated with this appliance. - * - * @return A OVFStartupSection - */ - public OVFStartupSection getOVFStartupSection(); - - /** - * Sets the startup information associated with this appliance. - * - * @param - * @return A OVFStartupSection - */ - public void setOVFStartupSection(OVFStartupSection value); - /** - * Sets the parent of the specific appliance - * @param parent - */ - public void setParent(ApplianceDescriptor parent); - - /** - * Gets the parent appliance - * @return - */ - public ApplianceDescriptor getParent(); - - /** - * Gets all the property of this appliance including those inherited - * @return - */ - public Collection getAllProperty(); - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/ApplianceStartupDescriptor.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/ApplianceStartupDescriptor.java deleted file mode 100644 index f7053f46c2af0d9849cb1abbc7719e414f540157..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/ApplianceStartupDescriptor.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ow2.contrail.common.interfaces; - -/** - * Represent the startup information associated to a specific appliance. - */ -public interface ApplianceStartupDescriptor -{ - - /** - * Gets the appliance id. - */ - public String getApplianceId(); - - /** - * Gets the absolute startup ordering. - */ - public int getStartupOrder(); - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/ApplicationConstraints.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/ApplicationConstraints.java deleted file mode 100644 index 322d1f8b65c6b625082c3e533cda9f8830396e37..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/ApplicationConstraints.java +++ /dev/null @@ -1,12 +0,0 @@ -package org.ow2.contrail.common.interfaces; - - -public interface ApplicationConstraints { - - - public String getCPURequirement(ApplianceDescriptor appDescr); - - public String getRAMRequirement(ApplianceDescriptor appDescr); - - public String getStorageRequirement(ApplianceDescriptor appDescr); -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/ApplicationDescriptor.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/ApplicationDescriptor.java deleted file mode 100644 index 4e2cc3e4cedb839e5322c2c222982e9db5b917dc..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/ApplicationDescriptor.java +++ /dev/null @@ -1,31 +0,0 @@ -package org.ow2.contrail.common.interfaces; - -import java.util.Collection; - -import org.ow2.contrail.common.implementation.sla.InternalSLAProposalImpl; - -public interface ApplicationDescriptor { - - // TODO: remove! Moved inside ApplianceDescriptor - //public SimpleWeightedGraph getApplicationGraph(); - - public Collection getAppliancesDescriptors(); - - /** The proposal is unique for each submission, maybe we can - * provide specific method in the InternalSLAProposalImpl Class - * to manage different degrees of granularity */ - public InternalSLAProposalImpl getSLAProposal(); - - public ApplicationConstraints getApplicationConstraints(); - - public UserConstraints getUserConstraints(); - - /** - * Gets information about the startup ordering for this application. - */ - public StartupDescriptor getStartupDescriptor(); - - @Override - public String toString(); - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/NegotiatedSLA.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/NegotiatedSLA.java deleted file mode 100644 index 9f6a0bd14eb8eb1c80c0609d5eb1da96695d3214..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/NegotiatedSLA.java +++ /dev/null @@ -1,7 +0,0 @@ -package org.ow2.contrail.common.interfaces; - -public interface NegotiatedSLA { - - public String getNegotiatedSLA(); - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/Property.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/Property.java deleted file mode 100644 index 7b5997a2f2b7099d8f51be4ab0ff5411387768de..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/Property.java +++ /dev/null @@ -1,14 +0,0 @@ -package org.ow2.contrail.common.interfaces; - -public interface Property { - - public String getKey(); - - public String getValue(); - - public void setKey(String key); - - public void setValue(String value); - public void setLabel(String msg, String description); - public void setDescription(String msg, String description); -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/SLAProposal.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/SLAProposal.java deleted file mode 100644 index 92bd9d7ed540f940b53907e4ec436302976118f8..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/SLAProposal.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.ow2.contrail.common.interfaces; - -public interface SLAProposal { - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/SLATemplate.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/SLATemplate.java deleted file mode 100644 index 8f785b019ed61c07697d17f16f4dbd8de3287baa..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/SLATemplate.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.ow2.contrail.common.interfaces; - -public interface SLATemplate { - - public String getTemplateID(); - public String getTemplateText(); - -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/StartupDescriptor.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/StartupDescriptor.java deleted file mode 100644 index fdfebf11dc17a144c308f7fb2d956cb79b9c39a6..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/StartupDescriptor.java +++ /dev/null @@ -1,8 +0,0 @@ -package org.ow2.contrail.common.interfaces; - -import java.util.Collection; - -public interface StartupDescriptor -{ - public Collection getStartupDescriptors(); -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/StartupGroup.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/StartupGroup.java deleted file mode 100644 index 95abf33a4a866909ac72741c2612e91e6ec54ee0..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/StartupGroup.java +++ /dev/null @@ -1,19 +0,0 @@ -package org.ow2.contrail.common.interfaces; - -import java.util.Collection; - -/** - * Represents a group of appliances with the same startup order. - */ -public interface StartupGroup -{ - /** - * Gets the group of related appliances. - */ - public Collection getStartupDescriptors(); - - /** - * Gets the time delay with respect to the next StartupGroup. - */ - public int getDelay(); -} diff --git a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/UserConstraints.java b/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/UserConstraints.java deleted file mode 100644 index 9c9e7e7f3766b9d821cff297eff4609eb4d4009c..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/java/org/ow2/contrail/common/interfaces/UserConstraints.java +++ /dev/null @@ -1,5 +0,0 @@ -package org.ow2.contrail.common.interfaces; - -public interface UserConstraints { - -} diff --git a/common/ovf-parser/src/main/resources/contrail_petstore.xml b/common/ovf-parser/src/main/resources/contrail_petstore.xml deleted file mode 100644 index 208789c73c67842158d8683b46f6cb79487b27bc..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/resources/contrail_petstore.xml +++ /dev/null @@ -1,629 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - Describes the set of virtual disks - - - - - - - - - - - - - - - - - - List of logical networks used in the package - - The network used to link the web server node and the engine frontend node. - - - The network used to link the engine nodes. - - - The network used to link the engine backend node and the db frontend node. - - - The network used to link the db nodes. - - - - - - - - - The packaging of the Contrail PetStoreService multi-tier application - Contrail PetStore Service - - - Describes product information for the service - Contrail PetStore Web Portal - Some Random Organization - 4.5 - 4.5-b4523 - http://www.vmware.com/go/ovf - http://www.vmware.com/ - - Network properties - - - - - IP address of the service - - - - - Primary IP address of the engine emitter node - - - - Primary IP address of the engine worker node 1 - - - - Primary IP address of the engine worker node 2 - - - - Primary IP address of the engine collector node - - - - - Primary IP address for the database - - - - - - Defines minimum reservations for CPU and memory - - - byte * 2^20 - 512 MB reservation - 0 - 512 - 4 - - - - byte * 2^20 - 384 MB reservation - 0 - 384 - 4 - - - - - MHz - 1000 MHz reservation - 1 - 500 - 3 - - - MHz - 500 MHz reservation - 1 - 500 - 3 - - - MHz - 1500 MHz reservation - 1 - 1500 - 3 - - - - - Specifies how the composite service is powered-on and off - - - - - - - - - - - The virtual machine containing the WebServer application - - Describes the product information - Apache Webserver - Apache Software Foundation - 6.5 - 6.5-b2432 - - - - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/web - 22001 - 1000 - 17 - - - true - VM Network - Ethernet adapter on "VM Network" - - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - - - - - The virtual machines containing the subgraph for the engine of the application - - - - - - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/engine_frontend - 22001 - 1000 - 17 - - - - - - - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/engine_worker - 22001 - 1000 - 17 - - - - - - - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/engine_worker - 22001 - 1000 - 17 - - - - - - - - - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/engine_backend - 22001 - 1000 - 17 - - - - - - - - Describes a clustered database instance - - Product Information - Somebody Clustered SQL Server - TBD - 2.5 - 2.5-b1234 - - - - - - - - - Specifies how the composite service is powered-on and off - - - - - - - - - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/db_frontend - 22001 - 1000 - 17 - - - - - - - Describes a virtual machine with the database image installed - Database Instance I - - - - - - - - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/db_backend - 22001 - 1000 - 17 - - - true - VM Network - Ethernet adapter on "VM Network" - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - - - - - - Describes a virtual machine with the database image installed - Database Instance II - - Specifies the OVF properties available in the OVF environment - - - - - - - - - - - 256 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 256 MB of memory - 2 - 4 - 256 - - - 0 - Harddisk 1 - ovf:/disk/db_backend - 22001 - 1000 - 17 - - - true - VM Network - Ethernet adapter on "VM Network" - - 3 - PCNet32 - 10 - - - 1 - SCSI Controller 0 - LSI Logic - 1000 - LsiLogic - 6 - - - - - - - - - \ No newline at end of file diff --git a/common/ovf-parser/src/main/resources/diff-order_template.xml b/common/ovf-parser/src/main/resources/diff-order_template.xml deleted file mode 100644 index 19e1894f9f1c7ab891a2ef70b755503cb7a38698..0000000000000000000000000000000000000000 --- a/common/ovf-parser/src/main/resources/diff-order_template.xml +++ /dev/null @@ -1,305 +0,0 @@ - - - - - - - - - - - - - - - - - Describes the set of virtual disks - - - - - - - - - List of logical networks used in the package - - The network used to link the - client and the server - - - - - - - - - Defines minimum reservations for CPU and memory - - - byte * 2^20 - 256 MB reservation - 0 - 256 - 4 - - - byte * 2^20 - 128 MB reservation - 0 - 384 - 4 - - - - MHz - 500 MHz reservation - 1 - 500 - 3 - - - MHz - 200 MHz reservation - 1 - 200 - 3 - - - MHz - 800 MHz reservation - 1 - 800 - 3 - - - - - Application Client Server - - - Describes product information for the service - Application to share information from client to server - - Cnr test - 0.1 - 0.1 - - - - Network properties - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Defines minimum reservations for CPU and memory - - - byte * 2^20 - 512 MB reservation - 0 - 512 - 4 - - - - byte * 2^20 - 384 MB reservation - 0 - 384 - 4 - - - - MHz - 200 MHz reservation - 1 - 200 - 3 - - - MHz - 100 MHz reservation - 1 - 100 - 3 - - - MHz - 300 MHz reservation - 1 - 300 - 3 - - - - - Specifies how the composite service is powered-on and off - - - - - - - - - - The virtual machine containing the server-side application - - - Describes the product information - Cnr Server - Cnr - 0.0.1 - 0.0.1 - - - - - - 128 MB, 1 CPU, 1 disk, 1 nic virtual machine - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 128 MB of memory - 2 - 4 - 128 - - - 0 - Harddisk 1 - ovf:/disk/server_image - 22001 - 1000 - 17 - - - true - VM Network - Ethernet adapter on "VM Network" - - 3 - PCNet32 - 10 - - - - - - The client used to interrogation the server - - - Describes the product information - Cnr Client - Cnr - 0.0.1 - 0.0.1 - - - - - - Virtual Hardware Family - 0 - vmx-04 - - - Number of virtual CPUs - 1 virtual CPU - 1 - 3 - 1 - - - byte * 2^20 - Memory Size - 128 MB of memory - 2 -